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

1 files changed, 43 insertions, 43 deletions

diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp
index e7ba30f3..72f2469b 100644
--- a/kdevdesigner/designer/mainwindowactions.cpp
+++ b/kdevdesigner/designer/mainwindowactions.cpp
@@ -44,12 +44,12 @@
 #include <tqmessagebox.h>
 #include <tqstatusbar.h>
 #include <tqlistbox.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqcombobox.h>
 #include <tqspinbox.h>
 #include <tqinputdialog.h>
 #include <tqdatetimeedit.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 
 #include "defs.h"
 #include "project.h"
@@ -225,7 +225,7 @@ void MainWindow::setupEditActions()
 
 /*    TQToolBar *tb = new TQToolBar( this, "Edit" );
     tb->setCloseMode( TQDockWindow::Undocked );
-    TQWhatsThis::add( tb, i18n( "<b>The Edit toolbar</b>%1").tqarg(i18n(toolbarHelp).tqarg("")) );
+    TQWhatsThis::add( tb, i18n( "<b>The Edit toolbar</b>%1").arg(i18n(toolbarHelp).arg("")) );
     addToolBar( tb, i18n( "Edit" ) );
     actionEditUndo->addTo( tb );
     actionEditRedo->addTo( tb );
@@ -330,14 +330,14 @@ void MainWindow::setupLayoutActions()
     connect( actionEditAdjustSize, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editAdjustSize() ) );
     actionEditAdjustSize->setEnabled( FALSE );
 
-    actionEditHLayout = new DesignerAction( i18n( "Lay OutQt::Horizontally" ), createIconSet("designer_edithtqlayout.png"),
+    actionEditHLayout = new DesignerAction( i18n( "Lay OutQt::Horizontally" ), createIconSet("designer_edithlayout.png"),
 				     i18n( "Lay Out &Horizontally" ), CTRL + Key_H, TQT_TQOBJECT(this), 0 );
     actionEditHLayout->setStatusTip(i18n("Lays out the selected widgets horizontally") );
     actionEditHLayout->setWhatsThis( whatsThisFrom( "Layout|Lay OutQt::Horizontally" ) );
     connect( actionEditHLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutHorizontal() ) );
     actionEditHLayout->setEnabled( FALSE );
 
-    actionEditVLayout = new DesignerAction( i18n( "Lay OutQt::Vertically" ), createIconSet("designer_editvtqlayout.png"),
+    actionEditVLayout = new DesignerAction( i18n( "Lay OutQt::Vertically" ), createIconSet("designer_editvlayout.png"),
 				     i18n( "Lay Out &Vertically" ), CTRL + Key_L, TQT_TQOBJECT(this), 0 );
     actionEditVLayout->setStatusTip(i18n("Lays out the selected widgets vertically") );
     actionEditVLayout->setWhatsThis(  whatsThisFrom( "Layout|Lay OutQt::Vertically" ) );
@@ -367,7 +367,7 @@ void MainWindow::setupLayoutActions()
 
     actionEditBreakLayout = new DesignerAction( i18n( "Break Layout" ), createIconSet("designer_editbreaklayout.png"),
 					 i18n( "&Break Layout" ), CTRL + Key_B, TQT_TQOBJECT(this), 0 );
-    actionEditBreakLayout->setStatusTip(i18n("Breaks the selected tqlayout") );
+    actionEditBreakLayout->setStatusTip(i18n("Breaks the selected layout") );
     actionEditBreakLayout->setWhatsThis( whatsThisFrom( "Layout|Break Layout" ) );
     connect( actionEditBreakLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editBreakLayout() ) );
     actionEditBreakLayout->setEnabled( FALSE );
@@ -376,23 +376,23 @@ void MainWindow::setupLayoutActions()
     actionInsertSpacer = new WidgetAction( i18n( "Layout" ), actionGroupTools, TQString::number( id ).latin1() );
     actionInsertSpacer->setToggleAction( TRUE );
     actionInsertSpacer->setText( WidgetDatabase::className( id ) );
-    actionInsertSpacer->setMenuText( i18n( "Add %1").tqarg( WidgetDatabase::className( id ) ) );
+    actionInsertSpacer->setMenuText( i18n( "Add %1").arg( WidgetDatabase::className( id ) ) );
     actionInsertSpacer->setIconSet( WidgetDatabase::iconSet( id ) );
     actionInsertSpacer->setToolTip( WidgetDatabase::toolTip( id ) );
-    actionInsertSpacer->setStatusTip( i18n( "Insert a %1").tqarg(WidgetDatabase::toolTip( id )) );
+    actionInsertSpacer->setStatusTip( i18n( "Insert a %1").arg(WidgetDatabase::toolTip( id )) );
     actionInsertSpacer->setWhatsThis( i18n("<b>A %1</b><p>%2</p>"
 			     "<p>Click to insert a single %3,"
 			     "or double click to keep the tool selected.")
-	.tqarg(WidgetDatabase::toolTip( id ))
-	.tqarg(WidgetDatabase::whatsThis( id ))
-	.tqarg(WidgetDatabase::toolTip( id ) ));
+	.arg(WidgetDatabase::toolTip( id ))
+	.arg(WidgetDatabase::whatsThis( id ))
+	.arg(WidgetDatabase::toolTip( id ) ));
 
     actionInsertSpacer->addTo( commonWidgetsToolBar );
     commonWidgetsPage.append( actionInsertSpacer );
     TQWidget *w;
     commonWidgetsToolBar->setStretchableWidget( ( w = new TQWidget( commonWidgetsToolBar ) ) );
     w->setBackgroundMode( commonWidgetsToolBar->backgroundMode() );
-    TQWhatsThis::add( layoutToolBar, i18n( "<b>The Layout toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("")) );
+    TQWhatsThis::add( layoutToolBar, i18n( "<b>The Layout toolbar</b>%1" ).arg(i18n(toolbarHelp).arg("")) );
     actionEditAdjustSize->addTo( layoutToolBar );
     layoutToolBar->addSeparator();
     actionEditHLayout->addTo( layoutToolBar );
@@ -461,7 +461,7 @@ void MainWindow::setupToolActions()
     TQToolBar *tb = new TQToolBar( this, "Tools" );
     tb->setCloseMode( TQDockWindow::Undocked );
     toolsToolBar = tb;
-    TQWhatsThis::add( tb, i18n( "<b>The Tools toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("")) );
+    TQWhatsThis::add( tb, i18n( "<b>The Tools toolbar</b>%1" ).arg(i18n(toolbarHelp).arg("")) );
 
     addToolBar( tb, i18n( "Tools" ), TQMainWindow::DockTop, FALSE );
     actionPointerTool->addTo( tb );
@@ -505,13 +505,13 @@ void MainWindow::setupToolActions()
 	widgetToolBars.append( tb );
 	bool plural = grp[(int)grp.length()-1] == 's';
 	if ( plural ) {
-	    TQWhatsThis::add( tb, i18n( "<b>The %1</b>%2" ).tqarg(grp).tqarg(i18n(toolbarHelp).
-				tqarg( i18n(" Click on a button to insert a single widget, "
-				"or double click to insert multiple %1.") ).tqarg(grp)) );
+	    TQWhatsThis::add( tb, i18n( "<b>The %1</b>%2" ).arg(grp).arg(i18n(toolbarHelp).
+				arg( i18n(" Click on a button to insert a single widget, "
+				"or double click to insert multiple %1.") ).arg(grp)) );
 	} else {
-	    TQWhatsThis::add( tb, i18n( "<b>The %1 Widgets</b>%2" ).tqarg(grp).tqarg(i18n(toolbarHelp).
-				tqarg( i18n(" Click on a button to insert a single %1 widget, "
-				"or double click to insert multiple widgets.") ).tqarg(grp)) );
+	    TQWhatsThis::add( tb, i18n( "<b>The %1 Widgets</b>%2" ).arg(grp).arg(i18n(toolbarHelp).
+				arg( i18n(" Click on a button to insert a single %1 widget, "
+				"or double click to insert multiple widgets.") ).arg(grp)) );
 	}
 	addToolBar( tb, grp );
 	tb->hide();
@@ -552,11 +552,11 @@ void MainWindow::setupToolActions()
 	    a->setToolTip( ttip );
 	    if ( !WidgetDatabase::isWhatsThisLoaded() )
 		WidgetDatabase::loadWhatsThis( documentationPath() );
-	    a->setStatusTip( i18n( "Insert a %1").tqarg(WidgetDatabase::className( i )) );
+	    a->setStatusTip( i18n( "Insert a %1").arg(WidgetDatabase::className( i )) );
 
-	    TQString whats = i18n("<b>A %1</b>").tqarg( WidgetDatabase::className( i ) );
+	    TQString whats = i18n("<b>A %1</b>").arg( WidgetDatabase::className( i ) );
 	    if ( !WidgetDatabase::whatsThis( i ).isEmpty() )
-	    whats += TQString("<p>%1</p>").tqarg(WidgetDatabase::whatsThis( i ));
+	    whats += TQString("<p>%1</p>").arg(WidgetDatabase::whatsThis( i ));
 	    a->setWhatsThis( whats+ i18n("<p>Double click on this tool to keep it selected.</p>") );
 
 	    if ( grp != "KDE" )
@@ -617,7 +617,7 @@ void MainWindow::setupFileActions()
     tb->setCloseMode( TQDockWindow::Undocked );
     projectToolBar = tb;
 
-    TQWhatsThis::add( tb, i18n( "<b>The File toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("")) );
+    TQWhatsThis::add( tb, i18n( "<b>The File toolbar</b>%1" ).arg(i18n(toolbarHelp).arg("")) );
     addToolBar( tb, i18n( "File" ) );
     fileMenu = new TQPopupMenu( this, "File" );
     menubar->insertItem( i18n( "&File" ), fileMenu );
@@ -883,12 +883,12 @@ void MainWindow::setupPreviewActions()
 	else if ( *it == "MotifPlus" )
 	    info = i18n( "The preview will use the advanced Motif look and feel used by the GIMP toolkit (GTK) on Linux." );
 
-	a = new DesignerAction( i18n( "Preview Form in %1 Style" ).tqarg( *it ), TQPixmap(),
-					 i18n( "... in %1 Style" ).tqarg( *it ), 0, TQT_TQOBJECT(this), 0 );
-	a->setStatusTip( i18n("Opens a preview in %1 style").tqarg( *it ) );
+	a = new DesignerAction( i18n( "Preview Form in %1 Style" ).arg( *it ), TQPixmap(),
+					 i18n( "... in %1 Style" ).arg( *it ), 0, TQT_TQOBJECT(this), 0 );
+	a->setStatusTip( i18n("Opens a preview in %1 style").arg( *it ) );
 	a->setWhatsThis( i18n("<b>Open a preview in %1 style.</b>"
 			"<p>Use the preview to test the design and "
-			"signal-slot connections of the current form. %2</p>").tqarg( *it ).tqarg( info ) );
+			"signal-slot connections of the current form. %2</p>").arg( *it ).arg( info ) );
 	mapper->setMapping( a, *it );
 	connect( a, TQT_SIGNAL(activated()), mapper, TQT_SLOT(map()) );
 	connect( this, TQT_SIGNAL( hasActiveForm(bool) ), a, TQT_SLOT( setEnabled(bool) ) );
@@ -965,7 +965,7 @@ void MainWindow::setupWindowActions()
 	j++;
 	TQString itemText;
 	if ( j < 10 )
-	    itemText = TQString("&%1 ").tqarg( j );
+	    itemText = TQString("&%1 ").arg( j );
 	if ( ::tqqt_cast<FormWindow*>(w) )
 	    itemText += w->name();
 	else
@@ -1015,7 +1015,7 @@ void MainWindow::setupHelpActions()
 
 /*    TQToolBar *tb = new TQToolBar( this, "Help" );
     tb->setCloseMode( TQDockWindow::Undocked );
-    TQWhatsThis::add( tb, i18n( "<b>The Help toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("") ));
+    TQWhatsThis::add( tb, i18n( "<b>The Help toolbar</b>%1" ).arg(i18n(toolbarHelp).arg("") ));
     addToolBar( tb, i18n( "Help" ) );
     actionHelpWhatsThis->addTo( tb );*/
 
