diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kcontrol/kfontinst/viewpart | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/kfontinst/viewpart')
| -rw-r--r-- | kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/kfontinst/viewpart/FontViewerApp.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp b/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp index 32f36f9e9..41d06984e 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp @@ -37,7 +37,7 @@ extern "C" { KDE_EXPORT void* init_libkfontviewpart() { - KGlobal::locale()->insertCatalogue("kfontinst"); + TDEGlobal::locale()->insertCatalogue("kfontinst"); return new KFI::CFontViewPartFactory; } } diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp index bbac01bc8..28dbd0f1f 100644 --- a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp @@ -100,7 +100,7 @@ void CFontViewerAppMainWindow::fileOpen() CFontViewerApp::CFontViewerApp() { - KGlobal::locale()->insertCatalogue(KFI_CATALOGUE); + TDEGlobal::locale()->insertCatalogue(KFI_CATALOGUE); setMainWidget(new CFontViewerAppMainWindow()); } |