Initial TDE conversion

1 files changed, 14 insertions, 14 deletions

diff --git a/src/mergeelements.cpp b/src/mergeelements.cpp
index 3bb1083..c996a17 100644
--- a/src/mergeelements.cpp
+++ b/src/mergeelements.cpp
@@ -24,14 +24,14 @@
 #include <ntqprogressbar.h>
 #include <ntqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
-#include <kapplication.h>
-#include <kmessagebox.h>
+#include <tdeapplication.h>
+#include <tdemessagebox.h>
 #include <ktextedit.h>
-#include <klistview.h>
-#include <kconfig.h>
-#include <kwin.h>
+#include <tdelistview.h>
+#include <tdeconfig.h>
+#include <twin.h>
 
 #include <macro.h>
 #include <comment.h>
@@ -128,7 +128,7 @@ namespace KBibTeX
 
     MergeElements::~MergeElements()
     {
-        KConfig * config = kapp->config();
+        TDEConfig * config = kapp->config();
         config->setGroup( "MergeElements" );
         saveWindowSize( config );
     }
@@ -143,7 +143,7 @@ namespace KBibTeX
         TQLabel *label = new TQLabel( i18n( "Select elements to merge. At least two elements must be checked to perform a merge operation. Checked entries will be replaced by the merged element, unchecked elements will be kept." ), vboxContainer );
         label->setAlignment( TQt::WordBreak );
         vboxLayout->addWidget( label );
-        m_listViewClique = new KListView( vboxContainer );
+        m_listViewClique = new TDEListView( vboxContainer );
         m_listViewClique->addColumn( i18n( "Entry/Macro Id" ) );
         m_listViewClique->setFullWidth( true );
         m_listViewClique->setAllColumnsShowFocus( true );
@@ -159,7 +159,7 @@ namespace KBibTeX
         label = new TQLabel( i18n( "Choose from this list which alternatives you want to keep in the merged element." ), vboxContainer );
         label->setAlignment( TQt::WordBreak );
         vboxLayout->addWidget( label );
-        m_listViewAlternatives = new KListView( vboxContainer );
+        m_listViewAlternatives = new TDEListView( vboxContainer );
         m_listViewAlternatives->addColumn( i18n( "Field/Key" ) );
         m_listViewAlternatives->setFullWidth( true );
         m_listViewAlternatives->setAllColumnsShowFocus( true );
@@ -768,8 +768,8 @@ namespace KBibTeX
             KBibTeX::PreambleWidget::execute( meci->preamble, TRUE, this );
     }
 
-    /* This function was taken form KMainWindow of KDE 3.5 and modified to fit KBibTeX */
-    void MergeElements::saveWindowSize( KConfig *config ) const
+    /* This function was taken form TDEMainWindow of KDE 3.5 and modified to fit KBibTeX */
+    void MergeElements::saveWindowSize( TDEConfig *config ) const
     {
         int scnum = TQApplication::desktop()->screenNumber( parentWidget() );
         TQRect desk = TQApplication::desktop()->screenGeometry( scnum );
@@ -811,13 +811,13 @@ namespace KBibTeX
     void MergeElements::slotRestore()
     {
         tqDebug( "slotRestore" );
-        KConfig * config = kapp->config();
+        TDEConfig * config = kapp->config();
         config->setGroup( "MergeElements" );
         restoreWindowSize( config );
     }
 
-    /* This function was taken form KMainWindow of KDE 3.5 and modified to fit KBibTeX */
-    void MergeElements::restoreWindowSize( KConfig *config )
+    /* This function was taken form TDEMainWindow of KDE 3.5 and modified to fit KBibTeX */
+    void MergeElements::restoreWindowSize( TDEConfig *config )
     {
         // restore the size
         int scnum = TQApplication::desktop()->screenNumber( parentWidget() );