Rename obsolete tq methods to standard names

7 files changed, 16 insertions, 16 deletions

diff --git a/src/app/configdialog.cpp b/src/app/configdialog.cpp
index a429095..3dbdb53 100644
--- a/src/app/configdialog.cpp
+++ b/src/app/configdialog.cpp
@@ -93,9 +93,9 @@ template<class T>
 void addConfigPage(KDialogBase* dialog, T* content, const TQString& header, const TQString& name, const char* iconName) {
 	TQFrame* page=dialog->addPage(name, header, BarIcon(iconName, 32));
 	content->reparent(page, TQPoint(0,0));
-	TQVBoxLayout* tqlayout=new TQVBoxLayout(page, 0, KDialog::spacingHint());
-	tqlayout->addWidget(content);
-	tqlayout->addStretch();
+	TQVBoxLayout* layout=new TQVBoxLayout(page, 0, KDialog::spacingHint());
+	layout->addWidget(content);
+	layout->addStretch();
 }
 
 template<class T>
diff --git a/src/app/configimagelistpage.ui b/src/app/configimagelistpage.ui
index e2fb15b..01cfe95 100644
--- a/src/app/configimagelistpage.ui
+++ b/src/app/configimagelistpage.ui
@@ -150,7 +150,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -258,7 +258,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/src/app/configimageviewpage.ui b/src/app/configimageviewpage.ui
index 2f816c0..963f13d 100644
--- a/src/app/configimageviewpage.ui
+++ b/src/app/configimageviewpage.ui
@@ -73,7 +73,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="6">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/src/app/configmiscpage.ui b/src/app/configmiscpage.ui
index 9df8e96..7e5874e 100644
--- a/src/app/configmiscpage.ui
+++ b/src/app/configmiscpage.ui
@@ -137,7 +137,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/src/app/main.cpp b/src/app/main.cpp
index bef08ae..989bffd 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -117,7 +117,7 @@ KDE_EXPORT int kdemain (int argc, char *argv[]) {
 	aboutData.addCredit("Marco Gazzetta", I18N_NOOP("Fixed crash when trying to generate a thumbnail for a broken JPEG file (v0.16.0)"), "mililani@pobox.com");
 	aboutData.addCredit("GeniusR13", I18N_NOOP("Fixed compilation on KDE 3.0 (v0.16.1)"), "geniusr13@gmx.net");
 	aboutData.addCredit("Ian Koenig", I18N_NOOP("First RPM spec file"), "iguy@ionsphere.org");
-	aboutData.addCredit("Meni Livne", I18N_NOOP("Toolbar tqlayout patch for RTL languages (v0.16.0)"), "livne@kde.org");
+	aboutData.addCredit("Meni Livne", I18N_NOOP("Toolbar layout patch for RTL languages (v0.16.0)"), "livne@kde.org");
 	aboutData.addCredit("Angelo Naselli", I18N_NOOP("Printing support (v1.0.0)"), "anaselli@linux.it");
 	aboutData.addCredit("Jos van den Oever", I18N_NOOP("File info view (v1.0.0)\nPatch to toggle auto-zoom on click (v1.0.0)"), "jos@vandenoever.info");
 	aboutData.addCredit("Jeroen Peters", I18N_NOOP("Configurable mouse wheel behavior (v1.1.1)"), "jpeters@coldmail.nl");
diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index 2f2275b..70b42d7 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -199,8 +199,8 @@ bool MainWindow::queryClose() {
 
 	KConfig* config=KGlobal::config();
 
-	// Don't store dock tqlayout if only the image dock is visible. This avoid
-	// saving tqlayout when in "fullscreen" or "image only" mode.
+	// Don't store dock layout if only the image dock is visible. This avoid
+	// saving layout when in "fullscreen" or "image only" mode.
 	if (mFileViewController->isVisible() || mDirViewController->widget()->isVisible()) {
 		mDockArea->writeDockConfig(config,CONFIG_DOCK_GROUP);
 	}
@@ -867,8 +867,8 @@ void MainWindow::createWidgets() {
 	mDockArea->manager()->setSplitterOpaqueResize(true);
 	
 	mViewModeWidget=new TQWidget(mCentralStack);
-	TQVBoxLayout* tqlayout=new TQVBoxLayout(mViewModeWidget);
-	tqlayout->setAutoAdd(true);
+	TQVBoxLayout* layout=new TQVBoxLayout(mViewModeWidget);
+	layout->setAutoAdd(true);
 	mCentralStack->addWidget(mViewModeWidget);
 
 	// Status bar
@@ -923,7 +923,7 @@ void MainWindow::createWidgets() {
 	setGeometry(20,20,720,520);
 
 	// Default dock config
-	// (The "magic numbers" were found by adjusting the tqlayout from within the
+	// (The "magic numbers" were found by adjusting the layout from within the
 	// app and looking at the result in the configuration file)
 	mFolderDock->manualDock(mFileDock, KDockWidget::DockLeft, 4000);
 	mImageDock->manualDock(mFolderDock, KDockWidget::DockBottom, 3734);
diff --git a/src/app/vtabwidget.cpp b/src/app/vtabwidget.cpp
index 66e9b9e..40a1a0a 100644
--- a/src/app/vtabwidget.cpp
+++ b/src/app/vtabwidget.cpp
@@ -47,9 +47,9 @@ VTabWidget::VTabWidget(TQWidget* parent)
 	d->mTabBar->setPosition(KMultiTabBar::Left);
 	d->mTabBar->setStyle(KMultiTabBar::KDEV3ICON);
 	d->mStack=new TQWidgetStack(this);
-	TQHBoxLayout* tqlayout=new TQHBoxLayout(this);
-	tqlayout->add(d->mTabBar);
-	tqlayout->add(d->mStack);
+	TQHBoxLayout* layout=new TQHBoxLayout(this);
+	layout->add(d->mTabBar);
+	layout->add(d->mStack);
 }