From ff5b07d9659291ac8172cd35f0821bcd30ce25c9 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 21 Dec 2011 14:17:23 -0600
Subject: Rename obsolete tq methods to standard names

---
 kicker-applets/kbinaryclock/kbinaryclock.cpp  |  4 ++--
 kicker-applets/kbinaryclock/kbinaryclock.kcfg |  2 +-
 kicker-applets/kbinaryclock/settings.ui       |  2 +-
 kicker-applets/kolourpicker/kolourpicker.cpp  | 10 +++++-----
 kicker-applets/kolourpicker/simplebutton.cpp  |  2 +-
 kicker-applets/ktimemon/confdlg.cc            |  2 +-
 kicker-applets/mediacontrol/simplebutton.cpp  |  2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'kicker-applets')

diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp
index f46b4a0..9eafcc4 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.cpp
+++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp
@@ -180,7 +180,7 @@ void KBinaryClock::loadSettings(){
 	int darkFactor = prefs->darkFactor();
 	TQColor backgroundColor = prefs->background();
 	bool modifyBackground = false;
-	if(backgroundColor != KApplication::tqpalette().active().background()){
+	if(backgroundColor != KApplication::palette().active().background()){
 		setPaletteBackgroundColor(backgroundColor);
 		modifyBackground = true;
 	}
@@ -348,7 +348,7 @@ void KBinaryClock::openContextMenu() {
 void KBinaryClock::slotCopyMenuActivated( int id ) {
 	TQPopupMenu *m = (TQPopupMenu *) sender();
 	TQString s = m->text(id);
-	TQApplication::tqclipboard()->setText(s);
+	TQApplication::clipboard()->setText(s);
 }
 
 void KBinaryClock::toggleCalendar()
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.kcfg b/kicker-applets/kbinaryclock/kbinaryclock.kcfg
index 84f35c3..b5a5fb3 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::tqpalette().active().background()</default>
+      <default code="true">KApplication::palette().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 7f21dec..59c5f6f 100644
--- a/kicker-applets/kbinaryclock/settings.ui
+++ b/kicker-applets/kbinaryclock/settings.ui
@@ -252,7 +252,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="4" rowspan="3" colspan="1">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp
index 9acfc26..b727446 100644
--- a/kicker-applets/kolourpicker/kolourpicker.cpp
+++ b/kicker-applets/kolourpicker/kolourpicker.cpp
@@ -208,7 +208,7 @@ void KolourPicker::mouseReleaseEvent(TQMouseEvent *e)
 // set both clipboard and selection
 void KolourPicker::setClipboard(const TQString& text)
 {
-	TQClipboard *clip = TQApplication::tqclipboard();
+	TQClipboard *clip = TQApplication::clipboard();
 	bool oldMode = clip->selectionModeEnabled();
 	clip->setSelectionMode(true);
 	clip->setText(text);
@@ -247,14 +247,14 @@ void KolourPicker::arrangeButtons()
 		h = height();
 		if (h > 40)
 		{
-			// vertical tqlayout
+			// vertical layout
 			p = (h - 40)/3;
 			m_colourButton->setGeometry(2, p, 20, 20);
 			m_historyButton->setGeometry(2, 2*p+20, 20, 20);
 		}
 		else
 		{
-			// horizontal tqlayout
+			// horizontal layout
 			p = (h - 20)/2;
 			m_colourButton->setGeometry(2, p, 20, 20);
 			m_historyButton->setGeometry(24, p, 20, 20);
@@ -265,14 +265,14 @@ void KolourPicker::arrangeButtons()
 		w = width();
 		if (w > 40)
 		{
-			// horizontal tqlayout
+			// horizontal layout
 			p = (w - 40)/3;
 			m_colourButton->setGeometry(p, 2, 20, 20);
 			m_historyButton->setGeometry(2*p+20, 2, 20, 20);
 		}
 		else
 		{
-			// vertical tqlayout
+			// vertical layout
 			p = (w - 20)/2;
 			m_colourButton->setGeometry(p, 2, 20, 20);
 			m_historyButton->setGeometry(p, 24, 20, 20);
diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp
index 4760982..0bc34b5 100644
--- a/kicker-applets/kolourpicker/simplebutton.cpp
+++ b/kicker-applets/kolourpicker/simplebutton.cpp
@@ -234,7 +234,7 @@ void SimpleArrowButton::drawButton( TQPainter *p )
     
     int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
     if (isDown() || isOn())	flags |= TQStyle::Style_Down;
-    tqstyle().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
+    style().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
 }
 
 void SimpleArrowButton::enterEvent( TQEvent *e )
diff --git a/kicker-applets/ktimemon/confdlg.cc b/kicker-applets/ktimemon/confdlg.cc
index c694f5c..df3fffe 100644
--- a/kicker-applets/ktimemon/confdlg.cc
+++ b/kicker-applets/ktimemon/confdlg.cc
@@ -170,7 +170,7 @@ KConfDialog::KConfDialog(KTimeMon *t)
   bl->addWidget(b);
   bl->addStretch();
 
-  TQVBoxLayout *vbox = new TQVBoxLayout( b->tqlayout() );
+  TQVBoxLayout *vbox = new TQVBoxLayout( b->layout() );
 
   gl = new TQGridLayout(b, MAX_MOUSE_ACTIONS + 1, 3, 0, 6 );
 
diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp
index 4760982..0bc34b5 100644
--- a/kicker-applets/mediacontrol/simplebutton.cpp
+++ b/kicker-applets/mediacontrol/simplebutton.cpp
@@ -234,7 +234,7 @@ void SimpleArrowButton::drawButton( TQPainter *p )
     
     int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
     if (isDown() || isOn())	flags |= TQStyle::Style_Down;
-    tqstyle().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
+    style().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
 }
 
 void SimpleArrowButton::enterEvent( TQEvent *e )
-- 
cgit v1.2.1