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/main_global.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/libgui/main_global.cpp') diff --git a/src/libgui/main_global.cpp b/src/libgui/main_global.cpp index 8741a44..283149d 100644 --- a/src/libgui/main_global.cpp +++ b/src/libgui/main_global.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "main_global.h" -#include +#include #include "toplevel.h" #include "common/global/about.h" @@ -60,16 +60,16 @@ KAction *Main::action(KStdAction::StdAction action) return _toplevel->KMainWindow::action(KStdAction::name(action)); } -QPopupMenu &Main::popup(const char *name) +TQPopupMenu &Main::popup(const char *name) { - QPopupMenu *popup = static_cast(_toplevel->factory()->container(name, _toplevel)); + TQPopupMenu *popup = static_cast(_toplevel->factory()->container(name, _toplevel)); Q_ASSERT(popup); return *popup; } const Device::Data *Main::deviceData() { - QString name = device(); + TQString name = device(); if ( name==Device::AUTO_DATA.name ) name = DeviceEditor::guessDeviceFromFile(_projectManager->projectUrl()); return Device::lister().data(name); @@ -77,5 +77,5 @@ const Device::Data *Main::deviceData() Editor *Main::currentEditor() { return _editorManager->currentEditor(); } Project *Main::project() { return _projectManager->project(); } -QString Main::device() { return Compile::Config::device(project()); } +TQString Main::device() { return Compile::Config::device(project()); } const Tool::Group &Main::toolGroup() { return Compile::Config::toolGroup(project()); } -- cgit v1.2.1