Additional k => tde renaming and fixes

9 files changed, 19 insertions, 19 deletions

diff --git a/kmymoney2/Makefile.am b/kmymoney2/Makefile.am
index df53831..2a83358 100644
--- a/kmymoney2/Makefile.am
+++ b/kmymoney2/Makefile.am
@@ -4,7 +4,7 @@ bin_PROGRAMS = kmymoney2
 
 kmymoney2_SOURCES = kmymoneyutils.cpp kstartuplogo.cpp kmymoney2.cpp main.cpp kmymoney2.stub kmymoney2.skel kmymoneysettings.kcfgc kmymoneyglobalsettings.cpp
 
-kmymoney2_LDADD = $(top_builddir)/kmymoney2/views/libviews.a $(top_builddir)/kmymoney2/reports/libreports.a $(top_builddir)/kmymoney2/wizards/newuserwizard/libnewuserwizard.a $(top_builddir)/kmymoney2/wizards/newaccountwizard/libnewaccountwizard.a $(top_builddir)/kmymoney2/wizards/wizardpages/libwizardpages.a $(top_builddir)/kmymoney2/dialogs/libdialogs.a $(top_builddir)/kmymoney2/dialogs/settings/libsettings.a $(top_builddir)/kmymoney2/widgets/libwidgets.a $(top_builddir)/kmymoney2/converter/libconverter.a $(top_builddir)/kmymoney2/mymoney/storage/libstorage.a $(top_builddir)/kmymoney2/mymoney/libkmm_mymoney.la $(top_builddir)/libkgpgfile/libkgpgfile.la $(top_builddir)/kmymoney2/plugins/interfaces/libinterfaces.a $(top_builddir)/kmymoney2/plugins/libkmm_plugin.la $(top_builddir)/libkdchart/libkmm_kdchart.la dialogs/libdialogs.a $(LIB_TDEABC) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIB_KUTILS)
+kmymoney2_LDADD = $(top_builddir)/kmymoney2/views/libviews.a $(top_builddir)/kmymoney2/reports/libreports.a $(top_builddir)/kmymoney2/wizards/newuserwizard/libnewuserwizard.a $(top_builddir)/kmymoney2/wizards/newaccountwizard/libnewaccountwizard.a $(top_builddir)/kmymoney2/wizards/wizardpages/libwizardpages.a $(top_builddir)/kmymoney2/dialogs/libdialogs.a $(top_builddir)/kmymoney2/dialogs/settings/libsettings.a $(top_builddir)/kmymoney2/widgets/libwidgets.a $(top_builddir)/kmymoney2/converter/libconverter.a $(top_builddir)/kmymoney2/mymoney/storage/libstorage.a $(top_builddir)/kmymoney2/mymoney/libkmm_mymoney.la $(top_builddir)/libkgpgfile/libkgpgfile.la $(top_builddir)/kmymoney2/plugins/interfaces/libinterfaces.a $(top_builddir)/kmymoney2/plugins/libkmm_plugin.la $(top_builddir)/libkdchart/libkmm_kdchart.la dialogs/libdialogs.a $(LIB_TDEABC) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIB_TDEUTILS)
 
 SUBDIRS = mymoney widgets dialogs wizards views converter pics icons html templates plugins reports misc
 
@@ -99,7 +99,7 @@ INCLUDES= $(all_includes) -I$(top_srcdir) -I. -I$(top_builddir)/kmymoney2/dialog
 METASOURCES = AUTO
 
 # the library search path.
-kmymoney2_LDFLAGS = $(all_libraries) $(kde_RPATH) -export-dynamic $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KUTILS)
+kmymoney2_LDFLAGS = $(all_libraries) $(kde_RPATH) -export-dynamic $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEUTILS)
 
 # Uncomment the following two lines if you add a ui.rc file for your application to make use of
 # KDE
@@ -166,6 +166,6 @@ kmymoneytest_SOURCES = kmymoneytest.cpp kmymoneyutils.cpp kmymoneyglobalsettings
 kmymoneytest_LDADD = ./mymoney/storage/libstoragetest.a ./mymoney/libmymoneytest.a ./converter/libconvertertest.a ./reports/libreportstest.a $(kmymoney2_LDADD) kmymoneysettings.$(OBJEXT)
 
 # the library search path.
-kmymoneytest_LDFLAGS = $(all_libraries) $(kde_RPATH) $(CPPUNIT_LIBS) $(LIB_KUTILS)
+kmymoneytest_LDFLAGS = $(all_libraries) $(kde_RPATH) $(CPPUNIT_LIBS) $(LIB_TDEUTILS)
 endif
 
diff --git a/kmymoney2/dialogs/knewfiledlg.cpp b/kmymoney2/dialogs/knewfiledlg.cpp
index f9ec0a7..454fe2f 100644
--- a/kmymoney2/dialogs/knewfiledlg.cpp
+++ b/kmymoney2/dialogs/knewfiledlg.cpp
@@ -82,13 +82,13 @@ void KNewFileDlg::init(const TQString& title)
 #endif
 
   if(!showLoadButton)
-    kabcBtn->hide();
+    tdeabcBtn->hide();
 
   userNameEdit->setFocus();
 
   connect(cancelBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()));
   connect(okBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(okClicked()));
