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

4 files changed, 28 insertions, 28 deletions

diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp
index 45ab5892..8591167f 100644
--- a/kexi/main/printing/kexisimpleprintingengine.cpp
+++ b/kexi/main/printing/kexisimpleprintingengine.cpp
@@ -30,7 +30,7 @@
 #include <kdebug.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
@@ -278,7 +278,7 @@ void KexiSimplePrintingEngine::paintPage(int pageNumber, TQPainter& painter, boo
 		}
 		painter.setFont(m_mainFont);
 
-		m_dateTimeText = KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime(),
+		m_dateTimeText = KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(),
 			true, false);
 		m_dateTimeWidth = painter.fontMetrics().width(m_dateTimeText+"   ");
 		m_mainLineSpacing = painter.fontMetrics().lineSpacing();
@@ -326,9 +326,9 @@ void KexiSimplePrintingEngine::paintPage(int pageNumber, TQPainter& painter, boo
 		TQString pageNumString;
 		if (m_pagesCount>0)
 			pageNumString = i18n("Page (number) of (total)", "Page %1 of %2")
-				.tqarg(pageNumber+1).tqarg(m_pagesCount);
+				.arg(pageNumber+1).arg(m_pagesCount);
 		else
-			pageNumString = i18n("Page %1").tqarg(pageNumber+1);
+			pageNumString = i18n("Page %1").arg(pageNumber+1);
 		painter.drawText((int)m_leftMargin, 
 			(int)m_topMargin + m_pageHeight - m_mainLineSpacing, 
 			m_pageWidth, m_mainLineSpacing,
diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
index 476f924a..1df66250 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp
+++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
@@ -38,7 +38,7 @@
 
 #include <tqlabel.h>
 #include <tqtimer.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
@@ -356,7 +356,7 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi
 			m_contents->openDataLink->setText( i18n("Open This Query") );
 			m_origCaptionLabelText = i18n("<h2>Page setup for printing \"%1\" query data</h2>");
 		}
-		m_contents->captionLabel->setText( m_origCaptionLabelText.tqarg(m_item->name()) );
+		m_contents->captionLabel->setText( m_origCaptionLabelText.arg(m_item->name()) );
 	}
 	connect(m_contents->headerTitleLineEdit,TQT_SIGNAL(textChanged(const TQString&)), 
 		this, TQT_SLOT(slotTitleTextChanged(const TQString&)));
@@ -442,8 +442,8 @@ void KexiSimplePrintingPageSetup::updatePageLayoutAndUnitInfo()
 	TQString s;
 	if (m_settings.pageLayout.format == PG_CUSTOM) {
 		s += TQString(" (%1 %2 x %3 %4)")
-			.tqarg(m_settings.pageLayout.ptWidth).tqarg(KoUnit::unitName(m_unit))
-			.tqarg(m_settings.pageLayout.ptHeight).tqarg(KoUnit::unitName(m_unit));
+			.arg(m_settings.pageLayout.ptWidth).arg(KoUnit::unitName(m_unit))
+			.arg(m_settings.pageLayout.ptHeight).arg(KoUnit::unitName(m_unit));
 	}
 	else
 		s += KoPageFormat::name(m_settings.pageLayout.format);
diff --git a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
index 6b169f7e..ff46ee7a 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
+++ b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="6">
             <property name="name">
-                <cstring>tqlayout15</cstring>
+                <cstring>layout15</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -45,7 +45,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter</set>
                     </property>
                 </widget>
@@ -106,7 +106,7 @@
             <property name="text">
                 <string>Page title:</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignBottom</set>
             </property>
             <property name="buddy" stdset="0">
@@ -115,7 +115,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="6">
             <property name="name">
-                <cstring>tqlayout19</cstring>
+                <cstring>layout19</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -158,7 +158,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>230</width>
                             <height>20</height>
@@ -222,7 +222,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="12" column="0" rowspan="1" colspan="6">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -238,7 +238,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>80</width>
                             <height>6</height>
