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

This reverts commit 882bcd26b3d60be72ea2b35921969a9850c52db9.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 036c436..dabecb1 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <tqtabwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqcursor.h>
 #include <tqwhatsthis.h>
@@ -111,7 +111,7 @@ MainWindow::MainWindow(TQWidget *parent, const char *name)
 	statusBar()->show();
 	statusBar()->setSizeGripEnabled(true);
 
-	setAutoSaveSettings(/*groupName=*/TQString::fromLatin1("MainWindow"), /*saveWindowSize=*//*FIXME:false:Why was it false??*/true);
+	setAutoSaveSettings(/*groupName=*/TQString::tqfromLatin1("MainWindow"), /*saveWindowSize=*//*FIXME:false:Why was it false??*/true);
 
 //	m_actShowToolbar->setChecked(   toolBar()->isShown()   );
 	m_actShowStatusbar->setChecked( statusBar()->isShown() );
@@ -193,7 +193,7 @@ void MainWindow::slotNewToolbarConfig() // This is called when OK or Apply is cl
 	createGUI("basketui.rc"); // TODO: Reconnect tags menu aboutToShow() ??
 	if (!Global::bnpView->isPart())
 		Global::bnpView->connectTagsMenu(); // The Tags menu was created again!
-	plugActionList( TQString::fromLatin1("go_baskets_list"), actBasketsList);
+	plugActionList( TQString::tqfromLatin1("go_baskets_list"), actBasketsList);
 	applyMainWindowSettings( KGlobal::config(), autoSaveGroup() );
 }
 
@@ -221,13 +221,13 @@ void MainWindow::polish()
 	bool shouldSave = false;
 
 	// If position and size has never been set, set nice ones:
-	//  - Set size to sizeHint()
+	//  - Set size to tqsizeHint()
 	//  - Keep the window manager placing the window where it want and save this
 	if (Settings::mainWindowSize().isEmpty()) {
 //		std::cout << "Main Window Position: Initial Set in show()" << std::endl;
 		int defaultWidth  = kapp->desktop()->width()  * 5 / 6;
 		int defaultHeight = kapp->desktop()->height() * 5 / 6;
-		resize(defaultWidth, defaultHeight); // sizeHint() is bad (too small) and we want the user to have a good default area size
+		resize(defaultWidth, defaultHeight); // tqsizeHint() is bad (too small) and we want the user to have a good default area size
 		shouldSave = true;
 	} else {
 //		std::cout << "Main Window Position: Recall in show(x="
@@ -307,7 +307,7 @@ bool MainWindow::queryClose()
 
 bool MainWindow::askForQuit()
 {
-	TQString message = i18n("<p>Do you really want to quit %1?</p>").arg(kapp->aboutData()->programName());
+	TQString message = i18n("<p>Do you really want to quit %1?</p>").tqarg(kapp->aboutData()->programName());
 	if (Settings::useSystray())
 		message += i18n("<p>Notice that you do not have to quit the application before ending your KDE session. "
 				"If you end your session while the application is still running, the application will be reloaded the next time you log in.</p>");