diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:47 -0600 |
| commit | da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb (patch) | |
| tree | b42ba87fcdfa425a31e243a62d71e1de248b6ee8 /kopete/plugins/cryptography | |
| parent | 4ed8d784e29102ed1659f4ccf71fcc6fb0dad5c8 (diff) | |
| download | tdenetwork-da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb.tar.gz tdenetwork-da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kopete/plugins/cryptography')
| -rw-r--r-- | kopete/plugins/cryptography/cryptographyguiclient.cpp | 2 | ||||
| -rw-r--r-- | kopete/plugins/cryptography/cryptographyplugin.cpp | 2 | ||||
| -rw-r--r-- | kopete/plugins/cryptography/kgpgselkey.cpp | 2 | ||||
| -rw-r--r-- | kopete/plugins/cryptography/popuppublic.cpp | 10 | ||||
| -rw-r--r-- | kopete/plugins/cryptography/popuppublic.h | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/kopete/plugins/cryptography/cryptographyguiclient.cpp b/kopete/plugins/cryptography/cryptographyguiclient.cpp index df66c608..d8cafd85 100644 --- a/kopete/plugins/cryptography/cryptographyguiclient.cpp +++ b/kopete/plugins/cryptography/cryptographyguiclient.cpp @@ -20,7 +20,7 @@ #include "kopetecontact.h" #include "kopetechatsession.h" -#include <kaction.h> +#include <tdeaction.h> #include <tdeconfig.h> #include <klocale.h> #include <kgenericfactory.h> diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp index 1085da9c..e402567c 100644 --- a/kopete/plugins/cryptography/cryptographyplugin.cpp +++ b/kopete/plugins/cryptography/cryptographyplugin.cpp @@ -20,7 +20,7 @@ #include <tqregexp.h> #include <kdebug.h> -#include <kaction.h> +#include <tdeaction.h> #include <tdeconfig.h> #include <kgenericfactory.h> #include <tdeversion.h> diff --git a/kopete/plugins/cryptography/kgpgselkey.cpp b/kopete/plugins/cryptography/kgpgselkey.cpp index 63d26510..e0a03cf8 100644 --- a/kopete/plugins/cryptography/kgpgselkey.cpp +++ b/kopete/plugins/cryptography/kgpgselkey.cpp @@ -26,7 +26,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <tqcheckbox.h> #include <kprocess.h> diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp index 7764d3b3..76151f57 100644 --- a/kopete/plugins/cryptography/popuppublic.cpp +++ b/kopete/plugins/cryptography/popuppublic.cpp @@ -32,14 +32,14 @@ #include <tqlabel.h> #include <tdeversion.h> -#include <klistview.h> +#include <tdelistview.h> #include <kprocess.h> #include <kprocio.h> #include <klocale.h> -#include <kaccel.h> -#include <klistviewsearchline.h> +#include <tdeaccel.h> +#include <tdelistviewsearchline.h> #include <kactivelabel.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <kiconloader.h> #include <klineedit.h> @@ -52,7 +52,7 @@ //#include "kgpg.h" #include "kgpginterface.h" -///////////////// klistviewitem special +///////////////// tdelistviewitem special class UpdateViewItem2 : public TDEListViewItem { diff --git a/kopete/plugins/cryptography/popuppublic.h b/kopete/plugins/cryptography/popuppublic.h index 83ac5102..547f8483 100644 --- a/kopete/plugins/cryptography/popuppublic.h +++ b/kopete/plugins/cryptography/popuppublic.h @@ -22,7 +22,7 @@ #include <kdialogbase.h> //#include <kiconloader.h> -#include <kshortcut.h> +#include <tdeshortcut.h> class TQPushButton; |