Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs

4 files changed, 11 insertions, 11 deletions

diff --git a/kab/README b/kab/README
index 8ddc6ecec..c8f0306ed 100644
--- a/kab/README
+++ b/kab/README
@@ -1,4 +1,4 @@
-Note: libkab is now obsolete. Please use libkabc in tdelibs/kabc. libkab is
+Note: libkab is now obsolete. Please use libkabc in tdelibs/tdeabc. libkab is
 no longer installed. It's only needed for the conversion tool converting
 libkab data to libkabc data.
 
diff --git a/kab/addressbook.cc b/kab/addressbook.cc
index 0408a4db7..852f56d57 100644
--- a/kab/addressbook.cc
+++ b/kab/addressbook.cc
@@ -21,12 +21,12 @@
 #include <tqfileinfo.h>
 #include <tqstringlist.h>
 
-#include <kapplication.h>
-#include <kglobal.h>
+#include <tdeapplication.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 extern "C" {
 #include <sys/stat.h>
diff --git a/kab/kabapi.cc b/kab/kabapi.cc
index 622fc708d..7f2159e24 100644
--- a/kab/kabapi.cc
+++ b/kab/kabapi.cc
@@ -17,9 +17,9 @@
 */
 
 #include "kabapi.h"
-#include <klistbox.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdelistbox.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 
@@ -36,7 +36,7 @@ using namespace std;
 KabAPI::KabAPI(TQWidget* parent, const char* name)
   : KDialogBase(parent, name),
     book(0),
-    listbox(new KListBox(this)),
+    listbox(new TDEListBox(this)),
     selection(-1)
 {
   TQ_CHECK_PTR(listbox);
diff --git a/kab/kabapi.h b/kab/kabapi.h
index 6cf46c37e..6204efc39 100644
--- a/kab/kabapi.h
+++ b/kab/kabapi.h
@@ -22,7 +22,7 @@
 
 class TQPushButton;
 class TQFrame;
-class KListBox;
+class TDEListBox;
 
 /**
   * The class KabAPI provides a public interface to access the
@@ -189,7 +189,7 @@ protected:
   /**
    * This displays the overview over the addresses in the dialog.
    */
-  KListBox* listbox;
+  TDEListBox* listbox;
   /**
    * The index of the selected entry. This value is only valid after the
    * KabAPI dialog has been executed and accepted by the user.