diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
| commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
| tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /tdeprint/tdeprintfax | |
| 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 'tdeprint/tdeprintfax')
| -rw-r--r-- | tdeprint/tdeprintfax/conffax.cpp | 2 | ||||
| -rw-r--r-- | tdeprint/tdeprintfax/confgeneral.cpp | 2 | ||||
| -rw-r--r-- | tdeprint/tdeprintfax/confsystem.cpp | 2 | ||||
| -rw-r--r-- | tdeprint/tdeprintfax/faxab.cpp | 2 | ||||
| -rw-r--r-- | tdeprint/tdeprintfax/faxctrl.cpp | 4 | ||||
| -rw-r--r-- | tdeprint/tdeprintfax/tdeprintfax.cpp | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/tdeprint/tdeprintfax/conffax.cpp b/tdeprint/tdeprintfax/conffax.cpp index 97d5e036a..26b6b77ab 100644 --- a/tdeprint/tdeprintfax/conffax.cpp +++ b/tdeprint/tdeprintfax/conffax.cpp @@ -27,7 +27,7 @@ #include <tqprinter.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kseparator.h> diff --git a/tdeprint/tdeprintfax/confgeneral.cpp b/tdeprint/tdeprintfax/confgeneral.cpp index 0526ee684..d7471fc5d 100644 --- a/tdeprint/tdeprintfax/confgeneral.cpp +++ b/tdeprint/tdeprintfax/confgeneral.cpp @@ -26,7 +26,7 @@ #include <tqcheckbox.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kseparator.h> diff --git a/tdeprint/tdeprintfax/confsystem.cpp b/tdeprint/tdeprintfax/confsystem.cpp index e1171962a..167e8b6f7 100644 --- a/tdeprint/tdeprintfax/confsystem.cpp +++ b/tdeprint/tdeprintfax/confsystem.cpp @@ -27,7 +27,7 @@ #include <tqcombobox.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kseparator.h> diff --git a/tdeprint/tdeprintfax/faxab.cpp b/tdeprint/tdeprintfax/faxab.cpp index fd0073b7a..6cc0e115f 100644 --- a/tdeprint/tdeprintfax/faxab.cpp +++ b/tdeprint/tdeprintfax/faxab.cpp @@ -32,7 +32,7 @@ #include <krun.h> #include <kstdguiitem.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> FaxAB::FaxAB(TQWidget *parent, const char *name) : KDialog(parent, name, true) diff --git a/tdeprint/tdeprintfax/faxctrl.cpp b/tdeprint/tdeprintfax/faxctrl.cpp index 2c8faffc6..78f0a119a 100644 --- a/tdeprint/tdeprintfax/faxctrl.cpp +++ b/tdeprint/tdeprintfax/faxctrl.cpp @@ -37,7 +37,7 @@ #include <kprocess.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kdialogbase.h> #include <kmimetype.h> @@ -47,7 +47,7 @@ #include <kemailsettings.h> #include <kdebug.h> #include <kstdguiitem.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <stdlib.h> diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp index 95266a95b..015bf7172 100644 --- a/tdeprint/tdeprintfax/tdeprintfax.cpp +++ b/tdeprint/tdeprintfax/tdeprintfax.cpp @@ -43,9 +43,9 @@ #include <tqheader.h> #include <klocale.h> #include <kiconloader.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmimetype.h> #include <kseparator.h> #include <ksystemtray.h> |