summaryrefslogtreecommitdiffstats
path: root/kaddressbook
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
parent6cc5f72b33f1d281de3e1bf809b1b5e77d5c96cf (diff)
downloadtdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.tar.gz
tdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kaddressbook')
-rw-r--r--kaddressbook/CMakeLists.txt2
-rw-r--r--kaddressbook/Makefile.am2
-rw-r--r--kaddressbook/addresseditwidget.cpp4
-rw-r--r--kaddressbook/addresseeeditorwidget.cpp2
-rw-r--r--kaddressbook/customfieldswidget.cpp2
-rw-r--r--kaddressbook/distributionlistpicker.cpp2
-rw-r--r--kaddressbook/editors/imeditorbase.ui2
-rw-r--r--kaddressbook/editors/imeditorwidget.h2
-rw-r--r--kaddressbook/emaileditwidget.cpp2
-rw-r--r--kaddressbook/extensionmanager.cpp2
-rw-r--r--kaddressbook/features/distributionlistngwidget.cpp4
-rw-r--r--kaddressbook/features/distributionlistngwidget.h2
-rw-r--r--kaddressbook/features/distributionlistwidget.cpp2
-rw-r--r--kaddressbook/features/distributionlistwidget.h2
-rw-r--r--kaddressbook/features/resourceselection.h2
-rw-r--r--kaddressbook/filtereditdialog.cpp4
-rw-r--r--kaddressbook/geowidget.cpp2
-rw-r--r--kaddressbook/imeditwidget.cpp2
-rw-r--r--kaddressbook/interfaces/xxport.cpp2
-rw-r--r--kaddressbook/kabcore.cpp6
-rw-r--r--kaddressbook/kaddressbook_part.cpp2
-rw-r--r--kaddressbook/kaddressbootdemain.cpp4
-rw-r--r--kaddressbook/kaddressbootdemain.h4
-rw-r--r--kaddressbook/kcmconfigs/addhostdialog.cpp2
-rw-r--r--kaddressbook/kcmconfigs/kabconfigwidget.cpp2
-rw-r--r--kaddressbook/kcmconfigs/ldapoptionswidget.cpp2
-rw-r--r--kaddressbook/main.cpp2
-rw-r--r--kaddressbook/nameeditdialog.cpp4
-rw-r--r--kaddressbook/phoneeditwidget.cpp2
-rw-r--r--kaddressbook/printing/detailledstyle.cpp2
-rw-r--r--kaddressbook/viewmanager.cpp2
-rw-r--r--kaddressbook/views/colorlistbox.h2
-rw-r--r--kaddressbook/views/configurecardviewdialog.cpp2
-rw-r--r--kaddressbook/views/contactlistview.h2
34 files changed, 42 insertions, 42 deletions
diff --git a/kaddressbook/CMakeLists.txt b/kaddressbook/CMakeLists.txt
index 1cea8dd87..fad0df465 100644
--- a/kaddressbook/CMakeLists.txt
+++ b/kaddressbook/CMakeLists.txt
@@ -75,7 +75,7 @@ tde_add_kpart( libkaddressbookpart AUTOMOC
##### kaddressbook (executable) #################
tde_add_executable( kaddressbook AUTOMOC
- SOURCES main.cpp kaddressbookmain.cpp
+ SOURCES main.cpp kaddressbootdemain.cpp
LINK kaddressbook-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kaddressbook/Makefile.am b/kaddressbook/Makefile.am
index b411e6189..51d92dd25 100644
--- a/kaddressbook/Makefile.am
+++ b/kaddressbook/Makefile.am
@@ -16,7 +16,7 @@ INCLUDES= -I$(top_srcdir)/kaddressbook/interfaces \
bin_PROGRAMS = kaddressbook
-kaddressbook_SOURCES = main.cpp kaddressbookmain.cpp
+kaddressbook_SOURCES = main.cpp kaddressbootdemain.cpp
kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kaddressbook_LDADD = libkaddressbook.la
diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp
index bb4938b89..5cf3b791b 100644
--- a/kaddressbook/addresseditwidget.cpp
+++ b/kaddressbook/addresseditwidget.cpp
@@ -36,7 +36,7 @@
#include <tqtoolbutton.h>
#include <tqtooltip.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <kactivelabel.h>
#include <kapplication.h>
#include <kbuttonbox.h>
@@ -47,7 +47,7 @@
#include <kiconloader.h>
#include <kinputdialog.h>
#include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kseparator.h>
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index a53d6c345..8cffb0c32 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -34,7 +34,7 @@
#include <kabc/resource.h>
#include <kabc/stdaddressbook.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <kapplication.h>
#include <tdeconfig.h>
#include <kcombobox.h>
diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp
index 13536148a..867ccddb6 100644
--- a/kaddressbook/customfieldswidget.cpp
+++ b/kaddressbook/customfieldswidget.cpp
@@ -30,7 +30,7 @@
#include <tqvalidator.h>
#include <tqspinbox.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <kcombobox.h>
#include <kinputdialog.h>
#include <klineedit.h>
diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp
index 354a24a20..2dce6b05d 100644
--- a/kaddressbook/distributionlistpicker.cpp
+++ b/kaddressbook/distributionlistpicker.cpp
@@ -31,7 +31,7 @@
#include <kapplication.h>
#include <kinputdialog.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <klocale.h>
#include <kmessagebox.h>
diff --git a/kaddressbook/editors/imeditorbase.ui b/kaddressbook/editors/imeditorbase.ui
index de9fff558..aca1c105f 100644
--- a/kaddressbook/editors/imeditorbase.ui
+++ b/kaddressbook/editors/imeditorbase.ui
@@ -158,7 +158,7 @@
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
- <includehint>klistview.h</includehint>
+ <includehint>tdelistview.h</includehint>
<includehint>kactivelabel.h</includehint>
</includehints>
</UI>
diff --git a/kaddressbook/editors/imeditorwidget.h b/kaddressbook/editors/imeditorwidget.h
index 62fb36dfc..517e26498 100644
--- a/kaddressbook/editors/imeditorwidget.h
+++ b/kaddressbook/editors/imeditorwidget.h
@@ -26,7 +26,7 @@
#define IMEDITORWIDGET_H
#include <tqvaluelist.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kdialogbase.h>
#include "contacteditorwidget.h"
diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp
index 7b5fe4c98..a1df16c3b 100644
--- a/kaddressbook/emaileditwidget.cpp
+++ b/kaddressbook/emaileditwidget.cpp
@@ -31,7 +31,7 @@
#include <tqtoolbutton.h>
#include <tqtooltip.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <tdeconfig.h>
#include <kcombobox.h>
#include <kdebug.h>
diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp
index c184adf07..4ec33675d 100644
--- a/kaddressbook/extensionmanager.cpp
+++ b/kaddressbook/extensionmanager.cpp
@@ -21,7 +21,7 @@
without including the source code for TQt in the source distribution.
*/
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <klocale.h>
diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp
index 6dda79de6..471769616 100644
--- a/kaddressbook/features/distributionlistngwidget.cpp
+++ b/kaddressbook/features/distributionlistngwidget.cpp
@@ -31,9 +31,9 @@
#include <kdialog.h>
#include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <tqevent.h>
#include <tqguardedptr.h>
diff --git a/kaddressbook/features/distributionlistngwidget.h b/kaddressbook/features/distributionlistngwidget.h
index dc4b036d2..fdeb83864 100644
--- a/kaddressbook/features/distributionlistngwidget.h
+++ b/kaddressbook/features/distributionlistngwidget.h
@@ -27,7 +27,7 @@
#include <kabc/addressee.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <tqstringlist.h>
diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp
index e77e3fc3b..73afa2ea5 100644
--- a/kaddressbook/features/distributionlistwidget.cpp
+++ b/kaddressbook/features/distributionlistwidget.cpp
@@ -30,7 +30,7 @@
#include <tqpushbutton.h>
#include <tqradiobutton.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kglobal.h>
diff --git a/kaddressbook/features/distributionlistwidget.h b/kaddressbook/features/distributionlistwidget.h
index 59a5d88bd..1429aa7bc 100644
--- a/kaddressbook/features/distributionlistwidget.h
+++ b/kaddressbook/features/distributionlistwidget.h
@@ -26,7 +26,7 @@
#include <config.h> // for TDEPIM_NEW_DISTRLISTS
#include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include "extensionwidget.h"
diff --git a/kaddressbook/features/resourceselection.h b/kaddressbook/features/resourceselection.h
index c986c5fca..4c1a6df61 100644
--- a/kaddressbook/features/resourceselection.h
+++ b/kaddressbook/features/resourceselection.h
@@ -24,7 +24,7 @@
#ifndef RESOURCESELECTION_H
#define RESOURCESELECTION_H
-#include <klistview.h>
+#include <tdelistview.h>
#include "extensionwidget.h"
diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp
index 3b3e37df1..3845f59fc 100644
--- a/kaddressbook/filtereditdialog.cpp
+++ b/kaddressbook/filtereditdialog.cpp
@@ -38,8 +38,8 @@
#include <kdebug.h>
#include <kiconloader.h>
#include <klineedit.h>
-#include <klistbox.h>
-#include <klistview.h>
+#include <tdelistbox.h>
+#include <tdelistview.h>
#include <klocale.h>
#include "kabprefs.h"
diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp
index 55714b368..27333bf99 100644
--- a/kaddressbook/geowidget.cpp
+++ b/kaddressbook/geowidget.cpp
@@ -22,7 +22,7 @@
*/
#include <kabc/geo.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <kcombobox.h>
#include <kdebug.h>
#include <kiconloader.h>
diff --git a/kaddressbook/imeditwidget.cpp b/kaddressbook/imeditwidget.cpp
index 9f7271201..d11a588ae 100644
--- a/kaddressbook/imeditwidget.cpp
+++ b/kaddressbook/imeditwidget.cpp
@@ -30,7 +30,7 @@
#include <tqtoolbutton.h>
#include <tqtooltip.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <tdeconfig.h>
#include <kcombobox.h>
#include <kdebug.h>
diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp
index a934bb976..e32a71b28 100644
--- a/kaddressbook/interfaces/xxport.cpp
+++ b/kaddressbook/interfaces/xxport.cpp
@@ -24,7 +24,7 @@
#include <tqmap.h>
#include <tqsignalmapper.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kinstance.h>
#include <kmessagebox.h>
#include <kapplication.h>
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index a6f8a20b8..924aa083e 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -44,10 +44,10 @@
#include <kabc/vcardconverter.h>
#include <kabc/resourcefile.h>
#include <kaboutdata.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <kapplication.h>
#include <dcopclient.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
#include <kcmdlineargs.h>
#include <kcmultidialog.h>
#include <kdebug.h>
@@ -63,7 +63,7 @@
#include <kstatusbar.h>
#include <kstdguiitem.h>
#include <kxmlguiclient.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
#include <libtdepim/addresseeview.h>
#include <libtdepim/categoryeditdialog.h>
#include <libtdepim/categoryselectdialog.h>
diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp
index cd1c15c7f..07e778df9 100644
--- a/kaddressbook/kaddressbook_part.cpp
+++ b/kaddressbook/kaddressbook_part.cpp
@@ -23,7 +23,7 @@
#include <tqlayout.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include <kdebug.h>
#include <kiconloader.h>
diff --git a/kaddressbook/kaddressbootdemain.cpp b/kaddressbook/kaddressbootdemain.cpp
index 4e5cf8ff3..60013be1f 100644
--- a/kaddressbook/kaddressbootdemain.cpp
+++ b/kaddressbook/kaddressbootdemain.cpp
@@ -32,7 +32,7 @@
#include "kabcore.h"
-#include "kaddressbookmain.h"
+#include "kaddressbootdemain.h"
KAddressBookMain::KAddressBookMain( const TQString &file )
: DCOPObject( "KAddressBookIface" ), TDEMainWindow( 0 )
@@ -189,4 +189,4 @@ void KAddressBookMain::newToolbarConfig()
applyMainWindowSettings( TDEGlobal::config(), "MainWindow" );
}
-#include "kaddressbookmain.moc"
+#include "kaddressbootdemain.moc"
diff --git a/kaddressbook/kaddressbootdemain.h b/kaddressbook/kaddressbootdemain.h
index a8ac77e2d..49e4a8a65 100644
--- a/kaddressbook/kaddressbootdemain.h
+++ b/kaddressbook/kaddressbootdemain.h
@@ -26,9 +26,9 @@
#include <tqptrlist.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include "kaddressbookiface.h"
diff --git a/kaddressbook/kcmconfigs/addhostdialog.cpp b/kaddressbook/kcmconfigs/addhostdialog.cpp
index 21a24780c..0c2484404 100644
--- a/kaddressbook/kcmconfigs/addhostdialog.cpp
+++ b/kaddressbook/kcmconfigs/addhostdialog.cpp
@@ -27,7 +27,7 @@
#include <tqspinbox.h>
#include <tqtooltip.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <kbuttonbox.h>
#include <klineedit.h>
#include <klocale.h>
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index d63247a48..6e2c4f68b 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -35,7 +35,7 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <kdialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <ktrader.h>
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
index 981b33cc8..edd805cae 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
@@ -32,7 +32,7 @@
#include <kapplication.h>
#include <kbuttonbox.h>
#include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include "addhostdialog.h"
diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp
index fd5a3149d..d08b9ad4d 100644
--- a/kaddressbook/main.cpp
+++ b/kaddressbook/main.cpp
@@ -36,7 +36,7 @@
#include <kuniqueapplication.h>
#include <twin.h>
-#include "kaddressbookmain.h"
+#include "kaddressbootdemain.h"
#include "kaddressbook_options.h"
#include "kabcore.h"
diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp
index aa76fdefb..765d62deb 100644
--- a/kaddressbook/nameeditdialog.cpp
+++ b/kaddressbook/nameeditdialog.cpp
@@ -31,12 +31,12 @@
#include <tqstring.h>
#include <tqwhatsthis.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <kapplication.h>
#include <kbuttonbox.h>
#include <tdeconfig.h>
#include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kcombobox.h>
#include <klocale.h>
#include <kdebug.h>
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index 6d3ef0b96..bb1c72451 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -39,7 +39,7 @@
#include <kdebug.h>
#include <kiconloader.h>
#include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <kabc/phonenumber.h>
diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp
index 949c1783c..adcbe5ec3 100644
--- a/kaddressbook/printing/detailledstyle.cpp
+++ b/kaddressbook/printing/detailledstyle.cpp
@@ -27,7 +27,7 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <kdialog.h>
-#include <kfontcombo.h>
+#include <tdefontcombo.h>
#include <kglobalsettings.h>
#include <tqlayout.h>
#include <klocale.h>
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 4ac23786f..51ed14d87 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -28,7 +28,7 @@
#include <libtdepim/kvcarddrag.h>
#include <kabc/addressbook.h>
#include <kabc/vcardconverter.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <tdeversion.h>
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>