summaryrefslogtreecommitdiffstats
path: root/kaddressbook/views
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:55 -0600
commitd318087925a540a204c9d3820d5a09fbda58b8b2 (patch)
treeb8dde6aa5d6559b81c6667d8364a4364c27bcba4 /kaddressbook/views
parent6cc5f72b33f1d281de3e1bf809b1b5e77d5c96cf (diff)
downloadtdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.tar.gz
tdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kaddressbook/views')
-rw-r--r--kaddressbook/views/colorlistbox.h2
-rw-r--r--kaddressbook/views/configurecardviewdialog.cpp2
-rw-r--r--kaddressbook/views/contactlistview.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/kaddressbook/views/colorlistbox.h b/kaddressbook/views/colorlistbox.h
index 18c307aca..62b7e5a8f 100644
--- a/kaddressbook/views/colorlistbox.h
+++ b/kaddressbook/views/colorlistbox.h
@@ -21,7 +21,7 @@
#ifndef _COLOR_LISTBOX_H_
#define _COLOR_LISTBOX_H_
-#include <klistbox.h>
+#include <tdelistbox.h>
class ColorListBox : public TDEListBox
{
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index 4cfbf9586..2c520ce74 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -37,7 +37,7 @@
#include <klocale.h>
#include <kiconloader.h>
#include <tdeconfig.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
#include <kpushbutton.h>
#include "colorlistbox.h"
diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h
index adfbc2dc8..0ca029f64 100644
--- a/kaddressbook/views/contactlistview.h
+++ b/kaddressbook/views/contactlistview.h
@@ -29,7 +29,7 @@
#include <tqtooltip.h>
#include <tqstring.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kabc/field.h>