From 0aaa8e3fc8f8a1481333b564f0922277c8d8ad59 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 30 Jun 2011 00:15:53 +0000 Subject: TQt4 port piklab This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/piklab@1238822 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/libgui/toplevel.h | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'src/libgui/toplevel.h') diff --git a/src/libgui/toplevel.h b/src/libgui/toplevel.h index 11a4316..d3e78be 100644 --- a/src/libgui/toplevel.h +++ b/src/libgui/toplevel.h @@ -10,8 +10,8 @@ #ifndef TOPLEVEL_H #define TOPLEVEL_H -#include -#include +#include +#include #include #include "config_center.h" @@ -26,10 +26,11 @@ namespace Process { class Base; } class MainWindow : public KDockMainWindow { Q_OBJECT + TQ_OBJECT public: MainWindow(); virtual ~MainWindow(); - void setDevice(const QString &device); + void setDevice(const TQString &device); public slots: void newSourceFile(); @@ -41,7 +42,7 @@ public slots: void configureProject(); void showDeviceInfo(); void runPikloops(); - void runKfind(); + void runKtqfind(); void configGenerator(); void templateGenerator(); void updateGUI(); @@ -77,7 +78,7 @@ private slots: void updateToolViewsActions(); void resetDockLayout(); - void toggleToolView(QWidget *widget); + void toggleToolView(TQWidget *widget); void pikloopsDone(); void kfindDone(); @@ -92,10 +93,10 @@ signals: private: Log::Widget *_programLog; - QLabel *_actionStatus, *_debugStatus, *_editorStatus; - ProgrammerStatusWidget *_programmerStatus; - ToolStatusWidget *_toolStatus; - QProgressBar *_actionProgress; + TQLabel *_actiontqStatus, *_debugtqStatus, *_editortqStatus; + ProgrammerStatusWidget *_programmertqStatus; + ToolStatusWidget *_tooltqStatus; + TQProgressBar *_actionProgress; ConfigGenerator *_configGenerator; ::Process::Base *_pikloopsProcess, *_kfindProcess; bool _forceProgramAfterBuild; @@ -103,9 +104,9 @@ private: class DockPosition { public: DockPosition() {} - DockPosition(const QString &pparent) : parent(pparent), pos(KDockWidget::DockCenter), space(0) {} - DockPosition(KDockWidget::DockPosition ppos, uint pspace) : parent("main_dock_widget"), pos(ppos), space(pspace) {} - QString parent; + DockPosition(const TQString &ptqparent) : tqparent(ptqparent), pos(KDockWidget::DockCenter), space(0) {} + DockPosition(KDockWidget::DockPosition ppos, uint pspace) : tqparent("main_dock_widget"), pos(ppos), space(pspace) {} + TQString tqparent; KDockWidget::DockPosition pos; uint space; }; @@ -113,19 +114,19 @@ private: public: ViewMenuAction *action; KDockWidget *dock; - QString title; + TQString title; DockPosition position; }; - QValueList _docks; + TQValueList _docks; KDockWidget *_mainDock; HexEditor *getHexEditor(); virtual bool queryClose(); bool stopOperations(); void cleanBuild(bool singleFile); - virtual void keyPressEvent(QKeyEvent *e); + virtual void keyPressEvent(TQKeyEvent *e); void readDockConfig(); - KDockWidget *createDock(const QString &name, const QPixmap &icon, const QString &title, const DockPosition &position); + KDockWidget *createDock(const TQString &name, const TQPixmap &icon, const TQString &title, const DockPosition &position); void initDockPosition(const DockData &ddata); }; -- cgit v1.2.1