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

1 files changed, 21 insertions, 21 deletions

diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp
index 1e526133..6fe4f550 100644
--- a/lib/kofficeui/KoTemplateChooseDia.cpp
+++ b/lib/kofficeui/KoTemplateChooseDia.cpp
@@ -47,7 +47,7 @@
 #include <kaboutdata.h>
 
 #include <tqapplication.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtabwidget.h>
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
@@ -84,7 +84,7 @@ class MyFileDialog : public KFileDialog
                 ok = TQFile::exists( url.path() );
                 if ( !ok ) {
                     // Maybe offer to create a new document with that name? (see alos KoDocument::openFile)
-                    KMessageBox::error( this, i18n( "The file %1 does not exist." ).tqarg( url.path() ) );
+                    KMessageBox::error( this, i18n( "The file %1 does not exist." ).arg( url.path() ) );
                 }
             }
             return ok;
@@ -165,7 +165,7 @@ class KoTemplateChooseDiaPrivate {
 	// choose a file
 	MyFileDialog *m_filedialog;
 
-	// for the tqlayout
+	// for the layout
 	TQTabWidget* tabWidget;
 	TQWidget* newTab;
 	TQWidget* existingTab;
@@ -298,13 +298,13 @@ KoTemplateChooseDia::DialogType KoTemplateChooseDia::getDialogType() const {
 
 /*================================================================*/
 // private
-void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout * tqlayout)
+void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout * layout)
 {
 
         d->m_recent = new KoTCDRecentFilesIconView(widgetbase, "recent files");
         // I prefer the icons to be in "most recent first" order (DF)
         d->m_recent->setSorting( static_cast<TQDir::SortSpec>( TQDir::Time | TQDir::Reversed ) );
-        tqlayout->addWidget(d->m_recent,0,0);
+        layout->addWidget(d->m_recent,0,0);
 
         TQString oldGroup = d->m_instance->config()->group();
         d->m_instance->config()->setGroup( "RecentFiles" );
@@ -312,7 +312,7 @@ void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout
         int i = 0;
         TQString value;
         do {
-                TQString key=TQString( "File%1" ).tqarg( i );
+                TQString key=TQString( "File%1" ).arg( i );
                 value=d->m_instance->config()->readPathEntry( key );
                 if ( !value.isEmpty() ) {
                     // Support for tdelibs-3.5's new RecentFiles format: name[url]
@@ -342,7 +342,7 @@ void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout
 
 /*================================================================*/
 // private
-void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout * tqlayout)
+void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout * layout)
 {
     TQString dir = TQString();
     TQPoint point( 0, 0 );
@@ -353,7 +353,7 @@ void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout *
 	    "file dialog",
 	    false);
 
-    tqlayout->addWidget(d->m_filedialog,0,0);
+    layout->addWidget(d->m_filedialog,0,0);
     d->m_filedialog->reparent( widgetbase , point );
     //d->m_filedialog->setOperationMode( KFileDialog::Opening);
 
@@ -387,20 +387,20 @@ void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout *
 
 /*================================================================*/
 // private
-void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayout * tqlayout)
+void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayout * layout)
 {
 
     d->m_jwidget = new KJanusWidget(
 	    widgetbase,
 	    "kjanuswidget",
 	    KJanusWidget::IconList);
-    tqlayout->addWidget(d->m_jwidget,0,0);
+    layout->addWidget(d->m_jwidget,0,0);
 
     d->boxdescription = new TQVGroupBox(
 	    i18n("Selected Template"),
 	    widgetbase,
 	    "boxdescription");
-    tqlayout->addWidget(d->boxdescription, 1, 0 );
+    layout->addWidget(d->boxdescription, 1, 0 );
 
     // config
     KConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" );
@@ -429,11 +429,11 @@ void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayou
 		group->name(),
 		group->first()->loadPicture(d->m_instance));
 
