Changeset 7531 in orxonox.OLD

Timestamp:

May 4, 2006, 9:52:36 AM (18 years ago)

Author:

bensch

Message:

strange error on tardis again

Location:

branches/qt_gui/src/lib/gui/qt_gui

Files:

• gui_video.cc (modified) (2 diffs)
• gui_video.h (modified) (1 diff)
• qt_gui.cc (modified) (1 diff)
• qt_gui_elements.cc (modified) (1 diff)
• qt_gui_elements.h (modified) (1 diff)

branches/qt_gui/src/lib/gui/qt_gui/gui_video.cc

@@ -56 +56 @@
         QComboBox* resolution = new QComboBox("Resolution", this);
         layout->addWidget(resolution, 2, 0);
-        std::vector<std::string> resolutions;
+        std::vector<QString> resolutions;
         this->getResolutions(resolutions);
         for (unsigned int i = 0; i < resolutions.size(); ++i)
@@ -115 +115 @@
    * @param menu the Menu to set The resolutions to.
   */
-  void GuiVideo::getResolutions(std::vector<std::string>& resolutionList)
+  void GuiVideo::getResolutions(std::vector<QString>& resolutionList)
   {
     SDL_Init(SDL_INIT_VIDEO);

branches/qt_gui/src/lib/gui/qt_gui/gui_video.h

@@ -21 +21 @@
 
   private:
-    void getResolutions(std::vector<std::string>& resolutionList);
+    void getResolutions(std::vector<QString>& resolutionList);
   };
 }

branches/qt_gui/src/lib/gui/qt_gui/qt_gui.cc

@@ -24 +24 @@
 
 #include <qpushbutton.h>
+#include <qcombobox.h>
 
 #include "gui_video.h"

branches/qt_gui/src/lib/gui/qt_gui/qt_gui_elements.cc

@@ -23 +23 @@
 
 
+
+
+  QtGuiComboBox::QtGuiComboBox(QWidget* parent, const std::string& name)
+  : QComboBox(parent), Saveable(name)
+  {
+
+
+  }
+
+
+
 }

branches/qt_gui/src/lib/gui/qt_gui/qt_gui_elements.h

@@ -115 +115 @@
   };
 
+
+  class QtGuiComboBox : public QComboBox, public OrxGui::Saveable
+  {
+    QtGuiComboBox(QWidget* parent, const std::string& name);
+  }
+
+
+
   class QtGuiTextLine : public QLineEdit, public QtGuiWidget, public GuiSaveable
   {