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/history | |
| 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/history')
| -rw-r--r-- | kopete/plugins/history/historydialog.cpp | 8 | ||||
| -rw-r--r-- | kopete/plugins/history/historydialog.h | 2 | ||||
| -rw-r--r-- | kopete/plugins/history/historyguiclient.cpp | 2 | ||||
| -rw-r--r-- | kopete/plugins/history/historyplugin.cpp | 2 | ||||
| -rw-r--r-- | kopete/plugins/history/historyviewer.ui | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp index 992d586f..b5b65b80 100644 --- a/kopete/plugins/history/historydialog.cpp +++ b/kopete/plugins/history/historydialog.cpp @@ -48,14 +48,14 @@ #include <klocale.h> #include <krun.h> #include <kstandarddirs.h> -#include <klistview.h> -#include <klistviewsearchline.h> +#include <tdelistview.h> +#include <tdelistviewsearchline.h> #include <kprogress.h> #include <kiconloader.h> #include <kcombobox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstdaction.h> -#include <kaction.h> +#include <tdeaction.h> class TDEListViewDateItem : public TDEListViewItem { diff --git a/kopete/plugins/history/historydialog.h b/kopete/plugins/history/historydialog.h index daa45362..7efea5fa 100644 --- a/kopete/plugins/history/historydialog.h +++ b/kopete/plugins/history/historydialog.h @@ -23,7 +23,7 @@ #include <tqstringlist.h> #include <kdialogbase.h> -#include <klistview.h> +#include <tdelistview.h> #include "kopetemessage.h" diff --git a/kopete/plugins/history/historyguiclient.cpp b/kopete/plugins/history/historyguiclient.cpp index 21bde3b5..eeda505c 100644 --- a/kopete/plugins/history/historyguiclient.cpp +++ b/kopete/plugins/history/historyguiclient.cpp @@ -21,7 +21,7 @@ #include "kopetecontact.h" #include "kopeteview.h" -#include <kaction.h> +#include <tdeaction.h> #include <klocale.h> #include <kgenericfactory.h> diff --git a/kopete/plugins/history/historyplugin.cpp b/kopete/plugins/history/historyplugin.cpp index d4791952..83405ee2 100644 --- a/kopete/plugins/history/historyplugin.cpp +++ b/kopete/plugins/history/historyplugin.cpp @@ -17,7 +17,7 @@ #include <kgenericfactory.h> #include <kaboutdata.h> -#include <kaction.h> +#include <tdeaction.h> #include <kmessagebox.h> //#include <tdeconfig.h> #include <kplugininfo.h> diff --git a/kopete/plugins/history/historyviewer.ui b/kopete/plugins/history/historyviewer.ui index 6711dd31..be64272d 100644 --- a/kopete/plugins/history/historyviewer.ui +++ b/kopete/plugins/history/historyviewer.ui @@ -340,8 +340,8 @@ <includehints> <includehint>kprogress.h</includehint> <includehint>klineedit.h</includehint> - <includehint>klistviewsearchline.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistviewsearchline.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>kcombobox.h</includehint> </includehints> </UI> |