Rename many classes and header files to avoid conflicts with KDE4

20 files changed, 50 insertions, 50 deletions

diff --git a/kmymoney2/widgets/Makefile.am b/kmymoney2/widgets/Makefile.am
index 2b5e1b0..6879430 100644
--- a/kmymoney2/widgets/Makefile.am
+++ b/kmymoney2/widgets/Makefile.am
@@ -6,7 +6,7 @@ noinst_LIBRARIES = libwidgets.a
 
 libwidgets_a_METASOURCES = AUTO
 
-libwidgets_a_SOURCES = kbudgetvalues.cpp kbudgetvaluesdecl.ui kguiutils.cpp klistviewsearchline.cpp kmymoneyaccountcombo.cpp kmymoneyaccountcompletion.cpp kmymoneyaccountselector.cpp kmymoneyaccounttreebase.cpp kmymoneyaccounttree.cpp kmymoneyaccounttreebudget.cpp kmymoneyaccounttreeforecast.cpp kmymoneybriefschedule.cpp kmymoneycalculator.cpp kmymoneycalendar.cpp kmymoneycategory.cpp kmymoneychecklistitem.cpp kmymoneycombo.cpp kmymoneycompletion.cpp kmymoneycurrencyselector.cpp kmymoneydateinput.cpp kmymoneydatetbl.cpp kmymoneyedit.cpp kmymoneyforecastlistviewitem.cpp kmymoneygpgconfig.cpp kmymoneygpgconfigdecl.ui kmymoneylineedit.cpp kmymoneylistviewitem.cpp kmymoneyonlinequoteconfig.cpp kmymoneyonlinequoteconfigdecl.ui kmymoneypriceview.cpp kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportconfigtabchartdecl.ui kmymoneyreportcontroldecl.ui kmymoneyscheduledcalendar.cpp kmymoneyscheduleddatetbl.cpp kmymoneyselector.cpp kmymoneytitlelabel.cpp kmymoneywizard.cpp kschedulebriefwidget.ui register.cpp registeritem.cpp registersearchline.cpp transaction.cpp scheduledtransaction.cpp stdtransactiondownloaded.cpp stdtransactionmatched.cpp transactioneditorcontainer.cpp transactionform.cpp kaccounttemplateselectordecl.ui kaccounttemplateselector.cpp \
+libwidgets_a_SOURCES = kbudgetvalues.cpp kbudgetvaluesdecl.ui kguiutils.cpp tdelistviewsearchline.cpp kmymoneyaccountcombo.cpp kmymoneyaccountcompletion.cpp kmymoneyaccountselector.cpp kmymoneyaccounttreebase.cpp kmymoneyaccounttree.cpp kmymoneyaccounttreebudget.cpp kmymoneyaccounttreeforecast.cpp kmymoneybriefschedule.cpp kmymoneycalculator.cpp kmymoneycalendar.cpp kmymoneycategory.cpp kmymoneychecklistitem.cpp kmymoneycombo.cpp kmymoneycompletion.cpp kmymoneycurrencyselector.cpp kmymoneydateinput.cpp kmymoneydatetbl.cpp kmymoneyedit.cpp kmymoneyforecastlistviewitem.cpp kmymoneygpgconfig.cpp kmymoneygpgconfigdecl.ui kmymoneylineedit.cpp kmymoneylistviewitem.cpp kmymoneyonlinequoteconfig.cpp kmymoneyonlinequoteconfigdecl.ui kmymoneypriceview.cpp kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportconfigtabchartdecl.ui kmymoneyreportcontroldecl.ui kmymoneyscheduledcalendar.cpp kmymoneyscheduleddatetbl.cpp kmymoneyselector.cpp kmymoneytitlelabel.cpp kmymoneywizard.cpp kschedulebriefwidget.ui register.cpp registeritem.cpp registersearchline.cpp transaction.cpp scheduledtransaction.cpp stdtransactiondownloaded.cpp stdtransactionmatched.cpp transactioneditorcontainer.cpp transactionform.cpp kaccounttemplateselectordecl.ui kaccounttemplateselector.cpp \
 transactionsortoption.cpp transactionsortoption.ui \
 selectedtransaction.cpp
 
@@ -27,7 +27,7 @@ inst_HEADERS = kmymoneydateinput.h kmymoneyedit.h kmymoneytitlelabel.h kmymoneya
  transactionsortoption.h
 
 # include the widgets that are only available to KMyMoney here
