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/slox | |
| 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/slox')
| -rw-r--r-- | kresources/slox/kabcresourceslox_plugin.cpp | 4 | ||||
| -rw-r--r-- | kresources/slox/kcalresourceslox_plugin.cpp | 4 | ||||
| -rw-r--r-- | kresources/slox/sloxfolderdialog.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kresources/slox/kabcresourceslox_plugin.cpp b/kresources/slox/kabcresourceslox_plugin.cpp index f570cff9f..cbc02f25e 100644 --- a/kresources/slox/kabcresourceslox_plugin.cpp +++ b/kresources/slox/kabcresourceslox_plugin.cpp @@ -32,8 +32,8 @@ extern "C" { void *init_kabc_slox() { - KGlobal::locale()->insertCatalogue( "libkcal" ); - KGlobal::locale()->insertCatalogue( "kabc_slox" ); + TDEGlobal::locale()->insertCatalogue( "libkcal" ); + TDEGlobal::locale()->insertCatalogue( "kabc_slox" ); return new SloxFactory; } } diff --git a/kresources/slox/kcalresourceslox_plugin.cpp b/kresources/slox/kcalresourceslox_plugin.cpp index e141892d5..8a5cf6906 100644 --- a/kresources/slox/kcalresourceslox_plugin.cpp +++ b/kresources/slox/kcalresourceslox_plugin.cpp @@ -33,8 +33,8 @@ extern "C" { void *init_kcal_slox() { - KGlobal::locale()->insertCatalogue( "libkcal" ); - KGlobal::locale()->insertCatalogue( "kabc_slox" ); + TDEGlobal::locale()->insertCatalogue( "libkcal" ); + TDEGlobal::locale()->insertCatalogue( "kabc_slox" ); return new SLOXFactory; } } diff --git a/kresources/slox/sloxfolderdialog.cpp b/kresources/slox/sloxfolderdialog.cpp index 4f17ea893..4d21c2307 100644 --- a/kresources/slox/sloxfolderdialog.cpp +++ b/kresources/slox/sloxfolderdialog.cpp @@ -82,7 +82,7 @@ void SloxFolderDialog::createFolderViewItem( SloxFolder *folder ) } folder->item->setText( 0, folder->name() ); folder->item->setText( 1, folder->id() ); - KGlobal::instance()->iconLoader()->addAppDir( "kmail" ); + TDEGlobal::instance()->iconLoader()->addAppDir( "kmail" ); switch ( folder->type() ) { case Calendar: folder->item->setPixmap( 0, SmallIcon( "kmgroupware_folder_calendar" ) ); |