summaryrefslogtreecommitdiffstats
path: root/keduca
diff options
context:
space:
mode:
Diffstat (limited to 'keduca')
-rw-r--r--keduca/keduca/configdialogbase.ui2
-rw-r--r--keduca/keduca/kcheckeduca.cpp10
-rw-r--r--keduca/keduca/keduca.cpp2
-rw-r--r--keduca/keduca/keducaprefs.cpp4
-rw-r--r--keduca/keduca/keducaview.cpp26
-rw-r--r--keduca/keduca/keducaview.h2
-rw-r--r--keduca/keduca/kgroupeduca.cpp2
-rw-r--r--keduca/keduca/kquestion.cpp4
-rw-r--r--keduca/keduca/kradioeduca.cpp10
-rw-r--r--keduca/keducabuilder/kcontroladdeditbase.ui34
-rw-r--r--keduca/keducabuilder/kcontrolheader.cpp38
-rw-r--r--keduca/keducabuilder/kcontrolheaderbase.ui16
-rw-r--r--keduca/keducabuilder/keducabuilder.cpp4
-rw-r--r--keduca/keducabuilder/keducaeditorstartdialogbase.ui6
-rw-r--r--keduca/keducabuilder/klangcombo.cpp6
-rw-r--r--keduca/keducabuilder/ktagcombobox.cpp2
-rw-r--r--keduca/libkeduca/kgallerydialogbase.ui12
17 files changed, 90 insertions, 90 deletions
diff --git a/keduca/keduca/configdialogbase.ui b/keduca/keduca/configdialogbase.ui
index 7eff82a8..a5926ad1 100644
--- a/keduca/keduca/configdialogbase.ui
+++ b/keduca/keduca/configdialogbase.ui
@@ -87,7 +87,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>51</height>
diff --git a/keduca/keduca/kcheckeduca.cpp b/keduca/keduca/kcheckeduca.cpp
index 1fd7465e..edeb42fd 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 = tqstyle().tqpixelMetric(TQStyle::PM_IndicatorWidth, 0);
+ indicator_width = tqstyle().pixelMetric(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 = tqcolorGroup();
+ TQColorGroup cg = colorGroup();
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, tqcolorGroup(), 0);
+ _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, colorGroup(), 0);
if ( hasFocus() ) {
-// TQRect br = tqstyle().tqitemRect( p, x, y, rw, rh+yo,
+// TQRect br = tqstyle().itemRect( 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 ) );
- tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, tqcolorGroup());
+ tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup());
}
}
diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp
index 5c39c0ed..508a137a 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(tqminimumSizeHint()));
+ resize( TQSize(550, 450).expandedTo(minimumSizeHint()));
}
Keduca::~Keduca()
diff --git a/keduca/keduca/keducaprefs.cpp b/keduca/keduca/keducaprefs.cpp
index f118f3ad..dbf130dc 100644
--- a/keduca/keduca/keducaprefs.cpp
+++ b/keduca/keduca/keducaprefs.cpp
@@ -48,7 +48,7 @@ void KEducaPrefs::setPageGeneral()
buttonGroup1->tqlayout()->setSpacing( 0 );
buttonGroup1->tqlayout()->setMargin( 0 );
TQVBoxLayout *buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->tqlayout() );
- buttonGroup1Layout->tqsetAlignment( TQt::AlignTop );
+ buttonGroup1Layout->setAlignment( TQt::AlignTop );
buttonGroup1Layout->setSpacing( 6 );
buttonGroup1Layout->setMargin( 11 );
@@ -66,7 +66,7 @@ void KEducaPrefs::setPageGeneral()
GroupBox1->tqlayout()->setSpacing( 0 );
GroupBox1->tqlayout()->setMargin( 0 );
TQVBoxLayout *GroupBox1Layout = new TQVBoxLayout( GroupBox1->tqlayout() );
- GroupBox1Layout->tqsetAlignment( TQt::AlignTop );
+ GroupBox1Layout->setAlignment( TQt::AlignTop );
GroupBox1Layout->setSpacing( 6 );
GroupBox1Layout->setMargin( 11 );
diff --git a/keduca/keduca/keducaview.cpp b/keduca/keduca/keducaview.cpp
index f7871e5c..97a46e35 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( TQt::white );
- _introWidget->tqsetAlignment( AlignCenter );
+ _introWidget->setAlignment( AlignCenter );
_introWidget->setPixmap( TQPixmap( locate("data","keduca/pics/keduca_init.png") ) );
addWidget( _introWidget, 0 );
@@ -121,7 +121,7 @@ void KEducaView::slotButtonNext()
_questionText->countdown(0);
}
- if( ( visibleWidget() == _questionWidget ) && !_isInittqStatus )
+ if( ( visibleWidget() == _questionWidget ) && !_isInitStatus )
setResults();
_buttonGroup->clearAnswers();
@@ -404,7 +404,7 @@ bool KEducaView::openURL( const KURL &url)
if ( !_keducaFile->openFile( url ) )
return false;
- _isInittqStatus = true;
+ _isInitStatus = true;
_results = "<HTML>";
_correctAnswer = 0;
_correctPoints = 0;
@@ -436,12 +436,12 @@ void KEducaView::configWrite()
Settings::writeConfig();
}
-/** current tqStatus Points */
+/** current Status Points */
TQString KEducaView::currentStatusPoints()
{
- TQString temptqStatus;
+ TQString tempStatus;
- temptqStatus = insertTable()
+ tempStatus = 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 )
- temptqStatus += insertRow( i18n("Total points"), true, 4 )
+ tempStatus += insertRow( i18n("Total points"), true, 4 )
+ insertRow( i18n("Correct points"),
TQString().setNum( _correctPoints ),
i18n("Incorrect points"),
TQString().setNum( _incorrectPoints ), true );
if( _keducaFile->getTotalTime() > 0 )
- temptqStatus += insertRow( i18n("Time"), true, 4 )
+ tempStatus += insertRow( i18n("Time"), true, 4 )
+ insertRow( i18n("Total time"),
TQString().setNum( _keducaFile->getTotalTime() ),
i18n("Time in tests"),
TQString().setNum( _currentTime ), true );
- temptqStatus += insertTableClose();
- return temptqStatus;
+ tempStatus += insertTableClose();
+ return tempStatus;
}
/** Set HTML table view with correct and incorrect answers */
@@ -503,15 +503,15 @@ TQString KEducaView::getTableQuestion( bool isCorrect, const TQString &correct,
/** Define the next questions (random, secuencial) */
bool KEducaView::questionNext()
{
- if( !Settings::randomQuestions() && !_isInittqStatus )
+ if( !Settings::randomQuestions() && !_isInitStatus )
{
_keducaFile->recordNext();
return _keducaFile->recordEOF() ? false : true;
}
- if( _isInittqStatus )
+ if( _isInitStatus )
{
- _isInittqStatus = false;
+ _isInitStatus = false;
if( !Settings::randomQuestions() ) return true;
}
diff --git a/keduca/keduca/keducaview.h b/keduca/keduca/keducaview.h
index 45387f0f..ed226f1b 100644
--- a/keduca/keduca/keducaview.h
+++ b/keduca/keduca/keducaview.h
@@ -115,7 +115,7 @@ private:
/** Current results */
TQString _currentResults;
/** If is init window */
- bool _isInittqStatus;
+ bool _isInitStatus;
TQTimer *_timeoutTimer;
/** Num of correct answers */
int _correctAnswer;
diff --git a/keduca/keduca/kgroupeduca.cpp b/keduca/keduca/kgroupeduca.cpp
index 747b65da..9f7a2413 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0 ) );
+ answer->setSizePolicy( 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 fee2abc7..7b549168 100644
--- a/keduca/keduca/kquestion.cpp
+++ b/keduca/keduca/kquestion.cpp
@@ -51,7 +51,7 @@ void KQuestion::initGUI()
_picture->setPalette( TQPalette( TQt::white ) );
_countdownWidget = new KProgress( picBox );
- _countdownWidget->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred,
+ _countdownWidget->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, true ) );
+ _view->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, true ) );
}
/** Set text */
diff --git a/keduca/keduca/kradioeduca.cpp b/keduca/keduca/kradioeduca.cpp
index 9b8ffe4f..4cf0185f 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 = tqstyle().tqpixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0);
+ indicator_width = tqstyle().pixelMetric(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 = tqcolorGroup();
+ TQColorGroup cg = colorGroup();
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, tqcolorGroup(), 0);
+ _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, colorGroup(), 0);
if ( hasFocus() ) {
-// TQRect br = tqstyle().tqitemRect( p, x, y, rw, rh+yo,
+// TQRect br = tqstyle().itemRect( 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 ) );
- tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, tqcolorGroup());
+ tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup());
}
}
diff --git a/keduca/keducabuilder/kcontroladdeditbase.ui b/keduca/keducabuilder/kcontroladdeditbase.ui
index b7e042b4..a2a92780 100644
--- a/keduca/keducabuilder/kcontroladdeditbase.ui
+++ b/keduca/keducabuilder/kcontroladdeditbase.ui
@@ -30,13 +30,13 @@
<property name="name">
<cstring>frame3</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>125</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>125</width>
<height>32767</height>
@@ -59,13 +59,13 @@
<property name="name">
<cstring>_questionPreview</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>100</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>100</width>
<height>100</height>
@@ -101,7 +101,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -130,7 +130,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>41</height>
@@ -314,7 +314,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>81</width>
<height>20</height>
@@ -346,7 +346,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>131</width>
<height>20</height>
@@ -377,13 +377,13 @@
<property name="name">
<cstring>frame3_2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>125</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>125</width>
<height>32767</height>
@@ -406,13 +406,13 @@
<property name="name">
<cstring>_answerPreview</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>100</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>100</width>
<height>100</height>
@@ -448,7 +448,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -477,7 +477,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>41</height>
@@ -531,7 +531,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>20</height>
@@ -717,7 +717,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>10</height>
@@ -756,7 +756,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
diff --git a/keduca/keducabuilder/kcontrolheader.cpp b/keduca/keducabuilder/kcontrolheader.cpp
index 49075f59..f126d07d 100644
--- a/keduca/keducabuilder/kcontrolheader.cpp
+++ b/keduca/keducabuilder/kcontrolheader.cpp
@@ -85,7 +85,7 @@ void KControlHeader::init()
GroupBox7->tqlayout()->setSpacing( 0 );
GroupBox7->tqlayout()->setMargin( 0 );
TQVBoxLayout *GroupBox7Layout = new TQVBoxLayout( GroupBox7->tqlayout() );
- GroupBox7Layout->tqsetAlignment( TQt::AlignTop );
+ GroupBox7Layout->setAlignment( TQt::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->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ TextLabel10->setAlignment( 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->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ TextLabel11->setAlignment( 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->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ TextLabel12->setAlignment( 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->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ TextLabel9->setAlignment( 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->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ TextLabel8->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
Layout13->addWidget( TextLabel8, 0, 0 );
GroupBox7Layout->addLayout( Layout13 );
@@ -150,7 +150,7 @@ void KControlHeader::init()
GroupBox8->tqlayout()->setSpacing( 0 );
GroupBox8->tqlayout()->setMargin( 0 );
TQHBoxLayout *GroupBox8Layout = new TQHBoxLayout( GroupBox8->tqlayout() );
- GroupBox8Layout->tqsetAlignment( TQt::AlignTop );
+ GroupBox8Layout->setAlignment( TQt::AlignTop );
GroupBox8Layout->setSpacing( 6 );
GroupBox8Layout->setMargin( 11 );
@@ -168,7 +168,7 @@ void KControlHeader::init()
GroupBox6->tqlayout()->setSpacing( 0 );
GroupBox6->tqlayout()->setMargin( 0 );
TQGridLayout *GroupBox6Layout = new TQGridLayout( GroupBox6->tqlayout() );
- GroupBox6Layout->tqsetAlignment( TQt::AlignTop );
+ GroupBox6Layout->setAlignment( TQt::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->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ TextLabel7->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
GroupBox6Layout->addWidget( TextLabel7, 2, 0 );
TQLabel *TextLabel6 = new TQLabel( GroupBox6, "TextLabel6" );
TextLabel6->setText( i18n( "Email:" ));
- TextLabel6->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ TextLabel6->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
GroupBox6Layout->addWidget( TextLabel6, 1, 0 );
TQLabel *TextLabel5 = new TQLabel( GroupBox6, "TextLabel5" );
TextLabel5->setText( i18n( "Name:" ));
- TextLabel5->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ TextLabel5->setAlignment( 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::tqfromLatin1("l10n/");
+ TQString sub = TQString::fromLatin1("l10n/");
// clear the list
combo->clear();
- TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*.desktop"));
+ TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.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::tqfromLatin1("KCM Locale"));
- TQString name = entry.readEntry(TQString::tqfromLatin1("Name"));
+ entry.setGroup(TQString::fromLatin1("KCM Locale"));
+ TQString name = entry.readEntry(TQString::fromLatin1("Name"));
combo->insertSubmenu( name, '-' + tag, sub );
}
// add all languages to the list
- TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*/entry.desktop"));
+ TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*/entry.desktop"));
countrylist.sort();
for ( TQStringList::ConstIterator it = countrylist.begin();
it != countrylist.end(); ++it )
{
KSimpleConfig entry(*it);
- entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
- TQString name = entry.readEntry(TQString::tqfromLatin1("Name"));
- TQString submenu = '-' + entry.readEntry(TQString::tqfromLatin1("Region"));
+ entry.setGroup(TQString::fromLatin1("KCM Locale"));
+ TQString name = entry.readEntry(TQString::fromLatin1("Name"));
+ TQString submenu = '-' + entry.readEntry(TQString::fromLatin1("Region"));
TQString tag = *it;
int index = tag.findRev('/');
diff --git a/keduca/keducabuilder/kcontrolheaderbase.ui b/keduca/keducabuilder/kcontrolheaderbase.ui
index 24dbbf09..242b9358 100644
--- a/keduca/keducabuilder/kcontrolheaderbase.ui
+++ b/keduca/keducabuilder/kcontrolheaderbase.ui
@@ -23,13 +23,13 @@
<property name="name">
<cstring>frame3</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>50</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>50</height>
@@ -59,13 +59,13 @@
<property name="name">
<cstring>frame4</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>125</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>125</width>
<height>32767</height>
@@ -104,7 +104,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>60</width>
<height>21</height>
@@ -209,7 +209,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>21</height>
@@ -344,7 +344,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>40</height>
@@ -389,7 +389,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp
index 6af778b8..88db1b59 100644
--- a/keduca/keducabuilder/keducabuilder.cpp
+++ b/keduca/keducabuilder/keducabuilder.cpp
@@ -91,7 +91,7 @@ void KEducaBuilder::init()
_split->setOrientation( Qt::Vertical );
_listAnswer = new KListBox( _split, "_listAnswer" );
- _listAnswer->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, _listAnswer->sizePolicy().hasHeightForWidth() ) );
+ _listAnswer->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, _listAnswer->sizePolicy().hasHeightForWidth() ) );
connect( _listAnswer, TQT_SIGNAL( highlighted(TQListBoxItem *) ), TQT_TQOBJECT(this), TQT_SLOT( slotPreview(TQListBoxItem *) ) );
connect( _listAnswer, TQT_SIGNAL( doubleClicked(TQListBoxItem *) ), TQT_TQOBJECT(this), TQT_SLOT( slotEditbyList(TQListBoxItem *) ) );
@@ -103,7 +103,7 @@ void KEducaBuilder::init()
setCentralWidget( mainView );
if (!initialGeometrySet())
- resize( TQSize(500, 400).expandedTo(tqminimumSizeHint()));
+ resize( TQSize(500, 400).expandedTo(minimumSizeHint()));
setupGUI( ToolBar | Keys | StatusBar | Create, "keducabuilderui.rc" );
setAutoSaveSettings();
}
diff --git a/keduca/keducabuilder/keducaeditorstartdialogbase.ui b/keduca/keducabuilder/keducaeditorstartdialogbase.ui
index c873a844..e7686ff9 100644
--- a/keduca/keducabuilder/keducaeditorstartdialogbase.ui
+++ b/keduca/keducabuilder/keducaeditorstartdialogbase.ui
@@ -100,7 +100,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -154,7 +154,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -238,7 +238,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/keduca/keducabuilder/klangcombo.cpp b/keduca/keducabuilder/klangcombo.cpp
index 66f77e45..05a36669 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::tqfromLatin1(" (") + path + TQString::tqfromLatin1(")");
- TQPixmap flag(locate("locale", sub + path + TQString::tqfromLatin1("/flag.png")));
+ TQString output = name + TQString::fromLatin1(" (") + path + TQString::fromLatin1(")");
+ TQPixmap flag(locate("locale", sub + path + TQString::fromLatin1("/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::tqfromLatin1(" (") + tag(i) + TQString::tqfromLatin1(")");
+ TQString output = name + TQString::fromLatin1(" (") + tag(i) + TQString::fromLatin1(")");
changeItem(output, i);
}
diff --git a/keduca/keducabuilder/ktagcombobox.cpp b/keduca/keducabuilder/ktagcombobox.cpp
index e6d0e617..8c317255 100644
--- a/keduca/keducabuilder/ktagcombobox.cpp
+++ b/keduca/keducabuilder/ktagcombobox.cpp
@@ -170,7 +170,7 @@ void KTagComboBox::paintEvent( TQPaintEvent * ev)
// Text
TQRect clip(2, 2, width() - 4, height() - 4);
if ( hasFocus())
- p.setPen( tqcolorGroup().highlightedText() );
+ p.setPen( colorGroup().highlightedText() );
p.drawText(clip, AlignCenter | SingleLine, _popup->text( _current ));
// Icon
diff --git a/keduca/libkeduca/kgallerydialogbase.ui b/keduca/libkeduca/kgallerydialogbase.ui
index 9a11d8b4..44b60949 100644
--- a/keduca/libkeduca/kgallerydialogbase.ui
+++ b/keduca/libkeduca/kgallerydialogbase.ui
@@ -97,7 +97,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>10</height>
@@ -108,7 +108,7 @@
<property name="name">
<cstring>buttonAdd</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -274,7 +274,7 @@
<property name="name">
<cstring>buttonHelp</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -294,7 +294,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -305,7 +305,7 @@
<property name="name">
<cstring>buttonOpen</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -322,7 +322,7 @@
<property name="name">
<cstring>buttonCancel</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>