-noinst_HEADERS = kbudgetvalues.h klistviewsearchline.h kmymoneyaccounttree.h \
+noinst_HEADERS = kbudgetvalues.h tdelistviewsearchline.h kmymoneyaccounttree.h \
 	kmymoneyaccounttreebudget.h kmymoneyaccounttreeforecast.h kmymoneybriefschedule.h kmymoneycalculator.h kmymoneycalendar.h \
 	kmymoneycategory.h kmymoneydatetbl.h kmymoneygpgconfig.h kmymoneyonlinequoteconfig.h \
 	kmymoneypriceview.h kmymoneyscheduledcalendar.h kmymoneyscheduleddatetbl.h \
diff --git a/kmymoney2/widgets/kaccounttemplateselector.cpp b/kmymoney2/widgets/kaccounttemplateselector.cpp
index d7afd37..1c90f8e 100644
--- a/kmymoney2/widgets/kaccounttemplateselector.cpp
+++ b/kmymoney2/widgets/kaccounttemplateselector.cpp
@@ -28,7 +28,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <ktextedit.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/widgets/kaccounttemplateselectordecl.cpp b/kmymoney2/widgets/kaccounttemplateselectordecl.cpp
index 80e5c58..40c6f3e 100644
--- a/kmymoney2/widgets/kaccounttemplateselectordecl.cpp
+++ b/kmymoney2/widgets/kaccounttemplateselectordecl.cpp
@@ -18,7 +18,7 @@ inline TQString kmm_i18n(const char* msg) { return i18n(msg); }
 #include <tqvariant.h>
 #include <tqpushbutton.h>
 #include <tqheader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqgroupbox.h>
 #include <ktextedit.h>
 #include <tqlayout.h>
diff --git a/kmymoney2/widgets/kmymoneyaccountcompletion.cpp b/kmymoney2/widgets/kmymoneyaccountcompletion.cpp
index 6eab9c8..049dd20 100644
--- a/kmymoney2/widgets/kmymoneyaccountcompletion.cpp
+++ b/kmymoney2/widgets/kmymoneyaccountcompletion.cpp
@@ -29,7 +29,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/kmymoneyaccounttreebase.h b/kmymoney2/widgets/kmymoneyaccounttreebase.h
index 528c845..2b4e431 100644
--- a/kmymoney2/widgets/kmymoneyaccounttreebase.h
+++ b/kmymoney2/widgets/kmymoneyaccounttreebase.h
@@ -27,7 +27,7 @@ class TQDragObject;
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/kmymoneyaccounttreebudget.h b/kmymoney2/widgets/kmymoneyaccounttreebudget.h
index 6f3c244..5b7bb02 100644
--- a/kmymoney2/widgets/kmymoneyaccounttreebudget.h
+++ b/kmymoney2/widgets/kmymoneyaccounttreebudget.h
@@ -27,7 +27,7 @@ class TQDragObject;
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/kmymoneyaccounttreeforecast.h b/kmymoney2/widgets/kmymoneyaccounttreeforecast.h
index 6965ab4..9f082aa 100644
--- a/kmymoney2/widgets/kmymoneyaccounttreeforecast.h
+++ b/kmymoney2/widgets/kmymoneyaccounttreeforecast.h
@@ -27,7 +27,7 @@ class TQDragObject;
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/kmymoneycalendar.cpp b/kmymoney2/widgets/kmymoneycalendar.cpp
index 2deeaf2..c9772ab 100644
--- a/kmymoney2/widgets/kmymoneycalendar.cpp
+++ b/kmymoney2/widgets/kmymoneycalendar.cpp
@@ -68,7 +68,7 @@
 #include <kdebug.h>
 #include <knotifyclient.h>
 #include <kdatetbl.h> // for maximum re-use
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #if KDE_IS_VERSION(3,2,0)
 #include <kcalendarsystem.h>
@@ -119,11 +119,11 @@ void kMyMoneyCalendar::init( const TQDate &dt )
   d->selectWeek = new TQToolButton( this );
 
 //  KIconLoader *kiconloader = TDEGlobal::iconLoader();
-  TDEPopupMenu* kpopupmenuNew = new TDEPopupMenu(this);
-  kpopupmenuNew->insertItem(i18n("Week"), this, TQT_SLOT(slotSetStyleWeekly()));
-  kpopupmenuNew->insertItem(i18n("Month"), this, TQT_SLOT(slotSetStyleMonthly()));
-/*  kpopupmenuNew->insertItem(i18n("3 Months"), this, TQT_SLOT(slotSetStyleQuarterly())); */
-  styleControl->setPopup(kpopupmenuNew);
+  TDEPopupMenu* tdepopupmenuNew = new TDEPopupMenu(this);
+  tdepopupmenuNew->insertItem(i18n("Week"), this, TQT_SLOT(slotSetStyleWeekly()));
+  tdepopupmenuNew->insertItem(i18n("Month"), this, TQT_SLOT(slotSetStyleMonthly()));
+/*  tdepopupmenuNew->insertItem(i18n("3 Months"), this, TQT_SLOT(slotSetStyleQuarterly())); */
+  styleControl->setPopup(tdepopupmenuNew);
 
   TQToolTip::add(styleControl, i18n("Choose Style"));
   TQToolTip::add(yearForward, i18n("Next year"));
