summaryrefslogtreecommitdiffstats
path: root/kmobile
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
commita9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch)
treed087071b1e8fcf79698938efec19f8e48bab0799 /kmobile
parent5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff)
downloadtdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz
tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmobile')
-rw-r--r--kmobile/kmobile.cpp6
-rw-r--r--kmobile/kmobileitem.cpp2
-rw-r--r--kmobile/kmobileview.cpp2
-rw-r--r--kmobile/systemtray.cpp4
4 files changed, 7 insertions, 7 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 );
diff --git a/kmobile/kmobileitem.cpp b/kmobile/kmobileitem.cpp
index d1e6c467e..2471f667e 100644
--- a/kmobile/kmobileitem.cpp
+++ b/kmobile/kmobileitem.cpp
@@ -98,7 +98,7 @@ bool KMobileItem::configLoad(int idx)
TQPixmap KMobileItem::getIcon() const
{
- return KGlobal::instance()->iconLoader()->loadIcon(m_iconName, KIcon::Desktop );
+ return TDEGlobal::instance()->iconLoader()->loadIcon(m_iconName, KIcon::Desktop );
}
TQString KMobileItem::config_SectionName(int idx) const
diff --git a/kmobile/kmobileview.cpp b/kmobile/kmobileview.cpp
index 3770dc0dd..89395bddb 100644
--- a/kmobile/kmobileview.cpp
+++ b/kmobile/kmobileview.cpp
@@ -100,7 +100,7 @@ KMobileItem *KMobileView::findDevice( const TQString &deviceName ) const
bool KMobileView::startKonqueror( const TQString &devName )
{
- KProcess *proc = new KProcess;
+ TDEProcess *proc = new TDEProcess;
*proc << "kfmclient" << "openProfile" << "webbrowsing" << "mobile:/"+devName;
return proc->start();
}
diff --git a/kmobile/systemtray.cpp b/kmobile/systemtray.cpp
index 7796a55b1..9f15f0551 100644
--- a/kmobile/systemtray.cpp
+++ b/kmobile/systemtray.cpp
@@ -38,7 +38,7 @@
SystemTray::SystemTray(KMainWindow *parent, const char *name) : KSystemTray(parent, name)
{
- m_appPix = KGlobal::instance()->iconLoader()->loadIcon("kmobile", KIcon::Small);
+ m_appPix = TDEGlobal::instance()->iconLoader()->loadIcon("kmobile", KIcon::Small);
setPixmap(m_appPix);
setToolTip();
@@ -72,7 +72,7 @@ void SystemTray::contextMenuAboutToShow(KPopupMenu *menu)
for (unsigned int no=0; no<list.count(); no++) {
TQString devName = list[no];
TQString iconName = main->mainView()->iconFileName(devName);
- TQPixmap pm = KGlobal::instance()->iconLoader()->loadIcon(iconName, KIcon::Small);
+ TQPixmap pm = TDEGlobal::instance()->iconLoader()->loadIcon(iconName, KIcon::Small);
menu->insertItem(pm, devName, SYSTEMTRAY_STARTID+no, 3+no);
menu->connectItem(SYSTEMTRAY_STARTID+no, this, TQT_SLOT(menuItemSelected()));
}