Commit 8328447a authored by Boris Barbulovski's avatar Boris Barbulovski Committed by Michal Marek

Remove support for QT3 and older.

Signed-off-by: default avatarBoris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: default avatarThiago Macieira <thiago.macieira@intel.com>
Signed-off-by: default avatarMichal Marek <mmarek@suse.com>
parent 1c199f28
...@@ -5,18 +5,6 @@ ...@@ -5,18 +5,6 @@
#include <qglobal.h> #include <qglobal.h>
#if QT_VERSION < 0x040000
#include <stddef.h>
#include <qmainwindow.h>
#include <qvbox.h>
#include <qvaluelist.h>
#include <qtextbrowser.h>
#include <qaction.h>
#include <qheader.h>
#include <qfiledialog.h>
#include <qdragobject.h>
#include <qpopupmenu.h>
#else
#include <q3mainwindow.h> #include <q3mainwindow.h>
#include <q3vbox.h> #include <q3vbox.h>
#include <q3valuelist.h> #include <q3valuelist.h>
...@@ -26,7 +14,6 @@ ...@@ -26,7 +14,6 @@
#include <q3filedialog.h> #include <q3filedialog.h>
#include <q3dragobject.h> #include <q3dragobject.h>
#include <q3popupmenu.h> #include <q3popupmenu.h>
#endif
#include <qapplication.h> #include <qapplication.h>
#include <qdesktopwidget.h> #include <qdesktopwidget.h>
...@@ -1282,11 +1269,7 @@ ConfigMainWindow::ConfigMainWindow(void) ...@@ -1282,11 +1269,7 @@ ConfigMainWindow::ConfigMainWindow(void)
QDesktopWidget *d = configApp->desktop(); QDesktopWidget *d = configApp->desktop();
snprintf(title, sizeof(title), "%s%s", snprintf(title, sizeof(title), "%s%s",
rootmenu.prompt->text, rootmenu.prompt->text,
#if QT_VERSION < 0x040000
" (Qt3)"
#else
"" ""
#endif
); );
setCaption(title); setCaption(title);
...@@ -1368,15 +1351,9 @@ ConfigMainWindow::ConfigMainWindow(void) ...@@ -1368,15 +1351,9 @@ ConfigMainWindow::ConfigMainWindow(void)
connect(optGroup, SIGNAL(selected(QAction *)), menuView, connect(optGroup, SIGNAL(selected(QAction *)), menuView,
SLOT(setOptionMode(QAction *))); SLOT(setOptionMode(QAction *)));
#if QT_VERSION >= 0x040000
configView->showNormalAction = new QAction(_("Show Normal Options"), optGroup); configView->showNormalAction = new QAction(_("Show Normal Options"), optGroup);
configView->showAllAction = new QAction(_("Show All Options"), optGroup); configView->showAllAction = new QAction(_("Show All Options"), optGroup);
configView->showPromptAction = new QAction(_("Show Prompt Options"), optGroup); configView->showPromptAction = new QAction(_("Show Prompt Options"), optGroup);
#else
configView->showNormalAction = new QAction(_("Show Normal Options"), 0, optGroup);
configView->showAllAction = new QAction(_("Show All Options"), 0, optGroup);
configView->showPromptAction = new QAction(_("Show Prompt Options"), 0, optGroup);
#endif
configView->showNormalAction->setToggleAction(TRUE); configView->showNormalAction->setToggleAction(TRUE);
configView->showNormalAction->setOn(configList->optMode == normalOpt); configView->showNormalAction->setOn(configList->optMode == normalOpt);
configView->showAllAction->setToggleAction(TRUE); configView->showAllAction->setToggleAction(TRUE);
......
...@@ -3,27 +3,9 @@ ...@@ -3,27 +3,9 @@
* Released under the terms of the GNU GPL v2.0. * Released under the terms of the GNU GPL v2.0.
*/ */
#if QT_VERSION < 0x040000
#include <qlistview.h>
#else
#include <q3listview.h> #include <q3listview.h>
#endif
#include <qsettings.h> #include <qsettings.h>
#if QT_VERSION < 0x040000
#define Q3ValueList QValueList
#define Q3PopupMenu QPopupMenu
#define Q3ListView QListView
#define Q3ListViewItem QListViewItem
#define Q3VBox QVBox
#define Q3TextBrowser QTextBrowser
#define Q3MainWindow QMainWindow
#define Q3Action QAction
#define Q3ToolBar QToolBar
#define Q3ListViewItemIterator QListViewItemIterator
#define Q3FileDialog QFileDialog
#endif
class ConfigView; class ConfigView;
class ConfigList; class ConfigList;
class ConfigItem; class ConfigItem;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment