diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:01 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:01 -0600 |
commit | 0e88a100de93641e5aeacd8c65e8076c948a5c20 (patch) | |
tree | 54cce3e6ae07c4fc8921244b1397c75cc21a2997 /kopete/protocols/gadu | |
parent | 5497356b6c12e5854b297bfa0d9c2a9f20cb4ca0 (diff) | |
download | tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.tar.gz tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kopete/protocols/gadu')
-rw-r--r-- | kopete/protocols/gadu/gaduaccount.cpp | 6 | ||||
-rw-r--r-- | kopete/protocols/gadu/gaduaddcontactpage.cpp | 2 | ||||
-rw-r--r-- | kopete/protocols/gadu/gaduaway.cpp | 2 | ||||
-rw-r--r-- | kopete/protocols/gadu/gaducommands.cpp | 2 | ||||
-rw-r--r-- | kopete/protocols/gadu/gaducontact.cpp | 4 | ||||
-rw-r--r-- | kopete/protocols/gadu/gadudcctransaction.cpp | 4 | ||||
-rw-r--r-- | kopete/protocols/gadu/gadueditaccount.cpp | 4 | ||||
-rw-r--r-- | kopete/protocols/gadu/gadueditcontact.cpp | 2 | ||||
-rw-r--r-- | kopete/protocols/gadu/gadupubdir.cpp | 2 | ||||
-rw-r--r-- | kopete/protocols/gadu/gaduregisteraccount.cpp | 6 | ||||
-rw-r--r-- | kopete/protocols/gadu/gadusession.cpp | 2 |
11 files changed, 18 insertions, 18 deletions
diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp index 5ca54870..f82f20ee 100644 --- a/kopete/protocols/gadu/gaduaccount.cpp +++ b/kopete/protocols/gadu/gaduaccount.cpp @@ -39,11 +39,11 @@ #include <kpassdlg.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <knotifyclient.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeio/netaccess.h> #include <tqapplication.h> diff --git a/kopete/protocols/gadu/gaduaddcontactpage.cpp b/kopete/protocols/gadu/gaduaddcontactpage.cpp index 99867508..aeed83b3 100644 --- a/kopete/protocols/gadu/gaduaddcontactpage.cpp +++ b/kopete/protocols/gadu/gaduaddcontactpage.cpp @@ -29,7 +29,7 @@ #include "gaducontact.h" #include "gaducontactlist.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kopetecontactlist.h> #include <kopetegroup.h> diff --git a/kopete/protocols/gadu/gaduaway.cpp b/kopete/protocols/gadu/gaduaway.cpp index 2be2a2aa..2678106c 100644 --- a/kopete/protocols/gadu/gaduaway.cpp +++ b/kopete/protocols/gadu/gaduaway.cpp @@ -27,7 +27,7 @@ #include "kopeteonlinestatus.h" #include <ktextedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqbuttongroup.h> #include <tqradiobutton.h> diff --git a/kopete/protocols/gadu/gaducommands.cpp b/kopete/protocols/gadu/gaducommands.cpp index 104e1b01..e167ffd7 100644 --- a/kopete/protocols/gadu/gaducommands.cpp +++ b/kopete/protocols/gadu/gaducommands.cpp @@ -32,7 +32,7 @@ #include <tqtextcodec.h> #include <tqimage.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <errno.h> diff --git a/kopete/protocols/gadu/gaducontact.cpp b/kopete/protocols/gadu/gaducontact.cpp index bedb3f55..40d06c52 100644 --- a/kopete/protocols/gadu/gaducontact.cpp +++ b/kopete/protocols/gadu/gaducontact.cpp @@ -20,11 +20,11 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA // 02110-1301, USA. -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> #include <kdebug.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "gaduaccount.h" #include "gaduprotocol.h" diff --git a/kopete/protocols/gadu/gadudcctransaction.cpp b/kopete/protocols/gadu/gadudcctransaction.cpp index a6568ff6..34be220a 100644 --- a/kopete/protocols/gadu/gadudcctransaction.cpp +++ b/kopete/protocols/gadu/gadudcctransaction.cpp @@ -27,8 +27,8 @@ #include <netinet/in.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "kopetetransfermanager.h" #include "kopetemetacontact.h" diff --git a/kopete/protocols/gadu/gadueditaccount.cpp b/kopete/protocols/gadu/gadueditaccount.cpp index 08987c16..75001746 100644 --- a/kopete/protocols/gadu/gadueditaccount.cpp +++ b/kopete/protocols/gadu/gadueditaccount.cpp @@ -36,9 +36,9 @@ #include <tqgroupbox.h> #include <klineedit.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpassdlg.h> #include "kopetepasswordwidget.h" diff --git a/kopete/protocols/gadu/gadueditcontact.cpp b/kopete/protocols/gadu/gadueditcontact.cpp index 985a9874..b3a5ae68 100644 --- a/kopete/protocols/gadu/gadueditcontact.cpp +++ b/kopete/protocols/gadu/gadueditcontact.cpp @@ -28,7 +28,7 @@ #include "gaduadd.h" #include <ktextedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kopetegroup.h> #include <kopetecontactlist.h> diff --git a/kopete/protocols/gadu/gadupubdir.cpp b/kopete/protocols/gadu/gadupubdir.cpp index 92f53b48..00ba18ed 100644 --- a/kopete/protocols/gadu/gadupubdir.cpp +++ b/kopete/protocols/gadu/gadupubdir.cpp @@ -38,7 +38,7 @@ #include <krestrictedline.h> #include <klineedit.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> GaduPublicDir::GaduPublicDir( GaduAccount* account, TQWidget* parent, const char* name ) : KDialogBase( parent, name, false, TQString(), User1|User2|User3|Cancel, User2 ) diff --git a/kopete/protocols/gadu/gaduregisteraccount.cpp b/kopete/protocols/gadu/gaduregisteraccount.cpp index 6f622b7d..f70feb60 100644 --- a/kopete/protocols/gadu/gaduregisteraccount.cpp +++ b/kopete/protocols/gadu/gaduregisteraccount.cpp @@ -25,11 +25,11 @@ #include <tqlabel.h> #include <klineedit.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "gaduregisteraccountui.h" #include "gaduregisteraccount.h" diff --git a/kopete/protocols/gadu/gadusession.cpp b/kopete/protocols/gadu/gadusession.cpp index 7fded85a..6789a6ff 100644 --- a/kopete/protocols/gadu/gadusession.cpp +++ b/kopete/protocols/gadu/gadusession.cpp @@ -25,7 +25,7 @@ #include "gadusession.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "kopetemessage.h" |