summaryrefslogtreecommitdiffstats
path: root/wizards
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 /wizards
parent5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff)
downloadtdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz
tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'wizards')
-rw-r--r--wizards/egroupwaremain.cpp2
-rw-r--r--wizards/exchangemain.cpp2
-rw-r--r--wizards/groupwisemain.cpp2
-rw-r--r--wizards/kolabmain.cpp2
-rw-r--r--wizards/main.cpp2
-rw-r--r--wizards/overviewpage.cpp2
-rw-r--r--wizards/scalixmain.cpp2
-rw-r--r--wizards/sloxmain.cpp2
8 files changed, 8 insertions, 8 deletions
diff --git a/wizards/egroupwaremain.cpp b/wizards/egroupwaremain.cpp
index a5fd9c67c..aa115cc82 100644
--- a/wizards/egroupwaremain.cpp
+++ b/wizards/egroupwaremain.cpp
@@ -44,7 +44,7 @@ int main(int argc,char **argv)
TDEApplication app;
- KGlobal::locale()->insertCatalogue( "libtdepim" );
+ TDEGlobal::locale()->insertCatalogue( "libtdepim" );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/wizards/exchangemain.cpp b/wizards/exchangemain.cpp
index 627467b63..a3d78909d 100644
--- a/wizards/exchangemain.cpp
+++ b/wizards/exchangemain.cpp
@@ -44,7 +44,7 @@ int main(int argc,char **argv)
TDEApplication app;
- KGlobal::locale()->insertCatalogue( "libtdepim" );
+ TDEGlobal::locale()->insertCatalogue( "libtdepim" );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/wizards/groupwisemain.cpp b/wizards/groupwisemain.cpp
index 86d2eae91..f7eab0bec 100644
--- a/wizards/groupwisemain.cpp
+++ b/wizards/groupwisemain.cpp
@@ -45,7 +45,7 @@ int main(int argc,char **argv)
TDEApplication app;
- KGlobal::locale()->insertCatalogue( "libtdepim" );
+ TDEGlobal::locale()->insertCatalogue( "libtdepim" );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/wizards/kolabmain.cpp b/wizards/kolabmain.cpp
index e24f7ac5f..8b316a456 100644
--- a/wizards/kolabmain.cpp
+++ b/wizards/kolabmain.cpp
@@ -44,7 +44,7 @@ int main(int argc,char **argv)
TDEApplication app;
- KGlobal::locale()->insertCatalogue( "libtdepim" );
+ TDEGlobal::locale()->insertCatalogue( "libtdepim" );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/wizards/main.cpp b/wizards/main.cpp
index ac9275a67..4b66356c1 100644
--- a/wizards/main.cpp
+++ b/wizards/main.cpp
@@ -23,7 +23,7 @@ int main( int argc, char **argv )
TDEApplication app;
- KGlobal::locale()->insertCatalogue( "libtdepim" );
+ TDEGlobal::locale()->insertCatalogue( "libtdepim" );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/wizards/overviewpage.cpp b/wizards/overviewpage.cpp
index 1d2ef06ca..d1a12db9a 100644
--- a/wizards/overviewpage.cpp
+++ b/wizards/overviewpage.cpp
@@ -51,7 +51,7 @@ OverViewPage::OverViewPage( TQWidget *parent, const char *name )
layout->addMultiCellWidget( label, 0, 0, 0, 2 );
label = new TQLabel( this );
- label->setPixmap( KGlobal::iconLoader()->loadIcon( "network", KIcon::Desktop ) );
+ label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "network", KIcon::Desktop ) );
layout->addWidget( label, 0, 3 );
label = new TQLabel( "", this );
diff --git a/wizards/scalixmain.cpp b/wizards/scalixmain.cpp
index 702438704..06fa5341e 100644
--- a/wizards/scalixmain.cpp
+++ b/wizards/scalixmain.cpp
@@ -44,7 +44,7 @@ int main(int argc,char **argv)
TDEApplication app;
- KGlobal::locale()->insertCatalogue( "libtdepim" );
+ TDEGlobal::locale()->insertCatalogue( "libtdepim" );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/wizards/sloxmain.cpp b/wizards/sloxmain.cpp
index 3eab6b69e..d63c43ae7 100644
--- a/wizards/sloxmain.cpp
+++ b/wizards/sloxmain.cpp
@@ -44,7 +44,7 @@ int main(int argc,char **argv)
TDEApplication app;
- KGlobal::locale()->insertCatalogue( "libtdepim" );
+ TDEGlobal::locale()->insertCatalogue( "libtdepim" );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();