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

1 files changed, 14 insertions, 14 deletions

diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp
index 3f39fb6..1bc9fdc 100644
--- a/atlantikdesigner/designer/designer.cpp
+++ b/atlantikdesigner/designer/designer.cpp
@@ -1,15 +1,15 @@
 #include <tqcolor.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqevent.h>
 #include <tqfile.h>
 #include <tqguardedptr.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpoint.h>
 #include <tqpopupmenu.h>
 #include <tqptrlist.h>
 #include <tqstring.h>
-#include <tqtextcodec.h>
-#include <tqtextstream.h>
+#include <textcodec.h>
+#include <textstream.h>
 #include <tqtimer.h>
 #include <tqwidget.h>
 
@@ -46,7 +46,7 @@ AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name)
 	copiedEstate = 0;
 	editor = 0;
 	board = 0;
-	tqlayout = 0;
+	layout = 0;
 
 	(void) KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
 	(void) KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection());
@@ -76,10 +76,10 @@ AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name)
 
 	KConfig *config = kapp->config();
 	config->setGroup("General");
-	TQColor defaultColor = tqcolorGroup().background();
+	TQColor defaultColor = colorGroup().background();
 	defaultBg = config->readColorEntry("alternateBackground", &defaultColor);
 	config->setGroup("WM");
-	defaultColor = tqcolorGroup().dark();
+	defaultColor = colorGroup().dark();
 	defaultFg = config->readColorEntry("activeBackground", &defaultColor);
 
 	// these must match up to the ones in editor.cpp!
@@ -130,17 +130,17 @@ void AtlanticDesigner::initBoard()
 
 	delete editor;
 	delete board;
-	delete tqlayout;
+	delete layout;
 
 	board = new AtlantikBoard(0, max, AtlantikBoard::Edit, this, "Board");
 
 	setCentralWidget(board);
-	tqlayout = new TQVBoxLayout(board->centerWidget());
+	layout = new TQVBoxLayout(board->centerWidget());
 	editor = new EstateEdit(&groups, &estates, &cards, board->centerWidget(), "Estate Editor");
 	connect(editor, TQT_SIGNAL(goChecked(int)), TQT_TQOBJECT(this), TQT_SLOT(goChanged(int)));
 	connect(editor, TQT_SIGNAL(updateBackground()), TQT_TQOBJECT(this), TQT_SLOT(updateBackground()));
 	connect(editor, TQT_SIGNAL(resized()), board, TQT_SLOT(slotResizeAftermath()));
-	tqlayout->addWidget(editor);
+	layout->addWidget(editor);
 
 	editor->setReady(false);
 
@@ -526,7 +526,7 @@ void AtlanticDesigner::openFile(const TQString &filename)
 
 	if (i < 8)
 	{
-		KMessageBox::detailedSorry(this, i18n("This board file is invalid; cannot open."), i18n("There are only %1 estates specified in this file.").tqarg(i));
+		KMessageBox::detailedSorry(this, i18n("This board file is invalid; cannot open."), i18n("There are only %1 estates specified in this file.").arg(i));
 		if (this->filename.isNull())
 			close();
 		return;
@@ -553,7 +553,7 @@ void AtlanticDesigner::updateJumpMenu()
 {
 	TQStringList estates;
 	for (int i = 1; i <= max; i++)
-		estates.append(i18n("Jump to Estate %1").tqarg(TQString::number(i)));
+		estates.append(i18n("Jump to Estate %1").arg(TQString::number(i)));
 	estateAct->setItems(estates);
 }
 
@@ -679,7 +679,7 @@ void AtlanticDesigner::save()
 
 		writtenGroups.append((*it).name());
 
-		t << endl << TQString("[%1]").tqarg((*it).name()) << endl;
+		t << endl << TQString("[%1]").arg((*it).name()) << endl;
 
 		if ((*it).globalPrice() > 0)
 			t << "price=" << (*it).globalPrice() << endl;
@@ -748,7 +748,7 @@ void AtlanticDesigner::save()
 
 	for (estate = estates.first(); estate; estate = estates.next())
 	{
-		t << endl << TQString("[%1]").tqarg(estate->name()) << endl;
+		t << endl << TQString("[%1]").arg(estate->name()) << endl;
 
 		switch (estate->type())
 		{