diff options
author | Timothy Pearson <[email protected]> | 2013-02-15 22:00:37 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-15 22:00:37 -0600 |
commit | 279764bab1514a051db18e14241e9bae62be14d6 (patch) | |
tree | c587a443a0a228897e395535e2791dbde757bb3d /quanta/dialogs/tagdialogs | |
parent | ee38b2862bfd887e95cf62fdf244edad40ece7b2 (diff) | |
download | tdewebdev-279764bab1514a051db18e14241e9bae62be14d6.tar.gz tdewebdev-279764bab1514a051db18e14241e9bae62be14d6.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'quanta/dialogs/tagdialogs')
-rw-r--r-- | quanta/dialogs/tagdialogs/colorcombo.cpp | 8 | ||||
-rw-r--r-- | quanta/dialogs/tagdialogs/listdlg.cpp | 2 | ||||
-rw-r--r-- | quanta/dialogs/tagdialogs/tagdialog.cpp | 2 | ||||
-rw-r--r-- | quanta/dialogs/tagdialogs/tagimgdlg.cpp | 2 | ||||
-rw-r--r-- | quanta/dialogs/tagdialogs/tagimgdlgdata.cpp | 2 | ||||
-rw-r--r-- | quanta/dialogs/tagdialogs/tagmaildlg.cpp | 6 | ||||
-rw-r--r-- | quanta/dialogs/tagdialogs/tagmiscdlg.cpp | 2 | ||||
-rw-r--r-- | quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp | 2 | ||||
-rw-r--r-- | quanta/dialogs/tagdialogs/tagxml.cpp | 2 |
9 files changed, 14 insertions, 14 deletions
diff --git a/quanta/dialogs/tagdialogs/colorcombo.cpp b/quanta/dialogs/tagdialogs/colorcombo.cpp index 188f2ca0..5b735fcf 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.cpp +++ b/quanta/dialogs/tagdialogs/colorcombo.cpp @@ -46,12 +46,12 @@ #include <kcolordialog.h> #include <tdeconfig.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <tdelistbox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kseparator.h> #include <kpalette.h> #include <kimageeffect.h> diff --git a/quanta/dialogs/tagdialogs/listdlg.cpp b/quanta/dialogs/tagdialogs/listdlg.cpp index c9b20d5a..eeb6bfc2 100644 --- a/quanta/dialogs/tagdialogs/listdlg.cpp +++ b/quanta/dialogs/tagdialogs/listdlg.cpp @@ -17,7 +17,7 @@ //kde include #include <tdelistbox.h> -#include <klocale.h> +#include <tdelocale.h> //qt includes #include <tqpushbutton.h> diff --git a/quanta/dialogs/tagdialogs/tagdialog.cpp b/quanta/dialogs/tagdialogs/tagdialog.cpp index fe466986..7db3c307 100644 --- a/quanta/dialogs/tagdialogs/tagdialog.cpp +++ b/quanta/dialogs/tagdialogs/tagdialog.cpp @@ -21,7 +21,7 @@ #include <tqevent.h> // include kde headers -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdetexteditor/viewcursorinterface.h> #include <tdeconfig.h> diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.cpp b/quanta/dialogs/tagdialogs/tagimgdlg.cpp index 9a032000..4c9531ee 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagimgdlg.cpp @@ -21,7 +21,7 @@ #include <tqimage.h> //kde includes #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/netaccess.h> #include <tdefiledialog.h> #include <kurl.h> diff --git a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp index a761d62c..97c82811 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp +++ b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp @@ -8,7 +8,7 @@ (C) 2006 Andras Mantia **********************************************************************/ -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <knumvalidator.h> #include <kiconloader.h> diff --git a/quanta/dialogs/tagdialogs/tagmaildlg.cpp b/quanta/dialogs/tagdialogs/tagmaildlg.cpp index bf78291d..1d2c44be 100644 --- a/quanta/dialogs/tagdialogs/tagmaildlg.cpp +++ b/quanta/dialogs/tagdialogs/tagmaildlg.cpp @@ -23,9 +23,9 @@ #include <tdeapplication.h> #include <kdialog.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <kabc/stdaddressbook.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdeabc/stdaddressbook.h> //qt includes #include <tqlineedit.h> diff --git a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp index 9313bb08..bea9a81f 100644 --- a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp @@ -15,7 +15,7 @@ #include "tagmiscdlg.h" #include "tagmisc.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlineedit.h> #include <tqcheckbox.h> diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp b/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp index 44d461c4..be0dff6a 100644 --- a/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp +++ b/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp @@ -8,7 +8,7 @@ **********************************************************************/ #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqbuttongroup.h> #include "tagquicklistdlg.h" #include <tqspinbox.h> diff --git a/quanta/dialogs/tagdialogs/tagxml.cpp b/quanta/dialogs/tagdialogs/tagxml.cpp index 0292dc79..2db18a3e 100644 --- a/quanta/dialogs/tagdialogs/tagxml.cpp +++ b/quanta/dialogs/tagdialogs/tagxml.cpp @@ -19,7 +19,7 @@ #include "tagattr.h" #include <klineedit.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqcheckbox.h> #include <tqlayout.h> |