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

6 files changed, 28 insertions, 28 deletions

diff --git a/kipi-plugins/picasawebexport/mpform.cpp b/kipi-plugins/picasawebexport/mpform.cpp
index 3fdeac6..2a5884c 100644
--- a/kipi-plugins/picasawebexport/mpform.cpp
+++ b/kipi-plugins/picasawebexport/mpform.cpp
@@ -30,7 +30,7 @@
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 // KDE includes.
 
@@ -76,7 +76,7 @@ void MPForm::finish()
 bool MPForm::addPair(const TQString& name, const TQString& value, const TQString& contentType)
 {
     TQCString str;
-    TQString  content_length = TQString("%1").tqarg(value.length());
+    TQString  content_length = TQString("%1").arg(value.length());
     str += "--";
     str += m_boundary;
     str += "\r\n";
@@ -131,7 +131,7 @@ bool MPForm::addFile(const TQString& name,const TQString& path)
     TQByteArray imageData = imageFile.readAll();
 
     TQCString str;
-    TQString file_size = TQString("%1").tqarg(imageFile.size());
+    TQString file_size = TQString("%1").arg(imageFile.size());
 
     str += "--";
     str += m_boundary;
diff --git a/kipi-plugins/picasawebexport/picasaweblogin.cpp b/kipi-plugins/picasawebexport/picasaweblogin.cpp
index 413a824..6a3cc0b 100644
--- a/kipi-plugins/picasawebexport/picasaweblogin.cpp
+++ b/kipi-plugins/picasawebexport/picasaweblogin.cpp
@@ -26,7 +26,7 @@
 #include <tqframe.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 // KDE includes.
 
@@ -50,7 +50,7 @@ PicasawebLogin::PicasawebLogin(TQWidget* parent, const TQString& header,
     TQVBoxLayout* vbox = new TQVBoxLayout( this, 5, 5, "vbox");
 
     m_headerLabel = new TQLabel(this);
-    m_headerLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,
+    m_headerLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,
                                              TQSizePolicy::Fixed));
     m_headerLabel->setText(header);
     vbox->addWidget( m_headerLabel );
@@ -96,7 +96,7 @@ PicasawebLogin::PicasawebLogin(TQWidget* parent, const TQString& header,
 
     vbox->addLayout( btnLayout );
 
-    resize( TQSize(300, 150).expandedTo(tqminimumSizeHint()) );
+    resize( TQSize(300, 150).expandedTo(minimumSizeHint()) );
     clearWState( WState_Polished );
 
     m_nameEdit->setText(_name);
diff --git a/kipi-plugins/picasawebexport/picasawebtalker.cpp b/kipi-plugins/picasawebexport/picasawebtalker.cpp
index 319373c..db78104 100644
--- a/kipi-plugins/picasawebexport/picasawebtalker.cpp
+++ b/kipi-plugins/picasawebexport/picasawebtalker.cpp
@@ -31,7 +31,7 @@
 // TQt includes.
 
 #include <tqcstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqimage.h>
@@ -320,8 +320,8 @@ void PicasawebTalker::addPhotoTag(const TQString& photoURI, const TQString& tag)
                                 "<title>%1</title> "
                                 "<category scheme='http://schemas.google.com/g/2005#kind' "
                                 "term='http://schemas.google.com/photos/2007#tag'/> "
-                                "</entry>").tqarg(tag);
-    TQString postUrl = TQString("%1").tqarg(photoURI);
+                                "</entry>").arg(tag);
+    TQString postUrl = TQString("%1").arg(photoURI);
     TQByteArray buffer;
     TQTextStream ts(buffer, IO_Append|IO_WriteOnly);
     ts.setEncoding(TQTextStream::UnicodeUTF8);
@@ -330,7 +330,7 @@ void PicasawebTalker::addPhotoTag(const TQString& photoURI, const TQString& tag)
     TQString auth_string = "GoogleLogin auth=" + m_token;
     KIO::TransferJob* job = KIO::http_post(postUrl, buffer, false);
     job->addMetaData("content-type", "Content-Type: application/atom+xml");
-    job->addMetaData("content-length", TQString("Content-Length: %1").tqarg(addTagXML.length()));
+    job->addMetaData("content-length", TQString("Content-Length: %1").arg(addTagXML.length()));
     job->addMetaData("customHTTPHeader", "Authorization: " + auth_string );
 
     //connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
@@ -374,13 +374,13 @@ void PicasawebTalker::createAlbum(const TQString& albumTitle, const TQString& al
                 "</media:group> "
                 "<category scheme='http://schemas.google.com/g/2005#kind' "
                         "term='http://schemas.google.com/photos/2007#album'></category> "
-                        "</entry> ").tqarg(albumTitle)
-                                    .tqarg(albumDesc)
-                                    .tqarg(location)
-                                    .tqarg(access)
-                                    .tqarg(isCommentsEnabled==true?"true":"false")
-                                    .tqarg(timestamp)
-                                    .tqarg(media_keywords);
+                        "</entry> ").arg(albumTitle)
+                                    .arg(albumDesc)
+                                    .arg(location)
+                                    .arg(access)
+                                    .arg(isCommentsEnabled==true?"true":"false")
+                                    .arg(timestamp)
+                                    .arg(media_keywords);
 
     TQByteArray buffer;
     TQTextStream ts(buffer, IO_Append|IO_WriteOnly);
