Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit ca82971624269719d487c6f7980d7237f9420036.

3 files changed, 33 insertions, 33 deletions

diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp
index 698fa1c..ebf7d59 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.cpp
+++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp
@@ -36,7 +36,7 @@
 
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <kled.h>
 
 extern "C"
@@ -68,7 +68,7 @@ SettingsImp::SettingsImp(TQWidget* parent, const char* name, WFlags fl): Setting
  * Update the preview
  */
 void SettingsImp::updatePreview(){
-	int shape = Shape_Circular->isChecked() ? Prefs::EnumShape::Circular : Prefs::EnumShape::Rectangular;
+	int tqshape = Shape_Circular->isChecked() ? Prefs::EnumShape::Circular : Prefs::EnumShape::Rectangular;
 	int look = KLed::Raised;
 	look = Look_Flat->isChecked() ? Prefs::EnumLook::Flat : look;
 	look = Look_Sunken->isChecked() ? Prefs::EnumLook::Sunken : look;
@@ -84,12 +84,12 @@ void SettingsImp::updatePreview(){
 	kLed5->setBackgroundColor(backgroundColor);
 	kLed6->setBackgroundColor(backgroundColor);
 
-	kLed1->setShape((KLed::Shape)shape);
-	kLed2->setShape((KLed::Shape)shape);
-	kLed3->setShape((KLed::Shape)shape);
-	kLed4->setShape((KLed::Shape)shape);
-	kLed5->setShape((KLed::Shape)shape);
-	kLed6->setShape((KLed::Shape)shape);
+	kLed1->setShape((KLed::Shape)tqshape);
+	kLed2->setShape((KLed::Shape)tqshape);
+	kLed3->setShape((KLed::Shape)tqshape);
+	kLed4->setShape((KLed::Shape)tqshape);
+	kLed5->setShape((KLed::Shape)tqshape);
+	kLed6->setShape((KLed::Shape)tqshape);
 
 	kLed1->setColor(color);
 	kLed2->setColor(color);
@@ -173,14 +173,14 @@ void KBinaryClock::resizeEvent( TQResizeEvent *e ) {
  * Load the settings for the clock.
  */
 void KBinaryClock::loadSettings(){
-	int shape = prefs->shape();
+	int tqshape = prefs->shape();
 	int look = prefs->look();
 	TQColor color = prefs->color();
 
 	int darkFactor = prefs->darkFactor();
 	TQColor backgroundColor = prefs->background();
 	bool modifyBackground = false;
-	if(backgroundColor != KApplication::palette().active().background()){
+	if(backgroundColor != KApplication::tqpalette().active().background()){
 		setPaletteBackgroundColor(backgroundColor);
 		modifyBackground = true;
 	}
@@ -197,7 +197,7 @@ void KBinaryClock::loadSettings(){
 	}
 	for(int i=0; i < 4; i++){
 		for(int j=0; j < ledWidth;j++){
-			ledMatrix[j][i]->setShape((KLed::Shape)shape);
+			ledMatrix[j][i]->setShape((KLed::Shape)tqshape);
 			ledMatrix[j][i]->setColor(color);
 			ledMatrix[j][i]->setLook((KLed::Look)look);
 			ledMatrix[j][i]->setDarkFactor(darkFactor);
@@ -290,7 +290,7 @@ void KBinaryClock::openContextMenu() {
 		menu->insertTitle( SmallIcon( "clock" ), i18n( "KBinaryClock" ) );
 
 		KLocale *loc = KGlobal::locale();
-		TQDateTime dt = TQDateTime::currentDateTime();
+		TQDateTime dt = TQDateTime::tqcurrentDateTime();
 
 		KPopupMenu *copyMenu = new KPopupMenu( menu );
 		copyMenu->insertItem(loc->formatDateTime(dt), 201);
@@ -329,8 +329,8 @@ void KBinaryClock::openContextMenu() {
 		proc << locate("exe", "tdesu");
 		proc << "--nonewdcop";
 		proc << TQString("%1 clock --lang %2")
-				.arg(locate("exe", "kcmshell"))
-				.arg(KGlobal::locale()->language());
+				.tqarg(locate("exe", "kcmshell"))
+				.tqarg(KGlobal::locale()->language());
 		proc.start(KProcess::DontCare);
 		break;
 	case 104:
@@ -348,7 +348,7 @@ void KBinaryClock::openContextMenu() {
 void KBinaryClock::slotCopyMenuActivated( int id ) {
 	TQPopupMenu *m = (TQPopupMenu *) sender();
 	TQString s = m->text(id);
-	TQApplication::clipboard()->setText(s);
+	TQApplication::tqclipboard()->setText(s);
 }
 
 void KBinaryClock::toggleCalendar()
@@ -361,15 +361,15 @@ void KBinaryClock::toggleCalendar()
 	if (_calendar || _disableCalendar){
 		return;
 	}
-	_calendar = new DatePicker(this, TQDateTime::currentDateTime().date());
+	_calendar = new DatePicker(this, TQDateTime::tqcurrentDateTime().date());
 	connect( _calendar, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotCalendarDeleted() ));
 
 	// some extra spacing is included if aligned on a desktop edge
 	TQPoint c = mapToGlobal(TQPoint(0,0));
 
-	int w = _calendar->sizeHint().width() + 28;
+	int w = _calendar->tqsizeHint().width() + 28;
 															// Added 28 px. to size poperly as said in API
-	int h = _calendar->sizeHint().height();
+	int h = _calendar->tqsizeHint().height();
 
 	switch (position()) {
 	case KPanelApplet::pLeft:	c.setX(c.x()+width()+2);	break;
@@ -405,7 +405,7 @@ ClockAppletToolTip::ClockAppletToolTip( KBinaryClock *clock ) : TQToolTip( clock
 
 void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ )
 {
-	tip(m_clock->geometry(), KGlobal::locale()->formatDate(TQDateTime::currentDateTime().date(), false));
+	tip(m_clock->tqgeometry(), KGlobal::locale()->formatDate(TQDateTime::tqcurrentDateTime().date(), false));
 }
 
 #include "kbinaryclock.moc"
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.kcfg b/kicker-applets/kbinaryclock/kbinaryclock.kcfg
index b5a5fb3..84f35c3 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.kcfg
+++ b/kicker-applets/kbinaryclock/kbinaryclock.kcfg
@@ -35,7 +35,7 @@
     </entry>
     <entry name="Background" type="Color">
       <label>Background color</label>
-      <default code="true">KApplication::palette().active().background()</default>
+      <default code="true">KApplication::tqpalette().active().background()</default>
     </entry>
     <entry name="Show_Seconds" type="Bool">
       <label>Whether to show seconds</label>
diff --git a/kicker-applets/kbinaryclock/settings.ui b/kicker-applets/kbinaryclock/settings.ui
index 59c5f6f..321f913 100644
--- a/kicker-applets/kbinaryclock/settings.ui
+++ b/kicker-applets/kbinaryclock/settings.ui
@@ -96,7 +96,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>21</width>
                             <height>20</height>
@@ -110,7 +110,7 @@
                     <property name="text">
                         <string>Dark</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -169,7 +169,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -252,7 +252,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="4" rowspan="3" colspan="1">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -287,7 +287,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -332,7 +332,7 @@
                                     <property name="name">
                                         <cstring>kLed1</cstring>
                                     </property>
-                                    <property name="minimumSize">
+                                    <property name="tqminimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>32</height>
@@ -346,7 +346,7 @@
                                     <property name="name">
                                         <cstring>kLed2</cstring>
                                     </property>
-                                    <property name="minimumSize">
+                                    <property name="tqminimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>32</height>
@@ -357,7 +357,7 @@
                                     <property name="name">
                                         <cstring>kLed4</cstring>
                                     </property>
-                                    <property name="minimumSize">
+                                    <property name="tqminimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>32</height>
@@ -368,7 +368,7 @@
                                     <property name="name">
                                         <cstring>kLed3</cstring>
                                     </property>
-                                    <property name="minimumSize">
+                                    <property name="tqminimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>32</height>
@@ -382,7 +382,7 @@
                                     <property name="name">
                                         <cstring>kLed6</cstring>
                                     </property>
-                                    <property name="minimumSize">
+                                    <property name="tqminimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>32</height>
@@ -396,7 +396,7 @@
                                     <property name="name">
                                         <cstring>kLed5</cstring>
                                     </property>
-                                    <property name="minimumSize">
+                                    <property name="tqminimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>32</height>
@@ -415,7 +415,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>21</width>
                                     <height>20</height>
@@ -434,7 +434,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>84</height>