From 98a12d05a48814bec3870b9a6d5865475cfa1c95 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 4 Jan 2011 02:22:38 +0000 Subject: Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1211429 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- keduca/keduca/configdialogbase.ui | 6 +- keduca/keduca/kcheckeduca.cpp | 10 +-- keduca/keduca/keduca.cpp | 2 +- keduca/keduca/keduca_part.cpp | 4 +- keduca/keduca/keduca_part.h | 2 +- keduca/keduca/keducaprefs.cpp | 16 ++--- keduca/keduca/keducaview.cpp | 22 +++---- keduca/keduca/keducaview.h | 2 +- keduca/keduca/kgroupeduca.cpp | 2 +- keduca/keduca/kquestion.cpp | 4 +- keduca/keduca/kradioeduca.cpp | 10 +-- keduca/keducabuilder/kcontroladdeditbase.ui | 72 +++++++++++----------- keduca/keducabuilder/kcontrolheader.cpp | 56 ++++++++--------- keduca/keducabuilder/kcontrolheaderbase.ui | 40 ++++++------ keduca/keducabuilder/keducabuilder.cpp | 10 +-- keduca/keducabuilder/keducabuilder.h | 2 +- .../keducabuilder/keducaeditorstartdialogbase.ui | 10 +-- keduca/keducabuilder/klangcombo.cpp | 6 +- keduca/keducabuilder/ktagcombobox.cpp | 12 ++-- keduca/keducabuilder/ktagcombobox.h | 2 +- keduca/libkeduca/fileread.cpp | 8 +-- keduca/libkeduca/kgallerydialogbase.ui | 28 ++++----- 22 files changed, 163 insertions(+), 163 deletions(-) (limited to 'keduca') diff --git a/keduca/keduca/configdialogbase.ui b/keduca/keduca/configdialogbase.ui index bb526841..ab7da6e0 100644 --- a/keduca/keduca/configdialogbase.ui +++ b/keduca/keduca/configdialogbase.ui @@ -4,7 +4,7 @@ ConfigDialogBase - + 0 0 @@ -87,7 +87,7 @@ Expanding - + 41 51 @@ -96,5 +96,5 @@ - + diff --git a/keduca/keduca/kcheckeduca.cpp b/keduca/keduca/kcheckeduca.cpp index a75c8478..9f88971b 100644 --- a/keduca/keduca/kcheckeduca.cpp +++ b/keduca/keduca/kcheckeduca.cpp @@ -38,7 +38,7 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){ int extra_width, indicator_width; extra_width = 8; - indicator_width = style().pixelMetric(TQStyle::PM_IndicatorWidth, 0); + indicator_width = style().tqpixelMetric(TQStyle::PM_IndicatorWidth, 0); y = 0; x = indicator_width + extra_width; //### @@ -61,14 +61,14 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){ yo = (cr.height()-rh)/2; if ( !isEnabled() ) { - TQColorGroup cg = colorGroup(); + TQColorGroup cg = tqcolorGroup(); cg.setColor( TQColorGroup::Text, cg.light() ); _doc->draw(p, cr.x()+xo+1, cr.y()+yo+1, cr, cg, 0); } - _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, colorGroup(), 0); + _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, tqcolorGroup(), 0); if ( hasFocus() ) { -// TQRect br = style().itemRect( p, x, y, rw, rh+yo, +// TQRect br = style().tqitemRect( p, x, y, rw, rh+yo, // AlignLeft|AlignVCenter|ShowPrefix, // isEnabled(), // pixmap(), text().visual() ); @@ -80,6 +80,6 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){ br.setBottom( br.bottom()+2); br = br.intersect( TQRect(0,0,rw, rh+yo ) ); - style().drawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup()); + style().drawPrimitive( TQStyle::PE_FocusRect, p, br, tqcolorGroup()); } } diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp index 2ab99ea0..7dfe7c8e 100644 --- a/keduca/keduca/keduca.cpp +++ b/keduca/keduca/keduca.cpp @@ -53,7 +53,7 @@ Keduca::Keduca( TQWidget* parent, const char *name, WFlags f ) kdFatal() << "The library \"libkeducapart\" could not be found. Aborting." << endl; } if (!initialGeometrySet()) - resize( TQSize(550, 450).expandedTo(minimumSizeHint())); + resize( TQSize(550, 450).expandedTo(tqminimumSizeHint())); } Keduca::~Keduca() diff --git a/keduca/keduca/keduca_part.cpp b/keduca/keduca/keduca_part.cpp index bc9e5485..6af8ea03 100644 --- a/keduca/keduca/keduca_part.cpp +++ b/keduca/keduca/keduca_part.cpp @@ -34,14 +34,14 @@ typedef KParts::GenericFactory KEducaPartFactory; K_EXPORT_COMPONENT_FACTORY( libkeducapart, KEducaPartFactory ) -KEducaPart::KEducaPart( TQWidget *parentWidget, const char *widgetName, +KEducaPart::KEducaPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList &/*args*/ ) : KParts::ReadOnlyPart( parent, name ) { setInstance( KEducaPartFactory::instance() ); - m_view = new KEducaView( parentWidget, widgetName ); + m_view = new KEducaView( tqparentWidget, widgetName ); m_view->show(); setWidget( m_view ); diff --git a/keduca/keduca/keduca_part.h b/keduca/keduca/keduca_part.h index 418209a8..76298098 100644 --- a/keduca/keduca/keduca_part.h +++ b/keduca/keduca/keduca_part.h @@ -40,7 +40,7 @@ class KEducaPart : public KParts::ReadOnlyPart /* * Constructor. */ - KEducaPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, + KEducaPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList &args ); /* diff --git a/keduca/keduca/keducaprefs.cpp b/keduca/keduca/keducaprefs.cpp index bdd07677..1b57d778 100644 --- a/keduca/keduca/keducaprefs.cpp +++ b/keduca/keduca/keducaprefs.cpp @@ -45,10 +45,10 @@ void KEducaPrefs::setPageGeneral() TQButtonGroup *buttonGroup1 = new TQButtonGroup( mainFrame, "ButtonGroup1" ); buttonGroup1->setTitle( i18n( "General" ) ); buttonGroup1->setColumnLayout(0, Qt::Vertical ); - buttonGroup1->layout()->setSpacing( 0 ); - buttonGroup1->layout()->setMargin( 0 ); - TQVBoxLayout *buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->layout() ); - buttonGroup1Layout->setAlignment( Qt::AlignTop ); + buttonGroup1->tqlayout()->setSpacing( 0 ); + buttonGroup1->tqlayout()->setMargin( 0 ); + TQVBoxLayout *buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->tqlayout() ); + buttonGroup1Layout->tqsetAlignment( Qt::AlignTop ); buttonGroup1Layout->setSpacing( 6 ); buttonGroup1Layout->setMargin( 11 ); @@ -63,10 +63,10 @@ void KEducaPrefs::setPageGeneral() TQGroupBox *GroupBox1 = new TQGroupBox( mainFrame, "GroupBox7" ); GroupBox1->setTitle( i18n( "Order" ) ); GroupBox1->setColumnLayout(0, Qt::Vertical ); - GroupBox1->layout()->setSpacing( 0 ); - GroupBox1->layout()->setMargin( 0 ); - TQVBoxLayout *GroupBox1Layout = new TQVBoxLayout( GroupBox1->layout() ); - GroupBox1Layout->setAlignment( Qt::AlignTop ); + GroupBox1->tqlayout()->setSpacing( 0 ); + GroupBox1->tqlayout()->setMargin( 0 ); + TQVBoxLayout *GroupBox1Layout = new TQVBoxLayout( GroupBox1->tqlayout() ); + GroupBox1Layout->tqsetAlignment( Qt::AlignTop ); GroupBox1Layout->setSpacing( 6 ); GroupBox1Layout->setMargin( 11 ); diff --git a/keduca/keduca/keducaview.cpp b/keduca/keduca/keducaview.cpp index 5c07c9c3..56348074 100644 --- a/keduca/keduca/keducaview.cpp +++ b/keduca/keduca/keducaview.cpp @@ -60,7 +60,7 @@ void KEducaView::init() // Intro Screen _introWidget = new TQLabel( this, "introScreen" ); _introWidget->setBackgroundColor( Qt::white ); - _introWidget->setAlignment( AlignCenter ); + _introWidget->tqsetAlignment( AlignCenter ); _introWidget->setPixmap( TQPixmap( locate("data","keduca/pics/keduca_init.png") ) ); addWidget( _introWidget, 0 ); @@ -129,7 +129,7 @@ void KEducaView::slotButtonNext() if( ( Settings::resultFinish()== Settings::EnumResultFinish::afterEachQuestion ) && _questionText->isVisible() ) { - showResults( _currentResults + "
" + currentStatusPoints() ); + showResults( _currentResults + "
" + currentqStatusPoints() ); } else { @@ -138,7 +138,7 @@ void KEducaView::slotButtonNext() else { configWrite(); - showResults( setFinalResult() + currentStatusPoints() + "

" + _results + "" + showResults( setFinalResult() + currentqStatusPoints() + "

" + _results + "" ); } } @@ -436,12 +436,12 @@ void KEducaView::configWrite() Settings::writeConfig(); } -/** current Status Points */ -TQString KEducaView::currentStatusPoints() +/** current tqStatus Points */ +TQString KEducaView::currentqStatusPoints() { - TQString tempStatus; + TQString temptqStatus; - tempStatus = insertTable() + temptqStatus = insertTable() + insertRow( i18n("Statistics"), true, 4) + insertRow( i18n("Correct questions"), TQString().setNum( _correctAnswer ), @@ -449,20 +449,20 @@ TQString KEducaView::currentStatusPoints() TQString().setNum( _incorrectAnswer ), true); if( _keducaFile->getTotalPoints() > 0 ) - tempStatus += insertRow( i18n("Total points"), true, 4 ) + temptqStatus += insertRow( i18n("Total points"), true, 4 ) + insertRow( i18n("Correct points"), TQString().setNum( _correctPoints ), i18n("Incorrect points"), TQString().setNum( _incorrectPoints ), true ); if( _keducaFile->getTotalTime() > 0 ) - tempStatus += insertRow( i18n("Time"), true, 4 ) + temptqStatus += insertRow( i18n("Time"), true, 4 ) + insertRow( i18n("Total time"), TQString().setNum( _keducaFile->getTotalTime() ), i18n("Time in tests"), TQString().setNum( _currentTime ), true ); - tempStatus += insertTableClose(); - return tempStatus; + temptqStatus += insertTableClose(); + return temptqStatus; } /** Set HTML table view with correct and incorrect answers */ diff --git a/keduca/keduca/keducaview.h b/keduca/keduca/keducaview.h index aa04df5e..fcbaab08 100644 --- a/keduca/keduca/keducaview.h +++ b/keduca/keduca/keducaview.h @@ -68,7 +68,7 @@ private: /** Write settings */ void configWrite(); /** current results Points */ - TQString currentStatusPoints(); + TQString currentqStatusPoints(); /** Set HTML table view with correct and incorrect answers */ TQString getTableQuestion( bool isCorrect, const TQString &correct, const TQString &incorrect); /** Define the next questions (random, secuencial) */ diff --git a/keduca/keduca/kgroupeduca.cpp b/keduca/keduca/kgroupeduca.cpp index 9f7a2413..747b65da 100644 --- a/keduca/keduca/kgroupeduca.cpp +++ b/keduca/keduca/kgroupeduca.cpp @@ -54,7 +54,7 @@ void KGroupEduca::insertAnswer( const TQString& text) answer = new KCheckEduca( _vbox2 ); break; } - answer->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0 ) ); + answer->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0 ) ); answer->setText( text ); answer->show(); insert(answer); diff --git a/keduca/keduca/kquestion.cpp b/keduca/keduca/kquestion.cpp index 69a90fdd..c379c146 100644 --- a/keduca/keduca/kquestion.cpp +++ b/keduca/keduca/kquestion.cpp @@ -51,7 +51,7 @@ void KQuestion::initGUI() _picture->setPalette( TQPalette( Qt::white ) ); _countdownWidget = new KProgress( picBox ); - _countdownWidget->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, + _countdownWidget->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); _countdownWidget->setFormat( i18n( "%v seconds left" ) ); @@ -60,7 +60,7 @@ void KQuestion::initGUI() _view->setFrameShape( TQTextEdit::NoFrame ); _view->setHScrollBarMode( TQTextEdit::AlwaysOff ); _view->setTextFormat( TQTextEdit::RichText ); - _view->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, true ) ); + _view->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, true ) ); } /** Set text */ diff --git a/keduca/keduca/kradioeduca.cpp b/keduca/keduca/kradioeduca.cpp index 89b3e830..3486b46d 100644 --- a/keduca/keduca/kradioeduca.cpp +++ b/keduca/keduca/kradioeduca.cpp @@ -37,7 +37,7 @@ void KRadioEduca::drawButtonLabel( TQPainter *p) int x, y, w, h; int extra_width, indicator_width; extra_width = 8; - indicator_width = style().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0); + indicator_width = style().tqpixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0); y = 0; x = indicator_width + extra_width; //### @@ -60,14 +60,14 @@ void KRadioEduca::drawButtonLabel( TQPainter *p) yo = (cr.height()-rh)/2; if (!isEnabled() ) { - TQColorGroup cg = colorGroup(); + TQColorGroup cg = tqcolorGroup(); cg.setColor( TQColorGroup::Text, cg.light() ); _doc->draw(p, cr.x()+xo+1, cr.y()+yo+1, cr, cg, 0); } - _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, colorGroup(), 0); + _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, tqcolorGroup(), 0); if ( hasFocus() ) { -// TQRect br = style().itemRect( p, x, y, rw, rh+yo, +// TQRect br = style().tqitemRect( p, x, y, rw, rh+yo, // AlignLeft|AlignVCenter|ShowPrefix, // isEnabled(), // pixmap(), text().visual() ); @@ -78,6 +78,6 @@ void KRadioEduca::drawButtonLabel( TQPainter *p) br.setTop( br.top()-2 ); br.setBottom( br.bottom()+2); br = br.intersect( TQRect(0,0,rw, rh+yo ) ); - style().drawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup()); + style().drawPrimitive( TQStyle::PE_FocusRect, p, br, tqcolorGroup()); } } diff --git a/keduca/keducabuilder/kcontroladdeditbase.ui b/keduca/keducabuilder/kcontroladdeditbase.ui index 0292edf2..b566cd9c 100644 --- a/keduca/keducabuilder/kcontroladdeditbase.ui +++ b/keduca/keducabuilder/kcontroladdeditbase.ui @@ -4,7 +4,7 @@ KControlAddEditBase - + 0 0 @@ -30,13 +30,13 @@ frame3 - + 125 0 - + 125 32767 @@ -59,13 +59,13 @@ _questionPreview - + 100 100 - + 100 100 @@ -101,7 +101,7 @@ Expanding - + 20 21 @@ -130,7 +130,7 @@ Expanding - + 20 41 @@ -160,7 +160,7 @@ &Question: - + AlignTop|AlignRight @@ -174,7 +174,7 @@ &Type: - + AlignVCenter|AlignRight @@ -188,7 +188,7 @@ &Picture: - + AlignVCenter|AlignRight @@ -227,7 +227,7 @@ P&oint: - + AlignVCenter|AlignRight @@ -241,7 +241,7 @@ Ti&me: - + AlignVCenter|AlignRight @@ -255,7 +255,7 @@ T&ip: - + AlignVCenter|AlignRight @@ -274,7 +274,7 @@ &Explain: - + AlignTop|AlignRight @@ -293,7 +293,7 @@ - layout1 + tqlayout1 @@ -314,7 +314,7 @@ Expanding - + 81 20 @@ -325,7 +325,7 @@ - layout2 + tqlayout2 @@ -346,7 +346,7 @@ Expanding - + 131 20 @@ -377,13 +377,13 @@ frame3_2 - + 125 0 - + 125 32767 @@ -406,13 +406,13 @@ _answerPreview - + 100 100 - + 100 100 @@ -448,7 +448,7 @@ Expanding - + 20 21 @@ -477,7 +477,7 @@ Expanding - + 20 41 @@ -502,7 +502,7 @@ - layout11 + tqlayout11 @@ -510,7 +510,7 @@ - layout3 + tqlayout3 @@ -531,7 +531,7 @@ Expanding - + 31 20 @@ -552,7 +552,7 @@ &Answer: - + AlignTop|AlignRight @@ -566,7 +566,7 @@ &Value: - + AlignVCenter|AlignRight @@ -575,7 +575,7 @@ - layout7 + tqlayout7 @@ -605,7 +605,7 @@ &Points: - + AlignVCenter|AlignRight @@ -630,7 +630,7 @@ - layout17 + tqlayout17 @@ -679,7 +679,7 @@ - layout16 + tqlayout16 @@ -717,7 +717,7 @@ Fixed - + 20 10 @@ -756,7 +756,7 @@ Expanding - + 20 21 @@ -860,7 +860,7 @@ slotDataChanged() slotAnswerSelected(QListViewItem *) - + kurlrequester.h klineedit.h diff --git a/keduca/keducabuilder/kcontrolheader.cpp b/keduca/keducabuilder/kcontrolheader.cpp index e46bfdc4..344e1b32 100644 --- a/keduca/keducabuilder/kcontrolheader.cpp +++ b/keduca/keducabuilder/kcontrolheader.cpp @@ -82,10 +82,10 @@ void KControlHeader::init() TQGroupBox *GroupBox7 = new TQGroupBox( mainView, "GroupBox7" ); GroupBox7->setTitle( i18n( "Description" ) ); GroupBox7->setColumnLayout(0, Qt::Vertical ); - GroupBox7->layout()->setSpacing( 0 ); - GroupBox7->layout()->setMargin( 0 ); - TQVBoxLayout *GroupBox7Layout = new TQVBoxLayout( GroupBox7->layout() ); - GroupBox7Layout->setAlignment( Qt::AlignTop ); + GroupBox7->tqlayout()->setSpacing( 0 ); + GroupBox7->tqlayout()->setMargin( 0 ); + TQVBoxLayout *GroupBox7Layout = new TQVBoxLayout( GroupBox7->tqlayout() ); + GroupBox7Layout->tqsetAlignment( Qt::AlignTop ); GroupBox7Layout->setSpacing( 6 ); GroupBox7Layout->setMargin( 11 ); @@ -95,7 +95,7 @@ void KControlHeader::init() TQLabel *TextLabel10 = new TQLabel( GroupBox7, "TextLabel10" ); TextLabel10->setText( i18n( "Type:" )); - TextLabel10->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + TextLabel10->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); Layout13->addWidget( TextLabel10, 2, 0 ); @@ -108,7 +108,7 @@ void KControlHeader::init() TQLabel *TextLabel11 = new TQLabel( GroupBox7, "TextLabel11" ); TextLabel11->setText( i18n( "Level:" )); - TextLabel11->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + TextLabel11->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); Layout12->addWidget( TextLabel11 ); _headerLevel = new KComboBox( FALSE, GroupBox7, "_headerLevel" ); @@ -117,7 +117,7 @@ void KControlHeader::init() TQLabel *TextLabel12 = new TQLabel( GroupBox7, "TextLabel12" ); TextLabel12->setText( i18n( "Language:" )); - TextLabel12->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + TextLabel12->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); Layout13->addWidget( TextLabel12, 3, 0 ); _headerLang = new KLanguageCombo( GroupBox7, "_headerLang" ); @@ -126,7 +126,7 @@ void KControlHeader::init() TQLabel *TextLabel9 = new TQLabel( GroupBox7, "TextLabel9" ); TextLabel9->setText( i18n( "Category:" )); - TextLabel9->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + TextLabel9->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); Layout13->addWidget( TextLabel9, 1, 0 ); @@ -138,7 +138,7 @@ void KControlHeader::init() TQLabel *TextLabel8 = new TQLabel( GroupBox7, "TextLabel8" ); TextLabel8->setText( i18n( "Title:" )); - TextLabel8->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + TextLabel8->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); Layout13->addWidget( TextLabel8, 0, 0 ); GroupBox7Layout->addLayout( Layout13 ); @@ -147,10 +147,10 @@ void KControlHeader::init() TQGroupBox *GroupBox8 = new TQGroupBox( mainView, "GroupBox8" ); GroupBox8->setTitle( i18n( "Picture" ) ); GroupBox8->setColumnLayout(0, Qt::Vertical ); - GroupBox8->layout()->setSpacing( 0 ); - GroupBox8->layout()->setMargin( 0 ); - TQHBoxLayout *GroupBox8Layout = new TQHBoxLayout( GroupBox8->layout() ); - GroupBox8Layout->setAlignment( Qt::AlignTop ); + GroupBox8->tqlayout()->setSpacing( 0 ); + GroupBox8->tqlayout()->setMargin( 0 ); + TQHBoxLayout *GroupBox8Layout = new TQHBoxLayout( GroupBox8->tqlayout() ); + GroupBox8Layout->tqsetAlignment( Qt::AlignTop ); GroupBox8Layout->setSpacing( 6 ); GroupBox8Layout->setMargin( 11 ); @@ -165,10 +165,10 @@ void KControlHeader::init() TQGroupBox *GroupBox6 = new TQGroupBox( mainView, "GroupBox6" ); GroupBox6->setTitle( i18n( "Author" ) ); GroupBox6->setColumnLayout(0, Qt::Vertical ); - GroupBox6->layout()->setSpacing( 0 ); - GroupBox6->layout()->setMargin( 0 ); - TQGridLayout *GroupBox6Layout = new TQGridLayout( GroupBox6->layout() ); - GroupBox6Layout->setAlignment( Qt::AlignTop ); + GroupBox6->tqlayout()->setSpacing( 0 ); + GroupBox6->tqlayout()->setMargin( 0 ); + TQGridLayout *GroupBox6Layout = new TQGridLayout( GroupBox6->tqlayout() ); + GroupBox6Layout->tqsetAlignment( Qt::AlignTop ); GroupBox6Layout->setSpacing( 6 ); GroupBox6Layout->setMargin( 11 ); @@ -182,19 +182,19 @@ void KControlHeader::init() TQLabel *TextLabel7 = new TQLabel( GroupBox6, "TextLabel7" ); TextLabel7->setText( i18n( "Web page:" )); - TextLabel7->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + TextLabel7->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); GroupBox6Layout->addWidget( TextLabel7, 2, 0 ); TQLabel *TextLabel6 = new TQLabel( GroupBox6, "TextLabel6" ); TextLabel6->setText( i18n( "Email:" )); - TextLabel6->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + TextLabel6->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); GroupBox6Layout->addWidget( TextLabel6, 1, 0 ); TQLabel *TextLabel5 = new TQLabel( GroupBox6, "TextLabel5" ); TextLabel5->setText( i18n( "Name:" )); - TextLabel5->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + TextLabel5->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); GroupBox6Layout->addWidget( TextLabel5, 0, 0 ); @@ -246,12 +246,12 @@ void KControlHeader::insertHeader() /** Load country list */ void KControlHeader::loadCountryList(KLanguageCombo *combo) { - TQString sub = TQString::fromLatin1("l10n/"); + TQString sub = TQString::tqfromLatin1("l10n/"); // clear the list combo->clear(); - TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop")); + TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*.desktop")); regionlist.sort(); for ( TQStringList::ConstIterator it = regionlist.begin(); @@ -268,23 +268,23 @@ void KControlHeader::loadCountryList(KLanguageCombo *combo) if (index != -1) tag.truncate(index); KSimpleConfig entry(*it); - entry.setGroup(TQString::fromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::fromLatin1("Name")); + entry.setGroup(TQString::tqfromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::tqfromLatin1("Name")); combo->insertSubmenu( name, '-' + tag, sub ); } // add all languages to the list - TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*/entry.desktop")); + TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*/entry.desktop")); countrylist.sort(); for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) { KSimpleConfig entry(*it); - entry.setGroup(TQString::fromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::fromLatin1("Name")); - TQString submenu = '-' + entry.readEntry(TQString::fromLatin1("Region")); + entry.setGroup(TQString::tqfromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::tqfromLatin1("Name")); + TQString submenu = '-' + entry.readEntry(TQString::tqfromLatin1("Region")); TQString tag = *it; int index = tag.findRev('/'); diff --git a/keduca/keducabuilder/kcontrolheaderbase.ui b/keduca/keducabuilder/kcontrolheaderbase.ui index 04f2411b..9041b6a2 100644 --- a/keduca/keducabuilder/kcontrolheaderbase.ui +++ b/keduca/keducabuilder/kcontrolheaderbase.ui @@ -4,7 +4,7 @@ MyDialog - + 0 0 @@ -23,13 +23,13 @@ frame3 - + 0 50 - + 32767 50 @@ -59,13 +59,13 @@ frame4 - + 125 0 - + 125 32767 @@ -104,7 +104,7 @@ Expanding - + 60 21 @@ -139,7 +139,7 @@ Title: - + AlignVCenter|AlignRight @@ -150,7 +150,7 @@ Language: - + AlignVCenter|AlignRight @@ -161,7 +161,7 @@ Category: - + AlignVCenter|AlignRight @@ -172,7 +172,7 @@ Type: - + AlignVCenter|AlignRight @@ -188,7 +188,7 @@ - layout2 + tqlayout2 @@ -209,7 +209,7 @@ Expanding - + 61 21 @@ -223,7 +223,7 @@ Level: - + AlignVCenter|AlignRight @@ -262,7 +262,7 @@ Default picture: - + AlignJustify|AlignVCenter @@ -291,7 +291,7 @@ Name: - + AlignVCenter|AlignRight @@ -317,7 +317,7 @@ Web page: - + AlignVCenter|AlignRight @@ -328,7 +328,7 @@ Email: - + AlignVCenter|AlignRight @@ -344,7 +344,7 @@ Expanding - + 31 40 @@ -389,7 +389,7 @@ Expanding - + 20 20 @@ -459,7 +459,7 @@ buttonOk buttonCancel - + klineedit.h klineedit.h diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp index fa7da986..b6b9332b 100644 --- a/keduca/keducabuilder/keducabuilder.cpp +++ b/keduca/keducabuilder/keducabuilder.cpp @@ -91,7 +91,7 @@ void KEducaBuilder::init() _split->setOrientation( TQSplitter::Vertical ); _listAnswer = new KListBox( _split, "_listAnswer" ); - _listAnswer->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, _listAnswer->sizePolicy().hasHeightForWidth() ) ); + _listAnswer->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, _listAnswer->sizePolicy().hasHeightForWidth() ) ); connect( _listAnswer, TQT_SIGNAL( highlighted(TQListBoxItem *) ), this, TQT_SLOT( slotPreview(TQListBoxItem *) ) ); connect( _listAnswer, TQT_SIGNAL( doubleClicked(TQListBoxItem *) ), this, TQT_SLOT( slotEditbyList(TQListBoxItem *) ) ); @@ -103,7 +103,7 @@ void KEducaBuilder::init() setCentralWidget( mainView ); if (!initialGeometrySet()) - resize( TQSize(500, 400).expandedTo(minimumSizeHint())); + resize( TQSize(500, 400).expandedTo(tqminimumSizeHint())); setupGUI( ToolBar | Keys | StatusBar | Create, "keducabuilderui.rc" ); setAutoSaveSettings(); } @@ -289,18 +289,18 @@ bool KEducaBuilder::currentFileMayBeReplaced() switch (res) { case KMessageBox::Yes: - // If the saving was successful, then the file may be replaced + // If the saving was successful, then the file may be tqreplaced return fileSave(); break; case KMessageBox::Cancel: - // User cancels operation, do not replace the file + // User cancels operation, do not tqreplace the file return false; break; default: ; } } - // file was not changed, it may be replaced + // file was not changed, it may be tqreplaced return true; } diff --git a/keduca/keducabuilder/keducabuilder.h b/keduca/keducabuilder/keducabuilder.h index c3a736a7..9171f58f 100644 --- a/keduca/keducabuilder/keducabuilder.h +++ b/keduca/keducabuilder/keducabuilder.h @@ -67,7 +67,7 @@ private: bool fileSaveAs(); /** Ask the user if he wants to save the file if it has been changed. - Returns true if the file may be replaced (that is when he successfully saved it or said "Discard") */ + Returns true if the file may be tqreplaced (that is when he successfully saved it or said "Discard") */ bool currentFileMayBeReplaced(); // Private attributes diff --git a/keduca/keducabuilder/keducaeditorstartdialogbase.ui b/keduca/keducabuilder/keducaeditorstartdialogbase.ui index 0cb69e39..4419fbcc 100644 --- a/keduca/keducabuilder/keducaeditorstartdialogbase.ui +++ b/keduca/keducabuilder/keducaeditorstartdialogbase.ui @@ -4,7 +4,7 @@ KEducaEditorStartDialogBase - + 0 0 @@ -100,7 +100,7 @@ Fixed - + 20 20 @@ -154,7 +154,7 @@ Fixed - + 20 21 @@ -238,7 +238,7 @@ Expanding - + 20 20 @@ -312,7 +312,7 @@ openDocumentRB openRecentDocumentRB - + klineedit.h kpushbutton.h diff --git a/keduca/keducabuilder/klangcombo.cpp b/keduca/keducabuilder/klangcombo.cpp index 1d86c09e..310a9a23 100644 --- a/keduca/keducabuilder/klangcombo.cpp +++ b/keduca/keducabuilder/klangcombo.cpp @@ -38,14 +38,14 @@ KLanguageCombo::KLanguageCombo (TQWidget * parent, const char *name) void KLanguageCombo::insertLanguage(const TQString& path, const TQString& name, const TQString& sub, const TQString &submenu) { - TQString output = name + TQString::fromLatin1(" (") + path + TQString::fromLatin1(")"); - TQPixmap flag(locate("locale", sub + path + TQString::fromLatin1("/flag.png"))); + TQString output = name + TQString::tqfromLatin1(" (") + path + TQString::tqfromLatin1(")"); + TQPixmap flag(locate("locale", sub + path + TQString::tqfromLatin1("/flag.png"))); insertItem(TQIconSet(flag), output, path, submenu); } void KLanguageCombo::changeLanguage(const TQString& name, int i) { if (i < 0 || i >= count()) return; - TQString output = name + TQString::fromLatin1(" (") + tag(i) + TQString::fromLatin1(")"); + TQString output = name + TQString::tqfromLatin1(" (") + tag(i) + TQString::tqfromLatin1(")"); changeItem(output, i); } diff --git a/keduca/keducabuilder/ktagcombobox.cpp b/keduca/keducabuilder/ktagcombobox.cpp index 5a84574c..b91122f0 100644 --- a/keduca/keducabuilder/ktagcombobox.cpp +++ b/keduca/keducabuilder/ktagcombobox.cpp @@ -84,7 +84,7 @@ void KTagComboBox::internalActivate( int index ) if (_current == index) return; _current = index; emit activated( index ); - repaint(); + tqrepaint(); } void KTagComboBox::internalHighlight( int index ) @@ -158,7 +158,7 @@ void KTagComboBox::changeItem( const TQString &text, int index ) { _popup->changeItem( text, index); if (index == _current) - repaint(); + tqrepaint(); } void KTagComboBox::paintEvent( TQPaintEvent * ev) @@ -170,7 +170,7 @@ void KTagComboBox::paintEvent( TQPaintEvent * ev) // Text TQRect clip(2, 2, width() - 4, height() - 4); if ( hasFocus()) - p.setPen( colorGroup().highlightedText() ); + p.setPen( tqcolorGroup().highlightedText() ); p.drawText(clip, AlignCenter | SingleLine, _popup->text( _current )); // Icon @@ -181,9 +181,9 @@ void KTagComboBox::paintEvent( TQPaintEvent * ev) } } -bool KTagComboBox::containsTag( const TQString &str ) const +bool KTagComboBox::tqcontainsTag( const TQString &str ) const { - return _tags->contains(str) > 0; + return _tags->tqcontains(str) > 0; } TQString KTagComboBox::currentTag() const @@ -210,7 +210,7 @@ void KTagComboBox::setCurrentItem(int i) { if (i < 0 || i >= count()) return; _current = i; - repaint(); + tqrepaint(); } void KTagComboBox::setCurrentItem(const TQString &code) diff --git a/keduca/keducabuilder/ktagcombobox.h b/keduca/keducabuilder/ktagcombobox.h index ffeb2cda..897156d2 100644 --- a/keduca/keducabuilder/ktagcombobox.h +++ b/keduca/keducabuilder/ktagcombobox.h @@ -58,7 +58,7 @@ public: */ TQString currentTag() const; TQString tag ( int i ) const; - bool containsTag (const TQString &str ) const; + bool tqcontainsTag (const TQString &str ) const; /* * Set the current item diff --git a/keduca/libkeduca/fileread.cpp b/keduca/libkeduca/fileread.cpp index 7632b6fd..6c8c5aec 100644 --- a/keduca/libkeduca/fileread.cpp +++ b/keduca/libkeduca/fileread.cpp @@ -62,7 +62,7 @@ bool FileRead::loadFile(const TQString &filename) { TQDomDocument doc("document.xml"); - KMimeType::Ptr type = KMimeType::findByFileContent(filename); + KMimeType::Ptr type = KMimeType::tqfindByFileContent(filename); kdDebug() << "FileRead::loadFile(): MIME-Type is " << type->name() << endl; @@ -79,7 +79,7 @@ bool FileRead::loadFile(const TQString &filename) } else { - doc.setContent(qUncompress(file.readAll())); + doc.setContent(tqUncompress(file.readAll())); } TQDomElement docElem = doc.documentElement(); @@ -796,7 +796,7 @@ bool FileRead::saveFile( const TQString &filename, bool copyimages, bool saveCom doc.save( stream, 4); buffer.close(); if ( saveCompressed ) - file.writeBlock(qCompress(data)); + file.writeBlock(tqCompress(data)); else file.writeBlock(data); file.close(); @@ -905,7 +905,7 @@ void FileRead::setHeader( const TQString field, const TQString value) if( (_header[field]).isEmpty() ) _header.insert( field, value ); else - _header.replace( field, value ); + _header.tqreplace( field, value ); } /** is Multi Answer */ diff --git a/keduca/libkeduca/kgallerydialogbase.ui b/keduca/libkeduca/kgallerydialogbase.ui index ccd51e46..b98bfa91 100644 --- a/keduca/libkeduca/kgallerydialogbase.ui +++ b/keduca/libkeduca/kgallerydialogbase.ui @@ -4,7 +4,7 @@ KGalleryDialogBase - + 0 0 @@ -24,7 +24,7 @@ - layout13 + tqlayout13 @@ -32,7 +32,7 @@ - layout4 + tqlayout4 @@ -45,7 +45,7 @@ Name: - + AlignVCenter @@ -58,7 +58,7 @@ - layout3 + tqlayout3 @@ -81,7 +81,7 @@ - layout12 + tqlayout12 @@ -97,7 +97,7 @@ Preferred - + 20 10 @@ -108,7 +108,7 @@ buttonAdd - + 100 0 @@ -264,7 +264,7 @@ - layout2 + tqlayout2 @@ -274,7 +274,7 @@ buttonHelp - + 100 0 @@ -294,7 +294,7 @@ Expanding - + 40 20 @@ -305,7 +305,7 @@ buttonOpen - + 100 0 @@ -322,7 +322,7 @@ buttonCancel - + 100 0 @@ -366,5 +366,5 @@ slotButtonAdd() slotServerSelected(QListViewItem*) - + -- cgit v1.2.3