diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:19:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:19:22 -0600 |
| commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
| tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /tdeprint | |
| 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 'tdeprint')
| -rw-r--r-- | tdeprint/kjobviewer/kjobviewer.cpp | 2 | ||||
| -rw-r--r-- | tdeprint/tdeprint_part/printpart.cpp | 2 | ||||
| -rw-r--r-- | tdeprint/tdeprintfax/conffilters.cpp | 2 | ||||
| -rw-r--r-- | tdeprint/tdeprintfax/faxab.cpp | 2 | ||||
| -rw-r--r-- | tdeprint/tdeprintfax/tdeprintfax.cpp | 8 | ||||
| -rw-r--r-- | tdeprint/tdeprintfax/tdeprintfax.h | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/tdeprint/kjobviewer/kjobviewer.cpp b/tdeprint/kjobviewer/kjobviewer.cpp index 9795ef014..610dceb7a 100644 --- a/tdeprint/kjobviewer/kjobviewer.cpp +++ b/tdeprint/kjobviewer/kjobviewer.cpp @@ -31,7 +31,7 @@ #include <ksystemtray.h> #include <kdebug.h> #include <kiconloader.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <twin.h> #include <kstartupinfo.h> diff --git a/tdeprint/tdeprint_part/printpart.cpp b/tdeprint/tdeprint_part/printpart.cpp index c725aa872..64686dde8 100644 --- a/tdeprint/tdeprint_part/printpart.cpp +++ b/tdeprint/tdeprint_part/printpart.cpp @@ -21,7 +21,7 @@ #include <tdeprint/kmmainview.h> #include <tdeprint/kiconselectaction.h> -#include <kaction.h> +#include <tdeaction.h> #include <klocale.h> #include <kinstance.h> #include <kiconloader.h> diff --git a/tdeprint/tdeprintfax/conffilters.cpp b/tdeprint/tdeprintfax/conffilters.cpp index 212d96988..4937b88ba 100644 --- a/tdeprint/tdeprintfax/conffilters.cpp +++ b/tdeprint/tdeprintfax/conffilters.cpp @@ -30,7 +30,7 @@ #include <tqheader.h> #include <klocale.h> -#include <klistview.h> +#include <tdelistview.h> #include <kiconloader.h> #include <kstandarddirs.h> #include <kmessagebox.h> diff --git a/tdeprint/tdeprintfax/faxab.cpp b/tdeprint/tdeprintfax/faxab.cpp index 97b2986cc..4385827d4 100644 --- a/tdeprint/tdeprintfax/faxab.cpp +++ b/tdeprint/tdeprintfax/faxab.cpp @@ -23,7 +23,7 @@ #include <tqlabel.h> #include <tqlayout.h> #include <kpushbutton.h> -#include <klistview.h> +#include <tdelistview.h> #include <tqheader.h> #include <klocale.h> #include <kabc/stdaddressbook.h> diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp index 38e15425b..a52c5ade3 100644 --- a/tdeprint/tdeprintfax/tdeprintfax.cpp +++ b/tdeprint/tdeprintfax/tdeprintfax.cpp @@ -36,10 +36,10 @@ #include <kapplication.h> #include <kstdaction.h> #include <kmenubar.h> -#include <ktoolbar.h> -#include <kaction.h> -#include <klistbox.h> -#include <klistview.h> +#include <tdetoolbar.h> +#include <tdeaction.h> +#include <tdelistbox.h> +#include <tdelistview.h> #include <tqheader.h> #include <klocale.h> #include <kiconloader.h> diff --git a/tdeprint/tdeprintfax/tdeprintfax.h b/tdeprint/tdeprintfax/tdeprintfax.h index 192ba7b14..783593c3b 100644 --- a/tdeprint/tdeprintfax/tdeprintfax.h +++ b/tdeprint/tdeprintfax/tdeprintfax.h @@ -21,7 +21,7 @@ #ifndef TDEPRINTFAX_H #define TDEPRINTFAX_H -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kurl.h> class TDEListBox; |