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

This reverts commit 2b0e1de2ffcca7bb93f1fd8ddd32f74041d0d076.

1 files changed, 27 insertions, 27 deletions

diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp
index e3f5b592..8f18cd6a 100644
--- a/kommander/editor/mainwindowactions.cpp
+++ b/kommander/editor/mainwindowactions.cpp
@@ -24,7 +24,7 @@
 #endif // QT_NO_SQL
 
 #include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqfileinfo.h>
 #include <tqlineedit.h>
 #include <tqlistbox.h>
@@ -170,7 +170,7 @@ void MainWindow::setupEditActions()
 
   KToolBar *tb = new KToolBar(this, "Edit");
   tb->setFullSize(false);
-  TQWhatsThis::add(tb, i18n("<b>The Edit toolbar</b>%1").arg(toolbarHelp));
+  TQWhatsThis::add(tb, i18n("<b>The Edit toolbar</b>%1").tqarg(toolbarHelp));
   addToolBar(tb, i18n("Edit"));
   actionEditUndo->plug(tb);
   actionEditRedo->plug(tb);
@@ -207,13 +207,13 @@ void MainWindow::setupLayoutActions()
   actionEditAdjustSize->setWhatsThis(whatsThisFrom("Layout|Adjust Size"));
   actionEditAdjustSize->setEnabled(false);
 
-  actionEditHLayout = new KAction(i18n("Lay OutQt::Horizontally"), createIconSet("edithlayout.xpm"),
+  actionEditHLayout = new KAction(i18n("Lay OutQt::Horizontally"), createIconSet("edithtqlayout.xpm"),
                                   CTRL + Key_H, TQT_TQOBJECT(this), TQT_SLOT(editLayoutHorizontal()), actionCollection(), "edit_layout_h");
   actionEditHLayout->setToolTip(i18n("Lays out the selected widgets horizontally"));
   actionEditHLayout->setWhatsThis(whatsThisFrom("Layout|Lay OutQt::Horizontally"));
   actionEditHLayout->setEnabled(false);
 
-  actionEditVLayout = new KAction(i18n("Lay OutQt::Vertically"), createIconSet("editvlayout.xpm"),
+  actionEditVLayout = new KAction(i18n("Lay OutQt::Vertically"), createIconSet("editvtqlayout.xpm"),
                                   CTRL + Key_L, TQT_TQOBJECT(this), TQT_SLOT(editLayoutVertical()), actionCollection(), "edit_layout_v");
   actionEditVLayout->setToolTip(i18n("Lays out the selected widgets vertically"));
   actionEditVLayout->setWhatsThis(whatsThisFrom("Layout|Lay OutQt::Vertically"));
@@ -241,7 +241,7 @@ void MainWindow::setupLayoutActions()
 
   actionEditBreakLayout = new KAction(i18n("Break Layout"), createIconSet("editbreaklayout.xpm"),
                                       CTRL + Key_B, TQT_TQOBJECT(this), TQT_SLOT(editBreakLayout()), actionCollection(), "edit_break_layout");
-  actionEditBreakLayout->setToolTip(i18n("Breaks the selected layout"));
+  actionEditBreakLayout->setToolTip(i18n("Breaks the selected tqlayout"));
   actionEditBreakLayout->setWhatsThis(whatsThisFrom("Layout|Break Layout"));
 
   int id = WidgetDatabase::idFromClassName("Spacer");
@@ -249,13 +249,13 @@ void MainWindow::setupLayoutActions()
                                        actionCollection(), TQString::number(id).latin1());
   a->setExclusiveGroup("tool");
   a->setText(i18n("Add ") + WidgetDatabase::className(id));
-  a->setToolTip(i18n("Insert a %1").arg(WidgetDatabase::toolTip(id)));
+  a->setToolTip(i18n("Insert a %1").tqarg(WidgetDatabase::toolTip(id)));
   a->setWhatsThis(i18n("<b>A %1</b><p>%2</p>"
       "<p>Click to insert a single %3,"
-      "or double click to keep the tool selected.").arg(WidgetDatabase::toolTip(id)).
-      arg(WidgetDatabase::whatsThis(id)).arg(WidgetDatabase::toolTip(id)));
+      "or double click to keep the tool selected.").tqarg(WidgetDatabase::toolTip(id)).
+      tqarg(WidgetDatabase::whatsThis(id)).tqarg(WidgetDatabase::toolTip(id)));
 
-  TQWhatsThis::add(layoutToolBar, i18n("<b>The Layout toolbar</b>%1").arg(toolbarHelp));
+  TQWhatsThis::add(layoutToolBar, i18n("<b>The Layout toolbar</b>%1").tqarg(toolbarHelp));
   actionEditAdjustSize->plug(layoutToolBar);
   layoutToolBar->addSeparator();
   actionEditHLayout->plug(layoutToolBar);
@@ -306,7 +306,7 @@ void MainWindow::setupToolActions()
 
   KToolBar *tb = new KToolBar(this, "Tools");
   tb->setFullSize(false);
-  TQWhatsThis::add(tb, i18n("<b>The Tools toolbar</b>%1").arg(toolbarHelp));
+  TQWhatsThis::add(tb, i18n("<b>The Tools toolbar</b>%1").tqarg(toolbarHelp));
 
   addToolBar(tb, i18n("Tools"), TQMainWindow::DockTop, true);
   actionPointerTool->plug(tb);
