From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmobile/systemtray.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'kmobile/systemtray.cpp') diff --git a/kmobile/systemtray.cpp b/kmobile/systemtray.cpp index 01f21c8a..e40dff64 100644 --- a/kmobile/systemtray.cpp +++ b/kmobile/systemtray.cpp @@ -35,7 +35,7 @@ #include "kmobileview.h" -SystemTray::SystemTray(KMainWindow *parent, const char *name) : KSystemTray(parent, name) +SystemTray::SystemTray(KMainWindow *tqparent, const char *name) : KSystemTray(tqparent, name) { m_appPix = KGlobal::instance()->iconLoader()->loadIcon("kmobile", KIcon::Small); @@ -43,8 +43,8 @@ SystemTray::SystemTray(KMainWindow *parent, const char *name) : KSystemTray(pare setToolTip(); - m_actionCollection = parent->actionCollection(); - KAction *addAction = m_actionCollection->action("device_add"); + m_actionCollection = tqparent->actionCollection(); + KAction *addAction = m_actionCollection->action("tqdevice_add"); KPopupMenu* menu = contextMenu(); addAction->plug(menu); @@ -60,15 +60,15 @@ SystemTray::~SystemTray() void SystemTray::contextMenuAboutToShow(KPopupMenu *menu) { - KMobile *main = static_cast(parent()); + KMobile *main = static_cast(tqparent()); const int pos = 3; while (menu->idAt(pos)>=SYSTEMTRAY_STARTID && menu->idAt(pos)<=(SYSTEMTRAY_STARTID+1000)) menu->removeItemAt(pos); - // create menu entries for each mobile device and add it's icon - TQStringList list = main->mainView()->deviceNames(); + // create menu entries for each mobile tqdevice and add it's icon + TQStringList list = main->mainView()->tqdeviceNames(); for (unsigned int no=0; nomainView()->iconFileName(devName); @@ -84,7 +84,7 @@ void SystemTray::menuItemSelected() if (m_menuIDSYSTEMTRAY_STARTID+1000) return; TQString devName = contextMenu()->text(m_menuID); - KMobile *main = static_cast(parent()); + KMobile *main = static_cast(tqparent()); main->mainView()->startKonqueror(devName); } -- cgit v1.2.3