diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:02 -0600 |
| commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
| tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /kcontrol/kfontinst/kcmfontinst | |
| parent | 936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff) | |
| download | tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/kfontinst/kcmfontinst')
8 files changed, 15 insertions, 15 deletions
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp index c5db61ecc..bce091cd7 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp @@ -51,12 +51,12 @@ #include <ktoolbar.h> #include <ktoolbarbutton.h> #include <kstdaccel.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <kcmdlineargs.h> #include <kapplication.h> -#include <kio/job.h> -#include <kio/netaccess.h> +#include <tdeio/job.h> +#include <tdeio/netaccess.h> #include <kdirlister.h> #include <kpushbutton.h> #include <kguiitem.h> diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h index c3d64c7b0..4895f273e 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h @@ -36,8 +36,8 @@ #include <tqstringlist.h> #include <tdecmodule.h> #include <kurl.h> -#include <kconfig.h> -#include <kio/job.h> +#include <tdeconfig.h> +#include <tdeio/job.h> #ifdef HAVE_XFT #include <tdeparts/part.h> #endif diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp index 241ac88bf..0770094e3 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////////////////////////// #include <tqevent.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kurldrag.h> #include "KFileFontIconView.h" diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h index bb5ccfa5a..8a86b1ae2 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h @@ -29,7 +29,7 @@ // (C) Craig Drummond, 2003, 2004 //////////////////////////////////////////////////////////////////////////////// -#include <kfileiconview.h> +#include <tdefileiconview.h> namespace KFI { diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp index 0d05799d9..3c8801e75 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////////////////////////// // -// NOTE: HEAVILY copied from kfiledetailview.cpp... +// NOTE: HEAVILY copied from tdefiledetailview.cpp... // // Copyright (C) 1997 Stephan Kulow <coolo@kde.org> // 2000, 2001 Carsten Pfeiffer <pfeiffer@kde.org> @@ -39,7 +39,7 @@ #include <tqpainter.h> #include <tqpixmap.h> #include <kapplication.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kglobal.h> #include <kglobalsettings.h> #include <kicontheme.h> diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h index c160175be..6496c13fd 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h @@ -30,7 +30,7 @@ //////////////////////////////////////////////////////////////////////////////// // -// NOTE: HEAVILY copied from kfiledetailview.cpp... +// NOTE: HEAVILY copied from tdefiledetailview.cpp... // // Copyright (C) 1997 Stephan Kulow <coolo@kde.org> // 2000, 2001 Carste @@ -42,7 +42,7 @@ class TQKeyEvent; #include <klistview.h> #include <kmimetyperesolver.h> -#include "kfileview.h" +#include "tdefileview.h" /** * An item for the listiew, that has a reference to its corresponding diff --git a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp index c4a0d26b1..e555dc7fd 100644 --- a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp +++ b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp @@ -34,10 +34,10 @@ #include <tqvbox.h> #include <tqwhatsthis.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> -#include <kio/job.h> -#include <kio/netaccess.h> +#include <tdeio/job.h> +#include <tdeio/netaccess.h> namespace KFI { diff --git a/kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop b/kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop index dfdb9bad6..134e658c8 100644 --- a/kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop +++ b/kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell kcmfontinst +Exec=tdecmshell kcmfontinst Icon=fonts Type=Application DocPath=kcontrol/kcmfontinst/index.html |