From bba095a5aab3f7cbf3ec062071e94f5c1e66e50b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:10:14 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 libk3b/tools/k3blistview.h      | 2 +-
 libk3b/tools/k3bradioaction.cpp | 2 +-
 libk3b/tools/k3bradioaction.h   | 2 +-
 libk3b/tools/k3btoolbox.cpp     | 6 +++---
 libk3b/tools/k3btoolbutton.cpp  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'libk3b/tools')

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() ) {
-- 
cgit v1.2.1