diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:57:18 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:57:18 -0600 |
| commit | 958d14ea303abe33fce2c259c1000f18171e4229 (patch) | |
| tree | 61bc8236ab3aa4bc27ca205740322f8df50baff1 /kfax | |
| parent | b2de6514213d205907e8de3dd17f8eb80d868a4f (diff) | |
| download | tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.tar.gz tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kfax')
| -rw-r--r-- | kfax/faxinput.cpp | 2 | ||||
| -rw-r--r-- | kfax/kfax.cpp | 8 | ||||
| -rw-r--r-- | kfax/kfax_printsettings.cpp | 2 | ||||
| -rw-r--r-- | kfax/options.cpp | 2 | ||||
| -rw-r--r-- | kfax/viewfax.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/kfax/faxinput.cpp b/kfax/faxinput.cpp index 3f91f483..b0f7495f 100644 --- a/kfax/faxinput.cpp +++ b/kfax/faxinput.cpp @@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #include <tqstring.h> #include <tqfile.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> void statusbarupdate(char* name,int width,int height,char* res); diff --git a/kfax/kfax.cpp b/kfax/kfax.cpp index dbe908fe..1d4b4b40 100644 --- a/kfax/kfax.cpp +++ b/kfax/kfax.cpp @@ -39,7 +39,7 @@ #include <tqpaintdevicemetrics.h> #include <tqbitmap.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kstandarddirs.h> #include <kiconloader.h> @@ -47,12 +47,12 @@ #include <tdefilemetainfo.h> #include <tdestdaccel.h> #include <tdeconfig.h> -#include <kmenubar.h> -#include <kmessagebox.h> +#include <tdemenubar.h> +#include <tdemessagebox.h> #include <tdecmdlineargs.h> #include <tdeio/netaccess.h> #include <knotifyclient.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kstdaction.h> #include <kdebug.h> #include <kurldrag.h> diff --git a/kfax/kfax_printsettings.cpp b/kfax/kfax_printsettings.cpp index 5382c2e5..a05e4986 100644 --- a/kfax/kfax_printsettings.cpp +++ b/kfax/kfax_printsettings.cpp @@ -19,7 +19,7 @@ #include "kfax_printsettings.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqcheckbox.h> #include <tqlayout.h> #include <tqwhatsthis.h> diff --git a/kfax/options.cpp b/kfax/options.cpp index 2f162f7d..756eac62 100644 --- a/kfax/options.cpp +++ b/kfax/options.cpp @@ -28,7 +28,7 @@ #include <stdio.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <tqdir.h> #include <tqprinter.h> diff --git a/kfax/viewfax.cpp b/kfax/viewfax.cpp index 45d059d1..09560320 100644 --- a/kfax/viewfax.cpp +++ b/kfax/viewfax.cpp @@ -44,7 +44,7 @@ #include <tqstring.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include "kfax.h" #include "faxexpand.h" |