diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:49:26 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:49:26 -0600 |
| commit | 59a706bc2a5caa7990e77b6018c25c4f5ef3bcf2 (patch) | |
| tree | 338d237cc0f1b3a701dfa11b09983ed675beb740 /src | |
| parent | b7fc57b750ab7e1ed9e0c156af3157cc31dfe12d (diff) | |
| download | kopete-otr-59a706bc2a5caa7990e77b6018c25c4f5ef3bcf2.tar.gz kopete-otr-59a706bc2a5caa7990e77b6018c25c4f5ef3bcf2.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src')
| -rw-r--r-- | src/otrguiclient.cpp | 4 | ||||
| -rw-r--r-- | src/otrguiclient.h | 2 | ||||
| -rw-r--r-- | src/otrlchatinterface.cpp | 4 | ||||
| -rw-r--r-- | src/otrlconfinterface.cpp | 4 | ||||
| -rw-r--r-- | src/otrplugin.cpp | 2 | ||||
| -rw-r--r-- | src/otrpreferences.cpp | 2 | ||||
| -rw-r--r-- | src/smppopup.cpp | 2 | ||||
| -rw-r--r-- | src/verifypopup.cpp | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/src/otrguiclient.cpp b/src/otrguiclient.cpp index f3bf8de..2fbae0e 100644 --- a/src/otrguiclient.cpp +++ b/src/otrguiclient.cpp @@ -20,14 +20,14 @@ #include <tdeaction.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeactionclasses.h> #include <kopetechatsession.h> #include <kopeteview.h> #include <kopetemessage.h> #include <kdebug.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "otrguiclient.h" diff --git a/src/otrguiclient.h b/src/otrguiclient.h index 462338f..084d515 100644 --- a/src/otrguiclient.h +++ b/src/otrguiclient.h @@ -27,7 +27,7 @@ //#include <tdeio/job.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kiconloader.h> diff --git a/src/otrlchatinterface.cpp b/src/otrlchatinterface.cpp index c181b29..7f2a946 100644 --- a/src/otrlchatinterface.cpp +++ b/src/otrlchatinterface.cpp @@ -36,9 +36,9 @@ #include <kopeteprotocol.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprogress.h> #include <kpassivepopup.h> #include <kanimwidget.h> diff --git a/src/otrlconfinterface.cpp b/src/otrlconfinterface.cpp index cb025a4..75bcb22 100644 --- a/src/otrlconfinterface.cpp +++ b/src/otrlconfinterface.cpp @@ -30,9 +30,9 @@ #include <kopeteaccount.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kanimwidget.h> diff --git a/src/otrplugin.cpp b/src/otrplugin.cpp index ff0a404..85c9d37 100644 --- a/src/otrplugin.cpp +++ b/src/otrplugin.cpp @@ -33,7 +33,7 @@ #include <tdeversion.h> #include <tdeaboutdata.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kopetemetacontact.h> #include <kopetecontactlist.h> diff --git a/src/otrpreferences.cpp b/src/otrpreferences.cpp index 90cfa6e..f492dbc 100644 --- a/src/otrpreferences.cpp +++ b/src/otrpreferences.cpp @@ -32,7 +32,7 @@ #include <kgenericfactory.h> #include <kurlrequester.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <kanimwidget.h> diff --git a/src/smppopup.cpp b/src/smppopup.cpp index dcb630b..59fa9f2 100644 --- a/src/smppopup.cpp +++ b/src/smppopup.cpp @@ -21,7 +21,7 @@ #include "tqlabel.h" #include "kdebug.h" -#include "klocale.h" +#include "tdelocale.h" #include "klineedit.h" #include "kurl.h" #include "krun.h" diff --git a/src/verifypopup.cpp b/src/verifypopup.cpp index c7550e0..12397aa 100644 --- a/src/verifypopup.cpp +++ b/src/verifypopup.cpp @@ -25,7 +25,7 @@ #include "tqlabel.h" -#include "klocale.h" +#include "tdelocale.h" #include "kactivelabel.h" #include "kcombobox.h" |