From a9bde819f2b421dcc44741156e75eca4bb5fb4f4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:49:30 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- wizards/egroupwaremain.cpp | 2 +- wizards/exchangemain.cpp | 2 +- wizards/groupwisemain.cpp | 2 +- wizards/kolabmain.cpp | 2 +- wizards/main.cpp | 2 +- wizards/overviewpage.cpp | 2 +- wizards/scalixmain.cpp | 2 +- wizards/sloxmain.cpp | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'wizards') diff --git a/wizards/egroupwaremain.cpp b/wizards/egroupwaremain.cpp index a5fd9c67..aa115cc8 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 627467b6..a3d78909 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 86d2eae9..f7eab0be 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 e24f7ac5..8b316a45 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 ac9275a6..4b66356c 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 1d2ef06c..d1a12db9 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 70243870..06fa5341 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 3eab6b69..d63c43ae 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(); -- cgit v1.2.3