@@ -1125,7 +1125,7 @@ void MainWindow::fileCloseProject()
     if ( a ) {
 	if ( pro->isModified() ) {
 	    switch ( TQMessageBox::warning( this, i18n( "Save Project Settings" ),
-					   i18n( "Save changes to '%1'?" ).tqarg( pro->fileName() ),
+					   i18n( "Save changes to '%1'?" ).arg( pro->fileName() ),
 					   i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) {
 	    case 0: // save
 		pro->save();
@@ -1166,7 +1166,7 @@ void MainWindow::fileCloseProject()
 	currentProject = 0;
 	if ( lastValid ) {
 	    projectSelected( lastValid );
-	    statusMessage( i18n( "Selected project '%1'" ).tqarg( currentProject->projectName() ) );
+	    statusMessage( i18n( "Selected project '%1'" ).arg( currentProject->projectName() ) );
 	}
 	if ( !windows.isEmpty() ) {
 	    for ( TQWidget *w = windows.first(); w; w = windows.next() ) {
@@ -1276,11 +1276,11 @@ void MainWindow::fileOpen( const TQString &filter, const TQString &extension, co
 					      arg( filename )/*, 3000*/ );
 			return;
 		    }
-		    statusMessage( i18n( "Importing '%1' using import filter ...").tqarg( filename ) );
+		    statusMessage( i18n( "Importing '%1' using import filter ...").arg( filename ) );
 		    TQStringList list = iface->import( filter, filename );
 		    iface->release();
 		    if ( list.isEmpty() ) {
-			statusMessage( i18n( "Nothing to load in '%1'").tqarg( filename )/*, 3000*/ );
+			statusMessage( i18n( "Nothing to load in '%1'").arg( filename )/*, 3000*/ );
 			return;
 		    }
 		    if ( !inProject )
@@ -1319,7 +1319,7 @@ FormWindow *MainWindow::openFormWindow( const TQString &filename, bool validFile
 	return formWindow();
     }
 
-    statusMessage( i18n( "Reading file '%1'...").tqarg( filename ) );
+    statusMessage( i18n( "Reading file '%1'...").arg( filename ) );
     FormFile *ff2 = currentProject->findFormFile( currentProject->makeRelative(filename) );
     if ( ff2 && ff2->formWindow() ) {
 	ff2->formWindow()->setFocus();
@@ -1338,10 +1338,10 @@ FormWindow *MainWindow::openFormWindow( const TQString &filename, bool validFile
     TQApplication::restoreOverrideCursor();
     if ( b ) {
 	rebuildCustomWidgetGUI();
-	statusMessage( i18n( "Loaded file '%1'").tqarg( filename )/*, 3000 */);
+	statusMessage( i18n( "Loaded file '%1'").arg( filename )/*, 3000 */);
     } else {
-	statusMessage( i18n( "Failed to load file '%1'").tqarg( filename )/*, 5000 */);
-	TQMessageBox::information( this, i18n("Load File"), i18n("Could not load file '%1'.").tqarg( filename ) );
+	statusMessage( i18n( "Failed to load file '%1'").arg( filename )/*, 5000 */);
+	TQMessageBox::information( this, i18n("Load File"), i18n("Could not load file '%1'.").arg( filename ) );
 	delete ff;
     }
     return (FormWindow*)resource.widget();
@@ -1389,7 +1389,7 @@ bool MainWindow::fileSaveForm()
 bool MainWindow::fileSaveProject()
 {
     currentProject->save();
-    statusMessage( i18n( "Project '%1' saved.").tqarg( currentProject->projectName() )/*, 3000 */);
+    statusMessage( i18n( "Project '%1' saved.").arg( currentProject->projectName() )/*, 3000 */);
     return TRUE;
 }
 
@@ -1482,7 +1482,7 @@ void MainWindow::createNewTemplate()
     ts << "    <cstring>" << cn << "Form</cstring>" << endl;
     ts << "</property>" << endl;
     ts << "<property stdset=\"1\">" << endl;
-    ts << "    <name>tqgeometry</name>" << endl;
+    ts << "    <name>geometry</name>" << endl;
     ts << "    <rect>" << endl;
     ts << "        <width>300</width>" << endl;
     ts << "        <height>400</height>" << endl;
@@ -1567,7 +1567,7 @@ void MainWindow::editPaste()
     } else {
 	TQMessageBox::information( this, i18n( "Paste Error" ),
 				  i18n( "Cannot paste widgets. Designer could not find a container\n"
-				      "to paste into which does not contain a tqlayout. Break the tqlayout\n"
+				      "to paste into which does not contain a layout. Break the layout\n"
 				      "of the container you want to paste into and select this container\n"
 				      "and then paste again." ) );
     }
@@ -1761,7 +1761,7 @@ SourceEditor *MainWindow::openSourceEditor()
     if ( !MetaDataBase::hasEditor( lang ) ) {
 	TQMessageBox::information( this, i18n( "Edit Source" ),
 				  i18n( "There is no plugin for editing %1 code installed.\n"
-				      "Note: Plugins are not available in static TQt configurations." ).tqarg( lang ) );
+				      "Note: Plugins are not available in static TQt configurations." ).arg( lang ) );
 	return 0;
     }
 
@@ -1784,7 +1784,7 @@ SourceEditor *MainWindow::editSource( SourceFile *f )
     if ( !MetaDataBase::hasEditor( lang ) ) {
 	TQMessageBox::information( this, i18n( "Edit Source" ),
 				  i18n( "There is no plugin for editing %1 code installed.\n"
-				      "Note: Plugins are not available in static TQt configurations." ).tqarg( lang ) );
+				      "Note: Plugins are not available in static TQt configurations." ).arg( lang ) );
 	return 0;
     }
 
@@ -1921,7 +1921,7 @@ void MainWindow::editPreferences()
 	setUsesTextLabel( dia->checkBoxTextLabels->isChecked() );
 	if (dia->textEditPluginPaths->isModified()) {
 	    pluginPaths = dia->textEditPluginPaths->text();
-	    TQApplication::tqsetLibraryPaths(TQStringList::split("\n", pluginPaths));
+	    TQApplication::setLibraryPaths(TQStringList::split("\n", pluginPaths));
 	    savePluginPaths = TRUE;
 	}