Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
May 4, 2006, 3:14:25 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: QT-4 works on Tardis

Location:
branches/qt_gui/src/lib/gui/qt_gui
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/qt_gui/src/lib/gui/qt_gui/gui_audio.cc

    r7495 r7534  
    2727#include "gui_audio.h"
    2828
    29 #include <qlayout.h>
     29#include <QtGui/QLayout>
    3030#include "sdlincl.h"
    3131#include "debug.h"
    3232
    33 #include <qpushbutton.h>
    34 #include <qcheckbox.h>
    35 #include <qcombobox.h>
     33#include <QtGui/QPushButton>
     34#include <QtGui/QCheckBox>
     35#include <QtGui/QComboBox>
    3636
    3737namespace OrxGui
     
    4646
    4747    {
    48       QCheckBox* fullscreen = new QCheckBox(QString("Enabled"), this);
     48      QCheckBox* fullscreen = new QCheckBox(QString("Enabled"));
    4949      //fullscreen->setName();
    5050      layout->addWidget(fullscreen, 0, 0);
    5151
    52       QCheckBox* wireframe = new QCheckBox("Test", this);
     52      QCheckBox* wireframe = new QCheckBox("Test");
    5353      layout->addWidget(wireframe, 1, 0);
    5454
    55       QComboBox* resolution = new QComboBox("SecondTest", this);
     55      QComboBox* resolution = new QComboBox();
    5656      layout->addWidget(resolution, 2, 0);
    5757
  • branches/qt_gui/src/lib/gui/qt_gui/gui_audio.h

    r7495 r7534  
    99#include <vector>
    1010#include <string>
    11 #include <qgroupbox.h>
     11#include <QtGui/QGroupBox>
    1212
    1313namespace OrxGui
  • branches/qt_gui/src/lib/gui/qt_gui/gui_video.cc

    r7531 r7534  
    2727#include "gui_video.h"
    2828
    29 #include <qlayout.h>
     29#include <QtGui/QLayout>
    3030#include "sdlincl.h"
    3131#include "debug.h"
    3232
    33 #include <qpushbutton.h>
    34 #include <qcheckbox.h>
    35 #include <qcombobox.h>
     33
     34#include <QtGui/QPushButton>
     35#include <QtGui/QCheckBox>
     36#include <QtGui/QComboBox>
    3637
    3738namespace OrxGui
     
    5455
    5556      {
    56         QComboBox* resolution = new QComboBox("Resolution", this);
     57        QComboBox* resolution = new QComboBox();
    5758        layout->addWidget(resolution, 2, 0);
    5859        std::vector<QString> resolutions;
    5960        this->getResolutions(resolutions);
    6061        for (unsigned int i = 0; i < resolutions.size(); ++i)
    61           resolution->insertItem(resolutions[i]);
     62          resolution->addItem(resolutions[i]);
    6263      }
    6364
     
    148149          PRINTF(5)("  %d x %d\n", modes[i]->w, modes[i]->h);
    149150          sprintf(tmpChar, "%dx%d", modes[i]->w, modes[i]->h);
    150           resolutionList.push_back(std::string(tmpChar));
     151          resolutionList.push_back(QString(tmpChar));
    151152          x = modes[i]->w; y = modes[i]->h;
    152153        }
  • branches/qt_gui/src/lib/gui/qt_gui/gui_video.h

    r7531 r7534  
    99#include <vector>
    1010#include <string>
    11 #include <qgroupbox.h>
     11#include <QtGui/QGroupBox>
    1212
    1313namespace OrxGui
  • branches/qt_gui/src/lib/gui/qt_gui/qt_gui.cc

    r7531 r7534  
    1818#include "qt_gui.h"
    1919
    20 #include <qapplication.h>
    21 #include <qgroupbox.h>
    22 #include <qlayout.h>
    23 #include <qtoolbox.h>
     20#include <QtGui/QApplication>
     21#include <QtGui/QToolBox>
     22#include <QtGui/QGridLayout>
    2423
    25 #include <qpushbutton.h>
    26 #include <qcombobox.h>
    2724
    2825#include "gui_video.h"
  • branches/qt_gui/src/lib/gui/qt_gui/qt_gui.h

    r7493 r7534  
    99#include "../gui.h"
    1010#include "../gui_element.h"
    11 #include <qapplication.h>
    12 #include <qmainwindow.h>
     11#include <QtGui/QApplication>
     12#include <QtGui/QMainWindow>
    1313
    1414namespace OrxGui
Note: See TracChangeset for help on using the changeset viewer.