diff --git a/kmymoney2/widgets/kmymoneycombo.cpp b/kmymoney2/widgets/kmymoneycombo.cpp
index 56c7e31..915e8d3 100644
--- a/kmymoney2/widgets/kmymoneycombo.cpp
+++ b/kmymoney2/widgets/kmymoneycombo.cpp
@@ -27,7 +27,7 @@
 // KDE Includes
 
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 
diff --git a/kmymoney2/widgets/kmymoneycompletion.cpp b/kmymoney2/widgets/kmymoneycompletion.cpp
index 0a7e99d..5d9dd38 100644
--- a/kmymoney2/widgets/kmymoneycompletion.cpp
+++ b/kmymoney2/widgets/kmymoneycompletion.cpp
@@ -28,7 +28,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/kmymoneydateinput.cpp b/kmymoney2/widgets/kmymoneydateinput.cpp
index b2aecf2..ef4f4ee 100644
--- a/kmymoney2/widgets/kmymoneydateinput.cpp
+++ b/kmymoney2/widgets/kmymoneydateinput.cpp
@@ -38,7 +38,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kpassivepopup.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/widgets/kmymoneyforecastlistviewitem.h b/kmymoney2/widgets/kmymoneyforecastlistviewitem.h
index eb0eed1..078c648 100644
--- a/kmymoney2/widgets/kmymoneyforecastlistviewitem.h
+++ b/kmymoney2/widgets/kmymoneyforecastlistviewitem.h
@@ -26,7 +26,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/kmymoneylistviewitem.h b/kmymoney2/widgets/kmymoneylistviewitem.h
index 984a4bc..00b2d8a 100644
--- a/kmymoney2/widgets/kmymoneylistviewitem.h
+++ b/kmymoney2/widgets/kmymoneylistviewitem.h
@@ -26,7 +26,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp b/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp
index dbc6b35..47f2077 100644
--- a/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp
+++ b/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp
@@ -26,7 +26,7 @@
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
 #include <kpushbutton.h>
diff --git a/kmymoney2/widgets/kmymoneypriceview.cpp b/kmymoney2/widgets/kmymoneypriceview.cpp
index 8af269f..a4714ac 100644
--- a/kmymoney2/widgets/kmymoneypriceview.cpp
+++ b/kmymoney2/widgets/kmymoneypriceview.cpp
@@ -34,7 +34,7 @@
 
 #include <klocale.h>
 #include <kglobal.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <kmessagebox.h>
diff --git a/kmymoney2/widgets/kmymoneypriceview.h b/kmymoney2/widgets/kmymoneypriceview.h
index 4415b88..6f1f8af 100644
--- a/kmymoney2/widgets/kmymoneypriceview.h
+++ b/kmymoney2/widgets/kmymoneypriceview.h
@@ -27,8 +27,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kpopupmenu.h>
-#include <klistview.h>
+#include <tdepopupmenu.h>
+#include <tdelistview.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp b/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp
index 8e8cf32..68eaf48 100644
--- a/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp
+++ b/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp
@@ -28,7 +28,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 
 // ----------------------------------------------------------------------------
