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, 45 insertions, 45 deletions

diff --git a/kword/KWConfigFootNoteDia.cpp b/kword/KWConfigFootNoteDia.cpp
index f2d606c6..6743e36f 100644
--- a/kword/KWConfigFootNoteDia.cpp
+++ b/kword/KWConfigFootNoteDia.cpp
@@ -30,17 +30,17 @@
 #include <klocale.h>
 #include <knuminput.h>
 
-#include <qradiobutton.h>
-#include <qwhatsthis.h>
-#include <qvbuttongroup.h>
-#include <qlabel.h>
-#include <qvbox.h>
-#include <qlayout.h>
-#include <qcombobox.h>
+#include <tqradiobutton.h>
+#include <tqwhatsthis.h>
+#include <tqvbuttongroup.h>
+#include <tqlabel.h>
+#include <tqvbox.h>
+#include <tqlayout.h>
+#include <tqcombobox.h>
 
 
-KWConfigFootNoteDia::KWConfigFootNoteDia( QWidget *parent, const char *name, KWDocument *doc )
-    : KDialogBase(Tabbed, QString::null, Ok | Cancel , Ok, parent, name, true)
+KWConfigFootNoteDia::KWConfigFootNoteDia( TQWidget *tqparent, const char *name, KWDocument *doc )
+    : KDialogBase(Tabbed, TQString(), Ok | Cancel , Ok, tqparent, name, true)
 {
     setCaption( i18n("Configure Endnote/Footnote") );
     m_doc = doc;
@@ -53,7 +53,7 @@ KWConfigFootNoteDia::KWConfigFootNoteDia( QWidget *parent, const char *name, KWD
 
 void KWConfigFootNoteDia::setupTab1()
 {
-    QVBox * page = addVBoxPage( i18n( "Footnotes" ) );
+    TQVBox * page = addVBoxPage( i18n( "Footnotes" ) );
     m_footNoteConfig = new KoCounterStyleWidget( false, true, false, page );
     //m_footNoteConfig->numTypeChanged( KoParagCounter::NUM_LIST );
     m_footNoteConfig->setCounter (static_cast<KWVariableSettings*>(m_doc->variableCollection()->variableSetting())->footNoteCounter() );
@@ -61,7 +61,7 @@ void KWConfigFootNoteDia::setupTab1()
 
 void KWConfigFootNoteDia::setupTab2()
 {
-    QVBox * page = addVBoxPage( i18n( "Endnotes" ) );
+    TQVBox * page = addVBoxPage( i18n( "Endnotes" ) );
     m_endNoteConfig = new KoCounterStyleWidget( false, true/*onlyStyleLetter*/,false, page );
     //m_endNoteConfig->numTypeChanged( KoParagCounter::NUM_LIST );
     m_endNoteConfig->setCounter (static_cast<KWVariableSettings*>(m_doc->variableCollection()->variableSetting())->endNoteCounter() );
@@ -70,28 +70,28 @@ void KWConfigFootNoteDia::setupTab2()
 
 void KWConfigFootNoteDia::setupTab3()
 {
-    QFrame * page = addPage( i18n( "Separator Line" ) );
-    QString comment= i18n ("Configure the separator line. The separator line "
+    TQFrame * page = addPage( i18n( "Separator Line" ) );
+    TQString comment= i18n ("Configure the separator line. The separator line "
         "is drawn directly above the frame for the footnotes.");
-    QWhatsThis::add(page, comment);
-    QVBoxLayout *pageLayout= new QVBoxLayout( page, 0, KDialog::spacingHint());
+    TQWhatsThis::add(page, comment);
+    TQVBoxLayout *pageLayout= new TQVBoxLayout( page, 0, KDialog::spacingHint());
 
-    QButtonGroup *positionGroupBox = new QButtonGroup( i18n( "Position"), page );
+    TQButtonGroup *positionGroupBox = new TQButtonGroup( i18n( "Position"), page );
     comment= i18n ("The separator can be positioned horizontally by picking one "
-        "of the three alignments.");
-    QWhatsThis::add(positionGroupBox, comment);
+        "of the three tqalignments.");
+    TQWhatsThis::add(positionGroupBox, comment);
     positionGroupBox->setColumnLayout(0, Qt::Vertical );
-    QVBoxLayout *positionLayout = new QVBoxLayout( positionGroupBox->layout() );
-    positionLayout->setAlignment( Qt::AlignTop );
+    TQVBoxLayout *positionLayout = new TQVBoxLayout( positionGroupBox->tqlayout() );
+    positionLayout->tqsetAlignment( TQt::AlignTop );
 
     // i18n context information necessary for gender considerations (e.g. in Polish)
-    rbPosLeft = new QRadioButton( i18n("Position", "Left"), positionGroupBox, "rbPosLeft" );
+    rbPosLeft = new TQRadioButton( i18n("Position", "Left"), positionGroupBox, "rbPosLeft" );
     positionLayout->addWidget( rbPosLeft );
 
-    rbPosCentered = new QRadioButton( i18n("Position", "Centered"), positionGroupBox, "rbPosCentered" );
+    rbPosCentered = new TQRadioButton( i18n("Position", "Centered"), positionGroupBox, "rbPosCentered" );
     positionLayout->addWidget( rbPosCentered );
 
-    rbPosRight = new QRadioButton( i18n("Position", "Right"), positionGroupBox, "rbPosRight" );
+    rbPosRight = new TQRadioButton( i18n("Position", "Right"), positionGroupBox, "rbPosRight" );
     positionLayout->addWidget( rbPosRight );
     pageLayout->addWidget( positionGroupBox );
     switch( m_doc->footNoteSeparatorLinePosition() ) {
@@ -106,43 +106,43 @@ void KWConfigFootNoteDia::setupTab3()
             break;
     }
 
-    QGridLayout *layout = new QGridLayout( 0, 1, 1, 0, KDialog::spacingHint());
+    TQGridLayout *tqlayout = new TQGridLayout( 0, 1, 1, 0, KDialog::spacingHint());
 
     spWidth = new KoUnitDoubleSpinBox(page, 0, 5, 0.5, m_doc->footNoteSeparatorLineWidth(), m_doc->unit(), 1);
 
-    layout->addWidget( spWidth, 1, 1 );
+    tqlayout->addWidget( spWidth, 1, 1 );
 
     spLength = new KIntNumInput( page, "spLength" );
     spLength->setRange( 1, 100, 1,false );
     spLength->setValue( m_doc->footNoteSeparatorLineLength());
     spLength->setSuffix(i18n(" %"));
-    layout->addWidget( spLength, 0, 1 );
+    tqlayout->addWidget( spLength, 0, 1 );
 
-    QLabel *lSize = new QLabel( i18n( "&Width:"), page );
+    TQLabel *lSize = new TQLabel( i18n( "&Width:"), page );
     lSize->setBuddy( spWidth );
     comment= i18n ("The width is the thickness of the separator line, set to 0 for no separator line.");
-    QWhatsThis::add(lSize, comment);
-    QWhatsThis::add(spWidth, comment);
-    layout->addWidget( lSize, 1, 0 );
+    TQWhatsThis::add(lSize, comment);
+    TQWhatsThis::add(spWidth, comment);
+    tqlayout->addWidget( lSize, 1, 0 );
 
-    QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
-    layout->addMultiCell( spacer, 0, 1, 2, 2 );
+    TQSpacerItem* spacer = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
+    tqlayout->addMultiCell( spacer, 0, 1, 2, 2 );
 
-    QLabel *lWidth = new QLabel( i18n("&Size on page:"), page, "lWidth" );
+    TQLabel *lWidth = new TQLabel( i18n("&Size on page:"), page, "lWidth" );
     lWidth->setBuddy( spLength );
     comment= i18n ("The size of the separator line can be defined as a percentage of the width of the page.");
-    QWhatsThis::add(spLength, comment);
-    QWhatsThis::add(lWidth, comment);
-    layout->addWidget( lWidth, 0, 0 );
-    pageLayout->addLayout( layout );
+    TQWhatsThis::add(spLength, comment);
+    TQWhatsThis::add(lWidth, comment);
+    tqlayout->addWidget( lWidth, 0, 0 );
+    pageLayout->addLayout( tqlayout );
 
-    QHBoxLayout *styleLayout = new QHBoxLayout( 0, 0, KDialog::spacingHint(), "styleLayout");
+    TQHBoxLayout *styleLayout = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "styleLayout");
 
-    QLabel *styleLabel = new QLabel( i18n("Style:"), page );
+    TQLabel *styleLabel = new TQLabel( i18n("Style:"), page );
     styleLayout->addWidget( styleLabel );
 
-    m_cbLineType = new QComboBox( page );
-    QStringList lst;
+    m_cbLineType = new TQComboBox( page );
+    TQStringList lst;
     lst <<i18n("Solid");
     lst <<i18n("Dash Line");
     lst <<i18n("Dot Line");
@@ -152,14 +152,14 @@ void KWConfigFootNoteDia::setupTab3()
     m_cbLineType->setCurrentItem( static_cast<int>(m_doc->footNoteSeparatorLineType()));
     comment= i18n ("The separator line can be drawn as a solid line or as a line which has a "
         "pattern; the pattern can be set in the style-type.");
-    QWhatsThis::add(styleLabel, comment);
-    QWhatsThis::add(m_cbLineType, comment);
+    TQWhatsThis::add(styleLabel, comment);
+    TQWhatsThis::add(m_cbLineType, comment);
     styleLayout->addWidget( m_cbLineType );
 
-    QSpacerItem* spacer_2 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
+    TQSpacerItem* spacer_2 = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
     styleLayout->addItem( spacer_2 );
     pageLayout->addLayout( styleLayout );
-    QSpacerItem* spacer_3 = new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding );
+    TQSpacerItem* spacer_3 = new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
     pageLayout->addItem( spacer_3 );
 }