Changeset 7534 in orxonox.OLD for branches/qt_gui/src

Timestamp:

May 4, 2006, 3:14:25 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: QT-4 works on Tardis

Location:

branches/qt_gui/src/lib/gui/qt_gui

Files:

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

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

@@ -27 +27 @@
 #include "gui_audio.h"
 
-#include <qlayout.h>
+#include <QtGui/QLayout>
 #include "sdlincl.h"
 #include "debug.h"
 
-#include <qpushbutton.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
+#include <QtGui/QPushButton>
+#include <QtGui/QCheckBox>
+#include <QtGui/QComboBox>
 
 namespace OrxGui
@@ -46 +46 @@
 
     {
-      QCheckBox* fullscreen = new QCheckBox(QString("Enabled"), this);
+      QCheckBox* fullscreen = new QCheckBox(QString("Enabled"));
       //fullscreen->setName();
       layout->addWidget(fullscreen, 0, 0);
 
-      QCheckBox* wireframe = new QCheckBox("Test", this);
+      QCheckBox* wireframe = new QCheckBox("Test");
       layout->addWidget(wireframe, 1, 0);
 
-      QComboBox* resolution = new QComboBox("SecondTest", this);
+      QComboBox* resolution = new QComboBox();
       layout->addWidget(resolution, 2, 0);
 

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

@@ -9 +9 @@
 #include <vector>
 #include <string>
-#include <qgroupbox.h>
+#include <QtGui/QGroupBox>
 
 namespace OrxGui

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

@@ -27 +27 @@
 #include "gui_video.h"
 
-#include <qlayout.h>
+#include <QtGui/QLayout>
 #include "sdlincl.h"
 #include "debug.h"
 
-#include <qpushbutton.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
+
+#include <QtGui/QPushButton>
+#include <QtGui/QCheckBox>
+#include <QtGui/QComboBox>
 
 namespace OrxGui
@@ -54 +55 @@
 
       {
-        QComboBox* resolution = new QComboBox("Resolution", this);
+        QComboBox* resolution = new QComboBox();
         layout->addWidget(resolution, 2, 0);
         std::vector<QString> resolutions;
         this->getResolutions(resolutions);
         for (unsigned int i = 0; i < resolutions.size(); ++i)
-          resolution->insertItem(resolutions[i]);
+          resolution->addItem(resolutions[i]);
       }
 
@@ -148 +149 @@
           PRINTF(5)("  %d x %d\n", modes[i]->w, modes[i]->h);
           sprintf(tmpChar, "%dx%d", modes[i]->w, modes[i]->h);
-          resolutionList.push_back(std::string(tmpChar));
+          resolutionList.push_back(QString(tmpChar));
           x = modes[i]->w; y = modes[i]->h;
         }

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

@@ -9 +9 @@
 #include <vector>
 #include <string>
-#include <qgroupbox.h>
+#include <QtGui/QGroupBox>
 
 namespace OrxGui

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

@@ -18 +18 @@
 #include "qt_gui.h"
 
-#include <qapplication.h>
-#include <qgroupbox.h>
-#include <qlayout.h>
-#include <qtoolbox.h>
+#include <QtGui/QApplication>
+#include <QtGui/QToolBox>
+#include <QtGui/QGridLayout>
 
-#include <qpushbutton.h>
-#include <qcombobox.h>
 
 #include "gui_video.h"

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

@@ -9 +9 @@
 #include "../gui.h"
 #include "../gui_element.h"
-#include <qapplication.h>
-#include <qmainwindow.h>
+#include <QtGui/QApplication>
+#include <QtGui/QMainWindow>
 
 namespace OrxGui