Rename obsolete tq methods to standard names

11 files changed, 68 insertions, 68 deletions

diff --git a/korn/ChangeLog b/korn/ChangeLog
index e644587e3..d22d617aa 100644
--- a/korn/ChangeLog
+++ b/korn/ChangeLog
@@ -14,7 +14,7 @@
 	* Converted C-style casts to C++-style, and checked retvals
 	  of dynamic_casts. Currently only assert() used, but that's
 	  better than crashing.
-	* Fixed tqlayout of polldlg.
+	* Fixed layout of polldlg.
 	* Split 'General' cfg widget into two, 'View' and 'Commands'
 	* Added some keyboard accelerators.
 	* Still need to connect config stuff up properly...
@@ -28,7 +28,7 @@
 
 	* temporarily take care of korn (with Taj's blessing)
 	* fix most of the layouts (/me being too stupid to fix Taj's nice
-		custom tqlayout classes, I switched completely to pure QLayouts)
+		custom layout classes, I switched completely to pure QLayouts)
 	* fixed most of the i18n
 	* made FileDialogs start with the current path by default (instead no
 		path, used before)
diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp
index 7a0c4637c..b026e95c4 100644
--- a/korn/boxcontaineritem.cpp
+++ b/korn/boxcontaineritem.cpp
@@ -216,23 +216,23 @@ void BoxContainerItem::showPassivePopup( TQWidget* parent, TQPtrList< KornMailSu
 {
 	KPassivePopup *popup = new KPassivePopup( parent, "Passive popup" );
 		
-	TQVBox *mainvtqlayout = popup->standardView( i18n( "KOrn - %1/%2 (total: %3)" ).arg( TQString(objId()) ).arg( accountName )
+	TQVBox *mainvlayout = popup->standardView( i18n( "KOrn - %1/%2 (total: %3)" ).arg( TQString(objId()) ).arg( accountName )
 			.arg( total ), "", TQPixmap(), 0 );
-	TQGrid *maingtqlayout = new TQGrid( date ? 3 : 2 ,mainvtqlayout, "Grid-Layout" );
+	TQGrid *mainglayout = new TQGrid( date ? 3 : 2 ,mainvlayout, "Grid-Layout" );
 	
-	TQLabel *title = new TQLabel( i18n("From"), maingtqlayout, "from_label" );
+	TQLabel *title = new TQLabel( i18n("From"), mainglayout, "from_label" );
 	TQFont font = title->font();
 	font.setBold( true );
 	title->setFont( font );
 		
-	title = new TQLabel( i18n("Subject"), maingtqlayout, "subject_label" );
+	title = new TQLabel( i18n("Subject"), mainglayout, "subject_label" );
 	font = title->font();
 	font.setBold( true );
 	title->setFont( font );
 		
 	if( date )
 	{
-		title = new TQLabel( i18n("Date"), maingtqlayout, "date_label" );
+		title = new TQLabel( i18n("Date"), mainglayout, "date_label" );
 		font = title->font();
 		font.setBold( true );
 		title->setFont( font );
@@ -240,19 +240,19 @@ void BoxContainerItem::showPassivePopup( TQWidget* parent, TQPtrList< KornMailSu
 	
 	for( KornMailSubject* subject = list->first(); subject; subject = list->next() )
 	{
-		new TQLabel( subject->getSender(), maingtqlayout, "from-value" );
-		new TQLabel( subject->getSubject(), maingtqlayout, "subject-value" );
+		new TQLabel( subject->getSender(), mainglayout, "from-value" );
+		new TQLabel( subject->getSubject(), mainglayout, "subject-value" );
 		if( date )
 		{
 			TQDateTime tijd;
 			tijd.setTime_t( subject->getDate() );
-			new TQLabel( tijd.toString(), maingtqlayout, "date-value" );
+			new TQLabel( tijd.toString(), mainglayout, "date-value" );
 		}
 	}
 	
 	popup->setAutoDelete( true ); //Now, now care for deleting these pointers.
 	
-	popup->setView( mainvtqlayout );
+	popup->setView( mainvlayout );
 	
 	popup->show(); //Display it
 }
diff --git a/korn/kornaccountcfg.ui b/korn/kornaccountcfg.ui
index 9a640718e..5e540b4b2 100644
--- a/korn/kornaccountcfg.ui
+++ b/korn/kornaccountcfg.ui
@@ -73,7 +73,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout35</cstring>
+                            <cstring>layout35</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -137,7 +137,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout33</cstring>
+                                    <cstring>layout33</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
diff --git a/korn/kornaccountcfgimpl.cpp b/korn/kornaccountcfgimpl.cpp
index ce1c9058b..19c0bb1d6 100644
--- a/korn/kornaccountcfgimpl.cpp
+++ b/korn/kornaccountcfgimpl.cpp
@@ -44,7 +44,7 @@ KornAccountCfgImpl::KornAccountCfgImpl( TQWidget * parent, const char * name )
 	_urlfields( 0 ),
 	_boxnr( 0 ),
 	_accountnr( 0 ),
-	_vtqlayout( 0 ),
+	_vlayout( 0 ),
 	_protocolLayout( 0 ),
 	_groupBoxes( 0 ),
 	_accountinput( new TQPtrList< AccountInput >() )
@@ -173,12 +173,12 @@ void KornAccountCfgImpl::slotProtocolChanged( const TQString& proto )
 	_accountinput->clear();
 	delete _groupBoxes;
 	delete _protocolLayout;
-	delete _vtqlayout;
-	_vtqlayout = new TQVBoxLayout( this->server_tab, groupBoxes->count() + 1 );
-	_vtqlayout->setSpacing( 10 );
-	_vtqlayout->setMargin( 10 );
+	delete _vlayout;
+	_vlayout = new TQVBoxLayout( this->server_tab, groupBoxes->count() + 1 );
+	_vlayout->setSpacing( 10 );
+	_vlayout->setMargin( 10 );
 
-	_protocolLayout = new TQHBoxLayout( _vtqlayout );
+	_protocolLayout = new TQHBoxLayout( _vlayout );
 	_protocolLayout->addWidget( this->lbProtocol );
 	_protocolLayout->addWidget( this->cbProtocol );
 
@@ -189,7 +189,7 @@ void KornAccountCfgImpl::slotProtocolChanged( const TQString& proto )
 	for( it = groupBoxes->begin(); it != groupBoxes->end(); ++it )
 	{
 		_groupBoxes->insert( counter, new TQGroupBox( (*it), this->server_tab, "groupbox" ) );
-		_vtqlayout->addWidget( _groupBoxes->at( counter ) );
+		_vlayout->addWidget( _groupBoxes->at( counter ) );
 		++counter;
 	}
 	delete groupBoxes;
diff --git a/korn/kornaccountcfgimpl.h b/korn/kornaccountcfgimpl.h
index 10c1cbf71..c17885d6d 100644
--- a/korn/kornaccountcfgimpl.h
+++ b/korn/kornaccountcfgimpl.h
@@ -60,7 +60,7 @@ private:
 	int _urlfields;
 	int _boxnr, _accountnr;
 		
-	TQVBoxLayout *_vtqlayout;
+	TQVBoxLayout *_vlayout;
 	TQHBoxLayout *_protocolLayout;
 	TQPtrVector< TQWidget > *_groupBoxes;
 	
diff --git a/korn/kornboxcfg.ui b/korn/kornboxcfg.ui
index 78bd0367f..f47b0f3e4 100644
--- a/korn/kornboxcfg.ui
+++ b/korn/kornboxcfg.ui
@@ -33,7 +33,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="1" column="2">
                         <property name="name">
-                            <cstring>tqlayout32</cstring>
+                            <cstring>layout32</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -69,7 +69,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="2" column="1">
                         <property name="name">
-                            <cstring>tqlayout34</cstring>
+                            <cstring>layout34</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -124,7 +124,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="2" column="2">
                         <property name="name">
-                            <cstring>tqlayout33</cstring>
+                            <cstring>layout33</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -167,7 +167,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="3" column="2">
                         <property name="name">
-                            <cstring>tqlayout36</cstring>
+                            <cstring>layout36</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -215,7 +215,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="1" column="1">
                         <property name="name">
-                            <cstring>tqlayout31</cstring>
+                            <cstring>layout31</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -251,7 +251,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="3" column="1">
                         <property name="name">
-                            <cstring>tqlayout35</cstring>
+                            <cstring>layout35</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -297,7 +297,7 @@
                     </spacer>
                     <widget class="TQLayoutWidget" row="5" column="1">
                         <property name="name">
-                            <cstring>tqlayout29</cstring>
+                            <cstring>layout29</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -326,7 +326,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="5" column="2">
                         <property name="name">
-                            <cstring>tqlayout28</cstring>
+                            <cstring>layout28</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -371,7 +371,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="4" column="2">
                         <property name="name">
-                            <cstring>tqlayout28_2</cstring>
+                            <cstring>layout28_2</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -400,7 +400,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="4" column="1">
                         <property name="name">
-                            <cstring>tqlayout29_2</cstring>
+                            <cstring>layout29_2</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -442,7 +442,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout31</cstring>
+                            <cstring>layout31</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -461,7 +461,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="5" column="2">
                                 <property name="name">
-                                    <cstring>tqlayout52_7</cstring>
+                                    <cstring>layout52_7</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -524,7 +524,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="2" column="2">
                                 <property name="name">
-                                    <cstring>tqlayout52</cstring>
+                                    <cstring>layout52</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -576,7 +576,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="3" column="1">
                                 <property name="name">
-                                    <cstring>tqlayout52_4</cstring>
+                                    <cstring>layout52_4</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -628,7 +628,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="5" column="3">
                                 <property name="name">
-                                    <cstring>tqlayout52_9</cstring>
+                                    <cstring>layout52_9</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -680,7 +680,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="2" column="1">
                                 <property name="name">
-                                    <cstring>tqlayout52</cstring>
+                                    <cstring>layout52</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -751,7 +751,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="4" column="3">
                                 <property name="name">
-                                    <cstring>tqlayout52_9</cstring>
+                                    <cstring>layout52_9</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -803,7 +803,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="5" column="1">
                                 <property name="name">
-                                    <cstring>tqlayout52_5</cstring>
+                                    <cstring>layout52_5</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -866,7 +866,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="6" column="1">
                                 <property name="name">
-                                    <cstring>tqlayout52_5</cstring>
+                                    <cstring>layout52_5</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -926,7 +926,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="3" column="3">
                                 <property name="name">
-                                    <cstring>tqlayout52_8</cstring>
+                                    <cstring>layout52_8</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -986,7 +986,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="6" column="2">
                                 <property name="name">
-                                    <cstring>tqlayout52_7</cstring>
+                                    <cstring>layout52_7</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1046,7 +1046,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="4" column="1">
                                 <property name="name">
-                                    <cstring>tqlayout52_5</cstring>
+                                    <cstring>layout52_5</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1098,7 +1098,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="2" column="3">
                                 <property name="name">
-                                    <cstring>tqlayout52_3</cstring>
+                                    <cstring>layout52_3</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1150,7 +1150,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="3" column="2">
                                 <property name="name">
-                                    <cstring>tqlayout52_6</cstring>
+                                    <cstring>layout52_6</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1202,7 +1202,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="4" column="2">
                                 <property name="name">
-                                    <cstring>tqlayout52_7</cstring>
+                                    <cstring>layout52_7</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1262,7 +1262,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="6" column="3">
                                 <property name="name">
-                                    <cstring>tqlayout52_9</cstring>
+                                    <cstring>layout52_9</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1316,7 +1316,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout31_3</cstring>
+                            <cstring>layout31_3</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1356,7 +1356,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout33</cstring>
+                                    <cstring>layout33</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
diff --git a/korn/korncfgimpl.cpp b/korn/korncfgimpl.cpp
index b61cf32c7..33af34065 100644
--- a/korn/korncfgimpl.cpp
+++ b/korn/korncfgimpl.cpp
@@ -198,10 +198,10 @@ void KornCfgImpl::readConfig()
 {
 	_config->setGroup( "korn" );
 	
-	TQChar tqlayout = _config->readEntry( "tqlayout" ).stripWhiteSpace()[0].upper();
-	if( tqlayout == TQChar( 'H' ) )
+	TQChar layout = _config->readEntry( "layout" ).stripWhiteSpace()[0].upper();
+	if( layout == TQChar( 'H' ) )
 		rbHorizontal->setChecked( true );
-	else if( tqlayout == TQChar( 'V' ) )
+	else if( layout == TQChar( 'V' ) )
 		rbVertical->setChecked( true );
 	else
 		rbDocked->setChecked( true );
@@ -214,11 +214,11 @@ void KornCfgImpl::writeConfig()
 	_config->setGroup( "korn" );
 	
 	if( rbHorizontal->isChecked() )
-		_config->writeEntry( "tqlayout", "Horizontal" );
+		_config->writeEntry( "layout", "Horizontal" );
 	if( rbVertical->isChecked() )
-		_config->writeEntry( "tqlayout", "Vertical" );
+		_config->writeEntry( "layout", "Vertical" );
 	if( rbDocked->isChecked() )
-		_config->writeEntry( "tqlayout", "Docked" );
+		_config->writeEntry( "layout", "Docked" );
 
 	//Default is 'false' here, because if no option is set, KWallet isn't used.
 	if( _config->readBoolEntry( "usewallet", false ) != chUseWallet->isChecked() )
diff --git a/korn/kornshell.cpp b/korn/kornshell.cpp
index eb3a0253b..dc823779d 100644
--- a/korn/kornshell.cpp
+++ b/korn/kornshell.cpp
@@ -95,12 +95,12 @@ void KornShell::readConfig()
 	static bool shownConfig = false;
 	
 	_config->setGroup( "korn" );
-	TQChar tqlayout = _config->readEntry( "tqlayout", "Docked" )[0].upper();
+	TQChar layout = _config->readEntry( "layout", "Docked" )[0].upper();
 	KOrnPassword::setUseWallet( _config->readBoolEntry( "usewallet", false ) );
 	
-	if( tqlayout == 'H' )
+	if( layout == 'H' )
 		_box = new HVContainer( Qt::Horizontal, TQT_TQOBJECT(this), "horizontal container" );
-	else if( tqlayout == 'V' )
+	else if( layout == 'V' )
 		_box = new HVContainer( Qt::Vertical, TQT_TQOBJECT(this), "vertical container" );
 	else
 		_box = new DockedContainer( TQT_TQOBJECT(this), "docked container" );
diff --git a/korn/maildrop.cpp b/korn/maildrop.cpp
index d0818962c..9d2f12f67 100644
--- a/korn/maildrop.cpp
+++ b/korn/maildrop.cpp
@@ -40,10 +40,10 @@ KMailDrop::KMailDrop()
   connect(this, TQT_SIGNAL(changed( int, KMailDrop* )), TQT_SLOT(setCount( int, KMailDrop* )));
   
   //Set default colours; this prevents black (TQColor::invalid) boxes after creating a new box.
-  _bgColour  = TQApplication::tqpalette().active().background();
-  _fgColour  = TQApplication::tqpalette().active().text();
-  _nbgColour = TQApplication::tqpalette().active().background();
-  _nfgColour = TQApplication::tqpalette().active().text();
+  _bgColour  = TQApplication::palette().active().background();
+  _fgColour  = TQApplication::palette().active().text();
+  _nbgColour = TQApplication::palette().active().background();
+  _nfgColour = TQApplication::palette().active().text();
 }
 
 KMailDrop::~KMailDrop()
@@ -87,10 +87,10 @@ bool KMailDrop::readConfigGroup(const KConfigBase & c)
   _caption    = c.readEntry(fu(CaptionConfigKey));
   _clickCmd   = c.readPathEntry(fu(ClickConfigKey));
   _style      = Style(c.readUnsignedNumEntry(fu(DisplayStyleConfigKey), Plain));
-  _bgColour   = c.readColorEntry(fu(BgColourConfigKey), &TQApplication::tqpalette().active().background());
-  _fgColour   = c.readColorEntry(fu(FgColourConfigKey), &TQApplication::tqpalette().active().text());
-  _nbgColour  = c.readColorEntry(fu(NBgColourConfigKey), &TQApplication::tqpalette().active().background());
-  _nfgColour  = c.readColorEntry(fu(NFgColourConfigKey), &TQApplication::tqpalette().active().text());
+  _bgColour   = c.readColorEntry(fu(BgColourConfigKey), &TQApplication::palette().active().background());
+  _fgColour   = c.readColorEntry(fu(FgColourConfigKey), &TQApplication::palette().active().text());
+  _nbgColour  = c.readColorEntry(fu(NBgColourConfigKey), &TQApplication::palette().active().background());
+  _nfgColour  = c.readColorEntry(fu(NFgColourConfigKey), &TQApplication::palette().active().text());
   _icon       = c.readEntry(fu(IconConfigKey));
   _nIcon      = c.readEntry(fu(NewMailIconConfigKey));
   _realName   = c.readEntry(fu(RealNameConfigKey));
diff --git a/korn/password.cpp b/korn/password.cpp
index f0ae5d8f3..764b90f98 100644
--- a/korn/password.cpp
+++ b/korn/password.cpp
@@ -241,7 +241,7 @@ TQString KOrnPassword::KMailDecrypt( const TQString& enc )
 {
 	TQString result;
 	for (uint i = 0; i < enc.length(); i++)
-		result += (enc[i].tqunicode() <= 0x21) ? enc[i] : TQChar(0x1001F - enc[i].tqunicode());
+		result += (enc[i].unicode() <= 0x21) ? enc[i] : TQChar(0x1001F - enc[i].unicode());
 
 	return result;
 }
diff --git a/korn/progress_dialog.ui b/korn/progress_dialog.ui
index 2be856f3e..9c8910286 100644
--- a/korn/progress_dialog.ui
+++ b/korn/progress_dialog.ui
@@ -39,7 +39,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">