Rename obsolete tq methods to standard names

4 files changed, 23 insertions, 23 deletions

diff --git a/src/sources/labelsourcePrefs.cpp b/src/sources/labelsourcePrefs.cpp
index 3f32e77..8510961 100644
--- a/src/sources/labelsourcePrefs.cpp
+++ b/src/sources/labelsourcePrefs.cpp
@@ -44,36 +44,36 @@ LabelSourcePrefs::LabelSourcePrefs( TQWidget* parent, const char* name, WFlags f
     taskbartitleLabel->setFont( taskbartitleLabel_font ); 
     defaultSourcePrefsFrameLayout->addWidget( taskbartitleLabel );
 
-    tqlayout13 = new TQHBoxLayout( 0, 0, 6, "tqlayout13"); 
+    layout13 = new TQHBoxLayout( 0, 0, 6, "layout13"); 
 
     colorLabel = new TQLabel( defaultSourcePrefsFrame, "colorLabel" );
-    tqlayout13->addWidget( colorLabel );
+    layout13->addWidget( colorLabel );
 
     colorButton = new KColorButton( defaultSourcePrefsFrame, "colorButton" );
-    tqlayout13->addWidget( colorButton );
+    layout13->addWidget( colorButton );
     spacer1 = new TQSpacerItem( 350, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-    tqlayout13->addItem( spacer1 );
-    defaultSourcePrefsFrameLayout->addLayout( tqlayout13 );
+    layout13->addItem( spacer1 );
+    defaultSourcePrefsFrameLayout->addLayout( layout13 );
 
-    tqlayout17 = new TQHBoxLayout( 0, 0, 6, "tqlayout17"); 
+    layout17 = new TQHBoxLayout( 0, 0, 6, "layout17"); 
 
     fontLabel = new TQLabel( defaultSourcePrefsFrame, "fontLabel" );
-    tqlayout17->addWidget( fontLabel );
+    layout17->addWidget( fontLabel );
 
     fontRequester = new KFontRequester( defaultSourcePrefsFrame, "fontRequester" );
-    tqlayout17->addWidget( fontRequester );
-    defaultSourcePrefsFrameLayout->addLayout( tqlayout17 );
+    layout17->addWidget( fontRequester );
+    defaultSourcePrefsFrameLayout->addLayout( layout17 );
 
-    tqlayout18 = new TQHBoxLayout( 0, 0, 6, "tqlayout18"); 
+    layout18 = new TQHBoxLayout( 0, 0, 6, "layout18"); 
 
     alignmentLabel = new TQLabel( defaultSourcePrefsFrame, "alignmentLabel" );
-    tqlayout18->addWidget( alignmentLabel );
+    layout18->addWidget( alignmentLabel );
 
     alignmentComboBox = new TQComboBox( FALSE, defaultSourcePrefsFrame, "alignmentComboBox" );
-    tqlayout18->addWidget( alignmentComboBox );
+    layout18->addWidget( alignmentComboBox );
     spacer2 = new TQSpacerItem( 350, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-    tqlayout18->addItem( spacer2 );
-    defaultSourcePrefsFrameLayout->addLayout( tqlayout18 );
+    layout18->addItem( spacer2 );
+    defaultSourcePrefsFrameLayout->addLayout( layout18 );
     LabelSourcePrefsLayout->addWidget( defaultSourcePrefsFrame );
     languageChange();
     resize( TQSize(299, 135).expandedTo(minimumSizeHint()) );
diff --git a/src/sources/labelsourcePrefs.ui b/src/sources/labelsourcePrefs.ui
index 4fe2cc1..2458413 100644
--- a/src/sources/labelsourcePrefs.ui
+++ b/src/sources/labelsourcePrefs.ui
@@ -55,7 +55,7 @@ Taskbar visual settings</string>
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout13</cstring>
+                        <cstring>layout13</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -98,7 +98,7 @@ Taskbar visual settings</string>
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout17</cstring>
+                        <cstring>layout17</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -121,7 +121,7 @@ Taskbar visual settings</string>
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout18</cstring>
+                        <cstring>layout18</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/src/sources/source.cpp b/src/sources/source.cpp
index 20885b0..18d801c 100644
--- a/src/sources/source.cpp
+++ b/src/sources/source.cpp
@@ -107,7 +107,7 @@ TQWidget* Source::createPrefs(TQWidget* inParent){
 		createSubPrefs(mSourcePrefs);
 			
 		// add bottom vspacer
-		mSourcePrefs->tqlayout()->addItem(new TQSpacerItem(0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding) );
+		mSourcePrefs->layout()->addItem(new TQSpacerItem(0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding) );
 
 		updatePrefsGUI(); // fill the prefs gui
 	}
@@ -140,7 +140,7 @@ void Source::setPrefsWidgetsEnabled(bool isEnabled, bool isShownOnApplet){
 
 void Source::addPrefs(TQWidget* inParent){
 	if(inParent != NULL)
-		mSourcePrefs->tqlayout()->add(inParent);
+		mSourcePrefs->layout()->add(inParent);
 }
 
 void Source::applyPrefs(){
diff --git a/src/sources/source.h b/src/sources/source.h
index 6ae53c5..40e1033 100644
--- a/src/sources/source.h
+++ b/src/sources/source.h
@@ -48,12 +48,12 @@ public:
 	const TQString& getID() const;
 
 	/**
-	 * Returns the position of this source in the tqlayout
+	 * Returns the position of this source in the layout
 	 */
 	int getPosition() const;
 
 	/**
-	 * Sets the position of this source in the tqlayout
+	 * Sets the position of this source in the layout
 	 */
 	void setPosition(int inPosition, KConfig* inKConfig);
 
@@ -147,7 +147,7 @@ signals:
 	 */
 	void enabledChanged(bool inEnabled, Source* inSource); // needed by kima.cpp to add sources to its tqlayout
 	/**
-	 * This signal is emitted whenever this Source should be added or removed from the display (tqlayout) of the kicker applet
+	 * This signal is emitted whenever this Source should be added or removed from the display (layout) of the kicker applet
 	 */
 	void displaySource(bool inDisplay, Source* inSource);
 
@@ -179,7 +179,7 @@ protected:
 	 */
 	TQString mID;
 	/**
-	 * The Position of the source in the tqlayout
+	 * The Position of the source in the layout
 	 */
 	int mPosition;
 	/**