summaryrefslogtreecommitdiffstats
path: root/systemsettings
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:27:00 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:27:00 -0600
commit46164d2bf7219e6db2daf81d76cf45301d97c10f (patch)
tree9318201159d7c81ab880d6e8da71cf422e5cacf2 /systemsettings
parent8defc2d2a9ab80cd919d4aea9b9269cc203af9e8 (diff)
downloadtde-systemsettings-46164d2bf7219e6db2daf81d76cf45301d97c10f.tar.gz
tde-systemsettings-46164d2bf7219e6db2daf81d76cf45301d97c10f.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'systemsettings')
-rw-r--r--systemsettings/kcmultiwidget.cpp4
-rw-r--r--systemsettings/mainwindow.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/systemsettings/kcmultiwidget.cpp b/systemsettings/kcmultiwidget.cpp
index 5197994..cfd5b5e 100644
--- a/systemsettings/kcmultiwidget.cpp
+++ b/systemsettings/kcmultiwidget.cpp
@@ -195,10 +195,10 @@ void KCMultiWidget::slotHelp()
KURL url( KURL("help:/"), docPath );
if (url.protocol() == "help" || url.protocol() == "man" || url.protocol() == "info") {
- KProcess process;
+ TDEProcess process;
process << "khelpcenter"
<< url.url();
- process.start(KProcess::DontCare);
+ process.start(TDEProcess::DontCare);
process.detach();
} else {
new KRun(url);
diff --git a/systemsettings/mainwindow.cpp b/systemsettings/mainwindow.cpp
index 866af19..3cd07d8 100644
--- a/systemsettings/mainwindow.cpp
+++ b/systemsettings/mainwindow.cpp
@@ -141,7 +141,7 @@ void MainWindow::buildActions()
// "Search:" label
TQLabel *searchLabel = new TQLabel( this, "SearchLabel");
searchLabel->setText( i18n("&Search:") );
- searchLabel->setFont(KGlobalSettings::toolBarFont());
+ searchLabel->setFont(TDEGlobalSettings::toolBarFont());
searchLabel->setMargin(2);
searchText = new KWidgetAction( searchLabel, i18n("&Search:"), Key_F6, 0, 0, actionCollection(), "searchText" );
searchLabel->setBuddy( search );