@@ -343,7 +343,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -360,7 +360,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>4</height>
@@ -377,7 +377,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>4</height>
@@ -394,7 +394,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>4</height>
@@ -411,7 +411,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>4</height>
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
index 68c1c673..d17aac45 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
@@ -22,7 +22,7 @@
 #include "kexisimpleprintpreviewwindow_p.h"
 #include <kexi_version.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqaccel.h>
 #include <tqtimer.h>
 #include <tqlabel.h>
@@ -52,7 +52,7 @@ void KexiSimplePrintPreviewView::paintEvent( TQPaintEvent *pe )
 		return;
 	TQPixmap pm(size()); //dbl buffered
 	TQPainter p;
-	p.tqbegin(TQT_TQPAINTDEVICE(&pm), this);
+	p.begin(TQT_TQPAINTDEVICE(&pm), this);
 //! @todo only for screen!
 	p.fillRect(TQRect(TQPoint(0,0),pm.size()), TQBrush(white));//pe->rect(), TQBrush(white));
 	if (m_window->currentPage()>=0)
@@ -135,7 +135,7 @@ void KexiSimplePrintPreviewScrollView::setFullWidth()
 	viewport()->setUpdatesEnabled(true);
 	resize(size()+TQSize(1,1)); //to update pos.
 	widget->enablePainting = true;
-	widget->tqrepaint();
+	widget->repaint();
 }
 
 void KexiSimplePrintPreviewScrollView::setContentsPos(int x, int y)
@@ -157,7 +157,7 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow(
  , m_pageNumber(-1)
  , m_pagesCount(-1)
 {
-	setCaption(i18n("%1 - Print Preview - %2").tqarg(previewName).tqarg(KEXI_APP_NAME));
+	setCaption(i18n("%1 - Print Preview - %2").arg(previewName).arg(KEXI_APP_NAME));
 	setIcon(DesktopIcon("filequickprint"));
 	TQVBoxLayout *lyr = new TQVBoxLayout(this, 6);
 
@@ -196,11 +196,11 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow(
 	m_scrollView = new KexiSimplePrintPreviewScrollView(this);
 	m_scrollView->setUpdatesEnabled(false);
 	m_view = m_scrollView->widget;
-	m_scrollView->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+	m_scrollView->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
 	lyr->addWidget(m_scrollView);
 
 	TQWidget* navToolbarWidget = new TQWidget(this); //widget used to center the navigator toolbar
-	navToolbarWidget->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+	navToolbarWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	TQHBoxLayout *navToolbarLyr = new TQHBoxLayout(navToolbarWidget);
 	lyr->addWidget(navToolbarWidget);
 
@@ -308,14 +308,14 @@ void KexiSimplePrintPreviewWindow::goToPage(int pageNumber)
 	m_pageNumber = pageNumber;
 	m_pagesCount = m_engine.pagesCount();
 
-	m_view->tqrepaint(); //this will automatically paint a new page
+	m_view->repaint(); //this will automatically paint a new page
 
 	m_navToolbar->setItemEnabled(m_idNext, pageNumber < ((int)m_engine.pagesCount()-1));
 	m_navToolbar->setItemEnabled(m_idLast, pageNumber < ((int)m_engine.pagesCount()-1));
 	m_navToolbar->setItemEnabled(m_idPrevious, pageNumber > 0);
 	m_navToolbar->setItemEnabled(m_idFirst, pageNumber > 0);
 	static_cast<TQLabel*>(m_navToolbar->getWidget(m_idPageNumberLabel))->setText(
-		i18n("Page (number) of (total)", "Page %1 of %2").tqarg(m_pageNumber+1).tqarg(m_engine.pagesCount()));
+		i18n("Page (number) of (total)", "Page %1 of %2").arg(m_pageNumber+1).arg(m_engine.pagesCount()));
 }
 
 void KexiSimplePrintPreviewWindow::setFullWidth()