@@ -330,14 +330,14 @@ void MainWindow::setupToolActions()
     bool plural = grp[(int) grp.length() - 1] == 's';
     if (plural)
     {
-      TQWhatsThis::add(tb, i18n("<b>The %1</b>%2").arg(grp).arg(toolbarHelp).
-          arg(i18n(" Click on a button to insert a single widget, "
-              "or double click to insert multiple %1.")).arg(grp));
+      TQWhatsThis::add(tb, i18n("<b>The %1</b>%2").tqarg(grp).tqarg(toolbarHelp).
+          tqarg(i18n(" Click on a button to insert a single widget, "
+              "or double click to insert multiple %1.")).tqarg(grp));
     } else
     {
-      TQWhatsThis::add(tb, i18n("<b>The %1 Widgets</b>%2").arg(grp).arg(toolbarHelp).
-          arg(i18n(" Click on a button to insert a single %1 widget, "
-              "or double click to insert multiple widgets.")).arg(grp));
+      TQWhatsThis::add(tb, i18n("<b>The %1 Widgets</b>%2").tqarg(grp).tqarg(toolbarHelp).
+          tqarg(i18n(" Click on a button to insert a single %1 widget, "
+              "or double click to insert multiple widgets.")).tqarg(grp));
     }
     addToolBar(tb, grp);
     TQPopupMenu *menu = new TQPopupMenu(this, grp.latin1());
@@ -363,11 +363,11 @@ void MainWindow::setupToolActions()
       a->setToolTip(ttip);
       if (!WidgetDatabase::isWhatsThisLoaded())
         WidgetDatabase::loadWhatsThis(documentationPath());
-      a->setToolTip(i18n("Insert a %1").arg(WidgetDatabase::className(i)));
+      a->setToolTip(i18n("Insert a %1").tqarg(WidgetDatabase::className(i)));
 
-      TQString whats = i18n("<b>A %1</b>").arg(WidgetDatabase::className(i));
+      TQString whats = i18n("<b>A %1</b>").tqarg(WidgetDatabase::className(i));
       if (!WidgetDatabase::whatsThis(i).isEmpty())
-        whats += TQString("<p>%1</p>").arg(WidgetDatabase::whatsThis(i));
+        whats += TQString("<p>%1</p>").tqarg(WidgetDatabase::whatsThis(i));
       a->setWhatsThis(whats + i18n("<p>Double click on this tool to keep it selected.</p>"));
 
       if (grp != "KDE")
@@ -409,7 +409,7 @@ void MainWindow::setupFileActions()
   fileTb = new KToolBar(this, "File");
   fileTb->setFullSize(false);
 
-  TQWhatsThis::add(fileTb, i18n("<b>The File toolbar</b>%1").arg(toolbarHelp));
+  TQWhatsThis::add(fileTb, i18n("<b>The File toolbar</b>%1").tqarg(toolbarHelp));
   addToolBar(fileTb, i18n("File"));
   fileMenu = new TQPopupMenu(this, "File");
   menuBar()->insertItem(i18n("&File"), fileMenu);
@@ -560,7 +560,7 @@ void MainWindow::setupWindowActions()
     j++;
     TQString itemText;
     if (j < 10)
-      itemText = TQString("&%1 ").arg(j);
+      itemText = TQString("&%1 ").tqarg(j);
     if (w->inherits("FormWindow"))
       itemText += w->name();
     else
@@ -671,7 +671,7 @@ FormWindow *MainWindow::openFormWindow(const TQString &filename, bool validFileN
   }
   if (!makeNew)
   {
-    statusBar()->message(i18n("Reading file '%1'...").arg(filename));
+    statusBar()->message(i18n("Reading file '%1'...").tqarg(filename));
     if (TQFile::exists(filename))
     {
       TQApplication::setOverrideCursor(WaitCursor);
@@ -684,14 +684,14 @@ FormWindow *MainWindow::openFormWindow(const TQString &filename, bool validFileN
       TQApplication::restoreOverrideCursor();
       if (b)
       {
-        statusBar()->message(i18n("Loaded file '%1'").arg(filename), 3000);
+        statusBar()->message(i18n("Loaded file '%1'").tqarg(filename), 3000);
       } else
       {
  	emit removedFormFile(ff);
 	ff->close();
         delete ff;
-        statusBar()->message(i18n("Could not load file '%1'").arg(filename), 5000);
-        KMessageBox::information(this, i18n("Could not load file '%1'").arg(filename), i18n("Load File"));
+        statusBar()->message(i18n("Could not load file '%1'").tqarg(filename), 5000);
+        KMessageBox::information(this, i18n("Could not load file '%1'").tqarg(filename), i18n("Load File"));
       }
       return (FormWindow *) resource.widget();
     } else
@@ -845,7 +845,7 @@ void MainWindow::createNewTemplate()
   ts << "    <cstring>" << cn << "Form</cstring>" << endl;
   ts << "</property>" << endl;
   ts << "<property stdset=\"1\">" << endl;
-  ts << "    <name>geometry</name>" << endl;
+  ts << "    <name>tqgeometry</name>" << endl;
   ts << "    <rect>" << endl;
   ts << "        <width>300</width>" << endl;
   ts << "        <height>400</height>" << endl;
@@ -907,7 +907,7 @@ void MainWindow::editPaste()
   } else
   {
     KMessageBox::information(this, i18n("Cannot paste widgets. Designer could not find a container\n"
-            "to paste into which does not contain a layout. Break the layout\n"
+            "to paste into which does not contain a tqlayout. Break the tqlayout\n"
             "of the container you want to paste into and select this container\n"
                 "and then paste again."), i18n("Paste Error"));
   }