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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

1 files changed, 22 insertions, 22 deletions

diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp
index 022b47a0..37fab0e6 100644
--- a/kexi/plugins/queries/kexiquerydesignersql.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersql.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqsplitter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqhbox.h>
 #include <tqvbox.h>
 #include <tqtimer.h>
@@ -73,7 +73,7 @@ class KexiQueryDesignerSQLView::Private
 		}
 		KexiQueryDesignerSQLEditor *editor;
 		KexiQueryDesignerSQLHistory *history;
-		TQLabel *pixmapStatus, *lblStatus;
+		TQLabel *pixmaptqStatus, *lbltqStatus;
 		TQHBox *status_hbox;
 		TQVBox *history_section;
 		KexiSectionHeader *head, *historyHead;
@@ -120,18 +120,18 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi
 	d->status_hbox->installEventFilter(this);
 	d->splitter->setResizeMode(d->history_section, TQSplitter::KeepSize);
 	d->status_hbox->setSpacing(0);
-	d->pixmapStatus = new TQLabel(d->status_hbox);
-	d->pixmapStatus->setFixedWidth(d->statusPixmapOk.width()*3/2);
-	d->pixmapStatus->setAlignment(AlignHCenter | AlignTop);
-	d->pixmapStatus->setMargin(d->statusPixmapOk.width()/4);
-	d->pixmapStatus->setPaletteBackgroundColor( palette().active().color(TQColorGroup::Base) );
-
-	d->lblStatus = new TQLabel(d->status_hbox);
-	d->lblStatus->setAlignment(AlignLeft | AlignTop | WordBreak);
-	d->lblStatus->setMargin(d->statusPixmapOk.width()/4);
-	d->lblStatus->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding );
-	d->lblStatus->resize(d->lblStatus->width(),d->statusPixmapOk.width()*3);
-	d->lblStatus->setPaletteBackgroundColor( palette().active().color(TQColorGroup::Base) );
+	d->pixmaptqStatus = new TQLabel(d->status_hbox);
+	d->pixmaptqStatus->setFixedWidth(d->statusPixmapOk.width()*3/2);
+	d->pixmaptqStatus->tqsetAlignment(AlignHCenter | AlignTop);
+	d->pixmaptqStatus->setMargin(d->statusPixmapOk.width()/4);
+	d->pixmaptqStatus->setPaletteBackgroundColor( tqpalette().active().color(TQColorGroup::Base) );
+
+	d->lbltqStatus = new TQLabel(d->status_hbox);
+	d->lbltqStatus->tqsetAlignment(AlignLeft | AlignTop | WordBreak);
+	d->lbltqStatus->setMargin(d->statusPixmapOk.width()/4);
+	d->lbltqStatus->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding );
+	d->lbltqStatus->resize(d->lbltqStatus->width(),d->statusPixmapOk.width()*3);
+	d->lbltqStatus->setPaletteBackgroundColor( tqpalette().active().color(TQColorGroup::Base) );
 
 	TQHBoxLayout *b = new TQHBoxLayout(this);
 	b->addWidget(d->splitter);
@@ -171,36 +171,36 @@ KexiQueryDesignerSQLEditor *KexiQueryDesignerSQLView::editor() const
 
 void KexiQueryDesignerSQLView::setStatusOk()
 {
-	d->pixmapStatus->setPixmap(d->statusPixmapOk);
+	d->pixmaptqStatus->setPixmap(d->statusPixmapOk);
 	setStatusText("<h2>"+i18n("The query is correct")+"</h2>");
 	d->history->addEvent(d->editor->text().stripWhiteSpace(), true, TQString());
 }
 
 void KexiQueryDesignerSQLView::setStatusError(const TQString& msg)
 {
-	d->pixmapStatus->setPixmap(d->statusPixmapErr);
+	d->pixmaptqStatus->setPixmap(d->statusPixmapErr);
 	setStatusText("<h2>"+i18n("The query is incorrect")+"</h2><p>"+msg+"</p>");
 	d->history->addEvent(d->editor->text().stripWhiteSpace(), false, msg);
 }
 
 void KexiQueryDesignerSQLView::setStatusEmpty()
 {
-	d->pixmapStatus->setPixmap(d->statusPixmapInfo);
+	d->pixmaptqStatus->setPixmap(d->statusPixmapInfo);
 	setStatusText(i18n("Please enter your query and execute \"Check query\" function to verify it."));
 }
 
 void KexiQueryDesignerSQLView::setStatusText(const TQString& text)
 {
 	if (!d->action_toggle_history->isChecked()) {
-		TQSimpleRichText rt(text, d->lblStatus->font());
-		rt.setWidth(d->lblStatus->width());
+		TQSimpleRichText rt(text, d->lbltqStatus->font());
+		rt.setWidth(d->lbltqStatus->width());
 		TQValueList<int> sz = d->splitter->sizes();
-		const int newHeight = rt.height()+d->lblStatus->margin()*2;
+		const int newHeight = rt.height()+d->lbltqStatus->margin()*2;
 		if (sz[1]<newHeight) {
 			sz[1] = newHeight;
 			d->splitter->setSizes(sz);
 		}
-		d->lblStatus->setText(text);
+		d->lbltqStatus->setText(text);
 	}
 }
 
@@ -449,7 +449,7 @@ KexiQueryDesignerSQLView::storeNewData(const KexiDB::SchemaData& sdata, bool &ca
 {
 	Q_UNUSED( cancel );
 
-	//here: we won't store query layout: it will be recreated 'by hand' in GUI Query Editor
+	//here: we won't store query tqlayout: it will be recreated 'by hand' in GUI Query Editor
 	bool queryOK = slotCheckQuery();
 	bool ok = true;
 	KexiDB::SchemaData* query = 0;