diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
commit | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch) | |
tree | d087071b1e8fcf79698938efec19f8e48bab0799 /kmobile/kmobile.cpp | |
parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmobile/kmobile.cpp')
-rw-r--r-- | kmobile/kmobile.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp index f212dc411..4c46b8903 100644 --- a/kmobile/kmobile.cpp +++ b/kmobile/kmobile.cpp @@ -213,7 +213,7 @@ void KMobile::optionsConfigureKeys() void KMobile::optionsConfigureToolbars() { // use the standard toolbar editor - saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); } void KMobile::newToolbarConfig() @@ -222,7 +222,7 @@ void KMobile::newToolbarConfig() // recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.) createGUI(); - applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); } void KMobile::optionsPreferences() @@ -278,7 +278,7 @@ void KMobile::addDevice() TQString iconName = ptr->icon(); if (iconName.isEmpty()) iconName = KMOBILE_ICON_UNKNOWN; - TQPixmap pm = KGlobal::instance()->iconLoader()->loadIcon(iconName, KIcon::Desktop ); + TQPixmap pm = TDEGlobal::instance()->iconLoader()->loadIcon(iconName, KIcon::Desktop ); TQIconViewItem *item; item = new TQIconViewItem( dialog->iconView, ptr->name(), pm ); |