diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:10:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:10:14 -0600 |
| commit | bba095a5aab3f7cbf3ec062071e94f5c1e66e50b (patch) | |
| tree | 2a7e8b53757b499b0b08d235cfe58e9505ca4aa3 /libk3b/tools | |
| parent | 08e6e3d01bc56d3b55c1512164f48d3db762bd53 (diff) | |
| download | k3b-bba095a5aab3f7cbf3ec062071e94f5c1e66e50b.tar.gz k3b-bba095a5aab3f7cbf3ec062071e94f5c1e66e50b.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'libk3b/tools')
| -rw-r--r-- | libk3b/tools/k3blistview.h | 2 | ||||
| -rw-r--r-- | libk3b/tools/k3bradioaction.cpp | 2 | ||||
| -rw-r--r-- | libk3b/tools/k3bradioaction.h | 2 | ||||
| -rw-r--r-- | libk3b/tools/k3btoolbox.cpp | 6 | ||||
| -rw-r--r-- | libk3b/tools/k3btoolbutton.cpp | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/libk3b/tools/k3blistview.h b/libk3b/tools/k3blistview.h index 333b9f0..b29f594 100644 --- a/libk3b/tools/k3blistview.h +++ b/libk3b/tools/k3blistview.h @@ -18,7 +18,7 @@ #define K3BLISTVIEW_H -#include <klistview.h> +#include <tdelistview.h> #include "k3b_export.h" #include <tqptrvector.h> #include <tqptrlist.h> diff --git a/libk3b/tools/k3bradioaction.cpp b/libk3b/tools/k3bradioaction.cpp index a70b5be..d19f579 100644 --- a/libk3b/tools/k3bradioaction.cpp +++ b/libk3b/tools/k3bradioaction.cpp @@ -15,7 +15,7 @@ #include "k3bradioaction.h" -#include <ktoolbarbutton.h> +#include <tdetoolbarbutton.h> K3bRadioAction::K3bRadioAction( const TQString& text, const TDEShortcut& cut, TQObject* parent, const char* name ) diff --git a/libk3b/tools/k3bradioaction.h b/libk3b/tools/k3bradioaction.h index cf77f88..1932efb 100644 --- a/libk3b/tools/k3bradioaction.h +++ b/libk3b/tools/k3bradioaction.h @@ -16,7 +16,7 @@ #ifndef _K3B_RADIO_ACTION_H_ #define _K3B_RADIO_ACTION_H_ -#include <kactionclasses.h> +#include <tdeactionclasses.h> #include "k3b_export.h" /** diff --git a/libk3b/tools/k3btoolbox.cpp b/libk3b/tools/k3btoolbox.cpp index 22b7a94..8b00f51 100644 --- a/libk3b/tools/k3btoolbox.cpp +++ b/libk3b/tools/k3btoolbox.cpp @@ -15,9 +15,9 @@ #include "k3btoolbox.h" -#include <kaction.h> -#include <kpopupmenu.h> -#include <ktoolbarbutton.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> +#include <tdetoolbarbutton.h> #include <kiconloader.h> #include <tqtoolbutton.h> diff --git a/libk3b/tools/k3btoolbutton.cpp b/libk3b/tools/k3btoolbutton.cpp index b897ebd..cd931fc 100644 --- a/libk3b/tools/k3btoolbutton.cpp +++ b/libk3b/tools/k3btoolbutton.cpp @@ -57,7 +57,7 @@ void K3bToolButton::drawButton( TQPainter* p ) TQToolButton::drawButton( p ); // - // code below comes from ktoolbarbutton.cpp from the tdelibs sources + // code below comes from tdetoolbarbutton.cpp from the tdelibs sources // see the file for copyright information // if( TQToolButton::popup() ) { |