@@ -392,7 +392,7 @@ void PicasawebTalker::createAlbum(const TQString& albumTitle, const TQString& al
     TQString auth_string = "GoogleLogin auth=" + m_token;
     KIO::TransferJob* job = KIO::http_post(postUrl, buffer, false);
     job->addMetaData("content-type", "Content-Type: application/atom+xml");
-    job->addMetaData("content-length", TQString("Content-Length: %1").tqarg(newAlbumXML.length()));
+    job->addMetaData("content-length", TQString("Content-Length: %1").arg(newAlbumXML.length()));
     job->addMetaData("customHTTPHeader", "Authorization: " + auth_string );
 
     connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
@@ -593,7 +593,7 @@ void PicasawebTalker::slotError(const TQString & error)
             transError=i18n("Unknown error");
     };
 
-    KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Error Occured: %1\n We can not proceed further").tqarg(transError));
+    KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Error Occured: %1\n We can not proceed further").arg(transError));
     //kdDebug()<<"Not handling the error now will see it later"<<endl;
 }
 
@@ -904,7 +904,7 @@ void PicasawebTalker::parseResponseAddPhoto(const TQByteArray &data)
         for ( TQStringList::Iterator it = tags.begin(); it != tags.end(); ++it ) 
         {
             TQString photoURI= TQString("http://picasaweb.google.com/data/feed/api/user/"
-                    "%1/albumid/%2/photoid/%3").tqarg(m_username).tqarg(album_id).tqarg(photo_id);
+                    "%1/albumid/%2/photoid/%3").arg(m_username).arg(album_id).arg(photo_id);
             addPhotoTag( photoURI, *it);
         }
     }
diff --git a/kipi-plugins/picasawebexport/picasawebwidget.cpp b/kipi-plugins/picasawebexport/picasawebwidget.cpp
index b6c6be9..d3bf95c 100644
--- a/kipi-plugins/picasawebexport/picasawebwidget.cpp
+++ b/kipi-plugins/picasawebexport/picasawebwidget.cpp
@@ -32,7 +32,7 @@
 #include <tqgroupbox.h>
 #include <tqspinbox.h>
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqsplitter.h>
 #include <tqwhatsthis.h>
@@ -58,7 +58,7 @@ PicasawebWidget::PicasawebWidget(TQWidget* parent, const char* name, WFlags fl)
     if ( !name )
         setName("PicasawebWidget");
 
-    //resize( TQSize(600, 400).expandedTo(tqminimumSizeHint()) );
+    //resize( TQSize(600, 400).expandedTo(minimumSizeHint()) );
     //clearWState( WState_Polished );
 }
 
diff --git a/kipi-plugins/picasawebexport/picasawebwindow.cpp b/kipi-plugins/picasawebexport/picasawebwindow.cpp
index 762c03f..370e9b0 100644
--- a/kipi-plugins/picasawebexport/picasawebwindow.cpp
+++ b/kipi-plugins/picasawebexport/picasawebwindow.cpp
@@ -37,7 +37,7 @@
 #include <tqradiobutton.h>
 #include <tqdatetimeedit.h>
 #include <tqdatetime.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 
 // KDE includes.
 
@@ -374,7 +374,7 @@ void PicasawebWindow::slotAuthCancel()
 void PicasawebWindow::slotCreateNewAlbum()
 {
     NewAlbumDialog *dlg = new NewAlbumDialog(TQT_TQWIDGET(kapp->activeWindow()));
-    dlg->m_dateAndTimeEdit->setDateTime(TQDateTime::tqcurrentDateTime());
+    dlg->m_dateAndTimeEdit->setDateTime(TQDateTime::currentDateTime());
     TQString test;
     int t = dlg->exec();
 
@@ -541,7 +541,7 @@ void PicasawebWindow::slotAddPhotoNext()
         return;
     }
 
-    m_progressDlg->setLabelText(i18n("Uploading file %1 ").tqarg( KURL(pathComments.first).filename()));
+    m_progressDlg->setLabelText(i18n("Uploading file %1 ").arg( KURL(pathComments.first).filename()));
 
     if (m_progressDlg->isHidden())
         m_progressDlg->show();
@@ -558,7 +558,7 @@ void PicasawebWindow::slotAddPhotoFailed(const TQString& msg)
 {
     if ( KMessageBox::warningContinueCancel(this,
            i18n("Failed to upload photo into Picasaweb. %1\nDo you want to continue?")
-                .tqarg( msg )) != KMessageBox::Continue)
+                .arg( msg )) != KMessageBox::Continue)
     {
         m_uploadQueue.clear();
         m_progressDlg->reset();
diff --git a/kipi-plugins/picasawebexport/uploadwidget.ui b/kipi-plugins/picasawebexport/uploadwidget.ui
index 35f30ae..2180ca2 100644
--- a/kipi-plugins/picasawebexport/uploadwidget.ui
+++ b/kipi-plugins/picasawebexport/uploadwidget.ui
@@ -168,7 +168,7 @@
             <property name="text">
                 <string></string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -193,7 +193,7 @@
         <property name="text">
             <string>PicasaWeb Uploader</string>
         </property>
-        <property name="tqalignment">
+        <property name="alignment">
             <set>AlignCenter</set>
         </property>
     </widget>