summaryrefslogtreecommitdiffstats
path: root/karm/tray.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-13 00:46:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-13 00:46:47 +0000
commit67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch)
tree5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /karm/tray.cpp
parent2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff)
downloadtdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.tar.gz
tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.zip
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
Diffstat (limited to 'karm/tray.cpp')
-rw-r--r--karm/tray.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/karm/tray.cpp b/karm/tray.cpp
index ac820abbb..3758dd7f8 100644
--- a/karm/tray.cpp
+++ b/karm/tray.cpp
@@ -30,8 +30,8 @@
TQPtrVector<TQPixmap> *KarmTray::icons = 0;
-KarmTray::KarmTray(MainWindow* parent)
- : KSystemTray(parent, "Karm Tray")
+KarmTray::KarmTray(MainWindow* tqparent)
+ : KSystemTray(tqparent, "Karm Tray")
{
// the timer that updates the "running" icon in the tray
_taskActiveTimer = new TQTimer(this);
@@ -49,8 +49,8 @@ KarmTray::KarmTray(MainWindow* parent)
}
}
- parent->actionPreferences->plug( contextMenu() );
- parent->actionStopAll->plug( contextMenu() );
+ tqparent->actionPreferences->plug( contextMenu() );
+ tqparent->actionStopAll->plug( contextMenu() );
resetClock();
initToolTip();
@@ -71,7 +71,7 @@ KarmTray::KarmTray(MainWindow* parent)
*/
}
-KarmTray::KarmTray(karmPart * parent)
+KarmTray::KarmTray(karmPart * tqparent)
: KSystemTray( 0 , "Karm Tray")
{
// it is not convenient if every kpart gets an icon in the systray.