@@ -41,18 +41,18 @@ kMyMoneyScheduledCalendar::kMyMoneyScheduledCalendar(TQWidget *parent, const cha
 {
   TQPushButton *pb1 = new TQPushButton(i18n("Select Schedules"), this);
 
-  kpopupmenu = new TDEPopupMenu(this);
-  kpopupmenu->setCheckable(true);
-  kpopupmenu->insertItem(i18n("Bills"), 0);
-  kpopupmenu->insertItem(i18n("Deposits"), 1);
-  kpopupmenu->insertItem(i18n("Transfers"), 2);
-  kpopupmenu->connectItem(0, this, TQT_SLOT(slotSetViewBills()));
-  kpopupmenu->connectItem(1, this, TQT_SLOT(slotSetViewDeposits()));
-  kpopupmenu->connectItem(2, this, TQT_SLOT(slotSetViewTransfers()));
-  kpopupmenu->setItemChecked(0, true);
-  kpopupmenu->setItemChecked(1, true);
-  kpopupmenu->setItemChecked(2, true);
-  pb1->setPopup(kpopupmenu);
+  tdepopupmenu = new TDEPopupMenu(this);
+  tdepopupmenu->setCheckable(true);
+  tdepopupmenu->insertItem(i18n("Bills"), 0);
+  tdepopupmenu->insertItem(i18n("Deposits"), 1);
+  tdepopupmenu->insertItem(i18n("Transfers"), 2);
+  tdepopupmenu->connectItem(0, this, TQT_SLOT(slotSetViewBills()));
+  tdepopupmenu->connectItem(1, this, TQT_SLOT(slotSetViewDeposits()));
+  tdepopupmenu->connectItem(2, this, TQT_SLOT(slotSetViewTransfers()));
+  tdepopupmenu->setItemChecked(0, true);
+  tdepopupmenu->setItemChecked(1, true);
+  tdepopupmenu->setItemChecked(2, true);
+  pb1->setPopup(tdepopupmenu);
 
   m_scheduledDateTable = new kMyMoneyScheduledDateTbl(this);
   setDateTable((kMyMoneyDateTbl*)m_scheduledDateTable);
@@ -73,20 +73,20 @@ kMyMoneyScheduledCalendar::~kMyMoneyScheduledCalendar()
 
 void kMyMoneyScheduledCalendar::slotSetViewBills()
 {
-  kpopupmenu->setItemChecked(0, ((kpopupmenu->isItemChecked(0)) ? false : true));
-  m_scheduledDateTable->filterBills(!kpopupmenu->isItemChecked(0));
+  tdepopupmenu->setItemChecked(0, ((tdepopupmenu->isItemChecked(0)) ? false : true));
+  m_scheduledDateTable->filterBills(!tdepopupmenu->isItemChecked(0));
 }
 
 void kMyMoneyScheduledCalendar::slotSetViewDeposits()
 {
-  kpopupmenu->setItemChecked(1, ((kpopupmenu->isItemChecked(1)) ? false : true));
-  m_scheduledDateTable->filterDeposits(!kpopupmenu->isItemChecked(1));
+  tdepopupmenu->setItemChecked(1, ((tdepopupmenu->isItemChecked(1)) ? false : true));
+  m_scheduledDateTable->filterDeposits(!tdepopupmenu->isItemChecked(1));
 }
 
 void kMyMoneyScheduledCalendar::slotSetViewTransfers()
 {
-  kpopupmenu->setItemChecked(2, ((kpopupmenu->isItemChecked(2)) ? false : true));
-  m_scheduledDateTable->filterTransfers(!kpopupmenu->isItemChecked(2));
+  tdepopupmenu->setItemChecked(2, ((tdepopupmenu->isItemChecked(2)) ? false : true));
+  m_scheduledDateTable->filterTransfers(!tdepopupmenu->isItemChecked(2));
 }
 
 #include "kmymoneyscheduledcalendar.moc"
diff --git a/kmymoney2/widgets/kmymoneyscheduledcalendar.h b/kmymoney2/widgets/kmymoneyscheduledcalendar.h
index 682603c..534592d 100644
--- a/kmymoney2/widgets/kmymoneyscheduledcalendar.h
+++ b/kmymoney2/widgets/kmymoneyscheduledcalendar.h
@@ -81,7 +81,7 @@ protected slots:
   void slotSetViewTransfers();
 
 private:
-  TDEPopupMenu* kpopupmenu;
+  TDEPopupMenu* tdepopupmenu;
   kMyMoneyScheduledDateTbl *m_scheduledDateTable;
 };
 
diff --git a/kmymoney2/widgets/registersearchline.cpp b/kmymoney2/widgets/registersearchline.cpp
index d157808..626db9b 100644
--- a/kmymoney2/widgets/registersearchline.cpp
+++ b/kmymoney2/widgets/registersearchline.cpp
@@ -25,8 +25,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 #include <kiconloader.h>
 #include <klocale.h>
 
diff --git a/kmymoney2/widgets/tdelistviewsearchline.cpp b/kmymoney2/widgets/tdelistviewsearchline.cpp
index 0af29d7..4c72bdf 100644
--- a/kmymoney2/widgets/tdelistviewsearchline.cpp
+++ b/kmymoney2/widgets/tdelistviewsearchline.cpp
@@ -16,12 +16,12 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "klistviewsearchline.h"
+#include "tdelistviewsearchline.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 #include <kdebug.h>
 #include <klocale.h>
 
@@ -504,4 +504,4 @@ void TDEListViewSearchLineWidget::positionInToolBar()
         d->searchLine->show();
 }
 
-#include "klistviewsearchline.moc"
+#include "tdelistviewsearchline.moc"