Commit 68ccb7ef authored by Boris Barbulovski's avatar Boris Barbulovski Committed by Michal Marek

Port xconfig to Qt5 - Fix the code so it compiles with Qt5

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 76538660
This diff is collapsed.
...@@ -3,9 +3,18 @@ ...@@ -3,9 +3,18 @@
* Released under the terms of the GNU GPL v2.0. * Released under the terms of the GNU GPL v2.0.
*/ */
#include <q3listview.h> #include <QTextBrowser>
#include <QTreeWidget>
#include <QMainWindow> #include <QMainWindow>
#include <QHeaderView>
#include <qsettings.h> #include <qsettings.h>
#include <QPushButton>
#include <QSettings>
#include <QLineEdit>
#include <QSplitter>
#include <QCheckBox>
#include <QDialog>
#include "expr.h"
class ConfigView; class ConfigView;
class ConfigLineEdit; class ConfigLineEdit;
...@@ -37,11 +46,11 @@ class ConfigLineEdit : public QLineEdit { ...@@ -37,11 +46,11 @@ class ConfigLineEdit : public QLineEdit {
{ {
return (ConfigView*)Parent::parent(); return (ConfigView*)Parent::parent();
} }
void show(Q3ListViewItem *i); void show(QTreeWidgetItem *i);
void keyPressEvent(QKeyEvent *e); void keyPressEvent(QKeyEvent *e);
public: public:
Q3ListViewItem *item; QTreeWidgetItem *item;
}; };
class ConfigView : public QWidget { class ConfigView : public QWidget {
...@@ -50,7 +59,7 @@ class ConfigView : public QWidget { ...@@ -50,7 +59,7 @@ class ConfigView : public QWidget {
public: public:
ConfigView(QWidget* parent, const char *name = 0); ConfigView(QWidget* parent, const char *name = 0);
~ConfigView(void); ~ConfigView(void);
static void updateList(Q3ListViewItem* item); static void updateList(QTreeWidgetItem* item);
static void updateListAll(void); static void updateListAll(void);
bool showName(void) const { return false; } // TODO: Implement me. bool showName(void) const { return false; } // TODO: Implement me.
...@@ -66,7 +75,7 @@ public slots: ...@@ -66,7 +75,7 @@ public slots:
void showRangeChanged(bool); void showRangeChanged(bool);
void showDataChanged(bool); void showDataChanged(bool);
public: public:
Q3ListView* list; QTreeWidget* list;
ConfigLineEdit* lineEdit; ConfigLineEdit* lineEdit;
static ConfigView* viewList; static ConfigView* viewList;
...@@ -155,9 +164,9 @@ public slots: ...@@ -155,9 +164,9 @@ public slots:
ConfigSearchWindow *searchWindow; ConfigSearchWindow *searchWindow;
ConfigView *menuView; ConfigView *menuView;
Q3ListView *menuList; QTreeWidget *menuList;
ConfigView *configView; ConfigView *configView;
Q3ListView *configList; QTreeWidget *configList;
ConfigInfoView *helpText; ConfigInfoView *helpText;
QToolBar *toolBar; QToolBar *toolBar;
QAction *backAction; QAction *backAction;
......
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