-	TQGridLayout * tqlayout = new TQGridLayout(frame);
+	TQGridLayout * layout = new TQGridLayout(frame);
 	KoTCDIconCanvas *canvas = new KoTCDIconCanvas( frame );
-	tqlayout->addWidget(canvas,0,0);
+	layout->addWidget(canvas,0,0);
 
-	canvas->setBackgroundColor( tqcolorGroup().base() );
+	canvas->setBackgroundColor( colorGroup().base() );
 	canvas->setResizeMode(TQIconView::Adjust);
 	canvas->setWordWrapIconText( true );
 	canvas->show();
@@ -478,10 +478,10 @@ void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayou
     currentChanged(itemtoselect);
 
     // setup the checkbox
-    TQString translatedstring = i18n("Always start %1 with the selected template").tqarg(d->m_nativeName);
+    TQString translatedstring = i18n("Always start %1 with the selected template").arg(d->m_nativeName);
 
     d->m_nodiag = new TQCheckBox ( translatedstring , widgetbase);
-    tqlayout->addWidget(d->m_nodiag, 2, 0);
+    layout->addWidget(d->m_nodiag, 2, 0);
     TQString  startwithoutdialog = grp.readEntry( "NoStartDlg" );
     bool ischecked = startwithoutdialog == TQString("yes");
 
@@ -642,7 +642,7 @@ void KoTemplateChooseDia::slotOk()
 	static const char* const s_returnTypes[] = { 0 /*Cancel ;)*/, "Template", "File", "Empty" };
 	if ( d->m_returnType <= Empty )
 	{
-	    grp.writeEntry( "LastReturnType", TQString::tqfromLatin1(s_returnTypes[d->m_returnType]) );
+	    grp.writeEntry( "LastReturnType", TQString::fromLatin1(s_returnTypes[d->m_returnType]) );
 	    if (d->m_returnType == Template)
 	    {
 		grp.writeEntry( "TemplateTab", d->m_jwidget->activePageIndex() );
@@ -706,7 +706,7 @@ bool KoTemplateChooseDia::collectInfo()
 		KURL url = item->url();
 		if(url.isLocalFile() && !TQFile::exists(url.path()))
 		{
-			KMessageBox::error( this, i18n( "The file %1 does not exist." ).tqarg( url.path() ) );
+			KMessageBox::error( this, i18n( "The file %1 does not exist." ).arg( url.path() ) );
 			return false;
 		}
 		d->m_fullTemplateName = url.url();
@@ -793,12 +793,12 @@ void KoTCDRecentFilesIconView::showToolTip( TQIconViewItem* item )
     // and another one for deciding what's the text of the tooltip...
     const KFileItem *fi = ( (KFileIconViewItem*)item )->fileInfo();
     TQString toolTipText = fi->url().prettyURL( 0, KURL::StripFileProtocol );
-    toolTip = new TQLabel( TQString::tqfromLatin1(" %1 ").tqarg(toolTipText), 0,
+    toolTip = new TQLabel( TQString::fromLatin1(" %1 ").arg(toolTipText), 0,
                           "myToolTip",
                           WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM );
     toolTip->setFrameStyle( TQFrame::Plain | TQFrame::Box );
     toolTip->setLineWidth( 1 );
-    toolTip->tqsetAlignment( AlignLeft | AlignTop );
+    toolTip->setAlignment( AlignLeft | AlignTop );
     toolTip->move( TQCursor::pos() + TQPoint( 14, 14 ) );
     toolTip->adjustSize();
     TQRect screen = TQApplication::desktop()->screenGeometry(
@@ -810,7 +810,7 @@ void KoTCDRecentFilesIconView::showToolTip( TQIconViewItem* item )
         toolTip->move(toolTip->x(), screen.bottom()-toolTip->y()-toolTip->height()+toolTip->y());
     }
     toolTip->setFont( TQToolTip::font() );
-    toolTip->tqsetPalette( TQToolTip::palette(), TRUE );
+    toolTip->setPalette( TQToolTip::palette(), TRUE );
     toolTip->show();
 }