summaryrefslogtreecommitdiffstats
path: root/keduca/keducabuilder
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:18:52 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:18:52 +0000
commit648ba4a456d3aad2825193ff8f3bd52a875783b5 (patch)
tree0b50d2253a0c85238cc4dcba5c4f949de3f0eb15 /keduca/keducabuilder
parent98a12d05a48814bec3870b9a6d5865475cfa1c95 (diff)
downloadtdeedu-648ba4a456d3aad2825193ff8f3bd52a875783b5.tar.gz
tdeedu-648ba4a456d3aad2825193ff8f3bd52a875783b5.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1212481 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'keduca/keducabuilder')
-rw-r--r--keduca/keducabuilder/kcontroladdeditbase.ui72
-rw-r--r--keduca/keducabuilder/kcontrolheader.cpp56
-rw-r--r--keduca/keducabuilder/kcontrolheaderbase.ui40
-rw-r--r--keduca/keducabuilder/keducabuilder.cpp10
-rw-r--r--keduca/keducabuilder/keducabuilder.h2
-rw-r--r--keduca/keducabuilder/keducaeditorstartdialogbase.ui10
-rw-r--r--keduca/keducabuilder/klangcombo.cpp6
-rw-r--r--keduca/keducabuilder/ktagcombobox.cpp12
-rw-r--r--keduca/keducabuilder/ktagcombobox.h2
9 files changed, 105 insertions, 105 deletions
diff --git a/keduca/keducabuilder/kcontroladdeditbase.ui b/keduca/keducabuilder/kcontroladdeditbase.ui
index b566cd9c..0292edf2 100644
--- a/keduca/keducabuilder/kcontroladdeditbase.ui
+++ b/keduca/keducabuilder/kcontroladdeditbase.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>KControlAddEditBase</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -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>
@@ -160,7 +160,7 @@
<property name="text">
<string>&amp;Question:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -174,7 +174,7 @@
<property name="text">
<string>&amp;Type:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -188,7 +188,7 @@
<property name="text">
<string>&amp;Picture:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -227,7 +227,7 @@
<property name="text">
<string>P&amp;oint:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -241,7 +241,7 @@
<property name="text">
<string>Ti&amp;me:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -255,7 +255,7 @@
<property name="text">
<string>T&amp;ip:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -274,7 +274,7 @@
<property name="text">
<string>&amp;Explain:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -293,7 +293,7 @@
</widget>
<widget class="QLayoutWidget" row="4" column="1">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -314,7 +314,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>81</width>
<height>20</height>
@@ -325,7 +325,7 @@
</widget>
<widget class="QLayoutWidget" row="3" column="1">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -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>
@@ -502,7 +502,7 @@
</property>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<grid>
<property name="name">
@@ -510,7 +510,7 @@
</property>
<widget class="QLayoutWidget" row="2" column="1">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -531,7 +531,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>20</height>
@@ -552,7 +552,7 @@
<property name="text">
<string>&amp;Answer:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -566,7 +566,7 @@
<property name="text">
<string>&amp;Value:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -575,7 +575,7 @@
</widget>
<widget class="QLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -605,7 +605,7 @@
<property name="text">
<string>&amp;Points:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -630,7 +630,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout17</cstring>
+ <cstring>layout17</cstring>
</property>
<hbox>
<property name="name">
@@ -679,7 +679,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout16</cstring>
+ <cstring>layout16</cstring>
</property>
<vbox>
<property name="name">
@@ -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>
@@ -860,7 +860,7 @@
<slot access="private" specifier="pure virtual">slotDataChanged()</slot>
<slot access="private" specifier="pure virtual">slotAnswerSelected(QListViewItem *)</slot>
</slots>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/keduca/keducabuilder/kcontrolheader.cpp b/keduca/keducabuilder/kcontrolheader.cpp
index 344e1b32..e46bfdc4 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->tqlayout()->setSpacing( 0 );
- GroupBox7->tqlayout()->setMargin( 0 );
- TQVBoxLayout *GroupBox7Layout = new TQVBoxLayout( GroupBox7->tqlayout() );
- GroupBox7Layout->tqsetAlignment( Qt::AlignTop );
+ GroupBox7->layout()->setSpacing( 0 );
+ GroupBox7->layout()->setMargin( 0 );
+ TQVBoxLayout *GroupBox7Layout = new TQVBoxLayout( GroupBox7->layout() );
+ GroupBox7Layout->setAlignment( 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->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 );
@@ -147,10 +147,10 @@ void KControlHeader::init()
TQGroupBox *GroupBox8 = new TQGroupBox( mainView, "GroupBox8" );
GroupBox8->setTitle( i18n( "Picture" ) );
GroupBox8->setColumnLayout(0, Qt::Vertical );
- GroupBox8->tqlayout()->setSpacing( 0 );
- GroupBox8->tqlayout()->setMargin( 0 );
- TQHBoxLayout *GroupBox8Layout = new TQHBoxLayout( GroupBox8->tqlayout() );
- GroupBox8Layout->tqsetAlignment( Qt::AlignTop );
+ GroupBox8->layout()->setSpacing( 0 );
+ GroupBox8->layout()->setMargin( 0 );
+ TQHBoxLayout *GroupBox8Layout = new TQHBoxLayout( GroupBox8->layout() );
+ GroupBox8Layout->setAlignment( 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->tqlayout()->setSpacing( 0 );
- GroupBox6->tqlayout()->setMargin( 0 );
- TQGridLayout *GroupBox6Layout = new TQGridLayout( GroupBox6->tqlayout() );
- GroupBox6Layout->tqsetAlignment( Qt::AlignTop );
+ GroupBox6->layout()->setSpacing( 0 );
+ GroupBox6->layout()->setMargin( 0 );
+ TQGridLayout *GroupBox6Layout = new TQGridLayout( GroupBox6->layout() );
+ GroupBox6Layout->setAlignment( 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->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 9041b6a2..04f2411b 100644
--- a/keduca/keducabuilder/kcontrolheaderbase.ui
+++ b/keduca/keducabuilder/kcontrolheaderbase.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>MyDialog</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -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>
@@ -139,7 +139,7 @@
<property name="text">
<string>Title:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -150,7 +150,7 @@
<property name="text">
<string>Language:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -161,7 +161,7 @@
<property name="text">
<string>Category:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -172,7 +172,7 @@
<property name="text">
<string>Type:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -188,7 +188,7 @@
</widget>
<widget class="QLayoutWidget" row="2" column="1">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -209,7 +209,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>21</height>
@@ -223,7 +223,7 @@
<property name="text">
<string>Level:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -262,7 +262,7 @@
<property name="text">
<string>Default picture:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignJustify|AlignVCenter</set>
</property>
</widget>
@@ -291,7 +291,7 @@
<property name="text">
<string>Name:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -317,7 +317,7 @@
<property name="text">
<string>Web page:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -328,7 +328,7 @@
<property name="text">
<string>Email:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -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>
@@ -459,7 +459,7 @@
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp
index b6b9332b..fa7da986 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->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 *) ), 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(tqminimumSizeHint()));
+ resize( TQSize(500, 400).expandedTo(minimumSizeHint()));
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 tqreplaced
+ // If the saving was successful, then the file may be replaced
return fileSave();
break;
case KMessageBox::Cancel:
- // User cancels operation, do not tqreplace the file
+ // User cancels operation, do not replace the file
return false;
break;
default: ;
}
}
- // file was not changed, it may be tqreplaced
+ // file was not changed, it may be replaced
return true;
}
diff --git a/keduca/keducabuilder/keducabuilder.h b/keduca/keducabuilder/keducabuilder.h
index 9171f58f..c3a736a7 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 tqreplaced (that is when he successfully saved it or said "Discard") */
+ Returns true if the file may be replaced (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 4419fbcc..0cb69e39 100644
--- a/keduca/keducabuilder/keducaeditorstartdialogbase.ui
+++ b/keduca/keducabuilder/keducaeditorstartdialogbase.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>KEducaEditorStartDialogBase</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -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>
@@ -312,7 +312,7 @@
<tabstop>openDocumentRB</tabstop>
<tabstop>openRecentDocumentRB</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/keduca/keducabuilder/klangcombo.cpp b/keduca/keducabuilder/klangcombo.cpp
index 310a9a23..1d86c09e 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 b91122f0..5a84574c 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 );
- tqrepaint();
+ repaint();
}
void KTagComboBox::internalHighlight( int index )
@@ -158,7 +158,7 @@ void KTagComboBox::changeItem( const TQString &text, int index )
{
_popup->changeItem( text, index);
if (index == _current)
- tqrepaint();
+ repaint();
}
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( tqcolorGroup().highlightedText() );
+ p.setPen( colorGroup().highlightedText() );
p.drawText(clip, AlignCenter | SingleLine, _popup->text( _current ));
// Icon
@@ -181,9 +181,9 @@ void KTagComboBox::paintEvent( TQPaintEvent * ev)
}
}
-bool KTagComboBox::tqcontainsTag( const TQString &str ) const
+bool KTagComboBox::containsTag( const TQString &str ) const
{
- return _tags->tqcontains(str) > 0;
+ return _tags->contains(str) > 0;
}
TQString KTagComboBox::currentTag() const
@@ -210,7 +210,7 @@ void KTagComboBox::setCurrentItem(int i)
{
if (i < 0 || i >= count()) return;
_current = i;
- tqrepaint();
+ repaint();
}
void KTagComboBox::setCurrentItem(const TQString &code)
diff --git a/keduca/keducabuilder/ktagcombobox.h b/keduca/keducabuilder/ktagcombobox.h
index 897156d2..ffeb2cda 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 tqcontainsTag (const TQString &str ) const;
+ bool containsTag (const TQString &str ) const;
/*
* Set the current item