diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:50:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:50:20 -0600 |
| commit | aef5eada7f51ee48f3d21448db290bd8f06953a8 (patch) | |
| tree | 9d6e7572ebcc27e402501d6966f9b46361a1702c /kmilo | |
| parent | 95d05392f9bc01594738a1e06ebf23123b3d3e6e (diff) | |
| download | tdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.tar.gz tdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmilo')
| -rw-r--r-- | kmilo/generic/generic_monitor.cpp | 10 | ||||
| -rw-r--r-- | kmilo/generic/generic_monitor.h | 2 | ||||
| -rw-r--r-- | kmilo/kmilod/defaultskin.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kmilo/generic/generic_monitor.cpp b/kmilo/generic/generic_monitor.cpp index 4e13be1..658533a 100644 --- a/kmilo/generic/generic_monitor.cpp +++ b/kmilo/generic/generic_monitor.cpp @@ -98,7 +98,7 @@ bool GenericMonitor::init() { "Mute", KShortcut("XF86AudioMute"), TQT_SLOT(mute()) } }; - ga = new KGlobalAccel(this, "miloGenericAccel"); + ga = new TDEGlobalAccel(this, "miloGenericAccel"); ShortcutInfo si; int len = (int)sizeof(shortcuts)/sizeof(ShortcutInfo); @@ -338,9 +338,9 @@ Monitor::DisplayType GenericMonitor::poll() void GenericMonitor::launch(TQString configKey, TQString defaultApplication) { TQString application = config->readEntry(configKey, defaultApplication); - KProcess proc; + TDEProcess proc; proc << application; - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } void GenericMonitor::launchMail() @@ -362,9 +362,9 @@ void GenericMonitor::launchSearch() void GenericMonitor::launchHomeFolder() { TQString home = TQDir::home().path(); - KProcess proc; + TDEProcess proc; proc << "kfmclient" << "exec" << home; - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } void GenericMonitor::launchMusic() diff --git a/kmilo/generic/generic_monitor.h b/kmilo/generic/generic_monitor.h index 6f23316..3884627 100644 --- a/kmilo/generic/generic_monitor.h +++ b/kmilo/generic/generic_monitor.h @@ -85,7 +85,7 @@ private: void displayVolume(); void launch(TQString configKey, TQString defaultApplication); - KGlobalAccel *ga; + TDEGlobalAccel *ga; KConfig* config; DCOPRef *kmixClient, *kmixWindow; diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp index 6bc35c7..2793ee2 100644 --- a/kmilo/kmilod/defaultskin.cpp +++ b/kmilo/kmilod/defaultskin.cpp @@ -98,7 +98,7 @@ void DefaultSkin::clear() { void DefaultSkin::show() { #if KDE_IS_VERSION(3,1,90) - TQRect r = KGlobalSettings::splashScreenDesktopGeometry(); + TQRect r = TDEGlobalSettings::splashScreenDesktopGeometry(); #else TQRect r = TQApplication::desktop()->geometry(); #endif |