-  connect(kabcBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadFromKABC()));
+  connect(tdeabcBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadFromKABC()));
 }
 
 KNewFileDlg::~KNewFileDlg(){
diff --git a/kmymoney2/dialogs/knewfiledlgdecl.ui b/kmymoney2/dialogs/knewfiledlgdecl.ui
index b9f39da..0cfa81a 100644
--- a/kmymoney2/dialogs/knewfiledlgdecl.ui
+++ b/kmymoney2/dialogs/knewfiledlgdecl.ui
@@ -219,7 +219,7 @@ your KMyMoney file.</string>
                 </property>
                 <widget class="KPushButton">
                     <property name="name">
-                        <cstring>kabcBtn</cstring>
+                        <cstring>tdeabcBtn</cstring>
                     </property>
                     <property name="text">
                         <string>Load from Addressbook</string>
@@ -320,7 +320,7 @@ your KMyMoney file.</string>
     <tabstop>postcodeEdit</tabstop>
     <tabstop>telephoneEdit</tabstop>
     <tabstop>emailEdit</tabstop>
-    <tabstop>kabcBtn</tabstop>
+    <tabstop>tdeabcBtn</tabstop>
     <tabstop>okBtn</tabstop>
     <tabstop>cancelBtn</tabstop>
 </tabstops>
diff --git a/kmymoney2/dialogs/tdeconfirmmanualenterdlg.h b/kmymoney2/dialogs/tdeconfirmmanualenterdlg.h
index 2e878a3..107936d 100644
--- a/kmymoney2/dialogs/tdeconfirmmanualenterdlg.h
+++ b/kmymoney2/dialogs/tdeconfirmmanualenterdlg.h
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef KCONFIRMMANUALENTERDLG_H
-#define KCONFIRMMANUALENTERDLG_H
+#ifndef TDECONFIRMMANUALENTERDLG_H
+#define TDECONFIRMMANUALENTERDLG_H
 
 // ----------------------------------------------------------------------------
 // QT Includes
@@ -58,4 +58,4 @@ public:
   Action action(void) const;
 };
 
-#endif // KCONFIRMMANUALENTERDLG_H
+#endif // TDECONFIRMMANUALENTERDLG_H
diff --git a/kmymoney2/dialogs/tderecentfileitem.h b/kmymoney2/dialogs/tderecentfileitem.h
index 5a7cfb5..cbd521b 100644
--- a/kmymoney2/dialogs/tderecentfileitem.h
+++ b/kmymoney2/dialogs/tderecentfileitem.h
@@ -19,8 +19,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef KRECENTFILEITEM_H
-#define KRECENTFILEITEM_H
+#ifndef TDERECENTFILEITEM_H
+#define TDERECENTFILEITEM_H
 
 // ----------------------------------------------------------------------------
 // QT Includes
diff --git a/kmymoney2/dialogs/tdeselectdatabasedlg.h b/kmymoney2/dialogs/tdeselectdatabasedlg.h
index be06308..af52408 100644
--- a/kmymoney2/dialogs/tdeselectdatabasedlg.h
+++ b/kmymoney2/dialogs/tdeselectdatabasedlg.h
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef KSELECTDATABASEDLG_H
-#define KSELECTDATABASEDLG_H
+#ifndef TDESELECTDATABASEDLG_H
+#define TDESELECTDATABASEDLG_H
 
 // ----------------------------------------------------------------------------
 // QT Includes
diff --git a/kmymoney2/dialogs/tdeselecttransactionsdlg.h b/kmymoney2/dialogs/tdeselecttransactionsdlg.h
index a6cd4ca..c12202e 100644
--- a/kmymoney2/dialogs/tdeselecttransactionsdlg.h
+++ b/kmymoney2/dialogs/tdeselecttransactionsdlg.h
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef KSELECTTRANSACTIONSDLG_H
-#define KSELECTTRANSACTIONSDLG_H
+#ifndef TDESELECTTRANSACTIONSDLG_H
+#define TDESELECTTRANSACTIONSDLG_H
 
 // ----------------------------------------------------------------------------
 // QT Includes
diff --git a/kmymoney2/plugins/ofximport/Makefile.am b/kmymoney2/plugins/ofximport/Makefile.am
index 66b7f6a..2d8ee90 100644
--- a/kmymoney2/plugins/ofximport/Makefile.am
+++ b/kmymoney2/plugins/ofximport/Makefile.am
@@ -16,7 +16,7 @@ kmm_ofximport_la_LIBADD = @OFX_LIBS@ dialogs/libdialogs.la ../libkmm_plugin.la .
 # LD flags for the plugin
 # -module says: this is a module, i.e. something you're going to dlopen
 # so e.g. it has no version number like a normal shared lib would have.
-kmm_ofximport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TDEHTML) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_QT) -L../.libs
+kmm_ofximport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TDEHTML) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_QT) -L../.libs
 
 # rc file containing the GUI for the plugin
 pluginsdir = $(kde_datadir)/kmm_ofximport
diff --git a/kmymoney2/widgets/tdelistviewsearchline.h b/kmymoney2/widgets/tdelistviewsearchline.h
index 2ffad3c..0bd5cd2 100644
--- a/kmymoney2/widgets/tdelistviewsearchline.h
+++ b/kmymoney2/widgets/tdelistviewsearchline.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef KLISTVIEWSEARCHLINE_H
-#define KLISTVIEWSEARCHLINE_H
+#ifndef TDELISTVIEWSEARCHLINE_H
+#define TDELISTVIEWSEARCHLINE_H
 
 #include <klineedit.h>
 #include <tqhbox.h>