TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


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

1 files changed, 30 insertions, 30 deletions

diff --git a/kword/KWCreateBookmarkDia.cpp b/kword/KWCreateBookmarkDia.cpp
index 2bc3a1c7..19089366 100644
--- a/kword/KWCreateBookmarkDia.cpp
+++ b/kword/KWCreateBookmarkDia.cpp
@@ -19,11 +19,11 @@
 
 #include <klocale.h>
 #include "KWDocument.h"
-#include <qvbox.h>
-#include <qlayout.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qlistbox.h>
+#include <tqvbox.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
+#include <tqpushbutton.h>
+#include <tqlistbox.h>
 #include <kmessagebox.h>
 #include "KWCommand.h"
 #include "KWCreateBookmarkDia.h"
@@ -31,16 +31,16 @@
 #include "KWFrame.h"
 #include "KWFrameSet.h"
 
-KWCreateBookmarkDia::KWCreateBookmarkDia( const QStringList & _list, QWidget *parent, const char *name )
-    : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true )
+KWCreateBookmarkDia::KWCreateBookmarkDia( const TQStringList & _list, TQWidget *tqparent, const char *name )
+    : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true )
 {
     setCaption( i18n("Create New Bookmark") );
     listBookMark = _list;
     init();
 }
 
-KWCreateBookmarkDia::KWCreateBookmarkDia( const QStringList & _list, const QString & _name, QWidget *parent, const char *name )
-    : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true )
+KWCreateBookmarkDia::KWCreateBookmarkDia( const TQStringList & _list, const TQString & _name, TQWidget *tqparent, const char *name )
+    : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true )
 {
     setCaption( i18n("Rename Bookmark") );
     listBookMark = _list;
@@ -53,14 +53,14 @@ void KWCreateBookmarkDia::init()
     KWCreateBookmarkDiaBase *dia = new KWCreateBookmarkDiaBase( this );
     m_bookmarkName = dia->m_bookmarkName;
     enableButtonOK( false );
-    connect( m_bookmarkName, SIGNAL(textChanged ( const QString & )), this, SLOT(nameChanged( const QString &)));
+    connect( m_bookmarkName, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(nameChanged( const TQString &)));
     setMainWidget( dia );
     m_bookmarkName->setFocus();
 }
 
 void KWCreateBookmarkDia::slotOk()
 {
-    if ( listBookMark.findIndex(m_bookmarkName->text() ) != -1 )
+    if ( listBookMark.tqfindIndex(m_bookmarkName->text() ) != -1 )
     {
         KMessageBox::error(this, i18n("That name already exists, please choose another name."));
     }
@@ -68,43 +68,43 @@ void KWCreateBookmarkDia::slotOk()
         KDialogBase::slotOk();
 }
 
-QString KWCreateBookmarkDia::bookmarkName()const
+TQString KWCreateBookmarkDia::bookmarkName()const
 {
     return m_bookmarkName->text();
 }
 
-void KWCreateBookmarkDia::nameChanged( const QString &text)
+void KWCreateBookmarkDia::nameChanged( const TQString &text)
 {
     enableButtonOK( !text.isEmpty() );
 }
 
 
 /* ****************************  */
-KWSelectBookmarkDia::KWSelectBookmarkDia( const QStringList & _list, KWDocument *_doc, QWidget *parent, const char *name )
-    : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true )
+KWSelectBookmarkDia::KWSelectBookmarkDia( const TQStringList & _list, KWDocument *_doc, TQWidget *tqparent, const char *name )
+    : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true )
 {
     m_doc=_doc;
     setCaption( i18n("Select Bookmark") );
-    QWidget *page = new QWidget( this );
+    TQWidget *page = new TQWidget( this );
     setMainWidget(page);
 
-    QGridLayout * grid = new QGridLayout(page, 5, 2, KDialog::marginHint(), KDialog::spacingHint());
-    m_bookmarkList = new QListBox( page );
+    TQGridLayout * grid = new TQGridLayout(page, 5, 2, KDialog::marginHint(), KDialog::spacingHint());
+    m_bookmarkList = new TQListBox( page );
     grid->addMultiCellWidget(m_bookmarkList, 0, 4, 0, 0);
     m_bookmarkList->insertStringList(_list);
 
-    connect(m_bookmarkList,  SIGNAL( selectionChanged ()), this, SLOT(slotSelectionChanged()));
-    connect(m_bookmarkList,  SIGNAL(doubleClicked ( QListBoxItem * )), this, SLOT(slotOk()));
-    connect(m_bookmarkList,  SIGNAL(returnPressed ( QListBoxItem * )), this, SLOT(slotOk()));
+    connect(m_bookmarkList,  TQT_SIGNAL( selectionChanged ()), this, TQT_SLOT(slotSelectionChanged()));
+    connect(m_bookmarkList,  TQT_SIGNAL(doubleClicked ( TQListBoxItem * )), this, TQT_SLOT(slotOk()));
+    connect(m_bookmarkList,  TQT_SIGNAL(returnPressed ( TQListBoxItem * )), this, TQT_SLOT(slotOk()));
 
-    m_pbRename = new QPushButton( i18n("Rename Bookmark"), page );
+    m_pbRename = new TQPushButton( i18n("Rename Bookmark"), page );
     grid->addWidget( m_pbRename, 0, 1);
-    connect( m_pbRename, SIGNAL(clicked()), this, SLOT(slotRenameBookmark()));
+    connect( m_pbRename, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRenameBookmark()));
 
-    m_pbDelete = new QPushButton( i18n("Delete Bookmark"), page );
+    m_pbDelete = new TQPushButton( i18n("Delete Bookmark"), page );
     grid->addWidget( m_pbDelete, 1, 1);
 
-    connect( m_pbDelete, SIGNAL(clicked()), this, SLOT(slotDeleteBookmark()));
+    connect( m_pbDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteBookmark()));
 
     m_bookmarkList->setFocus();
     slotSelectionChanged();
@@ -112,15 +112,15 @@ KWSelectBookmarkDia::KWSelectBookmarkDia( const QStringList & _list, KWDocument
 
 void KWSelectBookmarkDia::slotRenameBookmark()
 {
-    QString tmp =m_bookmarkList->currentText();
+    TQString tmp =m_bookmarkList->currentText();
     if ( tmp.isEmpty() )
         return;
     //all bookmark name
-    QStringList lst =m_doc->listOfBookmarkName(0L);
+    TQStringList lst =m_doc->listOfBookmarkName(0L);
     lst.remove( tmp );
     KWCreateBookmarkDia dia( lst, tmp, this, 0 );
     if ( dia.exec() ) {
-        QString newName = dia.bookmarkName();
+        TQString newName = dia.bookmarkName();
         KWRenameBookmarkCommand *cmd = new KWRenameBookmarkCommand( i18n("Rename Bookmark"), tmp, newName, m_doc);
         m_doc->addCommand( cmd );
         cmd->execute();
@@ -130,7 +130,7 @@ void KWSelectBookmarkDia::slotRenameBookmark()
 
 void KWSelectBookmarkDia::slotDeleteBookmark()
 {
-    QString tmp =m_bookmarkList->currentText();
+    TQString tmp =m_bookmarkList->currentText();
     if ( !tmp.isEmpty())
     {
         m_doc->deleteBookmark(tmp);
@@ -139,7 +139,7 @@ void KWSelectBookmarkDia::slotDeleteBookmark()
 }
 
 
-QString KWSelectBookmarkDia::bookmarkSelected()const
+TQString KWSelectBookmarkDia::bookmarkSelected()const
 {
     return m_bookmarkList->currentText();
 }