TQt4 port krename

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/krename@1238984 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 32 insertions, 40 deletions

diff --git a/krename/helpdialog.cpp b/krename/helpdialog.cpp
index 2707f38..9183d7a 100644
--- a/krename/helpdialog.cpp
+++ b/krename/helpdialog.cpp
@@ -17,10 +17,10 @@
 #include "helpdialog.h"
 #include "krenameimpl.h"
 
-// Qt includes
-#include <qcombobox.h>
-#include <qlayout.h>
-#include <qlineedit.h>
+// TQt includes
+#include <tqcombobox.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
 
 // KDE includes
 #include <klocale.h>
@@ -28,9 +28,9 @@
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
-void HelpDialogData::remove( const QString & headline )
+void HelpDialogData::remove( const TQString & headline )
 {
-    if( m_map.contains( headline ) ) {
+    if( m_map.tqcontains( headline ) ) {
         m_map.remove( headline );
         m_icons.remove( headline );
         
@@ -39,7 +39,7 @@ void HelpDialogData::remove( const QString & headline )
     }
 }
 
-void HelpDialogData::add( const QString & headline, QStringList* commands, const QPixmap & icon, bool first )
+void HelpDialogData::add( const TQString & headline, TQStringList* commands, const TQPixmap & icon, bool first )
 {
     m_map.insert( headline, *commands );
     m_icons.insert( headline, icon );
@@ -50,39 +50,31 @@ void HelpDialogData::add( const QString & headline, QStringList* commands, const
     emit updateItems();
 }
 
-QStringList HelpDialogData::tokens() const
+TQStringList HelpDialogData::tokens() const
 {
-    QStringList list;
-    
-#if QT_VERSION >= 0x030005
-    // map.keys() seems only to be avaible in Qt >= 3.0.5
-    QStringList keys = m_map.keys();
-#else
-    QStringList keys;
-    QMap<QString, QStringList>::Iterator it;
-    for ( it = m_map.begin(); it != m_map.end(); ++it )
-        keys.append( it.key() );
-#endif
+    TQStringList list;
+
+    TQStringList keys = m_map.keys();
 
     for( unsigned int i = 0; i < keys.count(); i++ )
         for( unsigned int z = 0; z < m_map[keys[i]].count(); z++ )
             list.append( m_map[keys[i]][z].section( ";;", 0, 0 ) );
-        
+
     return list;
 }
 
 
-HelpDialog::HelpDialog( HelpDialogData* data, QWidget* parent,
+HelpDialog::HelpDialog( HelpDialogData* data, TQWidget* tqparent,
     const char* name, bool modal, WFlags fl )
-    : QDialog( parent, name, modal, fl )
+    : TQDialog( tqparent, name, modal, fl )
 {
     text = NULL;
 
     resize( 500, 400 ); 
     setCaption( i18n( "Help" ) );
-    HelpDialogLayout = new QVBoxLayout( this, 11, 6, "HelpDialogLayout"); 
+    HelpDialogLayout = new TQVBoxLayout( this, 11, 6, "HelpDialogLayout"); 
 
-    comboHeadline = new QComboBox( FALSE, this, "comboHeadline" );
+    comboHeadline = new TQComboBox( FALSE, this, "comboHeadline" );
     HelpDialogLayout->addWidget( comboHeadline );
 
     list = new KListView( this, "list" );
@@ -90,8 +82,8 @@ HelpDialog::HelpDialog( HelpDialogData* data, QWidget* parent,
     list->addColumn( i18n( "Description" ) );
     HelpDialogLayout->addWidget( list );
 
-    Layout1 = new QHBoxLayout( 0, 0, 6, "Layout1"); 
-    QSpacerItem* spacer = new QSpacerItem( 91, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
+    Layout1 = new TQHBoxLayout( 0, 0, 6, "Layout1"); 
+    TQSpacerItem* spacer = new TQSpacerItem( 91, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
     Layout1->addItem( spacer );
 
     buttonAdd = new KPushButton( this, "buttonAdd" );
@@ -103,20 +95,20 @@ HelpDialog::HelpDialog( HelpDialogData* data, QWidget* parent,
     HelpDialogLayout->addLayout( Layout1 );
 
     // signals and slots connections
-    connect( buttonClose, SIGNAL( clicked() ), this, SLOT( accept() ) );
-    connect( buttonAdd, SIGNAL( clicked() ), this, SLOT( execute() ) );
-    connect( list, SIGNAL( executed(QListViewItem*) ), this, SLOT( execute() ) );
-    connect( comboHeadline, SIGNAL( activated(int) ), this, SLOT(updateItems() ) );
+    connect( buttonClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) );
+    connect( buttonAdd, TQT_SIGNAL( clicked() ), this, TQT_SLOT( execute() ) );
+    connect( list, TQT_SIGNAL( executed(TQListViewItem*) ), this, TQT_SLOT( execute() ) );
+    connect( comboHeadline, TQT_SIGNAL( activated(int) ), this, TQT_SLOT(updateItems() ) );
     
     m_data = data;
-    connect( m_data, SIGNAL( updateItems() ), this, SLOT( updateItems() ) );
-    connect( m_data, SIGNAL( updateHeadline() ), this, SLOT( updateHeadline() ) );
+    connect( m_data, TQT_SIGNAL( updateItems() ), this, TQT_SLOT( updateItems() ) );
+    connect( m_data, TQT_SIGNAL( updateHeadline() ), this, TQT_SLOT( updateHeadline() ) );
 }
 
 HelpDialog::~HelpDialog()
 {
-    disconnect( m_data, SIGNAL( updateItems() ), this, SLOT( updateItems() ) );
-    disconnect( m_data, SIGNAL( updateHeadline() ), this, SLOT( updateHeadline() ) );
+    disconnect( m_data, TQT_SIGNAL( updateItems() ), this, TQT_SLOT( updateItems() ) );
+    disconnect( m_data, TQT_SIGNAL( updateHeadline() ), this, TQT_SLOT( updateHeadline() ) );
 }
 
 void HelpDialog::execute()
@@ -124,7 +116,7 @@ void HelpDialog::execute()
     if(!list->currentItem())
         return;
 
-    QString t = text->text();
+    TQString t = text->text();
 
     t.insert( text->cursorPosition(), list->currentItem()->text( 0 ) );
     text->setText( t );
@@ -136,10 +128,10 @@ void HelpDialog::execute()
 void HelpDialog::updateItems()
 {
     list->clear();
-    QStringList items = m_data->map()[comboHeadline->currentText()];
+    TQStringList items = m_data->map()[comboHeadline->currentText()];
 
     for( unsigned int i = 0; i < items.count(); i++ ) {
-        QString tmp = items[i];
+        TQString tmp = items[i];
         new KListViewItem( list, tmp.section( ";;", 0, 0 ), tmp.section( ";;", 1, 1 ) );
     }
 }
@@ -147,11 +139,11 @@ void HelpDialog::updateItems()
 void HelpDialog::updateHeadline()
 {
     comboHeadline->clear();
-    QMap<QString,QStringList> m = m_data->map();
-    QMap<QString,QPixmap> ic = m_data->icons();
+    TQMap<TQString,TQStringList> m = m_data->map();
+    TQMap<TQString,TQPixmap> ic = m_data->icons();
     
     comboHeadline->insertItem( ic[m_data->first()], m_data->first() );    
-    QMap<QString, QStringList>::Iterator it;
+    TQMap<TQString, TQStringList>::Iterator it;
     for ( it = m.begin(); it != m.end(); ++it )
         if( it.key() != m_data->first() )
             comboHeadline->insertItem( ic[it.key()], it.key() );