diff options
Diffstat (limited to 'kipi-plugins/picasawebexport')
17 files changed, 649 insertions, 644 deletions
diff --git a/kipi-plugins/picasawebexport/PicasawebNewAlbumDialog.ui b/kipi-plugins/picasawebexport/PicasawebNewAlbumDialog.ui index 6de4039..13cbfd3 100644 --- a/kipi-plugins/picasawebexport/PicasawebNewAlbumDialog.ui +++ b/kipi-plugins/picasawebexport/PicasawebNewAlbumDialog.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KIPIPicasawebExportPlugin::NewAlbumDialog</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>NewAlbumDialog</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -15,11 +15,11 @@ <property name="caption"> <string>New Album Dialog</string> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>30</x> <y>20</y> @@ -31,11 +31,11 @@ <string>Title</string> </property> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>m_accessRadioButton</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>160</x> <y>220</y> @@ -46,11 +46,11 @@ <property name="title"> <string>Access Level</string> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_isUnlistedRadioButton</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>40</y> @@ -62,11 +62,11 @@ <string>Unlisted </string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_isPublicRadioButton</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>20</y> @@ -79,11 +79,11 @@ </property> </widget> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_cancelButton</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>400</x> <y>300</y> @@ -95,11 +95,11 @@ <string>Cancel</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>30</x> <y>50</y> @@ -111,11 +111,11 @@ <string>Date</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>30</x> <y>90</y> @@ -127,11 +127,11 @@ <string>Description</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>30</x> <y>200</y> @@ -143,11 +143,11 @@ <string>Place Taken</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_titleLineEdit</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>160</x> <y>20</y> @@ -156,11 +156,11 @@ </rect> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_locationLineEdit</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>160</x> <y>200</y> @@ -169,11 +169,11 @@ </rect> </property> </widget> - <widget class="QDateTimeEdit"> + <widget class="TQDateTimeEdit"> <property name="name"> <cstring>m_dateAndTimeEdit</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>160</x> <y>50</y> @@ -182,11 +182,11 @@ </rect> </property> </widget> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>m_descriptionTextBox</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>160</x> <y>90</y> @@ -195,11 +195,11 @@ </rect> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_createAlbumButton</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>290</x> <y>300</y> @@ -229,9 +229,9 @@ <includes> <include location="local" impldecl="in implementation">PicasawebNewAlbumDialog.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected" specifier="non virtual">creatAlbumSlot()</slot> <slot access="protected" specifier="non virtual">cancelWindowSlot()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kipi-plugins/picasawebexport/mpform.cpp b/kipi-plugins/picasawebexport/mpform.cpp index 4730bec..3fdeac6 100644 --- a/kipi-plugins/picasawebexport/mpform.cpp +++ b/kipi-plugins/picasawebexport/mpform.cpp @@ -26,11 +26,11 @@ #include <cstring> #include <cstdio> -// Qt includes. +// TQt includes. -#include <qfile.h> -#include <qfileinfo.h> -#include <qtextstream.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqtextstream.h> // KDE includes. @@ -63,20 +63,20 @@ void MPForm::reset() void MPForm::finish() { - QCString str; + TQCString str; str += "--"; str += m_boundary; str += "--"; - QTextStream ts(m_buffer, IO_Append|IO_WriteOnly); - ts.setEncoding(QTextStream::UnicodeUTF8); + TQTextStream ts(m_buffer, IO_Append|IO_WriteOnly); + ts.setEncoding(TQTextStream::UnicodeUTF8); ts << str; } -bool MPForm::addPair(const QString& name, const QString& value, const QString& contentType) +bool MPForm::addPair(const TQString& name, const TQString& value, const TQString& contentType) { - QCString str; - QString content_length = QString("%1").arg(value.length()); + TQCString str; + TQString content_length = TQString("%1").tqarg(value.length()); str += "--"; str += m_boundary; str += "\r\n"; @@ -90,7 +90,7 @@ bool MPForm::addPair(const QString& name, const QString& value, const QString& c if (!contentType.isEmpty()) { - str += "Content-Type: "+ QCString(contentType.ascii()); + str += "Content-Type: "+ TQCString(contentType.ascii()); str += "\r\n"; str += "Mime-version: 1.0 "; str += "\r\n"; @@ -106,17 +106,17 @@ bool MPForm::addPair(const QString& name, const QString& value, const QString& c //m_buffer.resize(oldSize + str.size()); //memcpy(m_buffer.data() + oldSize, str.data(), str.size()); - QTextStream ts(m_buffer, IO_Append|IO_WriteOnly); - ts.setEncoding(QTextStream::UnicodeUTF8); - ts << QString::fromUtf8(str); + TQTextStream ts(m_buffer, IO_Append|IO_WriteOnly); + ts.setEncoding(TQTextStream::UnicodeUTF8); + ts << TQString::fromUtf8(str); return true; } -bool MPForm::addFile(const QString& name,const QString& path) +bool MPForm::addFile(const TQString& name,const TQString& path) { KMimeType::Ptr ptr = KMimeType::findByURL(path); - QString mime = ptr->name(); + TQString mime = ptr->name(); if (mime.isEmpty()) { // if we ourselves can't determine the mime of the local file, @@ -124,14 +124,14 @@ bool MPForm::addFile(const QString& name,const QString& path) return false; } - QFile imageFile(path); + TQFile imageFile(path); if (!imageFile.open(IO_ReadOnly)) return false; - QByteArray imageData = imageFile.readAll(); + TQByteArray imageData = imageFile.readAll(); - QCString str; - QString file_size = QString("%1").arg(imageFile.size()); + TQCString str; + TQString file_size = TQString("%1").tqarg(imageFile.size()); str += "--"; str += m_boundary; @@ -140,7 +140,7 @@ bool MPForm::addFile(const QString& name,const QString& path) str += name.ascii(); str += "\"; "; str += "filename=\""; - str += QFile::encodeName(KURL(path).filename()); + str += TQFile::encodeName(KURL(path).filename()); str += "\"\r\n"; str += "Content-Length: " ; str += file_size.ascii(); @@ -150,8 +150,8 @@ bool MPForm::addFile(const QString& name,const QString& path) str += "\r\n\r\n"; imageFile.close(); - QTextStream ts(m_buffer, IO_Append|IO_WriteOnly); - ts.setEncoding(QTextStream::UnicodeUTF8); + TQTextStream ts(m_buffer, IO_Append|IO_WriteOnly); + ts.setEncoding(TQTextStream::UnicodeUTF8); ts << str; int oldSize = m_buffer.size(); @@ -163,17 +163,17 @@ bool MPForm::addFile(const QString& name,const QString& path) return true; } -QString MPForm::contentType() const +TQString MPForm::contentType() const { - return QString("Content-Type: multipart/related; boundary=" + m_boundary); + return TQString("Content-Type: multipart/related; boundary=" + m_boundary); } -QString MPForm::boundary() const +TQString MPForm::boundary() const { return m_boundary; } -QByteArray MPForm::formData() const +TQByteArray MPForm::formData() const { return m_buffer; } diff --git a/kipi-plugins/picasawebexport/mpform.h b/kipi-plugins/picasawebexport/mpform.h index edfa558..28586aa 100644 --- a/kipi-plugins/picasawebexport/mpform.h +++ b/kipi-plugins/picasawebexport/mpform.h @@ -24,10 +24,10 @@ #ifndef MPFORM_H #define MPFORM_H -// Qt includes +// TQt includes -#include <qcstring.h> -#include <qstring.h> +#include <tqcstring.h> +#include <tqstring.h> namespace KIPIPicasawebExportPlugin { @@ -43,17 +43,17 @@ public: void finish(); void reset(); - bool addPair(const QString& name, const QString& value, const QString& contentType=QString()); - bool addFile(const QString& name, const QString& path); + bool addPair(const TQString& name, const TQString& value, const TQString& contentType=TQString()); + bool addFile(const TQString& name, const TQString& path); - QString contentType() const; - QByteArray formData() const; - QString boundary() const; + TQString contentType() const; + TQByteArray formData() const; + TQString boundary() const; private: - QByteArray m_buffer; - QCString m_boundary; + TQByteArray m_buffer; + TQCString m_boundary; }; } // namespace KIPIPicasawebExportPlugin diff --git a/kipi-plugins/picasawebexport/picasawebitem.h b/kipi-plugins/picasawebexport/picasawebitem.h index 2984053..c89bb5d 100644 --- a/kipi-plugins/picasawebexport/picasawebitem.h +++ b/kipi-plugins/picasawebexport/picasawebitem.h @@ -23,9 +23,9 @@ #ifndef PICASAWEBITEM_H #define PICASAWEBITEM_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> namespace KIPIPicasawebExportPlugin { @@ -46,9 +46,9 @@ public: int ref_num; - QStrList tags; - QString title; - QString description; + TQStrList tags; + TQString title; + TQString description; }; // ------------------------------------------------------ @@ -69,9 +69,9 @@ public: bool is_friend; bool is_family; - QString title; - QString description; - QStringList tags; + TQString title; + TQString description; + TQStringList tags; }; // ------------------------------------------------------ @@ -84,7 +84,7 @@ public: GAlbum() { ref_num = -1; - parent_ref_num = -1; + tqparent_ref_num = -1; add = false; write = false; @@ -94,7 +94,7 @@ public: } int ref_num; - int parent_ref_num; + int tqparent_ref_num; bool add; bool write; @@ -102,11 +102,11 @@ public: bool del_alb; bool create_sub; - QString name; - QString parentName; - QString title; - QString summary; - QString baseurl; + TQString name; + TQString tqparentName; + TQString title; + TQString summary; + TQString baseurl; }; // ------------------------------------------------------ @@ -121,13 +121,13 @@ public: id="-1"; } - QString id; - QString primary; //="2483" - QString secret; //="abcdef" - QString server; - QString photos; - QString title; - QString description; + TQString id; + TQString primary; //="2483" + TQString secret; //="abcdef" + TQString server; + TQString photos; + TQString title; + TQString description; }; } // namespace KIPIPicasawebExportPlugin diff --git a/kipi-plugins/picasawebexport/picasaweblogin.cpp b/kipi-plugins/picasawebexport/picasaweblogin.cpp index cb65ec6..2d6a275 100644 --- a/kipi-plugins/picasawebexport/picasaweblogin.cpp +++ b/kipi-plugins/picasawebexport/picasaweblogin.cpp @@ -20,13 +20,13 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qframe.h> -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqframe.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> +#include <tqlayout.h> // KDE includes. @@ -41,62 +41,62 @@ namespace KIPIPicasawebExportPlugin { -PicasawebLogin::PicasawebLogin(QWidget* parent, const QString& header, - const QString& _name, const QString& _passwd) - : QDialog(parent) +PicasawebLogin::PicasawebLogin(TQWidget* tqparent, const TQString& header, + const TQString& _name, const TQString& _passwd) + : TQDialog(tqparent) { setSizeGripEnabled(false); - QVBoxLayout* vbox = new QVBoxLayout( this, 5, 5, "vbox"); + TQVBoxLayout* vbox = new TQVBoxLayout( this, 5, 5, "vbox"); - m_headerLabel = new QLabel(this); - m_headerLabel->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, - QSizePolicy::Fixed)); + m_headerLabel = new TQLabel(this); + m_headerLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, + TQSizePolicy::Fixed)); m_headerLabel->setText(header); vbox->addWidget( m_headerLabel ); - QFrame* hline = new QFrame( this, "hline" ); - hline->setFrameShape( QFrame::HLine ); - hline->setFrameShadow( QFrame::Sunken ); - hline->setFrameShape( QFrame::HLine ); + TQFrame* hline = new TQFrame( this, "hline" ); + hline->setFrameShape( TQFrame::HLine ); + hline->setFrameShadow( TQFrame::Sunken ); + hline->setFrameShape( TQFrame::HLine ); vbox->addWidget( hline ); - QGridLayout* centerLayout = new QGridLayout(0, 1, 1, 5, 5); + TQGridLayout* centerLayout = new TQGridLayout(0, 1, 1, 5, 5); - m_nameEdit = new QLineEdit( this ); + m_nameEdit = new TQLineEdit( this ); centerLayout->addWidget(m_nameEdit, 0, 1); - m_passwdEdit = new QLineEdit( this ); - m_passwdEdit->setEchoMode(QLineEdit::Password); + m_passwdEdit = new TQLineEdit( this ); + m_passwdEdit->setEchoMode(TQLineEdit::Password); centerLayout->addWidget(m_passwdEdit, 1, 1); - QLabel* nameLabel = new QLabel(this); + TQLabel* nameLabel = new TQLabel(this); nameLabel->setText(i18n( "Username:" )); centerLayout->addWidget(nameLabel, 0, 0); - QLabel* passwdLabel = new QLabel(this); + TQLabel* passwdLabel = new TQLabel(this); passwdLabel->setText(i18n( "Password:" )); centerLayout->addWidget(passwdLabel, 1, 0); vbox->addLayout( centerLayout ); - QHBoxLayout* btnLayout = new QHBoxLayout(0, 0, 5); - btnLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding, - QSizePolicy::Minimum ) ); + TQHBoxLayout* btnLayout = new TQHBoxLayout(0, 0, 5); + btnLayout->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, + TQSizePolicy::Minimum ) ); - QPushButton *okBtn = new QPushButton( this ); + TQPushButton *okBtn = new TQPushButton( this ); okBtn->setAutoDefault( true ); okBtn->setDefault( true ); okBtn->setText( i18n( "&OK" ) ); btnLayout->addWidget( okBtn ); - QPushButton *cancelBtn = new QPushButton( this ); + TQPushButton *cancelBtn = new TQPushButton( this ); cancelBtn->setText( i18n( "&Cancel" ) ); btnLayout->addWidget( cancelBtn ); vbox->addLayout( btnLayout ); - resize( QSize(300, 150).expandedTo(minimumSizeHint()) ); + resize( TQSize(300, 150).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); m_nameEdit->setText(_name); @@ -104,40 +104,40 @@ PicasawebLogin::PicasawebLogin(QWidget* parent, const QString& header, // signals and slots connections - connect(okBtn, SIGNAL(clicked()), - this, SLOT(accept())); + connect(okBtn, TQT_SIGNAL(clicked()), + this, TQT_SLOT(accept())); - connect(cancelBtn, SIGNAL(clicked()), - this, SLOT(reject())); + connect(cancelBtn, TQT_SIGNAL(clicked()), + this, TQT_SLOT(reject())); } PicasawebLogin::~PicasawebLogin() { } -QString PicasawebLogin::name() const +TQString PicasawebLogin::name() const { return m_nameEdit->text(); } -QString PicasawebLogin::password() const +TQString PicasawebLogin::password() const { return m_passwdEdit->text(); } -QString PicasawebLogin::username() const +TQString PicasawebLogin::username() const { return m_nameEdit->text(); } -void PicasawebLogin::setUsername(const QString& username) +void PicasawebLogin::setUsername(const TQString& username) { kdDebug()<<" The username passed to me is "<<username <<endl; m_nameEdit->setText(username); kdDebug()<<" The username passed to me is "<<username <<endl; } -void PicasawebLogin::setPassword(const QString& password) +void PicasawebLogin::setPassword(const TQString& password) { m_passwdEdit->setText(password); } diff --git a/kipi-plugins/picasawebexport/picasaweblogin.h b/kipi-plugins/picasawebexport/picasaweblogin.h index f689773..69e0f37 100644 --- a/kipi-plugins/picasawebexport/picasaweblogin.h +++ b/kipi-plugins/picasawebexport/picasaweblogin.h @@ -23,37 +23,38 @@ #ifndef PICASAWEBLOGIN_H #define PICASAWEBLOGIN_H -// Qt includes. +// TQt includes. -#include <qdialog.h> +#include <tqdialog.h> -class QLabel; -class QLineEdit; +class TQLabel; +class TQLineEdit; namespace KIPIPicasawebExportPlugin { -class PicasawebLogin : public QDialog +class PicasawebLogin : public TQDialog { Q_OBJECT + TQ_OBJECT public: - PicasawebLogin(QWidget* parent, const QString& header, const QString& _name=QString(), - const QString& _passwd=QString()); + PicasawebLogin(TQWidget* tqparent, const TQString& header, const TQString& _name=TQString(), + const TQString& _passwd=TQString()); ~PicasawebLogin(); - QString name() const; - QString password() const; - QString username() const; - void setUsername(const QString&); - void setPassword(const QString&); + TQString name() const; + TQString password() const; + TQString username() const; + void setUsername(const TQString&); + void setPassword(const TQString&); private: - QLabel* m_headerLabel; - QLineEdit* m_nameEdit; - QLineEdit* m_passwdEdit; + TQLabel* m_headerLabel; + TQLineEdit* m_nameEdit; + TQLineEdit* m_passwdEdit; }; } // namespace KIPIPicasawebExportPlugin diff --git a/kipi-plugins/picasawebexport/picasawebtalker.cpp b/kipi-plugins/picasawebexport/picasawebtalker.cpp index 693b81e..bc9afd6 100644 --- a/kipi-plugins/picasawebexport/picasawebtalker.cpp +++ b/kipi-plugins/picasawebexport/picasawebtalker.cpp @@ -28,18 +28,18 @@ #include <cstdlib> #include <string> -// Qt includes. - -#include <qcstring.h> -#include <qtextstream.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qimage.h> -#include <qstringlist.h> -#include <qurl.h> -#include <qlineedit.h> -#include <qmessagebox.h> -#include <qdom.h> +// TQt includes. + +#include <tqcstring.h> +#include <tqtextstream.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqimage.h> +#include <tqstringlist.h> +#include <tqurl.h> +#include <tqlineedit.h> +#include <tqmessagebox.h> +#include <tqdom.h> // KDE includes. @@ -82,16 +82,16 @@ class PicasawebLogin; namespace KIPIPicasawebExportPlugin { -PicasawebTalker::PicasawebTalker( QWidget* parent ) - : m_parent( parent ), m_job( 0 ) +PicasawebTalker::PicasawebTalker( TQWidget* tqparent ) + : m_parent( tqparent ), m_job( 0 ) { m_apikey="49d585bafa0758cb5c58ab67198bf632"; m_secret="34b39925e6273ffd"; - connect(this, SIGNAL(signalError(const QString&)), - this, SLOT(slotError(const QString&))); + connect(this, TQT_SIGNAL(signalError(const TQString&)), + this, TQT_SLOT(slotError(const TQString&))); - authProgressDlg=new QProgressDialog(); + authProgressDlg=new TQProgressDialog(); } PicasawebTalker::~PicasawebTalker() @@ -100,25 +100,25 @@ PicasawebTalker::~PicasawebTalker() m_job->kill(); } -QString PicasawebTalker::getApiSig(QString secret, QStringList headers) +TQString PicasawebTalker::getApiSig(TQString secret, TQStringList headers) { - QStringList compressed ;//= new List<string>(headers.Length); + TQStringList compressed ;//= new List<string>(headers.Length); - for ( QStringList::Iterator it = headers.begin(); it != headers.end(); ++it ) { - QStringList str=QStringList::split("=",(*it)); + for ( TQStringList::Iterator it = headers.begin(); it != headers.end(); ++it ) { + TQStringList str=TQStringList::split("=",(*it)); compressed.append(str[0].stripWhiteSpace()+str[1].stripWhiteSpace()); } compressed.sort(); - QString merged=compressed.join(""); - QString final = secret + merged; + TQString merged=compressed.join(""); + TQString final = secret + merged; const char *test=final.ascii(); KMD5 context (test); //kdDebug()<< "Test Hex Digest output: " << context.hexDigest().data() << endl; return context.hexDigest().data(); } -void PicasawebTalker::getToken(const QString& username, const QString& password ) +void PicasawebTalker::getToken(const TQString& username, const TQString& password ) { if (m_job) { @@ -126,9 +126,9 @@ void PicasawebTalker::getToken(const QString& username, const QString& password m_job = 0; } - QString url = "https://www.google.com/accounts/ClientLogin"; + TQString url = "https://www.google.com/accounts/ClientLogin"; - PicasawebLogin *loginDialog = new PicasawebLogin(kapp->activeWindow(), QString("LoginWindow"), username, password); + PicasawebLogin *loginDialog = new PicasawebLogin(TQT_TQWIDGET(kapp->activeWindow()), TQString("LoginWindow"), username, password); /*if (username!=NULL && username.length() > 0){ // kdDebug()<<"Showing stored username"<< username << endl; loginDialog->setUsername(username); @@ -140,14 +140,14 @@ void PicasawebTalker::getToken(const QString& username, const QString& password } */ - QString username_edit, password_edit; + TQString username_edit, password_edit; if (!loginDialog) { kdDebug()<<" Out of memory error "<< endl; } - if (loginDialog->exec() == QDialog::Accepted) + if (loginDialog->exec() == TQDialog::Accepted) { username_edit = loginDialog->username(); password_edit = loginDialog->password(); @@ -160,22 +160,22 @@ void PicasawebTalker::getToken(const QString& username, const QString& password m_username = username_edit; username_edit = username; - QString accountType = "GOOGLE"; + TQString accountType = "GOOGLE"; if (!(username_edit.endsWith("@gmail.com"))) username_edit += "@gmail.com"; - QByteArray buffer; - QStringList qsl; + TQByteArray buffer; + TQStringList qsl; qsl.append("Email="+username_edit); qsl.append("Passwd="+password_edit); qsl.append("accountType="+accountType); qsl.append("service=lh2"); qsl.append("source=kipi-picasaweb-client"); - QString dataParameters = qsl.join("&"); + TQString dataParameters = qsl.join("&"); - QTextStream ts(buffer, IO_Append|IO_WriteOnly); - ts.setEncoding(QTextStream::UnicodeUTF8); + TQTextStream ts(buffer, IO_Append|IO_WriteOnly); + ts.setEncoding(TQTextStream::UnicodeUTF8); ts << dataParameters; KIO::TransferJob* job = KIO::http_post(url, buffer, false); @@ -183,18 +183,18 @@ void PicasawebTalker::getToken(const QString& username, const QString& password m_state = FE_GETTOKEN; authProgressDlg->setLabelText(i18n("Getting the token")); - connect(job, SIGNAL(data(KIO::Job*, const QByteArray&)), - this, SLOT(data(KIO::Job*, const QByteArray&))); + connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), + this, TQT_SLOT(data(KIO::Job*, const TQByteArray&))); - connect(job, SIGNAL(result(KIO::Job *)), - this, SLOT(slotResult(KIO::Job *))); + connect(job, TQT_SIGNAL(result(KIO::Job *)), + this, TQT_SLOT(slotResult(KIO::Job *))); m_job = job; m_buffer.resize(0); emit signalBusy( true ); } -void PicasawebTalker::authenticate(const QString& token, const QString& username, const QString& password) +void PicasawebTalker::authenticate(const TQString& token, const TQString& username, const TQString& password) { if (!token || token.length() < 1) { @@ -209,7 +209,7 @@ void PicasawebTalker::authenticate(const QString& token, const QString& username } } -void PicasawebTalker::checkToken(const QString& /*token*/) +void PicasawebTalker::checkToken(const TQString& /*token*/) { if (m_job) { @@ -217,19 +217,19 @@ void PicasawebTalker::checkToken(const QString& /*token*/) m_job = 0; } - QString url = "https://www.google.com/accounts/ClientLogin"; - QString auth_string = "GoogleLogin auth=" + m_token; - QByteArray tmp; + TQString url = "https://www.google.com/accounts/ClientLogin"; + TQString auth_string = "GoogleLogin auth=" + m_token; + TQByteArray tmp; KIO::TransferJob* job = KIO::http_post(url, tmp, false); job->addMetaData("customHTTPHeader", "Authorization: " + auth_string); job->addMetaData("content-type", "Content-Type: application/x-www-form-urlencoded"); - connect(job, SIGNAL(data(KIO::Job*, const QByteArray&)), - this, SLOT(data(KIO::Job*, const QByteArray&))); + connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), + this, TQT_SLOT(data(KIO::Job*, const TQByteArray&))); - connect(job, SIGNAL(result(KIO::Job *)), - this, SLOT(slotResult(KIO::Job *))); + connect(job, TQT_SIGNAL(result(KIO::Job *)), + this, TQT_SLOT(slotResult(KIO::Job *))); m_state = FE_CHECKTOKEN; authProgressDlg->setLabelText(i18n("Checking if previous token is still valid")); @@ -253,18 +253,18 @@ void PicasawebTalker::listAllAlbums() { m_job = 0; } - QString url = "http://picasaweb.google.com/data/feed/api/user/" + m_username + "?kind=album"; - QByteArray tmp; - QString auth_string = "GoogleLogin auth=" + m_token; - KIO::TransferJob* job = KIO::get(url, tmp, false); + TQString url = "http://picasaweb.google.com/data/feed/api/user/" + m_username + "?kind=album"; + TQByteArray tmp; + TQString auth_string = "GoogleLogin auth=" + m_token; + KIO::TransferJob* job = KIO::get(url, !tmp.isNull(), false); job->addMetaData("content-type", "Content-Type: application/x-www-form-urlencoded" ); job->addMetaData("customHTTPHeader", "Authorization: " + auth_string ); - connect(job, SIGNAL(data(KIO::Job*, const QByteArray&)), - this, SLOT(data(KIO::Job*, const QByteArray&))); + connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), + this, TQT_SLOT(data(KIO::Job*, const TQByteArray&))); - connect(job, SIGNAL(result(KIO::Job *)), - this, SLOT(slotResult(KIO::Job *))); + connect(job, TQT_SIGNAL(result(KIO::Job *)), + this, TQT_SLOT(slotResult(KIO::Job *))); m_state = FE_LISTALBUMS; m_job = job; @@ -273,7 +273,7 @@ void PicasawebTalker::listAllAlbums() { } -void PicasawebTalker::getPhotoProperty(const QString& method,const QString& argList) +void PicasawebTalker::getPhotoProperty(const TQString& method,const TQString& argList) { if (m_job) { @@ -281,25 +281,25 @@ void PicasawebTalker::getPhotoProperty(const QString& method,const QString& argL m_job = 0; } - QString url="http://www.picasaweb.com/services/rest/?"; - QStringList headers; + TQString url="http://www.picasaweb.com/services/rest/?"; + TQStringList headers; headers.append("api_key="+ m_apikey); headers.append("method="+method); headers.append("frob="+ m_frob); headers.append(argList); - QString md5=getApiSig(m_secret,headers); + TQString md5=getApiSig(m_secret,headers); headers.append("api_sig="+ md5); - QString queryStr=headers.join("&"); - QString postUrl=url+queryStr; - QByteArray tmp; + TQString queryStr=headers.join("&"); + TQString postUrl=url+queryStr; + TQByteArray tmp; KIO::TransferJob* job = KIO::http_post(postUrl, tmp, false); job->addMetaData("content-type", "Content-Type: application/x-www-form-urlencoded" ); - connect(job, SIGNAL(data(KIO::Job*, const QByteArray&)), - this, SLOT(data(KIO::Job*, const QByteArray&))); + connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), + this, TQT_SLOT(data(KIO::Job*, const TQByteArray&))); - connect(job, SIGNAL(result(KIO::Job *)), - this, SLOT(slotResult(KIO::Job *))); + connect(job, TQT_SIGNAL(result(KIO::Job *)), + this, TQT_SLOT(slotResult(KIO::Job *))); m_state = FE_GETPHOTOPROPERTY; m_job = job; @@ -309,35 +309,35 @@ void PicasawebTalker::getPhotoProperty(const QString& method,const QString& argL //authProgressDlg->setProgress(3,4); } -void PicasawebTalker::addPhotoTag(const QString& photoURI, const QString& tag) +void PicasawebTalker::addPhotoTag(const TQString& photoURI, const TQString& tag) { //if (m_job && m_state != FE_ADDTAG){ //we shouldn't kill the old tag request // m_job->kill(); // m_job = 0; //} - QString addTagXML = QString("<entry xmlns='http://www.w3.org/2005/Atom'> " + TQString addTagXML = TQString("<entry xmlns='http://www.w3.org/2005/Atom'> " "<title>%1</title> " "<category scheme='http://schemas.google.com/g/2005#kind' " "term='http://schemas.google.com/photos/2007#tag'/> " - "</entry>").arg(tag); - QString postUrl = QString("%1").arg(photoURI); - QByteArray buffer; - QTextStream ts(buffer, IO_Append|IO_WriteOnly); - ts.setEncoding(QTextStream::UnicodeUTF8); + "</entry>").tqarg(tag); + TQString postUrl = TQString("%1").tqarg(photoURI); + TQByteArray buffer; + TQTextStream ts(buffer, IO_Append|IO_WriteOnly); + ts.setEncoding(TQTextStream::UnicodeUTF8); ts << addTagXML; - QString auth_string = "GoogleLogin auth=" + m_token; + 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", QString("Content-Length: %1").arg(addTagXML.length())); + job->addMetaData("content-length", TQString("Content-Length: %1").tqarg(addTagXML.length())); job->addMetaData("customHTTPHeader", "Authorization: " + auth_string ); - //connect(job, SIGNAL(data(KIO::Job*, const QByteArray&)), - // this, SLOT(data(KIO::Job*, const QByteArray&))); + //connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), + // this, TQT_SLOT(data(KIO::Job*, const TQByteArray&))); - connect(job, SIGNAL(result(KIO::Job *)), - this, SLOT(slotResult(KIO::Job *))); + connect(job, TQT_SIGNAL(result(KIO::Job *)), + this, TQT_SLOT(slotResult(KIO::Job *))); m_state = FE_ADDTAG; m_job = job; @@ -345,14 +345,14 @@ void PicasawebTalker::addPhotoTag(const QString& photoURI, const QString& tag) emit signalBusy(true); } -void PicasawebTalker::listPhotos(const QString& /*albumName*/) +void PicasawebTalker::listPhotos(const TQString& /*albumName*/) { // TODO } -void PicasawebTalker::createAlbum(const QString& albumTitle, const QString& albumDesc, - const QString& location, uint timestamp, const QString& access, - const QString& media_keywords, bool isCommentsEnabled) +void PicasawebTalker::createAlbum(const TQString& albumTitle, const TQString& albumDesc, + const TQString& location, uint timestamp, const TQString& access, + const TQString& media_keywords, bool isCommentsEnabled) { if (m_job) { @@ -360,7 +360,7 @@ void PicasawebTalker::createAlbum(const QString& albumTitle, const QString& albu m_job = 0; } - QString newAlbumXML = QString("<entry xmlns='http://www.w3.org/2005/Atom' " + TQString newAlbumXML = TQString("<entry xmlns='http://www.w3.org/2005/Atom' " "xmlns:media='http://search.yahoo.com/mrss/' " "xmlns:gphoto='http://schemas.google.com/photos/2007'> " "<title type='text'>%1</title> " @@ -374,32 +374,32 @@ void PicasawebTalker::createAlbum(const QString& albumTitle, const QString& albu "</media:group> " "<category scheme='http://schemas.google.com/g/2005#kind' " "term='http://schemas.google.com/photos/2007#album'></category> " - "</entry> ").arg(albumTitle) - .arg(albumDesc) - .arg(location) - .arg(access) - .arg(isCommentsEnabled==true?"true":"false") - .arg(timestamp) - .arg(media_keywords); - - QByteArray buffer; - QTextStream ts(buffer, IO_Append|IO_WriteOnly); - ts.setEncoding(QTextStream::UnicodeUTF8); + "</entry> ").tqarg(albumTitle) + .tqarg(albumDesc) + .tqarg(location) + .tqarg(access) + .tqarg(isCommentsEnabled==true?"true":"false") + .tqarg(timestamp) + .tqarg(media_keywords); + + TQByteArray buffer; + TQTextStream ts(buffer, IO_Append|IO_WriteOnly); + ts.setEncoding(TQTextStream::UnicodeUTF8); ts << newAlbumXML; MPForm form; - QString postUrl = "http://www.picasaweb.google.com/data/feed/api/user/" + m_username ; - QString auth_string = "GoogleLogin auth=" + m_token; + TQString postUrl = "http://www.picasaweb.google.com/data/feed/api/user/" + m_username ; + 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", QString("Content-Length: %1").arg(newAlbumXML.length())); + job->addMetaData("content-length", TQString("Content-Length: %1").tqarg(newAlbumXML.length())); job->addMetaData("customHTTPHeader", "Authorization: " + auth_string ); - connect(job, SIGNAL(data(KIO::Job*, const QByteArray&)), - this, SLOT(data(KIO::Job*, const QByteArray&))); + connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), + this, TQT_SLOT(data(KIO::Job*, const TQByteArray&))); - connect(job, SIGNAL(result(KIO::Job *)), - this, SLOT(slotResult(KIO::Job *))); + connect(job, TQT_SIGNAL(result(KIO::Job *)), + this, TQT_SLOT(slotResult(KIO::Job *))); m_state = FE_CREATEALBUM; m_job = job; @@ -407,8 +407,8 @@ void PicasawebTalker::createAlbum(const QString& albumTitle, const QString& albu emit signalBusy(true); } -bool PicasawebTalker::addPhoto(const QString& photoPath, FPhotoInfo& info, - const QString& albumId, bool rescale, +bool PicasawebTalker::addPhoto(const TQString& photoPath, FPhotoInfo& info, + const TQString& albumId, bool rescale, int maxDim, int imageQuality) { // Disabling this totally may be checking the m_state and doing selecting @@ -419,21 +419,21 @@ bool PicasawebTalker::addPhoto(const QString& photoPath, FPhotoInfo& info, m_job = 0; }*/ - QString album_id = albumId; + TQString album_id = albumId; if (album_id.length() == 0) album_id = "test"; - QString postUrl = "http://www.picasaweb.google.com/data/feed/api/user/" + KURL::encode_string(m_username) + "/albumid/" + album_id; - QString path = postUrl; - QStringList headers; + TQString postUrl = "http://www.picasaweb.google.com/data/feed/api/user/" + KURL::encode_string(m_username) + "/albumid/" + album_id; + TQString path = postUrl; + TQStringList headers; MPForm form; - QString auth_string = "GoogleLogin auth=" + m_token; + TQString auth_string = "GoogleLogin auth=" + m_token; //form.addPair("Authorization", auth_string); //Create the Body in atom-xml - QStringList body_xml; + TQStringList body_xml; body_xml.append("<entry xmlns=\'http://www.w3.org/2005/Atom\'>"); body_xml.append("<title>"+ info.title +"</title>"); body_xml.append("<summary>"+ info.description +"</summary>"); @@ -441,32 +441,32 @@ bool PicasawebTalker::addPhoto(const QString& photoPath, FPhotoInfo& info, "term=\"http://schemas.google.com/photos/2007#photo\" />"); body_xml.append("</entry>"); - QString body = body_xml.join(""); + TQString body = body_xml.join(""); form.addPair("test", body, "application/atom+xml"); // save the tags for this photo in to the tags hashmap tags_map.insert(info.title, info.tags); - QImage image; + TQImage image; // Check if RAW file. #if KDCRAW_VERSION < 0x000106 - QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles()); + TQString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles()); #else - QString rawFilesExt(KDcrawIface::KDcraw::rawFiles()); + TQString rawFilesExt(KDcrawIface::KDcraw::rawFiles()); #endif - QFileInfo fileInfo(photoPath); - if (rawFilesExt.upper().contains(fileInfo.extension(false).upper())) + TQFileInfo fileInfo(photoPath); + if (rawFilesExt.upper().tqcontains(fileInfo.extension(false).upper())) KDcrawIface::KDcraw::loadDcrawPreview(image, photoPath); else image.load(photoPath); if (!image.isNull()) { - path = locateLocal("tmp", QFileInfo(photoPath).baseName().stripWhiteSpace() + ".jpg"); + path = locateLocal("tmp", TQFileInfo(photoPath).baseName().stripWhiteSpace() + ".jpg"); if (rescale && (image.width() > maxDim || image.height() > maxDim)) - image = image.smoothScale(maxDim, maxDim, QImage::ScaleMin); + image = image.smoothScale(maxDim, maxDim, TQ_ScaleMin); image.save(path, "JPEG", imageQuality); @@ -476,7 +476,7 @@ bool PicasawebTalker::addPhoto(const QString& photoPath, FPhotoInfo& info, if (exiv2Iface.load(photoPath)) { - exiv2Iface.setImageProgramId(QString("Kipi-plugins"), QString(kipiplugins_version)); + exiv2Iface.setImageProgramId(TQString("Kipi-plugins"), TQString(kipiplugins_version)); exiv2Iface.setImageDimensions(image.size()); exiv2Iface.save(path); } @@ -497,11 +497,11 @@ bool PicasawebTalker::addPhoto(const QString& photoPath, FPhotoInfo& info, job->addMetaData("content-type", form.contentType()); job->addMetaData("customHTTPHeader", "Authorization: " + auth_string ); - connect(job, SIGNAL(data(KIO::Job*, const QByteArray&)), - this, SLOT(data(KIO::Job*, const QByteArray&))); + connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), + this, TQT_SLOT(data(KIO::Job*, const TQByteArray&))); - connect(job, SIGNAL(result(KIO::Job *)), - this, SLOT(slotResult(KIO::Job *))); + connect(job, TQT_SIGNAL(result(KIO::Job *)), + this, TQT_SLOT(slotResult(KIO::Job *))); m_state = FE_ADDPHOTO; m_job = job; @@ -510,12 +510,12 @@ bool PicasawebTalker::addPhoto(const QString& photoPath, FPhotoInfo& info, return true; } -QString PicasawebTalker::getUserName() +TQString PicasawebTalker::getUserName() { return m_username; } -QString PicasawebTalker::getUserId() +TQString PicasawebTalker::getUserId() { return m_userId; } @@ -532,24 +532,24 @@ void PicasawebTalker::cancel() authProgressDlg->hide(); } -void PicasawebTalker::info(KIO::Job* /*job*/, const QString& /*str*/) +void PicasawebTalker::info(KIO::Job* /*job*/, const TQString& /*str*/) { } -void PicasawebTalker::data(KIO::Job*, const QByteArray& data) +void PicasawebTalker::data(KIO::Job*, const TQByteArray& data) { if (data.isEmpty()) return; int oldSize = m_buffer.size(); m_buffer.resize(m_buffer.size() + data.size()); - QString output_data = QString(data); + TQString output_data = TQString(data); memcpy(m_buffer.data()+oldSize, data.data(), data.size()); } -void PicasawebTalker::slotError(const QString & error) +void PicasawebTalker::slotError(const TQString & error) { - QString transError; + TQString transError; int errorNo = 0; if (!error.isEmpty()) @@ -593,7 +593,7 @@ void PicasawebTalker::slotError(const QString & error) transError=i18n("Unknown error"); }; - KMessageBox::error(kapp->activeWindow(), i18n("Error Occured: %1\n We can not proceed further").arg(transError)); + KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Error Occured: %1\n We can not proceed further").tqarg(transError)); //kdDebug()<<"Not handling the error now will see it later"<<endl; } @@ -652,12 +652,12 @@ void PicasawebTalker::slotResult(KIO::Job *job) } } -void PicasawebTalker::parseResponseCheckToken(const QByteArray &data) +void PicasawebTalker::parseResponseCheckToken(const TQByteArray &data) { bool success = false; - QString errorString; - QString username; - QString transReturn(data); + TQString errorString; + TQString username; + TQString transReturn(data); // If checktoken failed. // getToken ... @@ -671,18 +671,18 @@ void PicasawebTalker::parseResponseCheckToken(const QByteArray &data) //emit signalError(errorString); } -void PicasawebTalker::parseResponseGetToken(const QByteArray &data) +void PicasawebTalker::parseResponseGetToken(const TQByteArray &data) { bool success = false; - QString errorString; - QString str(data); + TQString errorString; + TQString str(data); //Check the response code should it be 200, proceed //if it is 403 handle the error mesg //figure out the auth string from this response - if (str.find("Auth=")) + if (str.tqfind("Auth=")) { - QStringList strList = QStringList::split("Auth=", str); + TQStringList strList = TQStringList::split("Auth=", str); m_token = strList[1]; success = 1; } @@ -700,29 +700,29 @@ void PicasawebTalker::parseResponseGetToken(const QByteArray &data) emit signalBusy(false); } -void PicasawebTalker::getHTMLResponseCode(const QString& /*str*/) +void PicasawebTalker::getHTMLResponseCode(const TQString& /*str*/) { } -void PicasawebTalker::parseResponseListAlbums(const QByteArray &data) +void PicasawebTalker::parseResponseListAlbums(const TQByteArray &data) { bool success = false; - QString str(data); - QDomDocument doc( "feed" ); + TQString str(data); + TQDomDocument doc( "feed" ); if ( !doc.setContent( data ) ) { return; } - QDomElement docElem = doc.documentElement(); - QDomNode node = docElem.firstChild(); - QDomElement e; - QString feed_id, feed_updated, feed_title, feed_subtitle; - QString feed_icon_url, feed_link_url; - QString feed_username, feed_user_uri; + TQDomElement docElem = doc.documentElement(); + TQDomNode node = docElem.firstChild(); + TQDomElement e; + TQString feed_id, feed_updated, feed_title, feed_subtitle; + TQString feed_icon_url, feed_link_url; + TQString feed_username, feed_user_uri; - QString album_id, album_title, album_description; - m_albumsList = new QValueList <PicasaWebAlbum>(); + TQString album_id, album_title, album_description; + m_albumsList = new TQValueList <PicasaWebAlbum>(); while(!node.isNull()) { @@ -730,9 +730,9 @@ void PicasawebTalker::parseResponseListAlbums(const QByteArray &data) { success = true; e = node.toElement(); - QDomNode details=e.firstChild(); + TQDomNode details=e.firstChild(); PicasaWebAlbum fps; - QDomNode detailsNode = details; + TQDomNode detailsNode = details; while(!detailsNode.isNull()) { @@ -742,10 +742,10 @@ void PicasawebTalker::parseResponseListAlbums(const QByteArray &data) { // The node data is a URL of which album id is the string following the last / // like <id>http://www.picasaweb.google.com/.../AlbumID<id> - QString albumIdUrl = detailsNode.toElement().text(); - int index = albumIdUrl.findRev("/"); + TQString albumIdUrl = detailsNode.toElement().text(); + int index = albumIdUrl.tqfindRev("/"); int length = albumIdUrl.length(); - QString album_id = albumIdUrl.right(length - index - 1); + TQString album_id = albumIdUrl.right(length - index - 1); fps.id = album_id; } @@ -762,7 +762,7 @@ void PicasawebTalker::parseResponseListAlbums(const QByteArray &data) if(detailsNode.nodeName()=="gphoto:name") { - QString name = detailsNode.toElement().text(); + TQString name = detailsNode.toElement().text(); } } @@ -786,38 +786,38 @@ void PicasawebTalker::parseResponseListAlbums(const QByteArray &data) } } -void PicasawebTalker::parseResponseListPhotos(const QByteArray &data) +void PicasawebTalker::parseResponseListPhotos(const TQByteArray &data) { - QDomDocument doc( "getPhotosList" ); + TQDomDocument doc( "getPhotosList" ); if ( !doc.setContent( data ) ) { return; } - QDomElement docElem = doc.documentElement(); - QDomNode node = docElem.firstChild(); - //QDomElement e; + TQDomElement docElem = doc.documentElement(); + TQDomNode node = docElem.firstChild(); + //TQDomElement e; // TODO } -void PicasawebTalker::parseResponseCreateAlbum(const QByteArray &data) +void PicasawebTalker::parseResponseCreateAlbum(const TQByteArray &data) { bool success = false; - QString errorString; - QString response(data); - QDomDocument doc( "AddPhoto Response" ); + TQString errorString; + TQString response(data); + TQDomDocument doc( "AddPhoto Response" ); // parse the new album name - QDomElement docElem = doc.documentElement(); - QString title, photo_id, album_id, photoURI; - QDomNode node = docElem.firstChild(); //this should mean <entry> - QDomElement e; + TQDomElement docElem = doc.documentElement(); + TQString title, photo_id, album_id, photoURI; + TQDomNode node = docElem.firstChild(); //this should mean <entry> + TQDomElement e; while( !node.isNull() ) { if ( node.isElement()) { - QString node_name = node.nodeName(); - QString node_value = node.toElement().text(); + TQString node_name = node.nodeName(); + TQString node_value = node.toElement().text(); if(node_name == "title") { success = true; @@ -837,9 +837,9 @@ void PicasawebTalker::parseResponseCreateAlbum(const QByteArray &data) // Raise a popup informing success } -void PicasawebTalker::parseResponseAddTag(const QByteArray &data) +void PicasawebTalker::parseResponseAddTag(const TQByteArray &data) { - QString str(data); + TQString str(data); remaining_tags_count -= 1; emit signalBusy( false ); m_buffer.resize(0); @@ -848,30 +848,30 @@ void PicasawebTalker::parseResponseAddTag(const QByteArray &data) emit signalAddPhotoSucceeded(); } -void PicasawebTalker::parseResponseAddPhoto(const QByteArray &data) +void PicasawebTalker::parseResponseAddPhoto(const TQByteArray &data) { bool success = false; - QString line; - QString str(data); + TQString line; + TQString str(data); success = 1; - QDomDocument doc( "AddPhoto Response" ); + TQDomDocument doc( "AddPhoto Response" ); if ( !doc.setContent( data ) ) { return; } - QDomElement docElem = doc.documentElement(); - QString title, photo_id, album_id, photoURI; - QDomNode node = docElem.firstChild(); //this should mean <entry> - QDomElement e; + TQDomElement docElem = doc.documentElement(); + TQString title, photo_id, album_id, photoURI; + TQDomNode node = docElem.firstChild(); //this should mean <entry> + TQDomElement e; while( !node.isNull() ) { if ( node.isElement()) { - QString node_name = node.nodeName(); - QString node_value = node.toElement().text(); + TQString node_name = node.nodeName(); + TQString node_value = node.toElement().text(); if(node_name == "title") { success = true; @@ -895,49 +895,49 @@ void PicasawebTalker::parseResponseAddPhoto(const QByteArray &data) else { // Update the tags information from the tags_map - QStringList tags = tags_map[title]; + TQStringList tags = tags_map[title]; remaining_tags_count = tags.count(); if (tags.count() == 0) emit signalAddPhotoSucceeded(); - for ( QStringList::Iterator it = tags.begin(); it != tags.end(); ++it ) + for ( TQStringList::Iterator it = tags.begin(); it != tags.end(); ++it ) { - QString photoURI= QString("http://picasaweb.google.com/data/feed/api/user/" - "%1/albumid/%2/photoid/%3").arg(m_username).arg(album_id).arg(photo_id); + 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); addPhotoTag( photoURI, *it); } } } -void PicasawebTalker::parseResponsePhotoProperty(const QByteArray &data) +void PicasawebTalker::parseResponsePhotoProperty(const TQByteArray &data) { bool success = false; - QString line; - QDomDocument doc( "Photos Properties" ); + TQString line; + TQDomDocument doc( "Photos Properties" ); if ( !doc.setContent( data ) ) { return; } - QDomElement docElem = doc.documentElement(); - QDomNode node = docElem.firstChild(); - QDomElement e; + TQDomElement docElem = doc.documentElement(); + TQDomNode node = docElem.firstChild(); + TQDomElement e; while( !node.isNull() ) { if ( node.isElement() && node.nodeName() == "photoid" ) { e = node.toElement(); // try to convert the node to an element. - QDomNode details=e.firstChild(); + TQDomNode details=e.firstChild(); success=true; } if ( node.isElement() && node.nodeName() == "err" ) { kdDebug()<<"Checking Error in response"<<endl; - QString code=node.toElement().attribute("code"); + TQString code=node.toElement().attribute("code"); kdDebug()<<"Error code="<<code<<endl; kdDebug()<<"Msg="<<node.toElement().attribute("msg")<<endl; emit signalError(code); diff --git a/kipi-plugins/picasawebexport/picasawebtalker.h b/kipi-plugins/picasawebexport/picasawebtalker.h index c59f71a..05adacc 100644 --- a/kipi-plugins/picasawebexport/picasawebtalker.h +++ b/kipi-plugins/picasawebexport/picasawebtalker.h @@ -24,12 +24,12 @@ #ifndef PICASAWEBTALKER_H #define PICASAWEBTALKER_H -// Qt includes. +// TQt includes. -#include <qvaluelist.h> -#include <qobject.h> -#include <qprogressdialog.h> -#include <qmap.h> +#include <tqvaluelist.h> +#include <tqobject.h> +#include <tqprogressdialog.h> +#include <tqmap.h> // KDE includes. @@ -51,9 +51,10 @@ class GPhoto; class FPhotoInfo; class PicasaWebAlbum; -class PicasawebTalker : public QObject +class PicasawebTalker : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -74,84 +75,84 @@ public: public: - PicasawebTalker(QWidget* parent); + PicasawebTalker(TQWidget* tqparent); ~PicasawebTalker(); - QValueList <PicasaWebAlbum> * m_albumsList; - QString getApiSig(QString,QStringList) ; - void addPhotoTag(const QString& photoURI, const QString& tag); - void getToken(const QString& user, const QString& passwd) ; - void checkToken(const QString& token) ; - void authenticate(const QString& token=NULL, const QString& username=NULL, const QString& password=NULL) ; - void getPhotoProperty(const QString& method, const QString& argList) ; - void getHTMLResponseCode(const QString& str); + TQValueList <PicasaWebAlbum> * m_albumsList; + TQString getApiSig(TQString,TQStringList) ; + void addPhotoTag(const TQString& photoURI, const TQString& tag); + void getToken(const TQString& user, const TQString& passwd) ; + void checkToken(const TQString& token) ; + void authenticate(const TQString& token=NULL, const TQString& username=NULL, const TQString& password=NULL) ; + void getPhotoProperty(const TQString& method, const TQString& argList) ; + void getHTMLResponseCode(const TQString& str); void listAllAlbums(); - void listPhotos( const QString& albumName ); - void createAlbum( const QString& albumTitle, const QString& albumDesc, const QString& location, - uint timestamp, const QString& access, const QString& media_keywords, bool isCommentEnabled=true); - bool addPhoto( const QString& photoPath, - FPhotoInfo& info, const QString& albumname, + void listPhotos( const TQString& albumName ); + void createAlbum( const TQString& albumTitle, const TQString& albumDesc, const TQString& location, + uint timestamp, const TQString& access, const TQString& media_keywords, bool isCommentEnabled=true); + bool addPhoto( const TQString& photoPath, + FPhotoInfo& info, const TQString& albumname, bool rescale=false, int maxDim=600 , int imageQuality=85 ); - QString getUserName(); - QString getUserId(); + TQString getUserName(); + TQString getUserId(); void cancel(); public: - QProgressDialog *authProgressDlg; + TQProgressDialog *authProgressDlg; signals: - void signalError( const QString& msg ); -// void signalLoginFailed( const QString& msg ); + void signalError( const TQString& msg ); +// void signalLoginFailed( const TQString& msg ); void signalBusy( bool val ); - void signalAlbums( const QValueList<GAlbum>& albumList ); - void signalPhotos( const QValueList<GPhoto>& photoList ); + void signalAlbums( const TQValueList<GAlbum>& albumList ); + void signalPhotos( const TQValueList<GPhoto>& photoList ); void signalAddPhotoSucceeded( ); void signalGetAlbumsListSucceeded(); - void signalGetAlbumsListFailed( const QString& msg ); - void signalAddPhotoFailed( const QString& msg ); + void signalGetAlbumsListFailed( const TQString& msg ); + void signalAddPhotoFailed( const TQString& msg ); void signalAuthenticate() ; - void signalTokenObtained(const QString& token); + void signalTokenObtained(const TQString& token); private: -// void parseResponseLogin(const QByteArray &data); - void parseResponseListAlbums(const QByteArray &data); - void parseResponseListPhotos(const QByteArray &data); - void parseResponseCreateAlbum(const QByteArray &data); - void parseResponseAddPhoto(const QByteArray &data); - void parseResponseAddTag(const QByteArray &data); - void parseResponseGetToken(const QByteArray &data); - void parseResponseCheckToken(const QByteArray &data); - void parseResponsePhotoProperty(const QByteArray &data); +// void parseResponseLogin(const TQByteArray &data); + void parseResponseListAlbums(const TQByteArray &data); + void parseResponseListPhotos(const TQByteArray &data); + void parseResponseCreateAlbum(const TQByteArray &data); + void parseResponseAddPhoto(const TQByteArray &data); + void parseResponseAddTag(const TQByteArray &data); + void parseResponseGetToken(const TQByteArray &data); + void parseResponseCheckToken(const TQByteArray &data); + void parseResponsePhotoProperty(const TQByteArray &data); private slots: - void slotError( const QString& msg ); + void slotError( const TQString& msg ); // void slotAuthenticate() ; - void data(KIO::Job *job, const QByteArray &data); - void info(KIO::Job *job, const QString& str); + void data(KIO::Job *job, const TQByteArray &data); + void info(KIO::Job *job, const TQString& str); void slotResult (KIO::Job *job); private: int remaining_tags_count; - QWidget* m_parent; + TQWidget* m_parent; - QByteArray m_buffer; + TQByteArray m_buffer; -// QString m_cookie; - QString m_apikey; - QString m_secret; - QString m_frob; - QString m_token; - QString m_username; - QString m_password; - QString m_userId; +// TQString m_cookie; + TQString m_apikey; + TQString m_secret; + TQString m_frob; + TQString m_token; + TQString m_username; + TQString m_password; + TQString m_userId; - QMap<QString, QStringList > tags_map; + TQMap<TQString, TQStringList > tags_map; // KURL m_url; KIO::Job* m_job; diff --git a/kipi-plugins/picasawebexport/picasawebviewitem.cpp b/kipi-plugins/picasawebexport/picasawebviewitem.cpp index 817b3ff..c847743 100644 --- a/kipi-plugins/picasawebexport/picasawebviewitem.cpp +++ b/kipi-plugins/picasawebexport/picasawebviewitem.cpp @@ -21,10 +21,10 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qpainter.h> -#include <qpixmap.h> +#include <tqpainter.h> +#include <tqpixmap.h> // Local includes. @@ -33,23 +33,23 @@ namespace KIPIPicasawebExportPlugin { -void GAlbumViewItem::paintCell(QPainter* p, const QColorGroup& cg, int column, int width, int) +void GAlbumViewItem::paintCell(TQPainter* p, const TQColorGroup& cg, int column, int width, int) { if (!p) return; - QListView *lv = listView(); + TQListView *lv = listView(); if (!lv) return; - QFontMetrics fm(p->fontMetrics()); + TQFontMetrics fm(p->fontMetrics()); if (isSelected()) p->fillRect(0, 0, width, height(), cg.highlight()); else p->fillRect(0, 0, width, height(), cg.base()); - const QPixmap * icon = pixmap( column ); + const TQPixmap * icon = pixmap( column ); int iconWidth = 0; if (icon) @@ -67,21 +67,21 @@ void GAlbumViewItem::paintCell(QPainter* p, const QColorGroup& cg, int column, i int r = lv->itemMargin() + iconWidth; int h = lv->fontMetrics().height() + 2; - p->drawText(r, 0, width-r, h, Qt::AlignVCenter, album.title); + p->drawText(r, 0, width-r, h, TQt::AlignVCenter, album.title); - QFont fn(lv->font()); + TQFont fn(lv->font()); fn.setPointSize(fn.pointSize()-2); fn.setItalic(true); p->setFont(fn); - p->setPen(isSelected() ? cg.highlightedText() : Qt::gray); - p->drawText(r, h, width-r, h, Qt::AlignVCenter, album.name); + p->setPen(isSelected() ? cg.highlightedText() : TQt::gray); + p->drawText(r, h, width-r, h, TQt::AlignVCenter, album.name); } void GAlbumViewItem::setup() { int h = listView()->fontMetrics().height(); int margin = 4; - setHeight(QMAX(2*h + margin, 32)); + setHeight(TQMAX(2*h + margin, 32)); } } // namespace KIPIPicasawebExportPlugin diff --git a/kipi-plugins/picasawebexport/picasawebviewitem.h b/kipi-plugins/picasawebexport/picasawebviewitem.h index 28904a7..bdf1e18 100644 --- a/kipi-plugins/picasawebexport/picasawebviewitem.h +++ b/kipi-plugins/picasawebexport/picasawebviewitem.h @@ -24,9 +24,9 @@ #ifndef PICASAWEBVIEWITEM_H #define PICASAWEBVIEWITEM_H -// Qt includes. +// TQt includes. -#include <qlistview.h> +#include <tqlistview.h> // Local includes. @@ -35,16 +35,16 @@ namespace KIPIPicasawebExportPlugin { -class GAlbumViewItem : public QListViewItem +class GAlbumViewItem : public TQListViewItem { public: - GAlbumViewItem(QListView* parent, const QString& name, const GAlbum& _album) - : QListViewItem(parent, name), album(_album) {}; + GAlbumViewItem(TQListView* tqparent, const TQString& name, const GAlbum& _album) + : TQListViewItem(tqparent, name), album(_album) {}; - GAlbumViewItem(QListViewItem* parent, const QString& name, const GAlbum& _album) - : QListViewItem(parent, name), album(_album) {}; + GAlbumViewItem(TQListViewItem* tqparent, const TQString& name, const GAlbum& _album) + : TQListViewItem(tqparent, name), album(_album) {}; ~GAlbumViewItem() {}; @@ -54,8 +54,8 @@ public: protected: - void paintCell(QPainter *p, const QColorGroup& cg, int column, int width, int); - void paintFocus (QPainter*, const QColorGroup&, const QRect&) {} + void paintCell(TQPainter *p, const TQColorGroup& cg, int column, int width, int); + void paintFocus (TQPainter*, const TQColorGroup&, const TQRect&) {} void setup(); }; diff --git a/kipi-plugins/picasawebexport/picasawebwidget.cpp b/kipi-plugins/picasawebexport/picasawebwidget.cpp index f76e180..c9096c4 100644 --- a/kipi-plugins/picasawebexport/picasawebwidget.cpp +++ b/kipi-plugins/picasawebexport/picasawebwidget.cpp @@ -20,23 +20,23 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qpushbutton.h> -#include <qlabel.h> -#include <qframe.h> -#include <qheader.h> -#include <qlistview.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> -#include <qgroupbox.h> -#include <qspinbox.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qsplitter.h> -#include <qwhatsthis.h> -#include <qlineedit.h> +#include <tqpushbutton.h> +#include <tqlabel.h> +#include <tqframe.h> +#include <tqheader.h> +#include <tqlistview.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> +#include <tqgroupbox.h> +#include <tqspinbox.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqsplitter.h> +#include <tqwhatsthis.h> +#include <tqlineedit.h> // KDE includes. @@ -52,13 +52,13 @@ namespace KIPIPicasawebExportPlugin { -PicasawebWidget::PicasawebWidget(QWidget* parent, const char* name, WFlags fl) - : UploadWidget(parent, name, fl) +PicasawebWidget::PicasawebWidget(TQWidget* tqparent, const char* name, WFlags fl) + : UploadWidget(tqparent, name, fl) { if ( !name ) setName("PicasawebWidget"); - //resize( QSize(600, 400).expandedTo(minimumSizeHint()) ); + //resize( TQSize(600, 400).expandedTo(tqminimumSizeHint()) ); //clearWState( WState_Polished ); } diff --git a/kipi-plugins/picasawebexport/picasawebwidget.h b/kipi-plugins/picasawebexport/picasawebwidget.h index b6ba85d..ca76c30 100644 --- a/kipi-plugins/picasawebexport/picasawebwidget.h +++ b/kipi-plugins/picasawebexport/picasawebwidget.h @@ -23,20 +23,20 @@ #ifndef PICASAWEBWIDGET_H #define PICASAWEBWIDGET_H -// Qt includes. +// TQt includes. -#include <qwidget.h> +#include <tqwidget.h> // Local includes. #include "uploadwidget.h" -class QListView; -class QPushButton; -class QSpinBox; -class QCheckBox; -class QLineEdit; -class QRadioButton; +class TQListView; +class TQPushButton; +class TQSpinBox; +class TQCheckBox; +class TQLineEdit; +class TQRadioButton; class KHTMLPart; @@ -48,10 +48,11 @@ class UploadWidget; class PicasawebWidget : public UploadWidget { Q_OBJECT + TQ_OBJECT public: - PicasawebWidget(QWidget* parent=0, const char* name=0, WFlags fl= 0); + PicasawebWidget(TQWidget* tqparent=0, const char* name=0, WFlags fl= 0); ~PicasawebWidget(); private slots: @@ -61,12 +62,12 @@ private slots: private: - QListView* m_tagView; + TQListView* m_tagView; - QButtonGroup* m_fileSrcButtonGroup; + TQButtonGroup* m_fileSrcButtonGroup; -// QCheckBox* m_resizeCheckBox; -// QCheckBox* m_exportApplicationTags; +// TQCheckBox* m_resizeCheckBox; +// TQCheckBox* m_exportApplicationTags; KHTMLPart* m_photoView; diff --git a/kipi-plugins/picasawebexport/picasawebwindow.cpp b/kipi-plugins/picasawebexport/picasawebwindow.cpp index 9e796a3..38d7af1 100644 --- a/kipi-plugins/picasawebexport/picasawebwindow.cpp +++ b/kipi-plugins/picasawebexport/picasawebwindow.cpp @@ -21,23 +21,23 @@ * * ============================================================ */ -// Qt includes. - -#include <qlistview.h> -#include <qpushbutton.h> -#include <qcombobox.h> -#include <qtimer.h> -#include <qpixmap.h> -#include <qcursor.h> -#include <qlineedit.h> -#include <qprogressdialog.h> -#include <qspinbox.h> -#include <qcheckbox.h> -#include <qstringlist.h> -#include <qradiobutton.h> -#include <qdatetimeedit.h> -#include <qdatetime.h> -#include <qtextedit.h> +// TQt includes. + +#include <tqlistview.h> +#include <tqpushbutton.h> +#include <tqcombobox.h> +#include <tqtimer.h> +#include <tqpixmap.h> +#include <tqcursor.h> +#include <tqlineedit.h> +#include <tqprogressdialog.h> +#include <tqspinbox.h> +#include <tqcheckbox.h> +#include <tqstringlist.h> +#include <tqradiobutton.h> +#include <tqdatetimeedit.h> +#include <tqdatetime.h> +#include <tqtextedit.h> // KDE includes. @@ -80,7 +80,7 @@ namespace KIPIPicasawebExportPlugin { -PicasawebWindow::PicasawebWindow(KIPI::Interface* interface, const QString &tmpFolder, QWidget* /*parent*/) +PicasawebWindow::PicasawebWindow(KIPI::Interface* interface, const TQString &tmpFolder, TQWidget* /*tqparent*/) : KDialogBase(0, 0, false, i18n("Export to Picasa Web Service"), Help|Close, Close, false), m_tmp(tmpFolder) { @@ -130,60 +130,60 @@ PicasawebWindow::PicasawebWindow(KIPI::Interface* interface, const QString &tmpF KHelpMenu* helpMenu = new KHelpMenu(this, m_about, false); helpMenu->menu()->removeItemAt(0); - helpMenu->menu()->insertItem(i18n("Plugin Handbook"), this, SLOT(slotHelp()), 0, -1, 0); + helpMenu->menu()->insertItem(i18n("Plugin Handbook"), this, TQT_SLOT(slotHelp()), 0, -1, 0); actionButton(Help)->setPopup(helpMenu->menu()); // ------------------------------------------------------------ m_talker = new PicasawebTalker(this); - connect(m_talker, SIGNAL(signalBusy(bool)), - this, SLOT(slotBusy( bool))); + connect(m_talker, TQT_SIGNAL(signalBusy(bool)), + this, TQT_SLOT(slotBusy( bool))); - connect(m_talker, SIGNAL(signalAddPhotoSucceeded()), - this, SLOT(slotAddPhotoSucceeded())); + connect(m_talker, TQT_SIGNAL(signalAddPhotoSucceeded()), + this, TQT_SLOT(slotAddPhotoSucceeded())); - connect(m_talker, SIGNAL(signalGetAlbumsListSucceeded()), - this, SLOT(slotGetAlbumsListSucceeded())); + connect(m_talker, TQT_SIGNAL(signalGetAlbumsListSucceeded()), + this, TQT_SLOT(slotGetAlbumsListSucceeded())); - connect(m_talker, SIGNAL(signalGetAlbumsListFailed(const QString&)), - this, SLOT(slotGetAlbumsListFailed(const QString&))); + connect(m_talker, TQT_SIGNAL(signalGetAlbumsListFailed(const TQString&)), + this, TQT_SLOT(slotGetAlbumsListFailed(const TQString&))); - connect(m_talker, SIGNAL( signalAddPhotoFailed(const QString&)), - this, SLOT(slotAddPhotoFailed(const QString&))); + connect(m_talker, TQT_SIGNAL( signalAddPhotoFailed(const TQString&)), + this, TQT_SLOT(slotAddPhotoFailed(const TQString&))); -// connect(m_talker, SIGNAL( signalListPhotoSetsSucceeded( const QValueList<FPhotoSet>& ) ), -// this, SLOT( slotListPhotoSetsResponse( const QValueList<FPhotoSet>& ) ) ); +// connect(m_talker, TQT_SIGNAL( signalListPhotoSetsSucceeded( const TQValueList<FPhotoSet>& ) ), +// this, TQT_SLOT( slotListPhotoSetsResponse( const TQValueList<FPhotoSet>& ) ) ); // ------------------------------------------------------------ - m_progressDlg = new QProgressDialog(this, 0, true); + m_progressDlg = new TQProgressDialog(this, 0, true); m_progressDlg->setAutoReset(true); m_progressDlg->setAutoClose(true); - connect(m_progressDlg, SIGNAL(canceled()), - this, SLOT(slotAddPhotoCancel())); + connect(m_progressDlg, TQT_SIGNAL(canceled()), + this, TQT_SLOT(slotAddPhotoCancel())); - connect(m_changeUserButton, SIGNAL(clicked()), - this, SLOT(slotUserChangeRequest())); + connect(m_changeUserButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotUserChangeRequest())); - connect(m_reloadAlbumsListButton, SIGNAL(clicked()), - this, SLOT(slotUpdateAlbumsList())); + connect(m_reloadAlbumsListButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotUpdateAlbumsList())); - connect(m_newAlbumButton, SIGNAL(clicked()), - this, SLOT(slotCreateNewAlbum())); + connect(m_newAlbumButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotCreateNewAlbum())); - connect(m_talker, SIGNAL(signalTokenObtained(const QString&)), - this, SLOT(slotTokenObtained(const QString&))); + connect(m_talker, TQT_SIGNAL(signalTokenObtained(const TQString&)), + this, TQT_SLOT(slotTokenObtained(const TQString&))); - connect(m_addPhotoButton, SIGNAL(clicked()), - this, SLOT(slotAddPhotos())); + connect(m_addPhotoButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotAddPhotos())); - connect(m_startUploadButton, SIGNAL(clicked()), - this, SLOT(slotUploadImages())); + connect(m_startUploadButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotUploadImages())); - connect(m_resizeCheckBox, SIGNAL(toggled(bool )), - this, SLOT(slotRefreshSizeButtons(bool))); + connect(m_resizeCheckBox, TQT_SIGNAL(toggled(bool )), + this, TQT_SLOT(slotRefreshSizeButtons(bool))); // ------------------------------------------------------------ // read config @@ -191,8 +191,8 @@ PicasawebWindow::PicasawebWindow(KIPI::Interface* interface, const QString &tmpF KSimpleConfig config("kipirc"); config.setGroup("PicasawebExport Settings"); m_token = config.readEntry("token"); - QString username = config.readEntry("username"); - QString password = config.readEntry("password"); + TQString username = config.readEntry("username"); + TQString password = config.readEntry("password"); //no saving password rt now if (config.readBoolEntry("Resize", false)) @@ -203,12 +203,12 @@ PicasawebWindow::PicasawebWindow(KIPI::Interface* interface, const QString &tmpF // ------------------------------------------------------------ - m_authProgressDlg = new QProgressDialog( this, 0, true ); + m_authProgressDlg = new TQProgressDialog( this, 0, true ); m_authProgressDlg->setAutoReset( true ); m_authProgressDlg->setAutoClose( true ); - connect(m_authProgressDlg, SIGNAL(canceled()), - this, SLOT(slotAuthCancel())); + connect(m_authProgressDlg, TQT_SIGNAL(canceled()), + this, TQT_SLOT(slotAuthCancel())); m_talker->authProgressDlg = m_authProgressDlg; m_widget->setEnabled(false); @@ -273,9 +273,9 @@ PicasawebWindow::~PicasawebWindow() delete m_about; } -void PicasawebWindow::getToken(QString& username, QString& password) +void PicasawebWindow::getToken(TQString& username, TQString& password) { - PicasawebLogin *loginDialog = new PicasawebLogin(this, QString("LoginWindow"), username, password); + PicasawebLogin *loginDialog = new PicasawebLogin(this, TQString("LoginWindow"), username, password); if (!loginDialog) { return; @@ -291,9 +291,9 @@ void PicasawebWindow::getToken(QString& username, QString& password) } }*/ - QString username_edit, password_edit; + TQString username_edit, password_edit; - if (loginDialog->exec() == QDialog::Accepted) + if (loginDialog->exec() == TQDialog::Accepted) { username_edit = loginDialog->username(); password_edit = loginDialog->password(); @@ -314,14 +314,14 @@ void PicasawebWindow::slotGetAlbumsListSucceeded() { if (m_talker && m_talker->m_albumsList) { - QValueList <PicasaWebAlbum> *list = m_talker->m_albumsList; + TQValueList <PicasaWebAlbum> *list = m_talker->m_albumsList; m_albumsListComboBox->clear(); - QValueList<PicasaWebAlbum>::iterator it = list->begin(); + TQValueList<PicasaWebAlbum>::iterator it = list->begin(); while(it != list->end()) { PicasaWebAlbum pwa=*it; - QString name = pwa.title; + TQString name = pwa.title; m_albumsListComboBox->insertItem(name); it++; } @@ -332,7 +332,7 @@ void PicasawebWindow::slotDoLogin() { } -void PicasawebWindow::slotTokenObtained( const QString& token ) +void PicasawebWindow::slotTokenObtained( const TQString& token ) { m_token=token; m_username=m_talker->getUserName(); @@ -346,15 +346,15 @@ void PicasawebWindow::slotBusy( bool val ) { if ( val ) { - setCursor(QCursor::WaitCursor); + setCursor(TQCursor::WaitCursor); } else { - setCursor(QCursor::ArrowCursor); + setCursor(TQCursor::ArrowCursor); } } -void PicasawebWindow::slotError( const QString& msg ) +void PicasawebWindow::slotError( const TQString& msg ) { KMessageBox::error(this, msg); } @@ -373,32 +373,32 @@ void PicasawebWindow::slotAuthCancel() void PicasawebWindow::slotCreateNewAlbum() { - NewAlbumDialog *dlg = new NewAlbumDialog(kapp->activeWindow()); - dlg->m_dateAndTimeEdit->setDateTime(QDateTime::currentDateTime()); - QString test; + NewAlbumDialog *dlg = new NewAlbumDialog(TQT_TQWIDGET(kapp->activeWindow())); + dlg->m_dateAndTimeEdit->setDateTime(TQDateTime::tqcurrentDateTime()); + TQString test; int t = dlg->exec(); - if(t == QDialog::Accepted) + if(t == TQDialog::Accepted) { if (dlg->m_isPublicRadioButton->isChecked()) - test = QString("public"); + test = TQString("public"); else - test = QString("unlisted"); + test = TQString("unlisted"); m_talker->createAlbum(dlg->m_titleLineEdit->text(), dlg->m_descriptionTextBox->text(), dlg->m_locationLineEdit->text(), dlg->m_dateAndTimeEdit->dateTime().toTime_t(), - test, QString(), true); + test, TQString(), true); } else { - if (t == QDialog::Rejected) + if (t == TQDialog::Rejected) { kdDebug()<<"Album Creation cancelled" <<endl; } } } /* -void PicasawebWindow::slotPhotos( const QValueList<GPhoto>& photoList) +void PicasawebWindow::slotPhotos( const TQValueList<GPhoto>& photoList) { // TODO } @@ -414,7 +414,7 @@ void PicasawebWindow::slotOpenPhoto( const KURL& url ) } */ -void PicasawebWindow::slotListPhotoSetsResponse(const QValueList <FPhotoSet>& /*photoSetList*/) +void PicasawebWindow::slotListPhotoSetsResponse(const TQValueList <FPhotoSet>& /*photoSetList*/) { } @@ -437,7 +437,7 @@ void PicasawebWindow::slotUploadImages() if (m_urls == NULL || m_urls->isEmpty()) return; - typedef QPair<QString,FPhotoInfo> Pair; + typedef TQPair<TQString,FPhotoInfo> Pair; m_uploadQueue.clear(); @@ -449,10 +449,10 @@ void PicasawebWindow::slotUploadImages() temp.title=info.title(); temp.description=info.description(); - QStringList allTags; + TQStringList allTags; - QStringList tagsFromDialog = QStringList::split(" ", m_tagsLineEdit->text(), false); - QStringList::Iterator itTags; + TQStringList tagsFromDialog = TQStringList::split(" ", m_tagsLineEdit->text(), false); + TQStringList::Iterator itTags; //Tags from the interface itTags= tagsFromDialog.begin(); @@ -464,8 +464,8 @@ void PicasawebWindow::slotUploadImages() } //Tags from the database - QMap <QString, QVariant> attribs = info.attributes(); - QStringList tagsFromDatabase; + TQMap <TQString, TQVariant> attribs = info.attributes(); + TQStringList tagsFromDatabase; if(m_exportApplicationTags->isChecked()) { @@ -508,7 +508,7 @@ void PicasawebWindow::slotAddPhotoNext() return; } - typedef QPair<QString,FPhotoInfo> Pair; + typedef TQPair<TQString,FPhotoInfo> Pair; Pair pathComments = m_uploadQueue.first(); FPhotoInfo info=pathComments.second; m_uploadQueue.pop_front(); @@ -517,13 +517,13 @@ void PicasawebWindow::slotAddPhotoNext() int upload_image_quality;*/ // Get the albums' Id from the name. - QString albumId = ""; - QString selectedAlbumName = m_albumsListComboBox->currentText(); + TQString albumId = ""; + TQString selectedAlbumName = m_albumsListComboBox->currentText(); - QValueList<PicasaWebAlbum>::iterator it = m_talker->m_albumsList->begin(); + TQValueList<PicasaWebAlbum>::iterator it = m_talker->m_albumsList->begin(); while(it != m_talker->m_albumsList->end()) { PicasaWebAlbum pwa=*it; - QString name = pwa.title; + TQString name = pwa.title; if (name == selectedAlbumName) { albumId = pwa.id; break; @@ -541,7 +541,7 @@ void PicasawebWindow::slotAddPhotoNext() return; } - m_progressDlg->setLabelText(i18n("Uploading file %1 ").arg( KURL(pathComments.first).filename())); + m_progressDlg->setLabelText(i18n("Uploading file %1 ").tqarg( KURL(pathComments.first).filename())); if (m_progressDlg->isHidden()) m_progressDlg->show(); @@ -554,11 +554,11 @@ void PicasawebWindow::slotAddPhotoSucceeded() slotAddPhotoNext(); } -void PicasawebWindow::slotAddPhotoFailed(const QString& msg) +void PicasawebWindow::slotAddPhotoFailed(const TQString& msg) { if ( KMessageBox::warningContinueCancel(this, i18n("Failed to upload photo into Picasaweb. %1\nDo you want to continue?") - .arg( msg )) != KMessageBox::Continue) + .tqarg( msg )) != KMessageBox::Continue) { m_uploadQueue.clear(); m_progressDlg->reset(); @@ -574,7 +574,7 @@ void PicasawebWindow::slotAddPhotoFailed(const QString& msg) } } -void PicasawebWindow::slotGetAlbumsListFailed(const QString& /*msg*/) +void PicasawebWindow::slotGetAlbumsListFailed(const TQString& /*msg*/) { // Raise some errors } diff --git a/kipi-plugins/picasawebexport/picasawebwindow.h b/kipi-plugins/picasawebexport/picasawebwindow.h index 215dd79..fa2c8d7 100644 --- a/kipi-plugins/picasawebexport/picasawebwindow.h +++ b/kipi-plugins/picasawebexport/picasawebwindow.h @@ -24,11 +24,11 @@ #ifndef PICASAWEBWINDOW_H #define PICASAWEBWINDOW_H -// Qt includes. +// TQt includes. -#include <qvaluelist.h> -#include <qpair.h> -#include <qintdict.h> +#include <tqvaluelist.h> +#include <tqpair.h> +#include <tqintdict.h> // KDE includes. @@ -43,16 +43,16 @@ #include "kpaboutdata.h" -class QListView; -class QPushButton; -class QRadioButton; -class QSpinBox; -class QCheckBox; -class QProgressDialog; +class TQListView; +class TQPushButton; +class TQRadioButton; +class TQSpinBox; +class TQCheckBox; +class TQProgressDialog; class KHTMLPart; class KURL; -class QLineEdit; -class QComboBox; +class TQLineEdit; +class TQComboBox; namespace KIPI { @@ -77,48 +77,49 @@ class GAlbumViewItem; class PicasawebWindow : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - PicasawebWindow(KIPI::Interface *interface, const QString &tmpFolder,QWidget *parent); + PicasawebWindow(KIPI::Interface *interface, const TQString &tmpFolder,TQWidget *tqparent); ~PicasawebWindow(); - void getToken(QString& username, QString& password); + void getToken(TQString& username, TQString& password); private: unsigned int m_uploadCount; unsigned int m_uploadTotal; - QListView *m_tagView; + TQListView *m_tagView; - QSpinBox *m_dimensionSpinBox; - QSpinBox *m_imageQualitySpinBox; + TQSpinBox *m_dimensionSpinBox; + TQSpinBox *m_imageQualitySpinBox; - QPushButton *m_newAlbumButton; - QPushButton *m_addPhotoButton; - QPushButton *m_startUploadButton; - QPushButton *m_reloadAlbumsListButton; - QPushButton *m_changeUserButton; + TQPushButton *m_newAlbumButton; + TQPushButton *m_addPhotoButton; + TQPushButton *m_startUploadButton; + TQPushButton *m_reloadAlbumsListButton; + TQPushButton *m_changeUserButton; - QString m_tmp; - QString m_token; - QString m_username; - QString m_userId; - QString m_lastSelectedAlbum; + TQString m_tmp; + TQString m_token; + TQString m_username; + TQString m_userId; + TQString m_lastSelectedAlbum; - QCheckBox *m_resizeCheckBox; + TQCheckBox *m_resizeCheckBox; - QLineEdit *m_tagsLineEdit; + TQLineEdit *m_tagsLineEdit; - QRadioButton *m_exportApplicationTags; + TQRadioButton *m_exportApplicationTags; - QProgressDialog *m_progressDlg; - QProgressDialog *m_authProgressDlg; + TQProgressDialog *m_progressDlg; + TQProgressDialog *m_authProgressDlg; - QComboBox *m_albumsListComboBox; + TQComboBox *m_albumsListComboBox; - QLabel *m_userNameDisplayLabel; + TQLabel *m_userNameDisplayLabel; // KWallet::Wallet *m_wallet; @@ -128,38 +129,38 @@ private: PicasawebWidget *m_widget; PicasawebTalker *m_talker; - QIntDict<GAlbumViewItem> m_albumDict; + TQIntDict<GAlbumViewItem> m_albumDict; - QValueList< QPair<QString,FPhotoInfo> > m_uploadQueue; + TQValueList< TQPair<TQString,FPhotoInfo> > m_uploadQueue; KIPI::Interface *m_interface; KIPIPlugins::KPAboutData *m_about; private slots: - void slotTokenObtained(const QString& token); + void slotTokenObtained(const TQString& token); void slotDoLogin(); -// void slotLoginFailed( const QString& msg ); +// void slotLoginFailed( const TQString& msg ); void slotBusy( bool val ); - void slotError( const QString& msg ); -// void slotAlbums( const QValueList<GAlbum>& albumList ); -// void slotPhotos( const QValueList<GPhoto>& photoList ); + void slotError( const TQString& msg ); +// void slotAlbums( const TQValueList<GAlbum>& albumList ); +// void slotPhotos( const TQValueList<GPhoto>& photoList ); // void slotTagSelected(); // void slotOpenPhoto( const KURL& url ); void slotUpdateAlbumsList(); void slotUserChangeRequest(); - void slotListPhotoSetsResponse(const QValueList <FPhotoSet>& photoSetList); + void slotListPhotoSetsResponse(const TQValueList <FPhotoSet>& photoSetList); void slotAddPhotos(); void slotUploadImages(); void slotAddPhotoNext(); void slotAddPhotoSucceeded(); - void slotAddPhotoFailed( const QString& msg ); + void slotAddPhotoFailed( const TQString& msg ); void slotAddPhotoCancel(); void slotAuthCancel(); void slotHelp(); void slotCreateNewAlbum(); void slotGetAlbumsListSucceeded(); - void slotGetAlbumsListFailed(const QString& msg); + void slotGetAlbumsListFailed(const TQString& msg); void slotRefreshSizeButtons(bool); // void slotHandleLogin(); diff --git a/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp b/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp index 99d1c99..01eae69 100644 --- a/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp +++ b/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp @@ -53,13 +53,13 @@ typedef KGenericFactory<Plugin_PicasawebExport> Factory; K_EXPORT_COMPONENT_FACTORY(kipiplugin_picasawebexport, Factory("kipiplugin_picasawebexport")) -Plugin_PicasawebExport::Plugin_PicasawebExport(QObject *parent, const char*, const QStringList&) - : KIPI::Plugin(Factory::instance(), parent, "PicasawebExport") +Plugin_PicasawebExport::Plugin_PicasawebExport(TQObject *tqparent, const char*, const TQStringList&) + : KIPI::Plugin(Factory::instance(), tqparent, "PicasawebExport") { kdDebug(51001) << "Plugin_PicasawebExport plugin loaded" << endl; } -void Plugin_PicasawebExport::setup(QWidget* widget) +void Plugin_PicasawebExport::setup(TQWidget* widget) { KIPI::Plugin::setup(widget); @@ -67,11 +67,11 @@ void Plugin_PicasawebExport::setup(QWidget* widget) "www", 0, this, - SLOT(slotActivate()), + TQT_SLOT(slotActivate()), actionCollection(), "picasawebexport"); - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(parent()); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(tqparent()); if (!interface) { @@ -90,7 +90,7 @@ Plugin_PicasawebExport::~Plugin_PicasawebExport() void Plugin_PicasawebExport::slotActivate() { - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(parent()); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(tqparent()); if (!interface) { kdError(51000) << "Kipi interface is null!" << endl; @@ -98,9 +98,9 @@ void Plugin_PicasawebExport::slotActivate() } KStandardDirs dir; - QString Tmp = dir.saveLocation("tmp", "kipi-picasawebexportplugin-" + QString::number(getpid()) + "/"); + TQString Tmp = dir.saveLocation("tmp", "kipi-picasawebexportplugin-" + TQString::number(getpid()) + "/"); - m_dlg = new KIPIPicasawebExportPlugin::PicasawebWindow(interface,Tmp,kapp->activeWindow()); + m_dlg = new KIPIPicasawebExportPlugin::PicasawebWindow(interface,Tmp,TQT_TQWIDGET(kapp->activeWindow())); m_dlg->show(); } diff --git a/kipi-plugins/picasawebexport/plugin_picasawebexport.h b/kipi-plugins/picasawebexport/plugin_picasawebexport.h index ddf2fc0..4ac156d 100644 --- a/kipi-plugins/picasawebexport/plugin_picasawebexport.h +++ b/kipi-plugins/picasawebexport/plugin_picasawebexport.h @@ -38,14 +38,15 @@ using namespace KIPIPicasawebExportPlugin; class Plugin_PicasawebExport : public KIPI::Plugin { Q_OBJECT + TQ_OBJECT public: - Plugin_PicasawebExport(QObject *parent, const char* name, const QStringList &args); + Plugin_PicasawebExport(TQObject *tqparent, const char* name, const TQStringList &args); ~Plugin_PicasawebExport(); virtual KIPI::Category category(KAction* action) const; - virtual void setup(QWidget*); + virtual void setup(TQWidget*); public slots: diff --git a/kipi-plugins/picasawebexport/uploadwidget.ui b/kipi-plugins/picasawebexport/uploadwidget.ui index d290d2f..3cd024e 100644 --- a/kipi-plugins/picasawebexport/uploadwidget.ui +++ b/kipi-plugins/picasawebexport/uploadwidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KIPIPicasawebExportPlugin::UploadWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>UploadWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -23,11 +23,11 @@ <property name="caption"> <string>PicasaWeb Exporter Upload</string> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>m_selectionFrame</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>390</x> <y>50</y> @@ -41,11 +41,11 @@ <property name="frameShadow"> <enum>Raised</enum> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>20</y> @@ -56,11 +56,11 @@ <property name="title"> <string>Images to upload</string> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_selectImagesButton</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>40</y> @@ -72,11 +72,11 @@ <string>Select Images for Upload</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_currentSelectionButton</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>20</y> @@ -89,11 +89,11 @@ </property> </widget> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_selectPhotosButton</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>60</x> <y>100</y> @@ -106,11 +106,11 @@ </property> </widget> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>390</x> <y>200</y> @@ -121,11 +121,11 @@ <property name="title"> <string>Account Details</string> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_changeUserButton</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>90</x> <y>50</y> @@ -137,11 +137,11 @@ <string>Change User</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>20</y> @@ -153,11 +153,11 @@ <string>Username:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_userNameDisplayLabel</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>90</x> <y>20</y> @@ -168,16 +168,16 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_WidgetLabel</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>10</y> @@ -193,15 +193,15 @@ <property name="text"> <string>PicasaWeb Uploader</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_startUploadButton</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>490</x> <y>10</y> @@ -213,11 +213,11 @@ <string>Start Uploading</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>50</y> @@ -228,11 +228,11 @@ <property name="title"> <string></string> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>tagsTxtLabel</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>80</y> @@ -244,11 +244,11 @@ <string>Tags:<p align="center"></p></string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_newAlbumButton</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>280</x> <y>20</y> @@ -260,11 +260,11 @@ <string>New &Album</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_reloadAlbumsListButton</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>210</x> <y>20</y> @@ -276,11 +276,11 @@ <string>Reload</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>20</y> @@ -292,11 +292,11 @@ <string>Album:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_tagsLineEdit</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>60</x> <y>80</y> @@ -305,11 +305,11 @@ </rect> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_exportApplicationTags</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>60</x> <y>110</y> @@ -324,11 +324,11 @@ <string>Alt+X</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>m_albumsListComboBox</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>60</x> <y>20</y> @@ -340,11 +340,11 @@ <bool>false</bool> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_resizeGroupBox</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>150</y> @@ -355,11 +355,11 @@ <property name="title"> <string></string> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_resizeCheckBox</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>10</y> @@ -374,11 +374,11 @@ <string>Alt+Z</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>40</y> @@ -390,11 +390,11 @@ <string>Size (pixels):</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>180</x> <y>40</y> @@ -406,11 +406,11 @@ <string>Compression:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>m_dimensionSpinBox</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>100</x> <y>40</y> @@ -422,11 +422,11 @@ <number>3200</number> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>m_imageQualitySpinBox</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>280</x> <y>40</y> @@ -438,5 +438,5 @@ </widget> </widget> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> |