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/protocols/yahoo | |
| 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/protocols/yahoo')
| -rw-r--r-- | kopete/protocols/yahoo/yahooaccount.cpp | 4 | ||||
| -rw-r--r-- | kopete/protocols/yahoo/yahoochatsession.cpp | 6 | ||||
| -rw-r--r-- | kopete/protocols/yahoo/yahooconferencemessagemanager.cpp | 2 | ||||
| -rw-r--r-- | kopete/protocols/yahoo/yahoocontact.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp index 4edc14e6..81fa7514 100644 --- a/kopete/protocols/yahoo/yahooaccount.cpp +++ b/kopete/protocols/yahoo/yahooaccount.cpp @@ -35,8 +35,8 @@ #include <klocale.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include <kmessagebox.h> #include <krun.h> #include <kstandarddirs.h> diff --git a/kopete/protocols/yahoo/yahoochatsession.cpp b/kopete/protocols/yahoo/yahoochatsession.cpp index c8eaf102..e59c5062 100644 --- a/kopete/protocols/yahoo/yahoochatsession.cpp +++ b/kopete/protocols/yahoo/yahoochatsession.cpp @@ -26,10 +26,10 @@ #include <kinputdialog.h> #include <klocale.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <ktempfile.h> -#include <kmainwindow.h> -#include <ktoolbar.h> +#include <tdemainwindow.h> +#include <tdetoolbar.h> #include <krun.h> #include <kiconloader.h> diff --git a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp index 64656e75..c96d52da 100644 --- a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp +++ b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp @@ -20,7 +20,7 @@ #include <klineeditdlg.h> #include <klocale.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tdeconfig.h> #include <kopetecontactaction.h> diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp index fbc1718d..1ca1a3db 100644 --- a/kopete/protocols/yahoo/yahoocontact.cpp +++ b/kopete/protocols/yahoo/yahoocontact.cpp @@ -45,11 +45,11 @@ // KDE Includes #include <kdebug.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <klocale.h> #include <krun.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <kmessagebox.h> #include <ktempfile.h> #include <tdeio/global.h> |