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/kfile-plugin | |
| 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/kfile-plugin')
| -rw-r--r-- | kcontrol/kfontinst/kfile-plugin/KFileFont.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp index 112e3562b..a4f09cb56 100644 --- a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp +++ b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp @@ -268,7 +268,7 @@ namespace KFI KFileFontPlugin::KFileFontPlugin(TQObject *parent, const char *name, const TQStringList& args) : KFilePlugin(parent, name, args) { - KGlobal::locale()->insertCatalogue(KFI_CATALOGUE); + TDEGlobal::locale()->insertCatalogue(KFI_CATALOGUE); addMimeType("application/x-font-ttf"), addMimeType("application/x-font-type1"); |