diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
| commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
| tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp | |
| parent | eba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff) | |
| download | tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp')
| -rw-r--r-- | kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp index da1e5f2e2..2a46fd2d8 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp @@ -47,10 +47,10 @@ #include "Misc.h" #include "KFileFontIconView.h" #include "KFileFontView.h" -#include <kpopupmenu.h> -#include <ktoolbar.h> -#include <ktoolbarbutton.h> -#include <kstdaccel.h> +#include <tdepopupmenu.h> +#include <tdetoolbar.h> +#include <tdetoolbarbutton.h> +#include <tdestdaccel.h> #include <tdefiledialog.h> #include <kmessagebox.h> #include <kcmdlineargs.h> @@ -76,7 +76,7 @@ namespace KFI { CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) - : TDECModule(parent, "kfontinst"), + : TDECModule(parent, "tdefontinst"), #ifdef HAVE_XFT itsPreview(NULL), #endif @@ -107,7 +107,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) TQFrame *fontsFrame; #ifdef HAVE_XFT - KLibFactory *factory=KLibLoader::self()->factory("libkfontviewpart"); + KLibFactory *factory=KLibLoader::self()->factory("libtdefontviewpart"); if(factory) { |