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 /kresources/scalix | |
| parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
| download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kresources/scalix')
| -rw-r--r-- | kresources/scalix/scalixadmin/main.cpp | 2 | ||||
| -rw-r--r-- | kresources/scalix/scalixadmin/mainwindow.cpp | 8 | ||||
| -rw-r--r-- | kresources/scalix/shared/resourcescalixbase.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kresources/scalix/scalixadmin/main.cpp b/kresources/scalix/scalixadmin/main.cpp index b317d90d1..6b9192a33 100644 --- a/kresources/scalix/scalixadmin/main.cpp +++ b/kresources/scalix/scalixadmin/main.cpp @@ -42,7 +42,7 @@ int main( int argc, char **argv ) TDEApplication app; - KGlobal::locale()->insertCatalogue( "scalixadmin" ); + TDEGlobal::locale()->insertCatalogue( "scalixadmin" ); MainWindow *window = new MainWindow; window->show(); diff --git a/kresources/scalix/scalixadmin/mainwindow.cpp b/kresources/scalix/scalixadmin/mainwindow.cpp index 4f3dbf94b..04e396d78 100644 --- a/kresources/scalix/scalixadmin/mainwindow.cpp +++ b/kresources/scalix/scalixadmin/mainwindow.cpp @@ -37,19 +37,19 @@ MainWindow::MainWindow() { KJanusWidget *wdg = new KJanusWidget( this, "", KJanusWidget::IconList ); - TQPixmap icon = KGlobal::iconLoader()->loadIcon( "folder_yellow", KIcon::Desktop ); + TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "folder_yellow", KIcon::Desktop ); TQVBox *page = wdg->addVBoxPage( i18n( "Other Accounts" ), i18n( "Register other accounts" ), icon ); new OtherUserPage( page ); - icon = KGlobal::iconLoader()->loadIcon( "edu_languages", KIcon::Desktop ); + icon = TDEGlobal::iconLoader()->loadIcon( "edu_languages", KIcon::Desktop ); page = wdg->addVBoxPage( i18n( "Delegates" ), i18n( "Setup delegates for my account" ), icon ); new DelegatePage( page ); - icon = KGlobal::iconLoader()->loadIcon( "kontact_summary_green", KIcon::Desktop ); + icon = TDEGlobal::iconLoader()->loadIcon( "kontact_summary_green", KIcon::Desktop ); page = wdg->addVBoxPage( i18n( "Out of Office..." ), i18n( "Setup Out of Office Message" ), icon ); new OutOfOfficePage( page ); - icon = KGlobal::iconLoader()->loadIcon( "password", KIcon::Desktop ); + icon = TDEGlobal::iconLoader()->loadIcon( "password", KIcon::Desktop ); page = wdg->addVBoxPage( i18n( "Password" ), i18n( "Change the password" ), icon ); new PasswordPage( page ); diff --git a/kresources/scalix/shared/resourcescalixbase.cpp b/kresources/scalix/shared/resourcescalixbase.cpp index c9c7ee11d..de1aa9159 100644 --- a/kresources/scalix/shared/resourcescalixbase.cpp +++ b/kresources/scalix/shared/resourcescalixbase.cpp @@ -51,8 +51,8 @@ static unsigned int uniquifier = 0; ResourceScalixBase::ResourceScalixBase( const TQCString& objId ) : mSilent( false ) { - KGlobal::locale()->insertCatalogue( "kres_scalix" ); - KGlobal::locale()->insertCatalogue( "libkcal" ); + TDEGlobal::locale()->insertCatalogue( "kres_scalix" ); + TDEGlobal::locale()->insertCatalogue( "libkcal" ); TQString uniqueObjId = TQString( objId ) + TQString::number( uniquifier++ ); mConnection = new KMailConnection( this, uniqueObjId.utf8() ); } |