diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-30 00:15:53 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-30 00:15:53 +0000 |
commit | 0aaa8e3fc8f8a1481333b564f0922277c8d8ad59 (patch) | |
tree | b95c0ca86c4876dd139af376b9f4afd8917cf0cd /src/libgui/main_global.h | |
parent | b79a2c28534cf09987eeeba3077fff9236df182a (diff) | |
download | piklab-0aaa8e3fc8f8a1481333b564f0922277c8d8ad59.tar.gz piklab-0aaa8e3fc8f8a1481333b564f0922277c8d8ad59.zip |
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
Diffstat (limited to 'src/libgui/main_global.h')
-rw-r--r-- | src/libgui/main_global.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libgui/main_global.h b/src/libgui/main_global.h index 020253e..a3dc901 100644 --- a/src/libgui/main_global.h +++ b/src/libgui/main_global.h @@ -9,8 +9,8 @@ #ifndef MAIN_GLOBAL_H #define MAIN_GLOBAL_H -#include <qstring.h> -#include <qpopupmenu.h> +#include <tqstring.h> +#include <tqpopupmenu.h> #include <kstdaction.h> #include "progs/base/generic_prog.h" @@ -41,10 +41,10 @@ public: static Programmer::State programmerState(); static KAction *action(const char *name); static KAction *action(KStdAction::StdAction action); - static QPopupMenu &popup(const char *name); + static TQPopupMenu &popup(const char *name); static EditorManager &editorManager() { return *_editorManager; } static Editor *currentEditor(); - static QString device(); + static TQString device(); static const Device::Data *deviceData(); static Breakpoint::View &breakpointsView() { return *_breakpointsView; } static ProjectManager::View &projectManager() { return *_projectManager; } |