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 /kmail/kmstartup.cpp | |
| parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
| download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmail/kmstartup.cpp')
| -rw-r--r-- | kmail/kmstartup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp index 4069aaa7b..6c041b0f1 100644 --- a/kmail/kmstartup.cpp +++ b/kmail/kmstartup.cpp @@ -250,8 +250,8 @@ void insertLibraryCataloguesAndIcons() { "libkmime" }; - KLocale * l = KGlobal::locale(); - KIconLoader * il = KGlobal::iconLoader(); + KLocale * l = TDEGlobal::locale(); + KIconLoader * il = TDEGlobal::iconLoader(); for ( unsigned int i = 0 ; i < sizeof catalogues / sizeof *catalogues ; ++i ) { l->insertCatalogue( catalogues[i] ); il->addAppDir( catalogues[i] ); |