diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:20:29 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:20:29 -0600 |
| commit | c688369447b544335c61ffdec4b1c1156b0a0158 (patch) | |
| tree | b33993819e0a209f05a436646279de7eecc17706 | |
| parent | 2e292ab46d52d5a222dfdd34296ac79553d89e6c (diff) | |
| download | kerberostray-c688369447b544335c61ffdec4b1c1156b0a0158.tar.gz kerberostray-c688369447b544335c61ffdec4b1c1156b0a0158.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
| -rw-r--r-- | src/toplevel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/toplevel.cpp b/src/toplevel.cpp index b5daa49..807c43b 100644 --- a/src/toplevel.cpp +++ b/src/toplevel.cpp @@ -76,7 +76,7 @@ TopLevel::TopLevel() : KSystemTray(), ticketWatch(0), m_refreshTimer(0), notifyE menu = new TQPopupMenu(); connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuAction(int))); - KHelpMenu* help = new KHelpMenu(this, KGlobal::instance()->aboutData(), false); + KHelpMenu* help = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false); KPopupMenu* helpMnu = help->menu(); menu->insertSeparator(); @@ -117,7 +117,7 @@ TopLevel::~TopLevel() } void TopLevel::load() { - KConfig* config = KGlobal::instance()->config(); + KConfig* config = TDEGlobal::instance()->config(); config->setGroup(NULL); autostart = config->readBoolEntry("Autostart", true); notifyExpiry = config->readBoolEntry("notifyExpiry", true); @@ -125,7 +125,7 @@ void TopLevel::load() { } void TopLevel::save() { - KConfig* config = KGlobal::instance()->config(); + KConfig* config = TDEGlobal::instance()->config(); config->setGroup(NULL); config->writeEntry("Autostart", autostart); config->writeEntry("notifyExpiry", notifyExpiry); |