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/viewpart | |
| 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/viewpart')
| -rw-r--r-- | kcontrol/kfontinst/viewpart/FontViewPart.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/kfontinst/viewpart/FontViewerApp.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp index 1eeb2396c..6147363b9 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp @@ -44,7 +44,7 @@ #include <tqsettings.h> #include <tqstringlist.h> #include <tqtimer.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kinstance.h> #include <kmessagebox.h> #include <knuminput.h> diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp index f4b57bde0..6690cc44b 100644 --- a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp @@ -33,8 +33,8 @@ #include <klibloader.h> #include <klocale.h> #include <kglobal.h> -#include <kfiledialog.h> -#include <kconfig.h> +#include <tdefiledialog.h> +#include <tdeconfig.h> #define CFG_GROUP "FontViewer Settings" #define CFG_SIZE_KEY "Window Size" |