diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-18 06:46:40 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-18 06:46:40 +0000 |
| commit | 7c19562ad065b6729bac8eb9b40dfe0452a72272 (patch) | |
| tree | 33325d1e02ecc9ca614c7209296f8f796a1c3478 /kipi-plugins/sync | |
| parent | a65baa328fac0a1ce12971fef8d998ce7bfbe237 (diff) | |
| download | kipi-plugins-7c19562ad065b6729bac8eb9b40dfe0452a72272.tar.gz kipi-plugins-7c19562ad065b6729bac8eb9b40dfe0452a72272.zip | |
TQt4 port kipi-plugins
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/libraries/kipi-plugins@1232561 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kipi-plugins/sync')
29 files changed, 547 insertions, 541 deletions
diff --git a/kipi-plugins/sync/TODO b/kipi-plugins/sync/TODO index fcff8e0..7a3d8b6 100644 --- a/kipi-plugins/sync/TODO +++ b/kipi-plugins/sync/TODO @@ -10,4 +10,4 @@ Somewhat immediate implementation needed: For the lazy times: * Polish the html code used to render the thumbnails, better - fonts sizes and layout + fonts sizes and tqlayout diff --git a/kipi-plugins/sync/galleryalbumdialog.ui b/kipi-plugins/sync/galleryalbumdialog.ui index 2dfbf6a..0ec158a 100644 --- a/kipi-plugins/sync/galleryalbumdialog.ui +++ b/kipi-plugins/sync/galleryalbumdialog.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KIPIGalleryExportPlugin::GalleryAlbumDialog</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>GalleryAlbumDialog</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -28,7 +28,7 @@ <property name="spacing"> <number>5</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>header</cstring> </property> @@ -50,15 +50,15 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>titleLabel</cstring> </property> @@ -66,7 +66,7 @@ <string>Title (optional):</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>nameLabel</cstring> </property> @@ -74,7 +74,7 @@ <string>Name (optional):</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>captionLabel</cstring> </property> @@ -82,17 +82,17 @@ <string>Caption (optional):</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>titleEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>nameEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>captionEdit</cstring> </property> @@ -113,7 +113,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -137,14 +137,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -161,7 +161,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -193,5 +193,5 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kipi-plugins/sync/galleryconfig.cpp b/kipi-plugins/sync/galleryconfig.cpp index 65fd7f4..9fc79f4 100644 --- a/kipi-plugins/sync/galleryconfig.cpp +++ b/kipi-plugins/sync/galleryconfig.cpp @@ -17,18 +17,18 @@ * * ============================================================ */ -// Include files for Qt - -#include <qlistview.h> -#include <qpushbutton.h> -#include <qtimer.h> -#include <qpixmap.h> -#include <qcursor.h> -#include <qlineedit.h> -#include <qprogressdialog.h> -#include <qspinbox.h> -#include <qcheckbox.h> -#include <qlayout.h> +// Include files for TQt + +#include <tqlistview.h> +#include <tqpushbutton.h> +#include <tqtimer.h> +#include <tqpixmap.h> +#include <tqcursor.h> +#include <tqlineedit.h> +#include <tqprogressdialog.h> +#include <tqspinbox.h> +#include <tqcheckbox.h> +#include <tqlayout.h> // Include files for KDE @@ -56,75 +56,75 @@ namespace KIPIGalleryExportPlugin { -GalleryEdit::GalleryEdit(QWidget* pParent, +GalleryEdit::GalleryEdit(TQWidget* pParent, Gallery* pGallery, - QString title) + TQString title) : KDialogBase(pParent, 0, true, title, Ok|Cancel, Ok, false), mpGallery(pGallery) { setButtonGuiItem( Ok, KStdGuiItem::save() ); - QFrame *page = new QFrame (this); - QHBoxLayout *tll = new QHBoxLayout(page); + TQFrame *page = new TQFrame (this); + TQHBoxLayout *tll = new TQHBoxLayout(page); page->setMinimumSize (500, 200); setMainWidget(page); - QVBoxLayout* vbox = new QVBoxLayout(); + TQVBoxLayout* vbox = new TQVBoxLayout(); vbox->setSpacing (KDialog::spacingHint()); tll->addItem(vbox); - mpHeaderLabel = new QLabel(page); - mpHeaderLabel->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, - QSizePolicy::Fixed)); + mpHeaderLabel = new TQLabel(page); + mpHeaderLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, + TQSizePolicy::Fixed)); mpHeaderLabel->setText(title); vbox->addWidget(mpHeaderLabel); - QFrame* hline = new QFrame(page, "hline"); - hline->setFrameShape(QFrame::HLine); - hline->setFrameShadow(QFrame::Sunken); - hline->setFrameShape(QFrame::HLine); + TQFrame* hline = new TQFrame(page, "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); - mpNameEdit = new QLineEdit( this ); + mpNameEdit = new TQLineEdit( this ); centerLayout->addWidget(mpNameEdit, 0, 1); - mpUrlEdit = new QLineEdit( this ); + mpUrlEdit = new TQLineEdit( this ); centerLayout->addWidget(mpUrlEdit, 1, 1); - mpUsernameEdit = new QLineEdit( this ); + mpUsernameEdit = new TQLineEdit( this ); centerLayout->addWidget(mpUsernameEdit, 2, 1); - mpPasswordEdit = new QLineEdit( this ); - mpPasswordEdit->setEchoMode(QLineEdit::Password); + mpPasswordEdit = new TQLineEdit( this ); + mpPasswordEdit->setEchoMode(TQLineEdit::Password); centerLayout->addWidget(mpPasswordEdit, 3, 1); - QLabel* name_label = new QLabel(this); + TQLabel* name_label = new TQLabel(this); name_label->setText(i18n( "Name:" )); centerLayout->addWidget(name_label, 0, 0); - QLabel* urlLabel = new QLabel(this); + TQLabel* urlLabel = new TQLabel(this); urlLabel->setText(i18n( "URL:" )); centerLayout->addWidget(urlLabel, 1, 0); - QLabel* nameLabel = new QLabel(this); + TQLabel* nameLabel = new TQLabel(this); nameLabel->setText(i18n( "Username:" )); centerLayout->addWidget(nameLabel, 2, 0); - QLabel* passwdLabel = new QLabel(this); + TQLabel* passwdLabel = new TQLabel(this); passwdLabel->setText(i18n( "Password:" )); centerLayout->addWidget(passwdLabel, 3, 0); //--------------------------------------------- - mpGalleryVersion = new QCheckBox( i18n("Use &Gallery 2"), this); + mpGalleryVersion = new TQCheckBox( i18n("Use &Gallery 2"), this); mpGalleryVersion->setChecked( 2 == pGallery->version() ); centerLayout->addWidget( mpGalleryVersion, 4, 1 ); //--------------------------------------------- vbox->addLayout( centerLayout ); - resize( QSize(300, 150).expandedTo(minimumSizeHint()) ); + resize( TQSize(300, 150).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); mpNameEdit->setText(pGallery->name()); diff --git a/kipi-plugins/sync/galleryconfig.h b/kipi-plugins/sync/galleryconfig.h index 0aaedcc..a5945ac 100644 --- a/kipi-plugins/sync/galleryconfig.h +++ b/kipi-plugins/sync/galleryconfig.h @@ -20,9 +20,9 @@ #define GALLERYCONFIG_H #include <kdialogbase.h> -#include <qvaluelist.h> -#include <qpair.h> -#include <qintdict.h> +#include <tqvaluelist.h> +#include <tqpair.h> +#include <tqintdict.h> namespace KIPIGalleryExportPlugin { @@ -32,23 +32,24 @@ class Gallery; class GalleryEdit : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - GalleryEdit(QWidget* pParent, + GalleryEdit(TQWidget* pParent, Gallery* pGallery, - QString title); + TQString title); ~GalleryEdit(); private: Gallery* mpGallery; - QLabel* mpHeaderLabel; - QLineEdit* mpNameEdit; - QLineEdit* mpUrlEdit; - QLineEdit* mpUsernameEdit; - QLineEdit* mpPasswordEdit; - QCheckBox* mpGalleryVersion; + TQLabel* mpHeaderLabel; + TQLineEdit* mpNameEdit; + TQLineEdit* mpUrlEdit; + TQLineEdit* mpUsernameEdit; + TQLineEdit* mpPasswordEdit; + TQCheckBox* mpGalleryVersion; private slots: void slotOk(void); diff --git a/kipi-plugins/sync/galleryitem.h b/kipi-plugins/sync/galleryitem.h index 89661ec..a752698 100644 --- a/kipi-plugins/sync/galleryitem.h +++ b/kipi-plugins/sync/galleryitem.h @@ -22,7 +22,7 @@ #ifndef GALLERYITEM_H #define GALLERYITEM_H -#include <qstring.h> +#include <tqstring.h> namespace KIPIGalleryExportPlugin { @@ -38,10 +38,10 @@ public: int ref_num; int album_num; - QString name; - QString caption; - QString thumbName; - QString albumURL; + TQString name; + TQString caption; + TQString thumbName; + TQString albumURL; }; class GAlbum @@ -51,7 +51,7 @@ public: GAlbum() { ref_num = -1; - parent_ref_num = -1; + tqparent_ref_num = -1; add = false; write = false; @@ -62,19 +62,19 @@ public: bool operator<(const GAlbum& rhs) const { - if (parent_ref_num == rhs.parent_ref_num) + if (tqparent_ref_num == rhs.tqparent_ref_num) return ref_num < rhs.ref_num; - return parent_ref_num < rhs.parent_ref_num; + return tqparent_ref_num < rhs.tqparent_ref_num; } int ref_num; - int parent_ref_num; - QString name; - QString parentName; - QString title; - QString summary; - QString baseurl; + int tqparent_ref_num; + TQString name; + TQString tqparentName; + TQString title; + TQString summary; + TQString baseurl; bool add; bool write; diff --git a/kipi-plugins/sync/galleryviewitem.cpp b/kipi-plugins/sync/galleryviewitem.cpp index 4a847ca..35ab07f 100644 --- a/kipi-plugins/sync/galleryviewitem.cpp +++ b/kipi-plugins/sync/galleryviewitem.cpp @@ -19,8 +19,8 @@ * * ============================================================ */ -#include <qpainter.h> -#include <qpixmap.h> +#include <tqpainter.h> +#include <tqpixmap.h> #include "galleryviewitem.h" #include "gallerytalker.h" @@ -28,23 +28,23 @@ namespace KIPIGalleryExportPlugin { -void GAlbumViewItem::paintCell(QPainter * p, const QColorGroup & cg, +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) @@ -68,18 +68,18 @@ void GAlbumViewItem::paintCell(QPainter * p, const QColorGroup & cg, // We display things slightly differently depending on version. if (GalleryTalker::isGallery2()) { - p->drawText(r, h/2, width-r, h, Qt::AlignVCenter, album.title); + p->drawText(r, h/2, width-r, h, TQt::AlignVCenter, album.title); } else { - 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); } } @@ -87,7 +87,7 @@ void GAlbumViewItem::setup() { int h = listView()->fontMetrics().height(); int margin = 4; - setHeight( QMAX(2*h + margin, 32) ); + setHeight( TQMAX(2*h + margin, 32) ); } } diff --git a/kipi-plugins/sync/galleryviewitem.h b/kipi-plugins/sync/galleryviewitem.h index 6c5077a..6a40c69 100644 --- a/kipi-plugins/sync/galleryviewitem.h +++ b/kipi-plugins/sync/galleryviewitem.h @@ -19,30 +19,30 @@ #ifndef GALLERYVIEWITEM_H #define GALLERYVIEWITEM_H -#include <qlistview.h> +#include <tqlistview.h> #include "galleryitem.h" namespace KIPIGalleryExportPlugin { -class GAlbumViewItem : public QListViewItem +class GAlbumViewItem : public TQListViewItem { public: - GAlbumViewItem(QListView* parent, const QString& name, + GAlbumViewItem(TQListView* tqparent, const TQString& name, const GAlbum& _album) - : QListViewItem(parent, name), album(_album) {} - GAlbumViewItem(QListViewItem* parent, const QString& name, + : TQListViewItem(tqparent, name), album(_album) {} + GAlbumViewItem(TQListViewItem* tqparent, const TQString& name, const GAlbum& _album) - : QListViewItem(parent, name), album(_album) {} + : TQListViewItem(tqparent, name), album(_album) {} GAlbum album; - void paintCell(QPainter * p, const QColorGroup & cg, + void paintCell(TQPainter * p, const TQColorGroup & cg, int column, int width, int ); - void paintFocus (QPainter*, const QColorGroup&, - const QRect&) {} + void paintFocus (TQPainter*, const TQColorGroup&, + const TQRect&) {} protected: diff --git a/kipi-plugins/sync/gallerywidget.cpp b/kipi-plugins/sync/gallerywidget.cpp index ed6e6fb..97e6818 100644 --- a/kipi-plugins/sync/gallerywidget.cpp +++ b/kipi-plugins/sync/gallerywidget.cpp @@ -23,53 +23,53 @@ #include <khtml_part.h> #include <khtmlview.h> -#include <qpushbutton.h> -#include <qlabel.h> -#include <qframe.h> -#include <qheader.h> -#include <qlistview.h> -#include <qbuttongroup.h> -#include <qgroupbox.h> -#include <qspinbox.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qsplitter.h> -#include <qwhatsthis.h> +#include <tqpushbutton.h> +#include <tqlabel.h> +#include <tqframe.h> +#include <tqheader.h> +#include <tqlistview.h> +#include <tqbuttongroup.h> +#include <tqgroupbox.h> +#include <tqspinbox.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqsplitter.h> +#include <tqwhatsthis.h> #include "gallerywidget.h" namespace KIPIGalleryExportPlugin { -GalleryWidget::GalleryWidget( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +GalleryWidget::GalleryWidget( TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { if ( !name ) setName( "GalleryWidget" ); - QVBoxLayout* galleryWidgetLayout - = new QVBoxLayout( this, 5, 5, "GalleryWidgetLayout"); + TQVBoxLayout* galleryWidgetLayout + = new TQVBoxLayout( this, 5, 5, "GalleryWidgetLayout"); // ------------------------------------------------------------------------ - QLabel* headerLabel; - QFrame* headerLine; + TQLabel* headerLabel; + TQFrame* headerLine; - headerLabel = new QLabel( this, "headerLabel" ); + headerLabel = new TQLabel( this, "headerLabel" ); galleryWidgetLayout->addWidget( headerLabel, 0 ); - headerLine = new QFrame( this, "headerLine" ); - headerLine->setFrameShape( QFrame::HLine ); - headerLine->setFrameShadow( QFrame::Sunken ); + headerLine = new TQFrame( this, "headerLine" ); + headerLine->setFrameShape( TQFrame::HLine ); + headerLine->setFrameShadow( TQFrame::Sunken ); galleryWidgetLayout->addWidget( headerLine, 0 ); // ------------------------------------------------------------------------ - QSplitter* splitter = new QSplitter(this); + TQSplitter* splitter = new TQSplitter(this); galleryWidgetLayout->addWidget( splitter, 5 ); - m_albumView = new QListView( splitter, "m_albumView" ); + m_albumView = new TQListView( splitter, "m_albumView" ); m_albumView->addColumn( i18n( "Albums" ) ); - m_albumView->setResizeMode( QListView::AllColumns ); + m_albumView->setResizeMode( TQListView::AllColumns ); // ------------------------------------------------------------------------ @@ -77,49 +77,49 @@ GalleryWidget::GalleryWidget( QWidget* parent, const char* name, WFlags fl ) // ------------------------------------------------------------------------ - QVBoxLayout* rightButtonGroupLayout; - QSpacerItem* spacer; - QButtonGroup* rightButtonGroup; + TQVBoxLayout* rightButtonGroupLayout; + TQSpacerItem* spacer; + TQButtonGroup* rightButtonGroup; - rightButtonGroup = new QButtonGroup( splitter, "rightButtonGroup" ); - rightButtonGroupLayout = new QVBoxLayout( rightButtonGroup ); + rightButtonGroup = new TQButtonGroup( splitter, "rightButtonGroup" ); + rightButtonGroupLayout = new TQVBoxLayout( rightButtonGroup ); rightButtonGroupLayout->setSpacing( 5 ); rightButtonGroupLayout->setMargin( 5 ); - m_newAlbumBtn = new QPushButton( rightButtonGroup, "m_newAlbumBtn" ); - m_newAlbumBtn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); - rightButtonGroupLayout->addWidget( m_newAlbumBtn, 0, Qt::AlignHCenter ); + m_newAlbumBtn = new TQPushButton( rightButtonGroup, "m_newAlbumBtn" ); + m_newAlbumBtn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + rightButtonGroupLayout->addWidget( m_newAlbumBtn, 0, TQt::AlignHCenter ); - m_addPhotoBtn = new QPushButton( rightButtonGroup, "m_addPhotoBtn" ); - m_addPhotoBtn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); - rightButtonGroupLayout->addWidget( m_addPhotoBtn, 0, Qt::AlignHCenter ); + m_addPhotoBtn = new TQPushButton( rightButtonGroup, "m_addPhotoBtn" ); + m_addPhotoBtn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + rightButtonGroupLayout->addWidget( m_addPhotoBtn, 0, TQt::AlignHCenter ); // ------------------------------------------------------------------------ - QGroupBox* optionsBox = new QGroupBox(i18n("Override Default Options"), + TQGroupBox* optionsBox = new TQGroupBox(i18n("Override Default Options"), rightButtonGroup); optionsBox->setColumnLayout(0, Qt::Vertical); - optionsBox->layout()->setSpacing(5); - optionsBox->layout()->setMargin(5); - QGridLayout* optionsBoxLayout = new QGridLayout(optionsBox->layout()); + optionsBox->tqlayout()->setSpacing(5); + optionsBox->tqlayout()->setMargin(5); + TQGridLayout* optionsBoxLayout = new TQGridLayout(optionsBox->tqlayout()); // ------------------------------------------------------------------------ - m_resizeCheckBox = new QCheckBox(optionsBox); + m_resizeCheckBox = new TQCheckBox(optionsBox); m_resizeCheckBox->setText(i18n("Resize photos before uploading")); optionsBoxLayout->addMultiCellWidget(m_resizeCheckBox, 0, 0, 0, 1); - m_dimensionSpinBox = new QSpinBox(0, 5000, 10, optionsBox); + m_dimensionSpinBox = new TQSpinBox(0, 5000, 10, optionsBox); m_dimensionSpinBox->setValue(600); - m_dimensionSpinBox->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + m_dimensionSpinBox->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); optionsBoxLayout->addWidget(m_dimensionSpinBox, 1, 1); - QLabel* resizeLabel = new QLabel(i18n("Maximum dimension:"), optionsBox); + TQLabel* resizeLabel = new TQLabel(i18n("Maximum dimension:"), optionsBox); optionsBoxLayout->addWidget(resizeLabel, 1, 0); m_resizeCheckBox->setChecked(false); m_dimensionSpinBox->setEnabled(false); - connect(m_resizeCheckBox, SIGNAL(clicked()), SLOT(slotResizeChecked())); + connect(m_resizeCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotResizeChecked())); // ------------------------------------------------------------------------ @@ -127,7 +127,7 @@ GalleryWidget::GalleryWidget( QWidget* parent, const char* name, WFlags fl ) // ------------------------------------------------------------------------ - spacer = new QSpacerItem( 20, 100, QSizePolicy::Minimum, QSizePolicy::Expanding ); + spacer = new TQSpacerItem( 20, 100, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); rightButtonGroupLayout->addItem( spacer ); // ------------------------------------------------------------------------ @@ -139,7 +139,7 @@ GalleryWidget::GalleryWidget( QWidget* parent, const char* name, WFlags fl ) // ------------------------------------------------------------------------ - resize( QSize(600, 400).expandedTo(minimumSizeHint()) ); + resize( TQSize(600, 400).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/kipi-plugins/sync/gallerywidget.h b/kipi-plugins/sync/gallerywidget.h index 9389ce1..4f1f081 100644 --- a/kipi-plugins/sync/gallerywidget.h +++ b/kipi-plugins/sync/gallerywidget.h @@ -19,24 +19,25 @@ #ifndef GALLERYWIDGET_H #define GALLERYWIDGET_H -#include <qwidget.h> +#include <tqwidget.h> -class QListView; -class QPushButton; -class QSpinBox; -class QCheckBox; +class TQListView; +class TQPushButton; +class TQSpinBox; +class TQCheckBox; class KHTMLPart; namespace KIPIGalleryExportPlugin { -class GalleryWidget : public QWidget +class GalleryWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - GalleryWidget( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + GalleryWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~GalleryWidget(); private slots: @@ -45,12 +46,12 @@ private slots: private: - QListView* m_albumView; + TQListView* m_albumView; KHTMLPart* m_photoView; - QPushButton* m_newAlbumBtn; - QPushButton* m_addPhotoBtn; - QCheckBox* m_resizeCheckBox; - QSpinBox* m_dimensionSpinBox; + TQPushButton* m_newAlbumBtn; + TQPushButton* m_addPhotoBtn; + TQCheckBox* m_resizeCheckBox; + TQSpinBox* m_dimensionSpinBox; friend class GalleryWindow; }; diff --git a/kipi-plugins/sync/gallerywindow.cpp b/kipi-plugins/sync/gallerywindow.cpp index 0b5960f..96121be 100644 --- a/kipi-plugins/sync/gallerywindow.cpp +++ b/kipi-plugins/sync/gallerywindow.cpp @@ -19,17 +19,17 @@ * * ============================================================ */ -// Include files for Qt - -#include <qlistview.h> -#include <qpushbutton.h> -#include <qtimer.h> -#include <qpixmap.h> -#include <qcursor.h> -#include <qlineedit.h> -#include <qprogressdialog.h> -#include <qspinbox.h> -#include <qcheckbox.h> +// Include files for TQt + +#include <tqlistview.h> +#include <tqpushbutton.h> +#include <tqtimer.h> +#include <tqpixmap.h> +#include <tqcursor.h> +#include <tqlineedit.h> +#include <tqprogressdialog.h> +#include <tqspinbox.h> +#include <tqcheckbox.h> // Include files for KDE @@ -68,8 +68,8 @@ namespace KIPIGalleryExportPlugin { -GalleryWindow::GalleryWindow(KIPI::Interface* interface, QWidget *parent, Galleries* pGalleries) - : KDialogBase(parent, 0, true, i18n("Gallery Export"), Help|Close, Close, false), +GalleryWindow::GalleryWindow(KIPI::Interface* interface, TQWidget *tqparent, Galleries* pGalleries) + : KDialogBase(tqparent, 0, true, i18n("Gallery Export"), Help|Close, Close, false), m_interface(interface), mpGalleries(pGalleries) { @@ -93,7 +93,7 @@ GalleryWindow::GalleryWindow(KIPI::Interface* interface, QWidget *parent, Galler m_helpButton = actionButton( Help ); 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); m_helpButton->setPopup( helpMenu->menu() ); GalleryWidget* widget = new GalleryWidget(this); @@ -112,40 +112,40 @@ GalleryWindow::GalleryWindow(KIPI::Interface* interface, QWidget *parent, Galler m_newAlbumBtn->setEnabled( false ); m_addPhotoBtn->setEnabled( false ); - 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()), SLOT(slotAddPhotoCancel())); + connect(m_progressDlg, TQT_SIGNAL(canceled()), TQT_SLOT(slotAddPhotoCancel())); - connect(m_albumView, SIGNAL(selectionChanged()), SLOT(slotAlbumSelected())); + connect(m_albumView, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotAlbumSelected())); connect(m_photoView->browserExtension(), - SIGNAL(openURLRequest(const KURL&, + TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), - SLOT(slotOpenPhoto(const KURL&))); + TQT_SLOT(slotOpenPhoto(const KURL&))); - connect(m_newAlbumBtn, SIGNAL(clicked()), SLOT(slotNewAlbum())); - connect(m_addPhotoBtn, SIGNAL(clicked()), SLOT( slotAddPhotos())); + connect(m_newAlbumBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewAlbum())); + connect(m_addPhotoBtn, TQT_SIGNAL(clicked()), TQT_SLOT( slotAddPhotos())); // read config KConfig config("kipirc"); config.setGroup("GallerySync Settings"); m_talker = new GalleryTalker( this ); - connect( m_talker, SIGNAL( signalError( const QString& ) ), - SLOT( slotError( const QString& ) ) ); - connect( m_talker, SIGNAL( signalBusy( bool ) ), - SLOT( slotBusy( bool ) ) ); - connect( m_talker, SIGNAL( signalLoginFailed( const QString& ) ), - SLOT( slotLoginFailed( const QString& ) ) ); - connect( m_talker, SIGNAL( signalAlbums( const QValueList<GAlbum>& ) ), - SLOT( slotAlbums( const QValueList<GAlbum>& ) ) ); - connect( m_talker, SIGNAL( signalPhotos( const QValueList<GPhoto>& ) ), - SLOT( slotPhotos( const QValueList<GPhoto>& ) ) ); - connect( m_talker, SIGNAL( signalAddPhotoSucceeded() ), - SLOT( slotAddPhotoSucceeded() ) ); - connect( m_talker, SIGNAL( signalAddPhotoFailed( const QString& ) ), - SLOT( slotAddPhotoFailed( const QString& ) ) ); + connect( m_talker, TQT_SIGNAL( signalError( const TQString& ) ), + TQT_SLOT( slotError( const TQString& ) ) ); + connect( m_talker, TQT_SIGNAL( signalBusy( bool ) ), + TQT_SLOT( slotBusy( bool ) ) ); + connect( m_talker, TQT_SIGNAL( signalLoginFailed( const TQString& ) ), + TQT_SLOT( slotLoginFailed( const TQString& ) ) ); + connect( m_talker, TQT_SIGNAL( signalAlbums( const TQValueList<GAlbum>& ) ), + TQT_SLOT( slotAlbums( const TQValueList<GAlbum>& ) ) ); + connect( m_talker, TQT_SIGNAL( signalPhotos( const TQValueList<GPhoto>& ) ), + TQT_SLOT( slotPhotos( const TQValueList<GPhoto>& ) ) ); + connect( m_talker, TQT_SIGNAL( signalAddPhotoSucceeded() ), + TQT_SLOT( slotAddPhotoSucceeded() ) ); + connect( m_talker, TQT_SIGNAL( signalAddPhotoFailed( const TQString& ) ), + TQT_SLOT( slotAddPhotoFailed( const TQString& ) ) ); if (config.readBoolEntry("Resize", false)) { @@ -159,7 +159,7 @@ GalleryWindow::GalleryWindow(KIPI::Interface* interface, QWidget *parent, Galler } m_dimensionSpinBox->setValue(config.readNumEntry("Maximum Width", 1600)); - QTimer::singleShot( 0, this, SLOT( slotDoLogin() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotDoLogin() ) ); } GalleryWindow::~GalleryWindow() @@ -184,7 +184,7 @@ void GalleryWindow::slotDoLogin() { GalleryList dlg(this, mpGalleries); - if (QDialog::Accepted != dlg.exec()) + if (TQDialog::Accepted != dlg.exec()) { close(); return; @@ -222,7 +222,7 @@ void GalleryWindow::slotDoLogin() m_talker->login(url.url(), p_gallery->username(), p_gallery->password()); } -void GalleryWindow::slotLoginFailed( const QString& msg ) +void GalleryWindow::slotLoginFailed( const TQString& msg ) { if ( KMessageBox::warningYesNo( this, i18n( "Failed to login into remote gallery. " ) @@ -241,25 +241,25 @@ void GalleryWindow::slotBusy( bool val ) { if ( val ) { - setCursor(QCursor::WaitCursor); + setCursor(TQCursor::WaitCursor); m_newAlbumBtn->setEnabled( false ); m_addPhotoBtn->setEnabled( false ); } else { - setCursor(QCursor::ArrowCursor); + setCursor(TQCursor::ArrowCursor); bool loggedIn = m_talker->loggedIn(); m_newAlbumBtn->setEnabled( loggedIn ); m_addPhotoBtn->setEnabled( loggedIn && m_albumView->selectedItem() ); } } -void GalleryWindow::slotError( const QString& msg ) +void GalleryWindow::slotError( const TQString& msg ) { KMessageBox::error( this, msg ); } -void GalleryWindow::slotAlbums( const QValueList<GAlbum>& albumList ) +void GalleryWindow::slotAlbums( const TQValueList<GAlbum>& albumList ) { m_albumDict.clear(); m_albumView->clear(); @@ -268,15 +268,15 @@ void GalleryWindow::slotAlbums( const QValueList<GAlbum>& albumList ) m_photoView->end(); KIconLoader* iconLoader = KApplication::kApplication()->iconLoader(); - QPixmap pix = iconLoader->loadIcon( "folder", KIcon::NoGroup, 32 ); + TQPixmap pix = iconLoader->loadIcon( "folder", KIcon::NoGroup, 32 ); - typedef QValueList<GAlbum> GAlbumList; + typedef TQValueList<GAlbum> GAlbumList; GAlbumList::const_iterator iter; for ( iter = albumList.begin(); iter != albumList.end(); ++iter ) { const GAlbum& album = *iter; - if ( album.parent_ref_num == 0 ) + if ( album.tqparent_ref_num == 0 ) { GAlbumViewItem* item = new GAlbumViewItem( m_albumView, album.title, album ); @@ -285,17 +285,17 @@ void GalleryWindow::slotAlbums( const QValueList<GAlbum>& albumList ) } else { - QListViewItem* parent = m_albumDict.find( album.parent_ref_num ); - if ( parent ) + TQListViewItem* tqparent = m_albumDict.tqfind( album.tqparent_ref_num ); + if ( tqparent ) { - GAlbumViewItem* item = new GAlbumViewItem( parent, album.title, + GAlbumViewItem* item = new GAlbumViewItem( tqparent, album.title, album); item->setPixmap( 0, pix ); m_albumDict.insert( album.ref_num, item ); } else { - kdWarning() << "Failed to find parent for album " + kdWarning() << "Failed to find tqparent for album " << album.name << " with id " << album.ref_num << "\n"; } @@ -316,7 +316,7 @@ void GalleryWindow::slotAlbums( const QValueList<GAlbum>& albumList ) if (lastSelectedID > 0) { - GAlbumViewItem* lastSelectedItem = m_albumDict.find( lastSelectedID ); + GAlbumViewItem* lastSelectedItem = m_albumDict.tqfind( lastSelectedID ); if (lastSelectedItem) { m_albumView->setSelected( lastSelectedItem, true ); @@ -325,24 +325,24 @@ void GalleryWindow::slotAlbums( const QValueList<GAlbum>& albumList ) } } -void GalleryWindow::slotPhotos( const QValueList<GPhoto>& photoList) +void GalleryWindow::slotPhotos( const TQValueList<GPhoto>& photoList) { int pxSize = fontMetrics().height() - 2; - QString styleSheet = - QString( "body { margin: 8px; font-size: %1px; " + TQString styleSheet = + TQString( "body { margin: 8px; font-size: %1px; " " color: %2; background-color: %3;}" ) - .arg( pxSize ) - .arg( colorGroup().text().name() ) - .arg( colorGroup().base().name() ); + .tqarg( pxSize ) + .tqarg( tqcolorGroup().text().name() ) + .tqarg( tqcolorGroup().base().name() ); - styleSheet += QString( "a { font-size: %1px; color: %2; " + styleSheet += TQString( "a { font-size: %1px; color: %2; " "text-decoration: none;}" ) - .arg( pxSize ) - .arg( colorGroup().text().name() ); - styleSheet += QString( "i { font-size: %1px; color: %2; " + .tqarg( pxSize ) + .tqarg( tqcolorGroup().text().name() ); + styleSheet += TQString( "i { font-size: %1px; color: %2; " "text-decoration: none;}" ) - .arg( pxSize-2 ) - .arg( QColor("steelblue").name() ); + .tqarg( pxSize-2 ) + .tqarg( TQColor("steelblue").name() ); m_photoView->begin(); m_photoView->setUserStyleSheet( styleSheet ); @@ -353,7 +353,7 @@ void GalleryWindow::slotPhotos( const QValueList<GPhoto>& photoList) "border='0' cellspacing='1' cellpadding='1'>" ); - typedef QValueList<GPhoto> GPhotoList; + typedef TQValueList<GPhoto> GPhotoList; GPhotoList::const_iterator iter; for ( iter = photoList.begin(); iter != photoList.end(); ++iter ) { @@ -362,14 +362,14 @@ void GalleryWindow::slotPhotos( const QValueList<GPhoto>& photoList) KURL thumburl(photo.albumURL + photo.thumbName); m_photoView->write( "<tr><td class='photo'>" - + QString("<a href='%1'>") - .arg(imageurl.url()) - + QString("<img border=1 src=\"%1\"><br>") - .arg(thumburl.url()) + + TQString("<a href='%1'>") + .tqarg(imageurl.url()) + + TQString("<img border=1 src=\"%1\"><br>") + .tqarg(thumburl.url()) + photo.name - + ( photo.caption.isEmpty() ? QString() : - QString("<br><i>%1</i>") - .arg(photo.caption) ) + + ( photo.caption.isEmpty() ? TQString() : + TQString("<br><i>%1</i>") + .tqarg(photo.caption) ) + "</a></td></tr>" ); } @@ -381,7 +381,7 @@ void GalleryWindow::slotPhotos( const QValueList<GPhoto>& photoList) void GalleryWindow::slotAlbumSelected() { - QListViewItem* item = m_albumView->selectedItem(); + TQListViewItem* item = m_albumView->selectedItem(); if ( !item ) { m_addPhotoBtn->setEnabled( false ); @@ -412,19 +412,19 @@ void GalleryWindow::slotNewAlbum() { GalleryAlbumDialog dlg; dlg.titleEdit->setFocus( ); - if ( dlg.exec() != QDialog::Accepted ) + if ( dlg.exec() != TQDialog::Accepted ) { return; } - QString name = dlg.nameEdit->text(); - QString title = dlg.titleEdit->text(); - QString caption = dlg.captionEdit->text(); + TQString name = dlg.nameEdit->text(); + TQString title = dlg.titleEdit->text(); + TQString caption = dlg.captionEdit->text(); // check for prohibited chars in the album name // \ / * ? " ' & < > | . + # ( ) or spaces - // Todo: Change this to a QRegExp check. - QChar ch; + // Todo: Change this to a TQRegExp check. + TQChar ch; bool clean = true; for (uint i=0; i<name.length(); i++) { @@ -514,29 +514,29 @@ void GalleryWindow::slotNewAlbum() if (!clean) { KMessageBox::error( this, i18n("Sorry, these characters are not allowed in album name: %1") - .arg("\\ / * ? \" \' & < > | . + # ( ) or spaces") ); + .tqarg("\\ / * ? \" \' & < > | . + # ( ) or spaces") ); return; } - QString parentAlbumName; + TQString tqparentAlbumName; - QListViewItem* item = m_albumView->selectedItem(); + TQListViewItem* item = m_albumView->selectedItem(); if (item) { GAlbumViewItem* viewItem = static_cast<GAlbumViewItem*>(item); - parentAlbumName = viewItem->album.name; + tqparentAlbumName = viewItem->album.name; } else { - parentAlbumName = "0"; + tqparentAlbumName = "0"; } - m_talker->createAlbum(parentAlbumName, name, title, caption); + m_talker->createAlbum(tqparentAlbumName, name, title, caption); } void GalleryWindow::slotAddPhotos() { - QListViewItem* item = m_albumView->selectedItem(); + TQListViewItem* item = m_albumView->selectedItem(); if (!item) return; @@ -544,7 +544,7 @@ void GalleryWindow::slotAddPhotos() if (urls.isEmpty()) return; - typedef QPair<QString,QString> Pair; + typedef TQPair<TQString,TQString> Pair; m_uploadQueue.clear(); for (KURL::List::iterator it = urls.begin(); it != urls.end(); ++it) @@ -569,7 +569,7 @@ void GalleryWindow::slotAddPhotoNext() return; } - typedef QPair<QString,QString> Pair; + typedef TQPair<TQString,TQString> Pair; Pair pathComments = m_uploadQueue.first(); m_uploadQueue.pop_front(); @@ -584,7 +584,7 @@ void GalleryWindow::slotAddPhotoNext() } m_progressDlg->setLabelText( i18n("Uploading file %1 ") - .arg( KURL(pathComments.first).filename() ) ); + .tqarg( KURL(pathComments.first).filename() ) ); if (m_progressDlg->isHidden()) m_progressDlg->show(); @@ -597,7 +597,7 @@ void GalleryWindow::slotAddPhotoSucceeded() slotAddPhotoNext(); } -void GalleryWindow::slotAddPhotoFailed( const QString& msg ) +void GalleryWindow::slotAddPhotoFailed( const TQString& msg ) { if ( KMessageBox::warningContinueCancel( this, i18n( "Failed to upload photo into " diff --git a/kipi-plugins/sync/gallerywindow.h b/kipi-plugins/sync/gallerywindow.h index 7e4aa0e..bf8d378 100644 --- a/kipi-plugins/sync/gallerywindow.h +++ b/kipi-plugins/sync/gallerywindow.h @@ -20,15 +20,15 @@ #define GALLERYWINDOW_H #include <kdialogbase.h> -#include <qvaluelist.h> -#include <qpair.h> -#include <qintdict.h> - -class QListView; -class QPushButton; -class QSpinBox; -class QCheckBox; -class QProgressDialog; +#include <tqvaluelist.h> +#include <tqpair.h> +#include <tqintdict.h> + +class TQListView; +class TQPushButton; +class TQSpinBox; +class TQCheckBox; +class TQProgressDialog; class KHTMLPart; class KURL; @@ -53,31 +53,32 @@ class GAlbumViewItem; class GalleryWindow : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - GalleryWindow(KIPI::Interface *interface, QWidget *parent, Galleries* pGalleries); + GalleryWindow(KIPI::Interface *interface, TQWidget *tqparent, Galleries* pGalleries); ~GalleryWindow(); private: - QListView *m_albumView; + TQListView *m_albumView; KHTMLPart *m_photoView; - QPushButton *m_newAlbumBtn; - QPushButton *m_addPhotoBtn; - QPushButton *m_helpButton; - QCheckBox *m_resizeCheckBox; - QSpinBox *m_dimensionSpinBox; + TQPushButton *m_newAlbumBtn; + TQPushButton *m_addPhotoBtn; + TQPushButton *m_helpButton; + TQCheckBox *m_resizeCheckBox; + TQSpinBox *m_dimensionSpinBox; GalleryTalker *m_talker; - QIntDict<GAlbumViewItem> m_albumDict; - QString m_lastSelectedAlbum; + TQIntDict<GAlbumViewItem> m_albumDict; + TQString m_lastSelectedAlbum; KIPI::Interface *m_interface; KIPIPlugins::KPAboutData *m_about; - QProgressDialog *m_progressDlg; + TQProgressDialog *m_progressDlg; unsigned int m_uploadCount; unsigned int m_uploadTotal; - QValueList< QPair<QString,QString> > m_uploadQueue; + TQValueList< TQPair<TQString,TQString> > m_uploadQueue; Galleries* mpGalleries; Gallery* mpGallery; @@ -85,18 +86,18 @@ private: private slots: 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 slotAlbumSelected(); void slotOpenPhoto( const KURL& url ); void slotNewAlbum(); void slotAddPhotos(); void slotAddPhotoNext(); void slotAddPhotoSucceeded(); - void slotAddPhotoFailed( const QString& msg ); + void slotAddPhotoFailed( const TQString& msg ); void slotAddPhotoCancel(); void slotHelp(); }; diff --git a/kipi-plugins/sync/libkipi2/collection.h b/kipi-plugins/sync/libkipi2/collection.h index f7953aa..931fa7c 100644 --- a/kipi-plugins/sync/libkipi2/collection.h +++ b/kipi-plugins/sync/libkipi2/collection.h @@ -19,7 +19,7 @@ #ifndef KIPI2_COLLECTION_H #define KIPI2_COLLECTION_H -#include <qvaluelist.h> +#include <tqvaluelist.h> namespace KIPI2 { @@ -38,8 +38,8 @@ namespace KIPI2 class Item; // Some list definitions - typedef QValueList<Collection*> CollectionList; - typedef QValueList<Item*> ItemList; + typedef TQValueList<Collection*> CollectionList; + typedef TQValueList<Item*> ItemList; // And some templated functions for cleaning up in Collection derived destructors template <class T> void DestroyCollectionList(CollectionList& collections); @@ -68,7 +68,7 @@ namespace KIPI2 virtual const Item* addItem() = 0; private: - // Store for parent + // Store for tqparent Collection* mpParent; // Store the features that this collection supports diff --git a/kipi-plugins/sync/libkipi2/interface.h b/kipi-plugins/sync/libkipi2/interface.h index e4d0e31..e77a4c6 100644 --- a/kipi-plugins/sync/libkipi2/interface.h +++ b/kipi-plugins/sync/libkipi2/interface.h @@ -19,14 +19,15 @@ #ifndef KIPI2_INTERFACE_H #define KIPI2_INTERFACE_H -#include <qobject.h> +#include <tqobject.h> #include "collection.h" namespace KIPI2 { -class Interface : public QObject +class Interface : public TQObject { Q_OBJECT + TQ_OBJECT public: virtual const CollectionList* getCollections() = 0; diff --git a/kipi-plugins/sync/libkipi2/item.h b/kipi-plugins/sync/libkipi2/item.h index 6b42830..0b3eda3 100644 --- a/kipi-plugins/sync/libkipi2/item.h +++ b/kipi-plugins/sync/libkipi2/item.h @@ -19,7 +19,7 @@ #ifndef KIPI2_ITEM_H #define KIPI2_ITEM_H -#include <qvaluelist.h> +#include <tqvaluelist.h> namespace KIPI2 { diff --git a/kipi-plugins/sync/plugin_sync.cpp b/kipi-plugins/sync/plugin_sync.cpp index c29f587..69a0c06 100644 --- a/kipi-plugins/sync/plugin_sync.cpp +++ b/kipi-plugins/sync/plugin_sync.cpp @@ -44,10 +44,10 @@ K_EXPORT_COMPONENT_FACTORY(kipiplugin_sync, Factory("kipiplugin_sync")) -Plugin_Sync::Plugin_Sync(QObject *parent, +Plugin_Sync::Plugin_Sync(TQObject *tqparent, const char*, - const QStringList&) - : KIPI::Plugin(Factory::instance(), parent, "Sync"), + const TQStringList&) + : KIPI::Plugin(Factory::instance(), tqparent, "Sync"), mpSinks(NULL) { kdDebug(51001) << "Plugin_Sync plugin loaded" @@ -55,7 +55,7 @@ Plugin_Sync::Plugin_Sync(QObject *parent, } -void Plugin_Sync::setup(QWidget* widget) +void Plugin_Sync::setup(TQWidget* widget) { // Create a collection to store the various Sinks a user can // define. @@ -63,7 +63,7 @@ void Plugin_Sync::setup(QWidget* widget) // Standard initialisation for Kipi Plugins KIPI::Plugin::setup(widget); - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(parent()); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(tqparent()); if (!interface) { @@ -77,7 +77,7 @@ void Plugin_Sync::setup(QWidget* widget) mpActionSync = new KAction(i18n("Synchronize..."), 0, this, - SLOT(slotSync()), + TQT_SLOT(slotSync()), actionCollection(), "sync"); mpActionSync->setEnabled(true); @@ -86,7 +86,7 @@ void Plugin_Sync::setup(QWidget* widget) mpActionConfigure = new KAction(i18n("Configure Synchronization..."), 0, this, - SLOT(slotConfigure()), + TQT_SLOT(slotConfigure()), actionCollection(), "sync"); mpActionConfigure->setEnabled(true); @@ -95,7 +95,7 @@ void Plugin_Sync::setup(QWidget* widget) mpActionSettingsCollection = new KAction(i18n("Synchronization Settings..."), 0, this, - SLOT(slotSettingsCollection()), + TQT_SLOT(slotSettingsCollection()), actionCollection(), "sync"); mpActionSettingsCollection->setEnabled(true); @@ -104,7 +104,7 @@ void Plugin_Sync::setup(QWidget* widget) mpActionSettingsImage = new KAction(i18n("Synchronization Settings..."), 0, this, - SLOT(slotSettingsImage()), + TQT_SLOT(slotSettingsImage()), actionCollection(), "sync"); mpActionSettingsImage->setEnabled(true); @@ -122,7 +122,7 @@ Plugin_Sync::~Plugin_Sync() void Plugin_Sync::slotSync() { - 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; @@ -137,7 +137,7 @@ void Plugin_Sync::slotSync() void Plugin_Sync::slotConfigure() { - 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; @@ -152,7 +152,7 @@ void Plugin_Sync::slotConfigure() void Plugin_Sync::slotSettingsCollection() { - 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; @@ -165,7 +165,7 @@ void Plugin_Sync::slotSettingsCollection() void Plugin_Sync::slotSettingsImage() { - 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; diff --git a/kipi-plugins/sync/plugin_sync.h b/kipi-plugins/sync/plugin_sync.h index 2d04997..4e98274 100644 --- a/kipi-plugins/sync/plugin_sync.h +++ b/kipi-plugins/sync/plugin_sync.h @@ -35,16 +35,17 @@ class Sinks; class Plugin_Sync : public KIPI::Plugin { Q_OBJECT + TQ_OBJECT public: - Plugin_Sync(QObject* pParent, + Plugin_Sync(TQObject* pParent, const char* pName, - const QStringList &rArgs); + const TQStringList &rArgs); ~Plugin_Sync(); virtual KIPI::Category category(KAction* pAction) const; - virtual void setup(QWidget* pWidget); + virtual void setup(TQWidget* pWidget); public slots: diff --git a/kipi-plugins/sync/sink.cpp b/kipi-plugins/sync/sink.cpp index 7d27f91..2c2dfec 100644 --- a/kipi-plugins/sync/sink.cpp +++ b/kipi-plugins/sync/sink.cpp @@ -23,7 +23,7 @@ namespace KIPISyncPlugin { -Sink::Sink(unsigned int sinkId, QString name, KConfig*, KWallet::Wallet*) +Sink::Sink(unsigned int sinkId, TQString name, KConfig*, KWallet::Wallet*) : mSinkId(sinkId), mName(name) { @@ -34,13 +34,13 @@ unsigned int Sink::SinkId() return mSinkId; } -QString Sink::Name() +TQString Sink::Name() { return mName; } /* -Sink::Sink(const QString& name, const QString& url, - const QString& username, const QString& password, +Sink::Sink(const TQString& name, const TQString& url, + const TQString& username, const TQString& password, const unsigned int version, const unsigned int sinkId) : mName(name), @@ -58,36 +58,36 @@ Sink::~Sink() } -QString Sink::name() const { return mName; } -QString Sink::url() const { return mUrl; } -QString Sink::username() const { return mUsername; } -QString Sink::password() const { return mPassword; } +TQString Sink::name() const { return mName; } +TQString Sink::url() const { return mUrl; } +TQString Sink::username() const { return mUsername; } +TQString Sink::password() const { return mPassword; } unsigned int Sink::version() const { return mVersion; } unsigned int Sink::sinkId() const { return mSinkId; } -void Sink::setName(QString name) { mName = name; } -void Sink::setUrl(QString url) { mUrl = url; } -void Sink::setUsername(QString username) { mUsername = username; } -void Sink::setPassword(QString password) { mPassword = password; } +void Sink::setName(TQString name) { mName = name; } +void Sink::setUrl(TQString url) { mUrl = url; } +void Sink::setUsername(TQString username) { mUsername = username; } +void Sink::setPassword(TQString password) { mPassword = password; } void Sink::setVersion(unsigned int version) { mVersion = version; } void Sink::setSinkId(unsigned int sinkId) { mSinkId = sinkId; } -void Sink::asQListViewItem(QListView* pParent) +void Sink::asTQListViewItem(TQListView* pParent) { - new SinkQListViewItem(this, pParent); + new SinkTQListViewItem(this, pParent); } */ // Pretend sink (just for testin the structure - will be removed!) -Sink2::Sink2(unsigned int sinkId, QString name, KConfig* pConfig, KWallet::Wallet* pWallet) +Sink2::Sink2(unsigned int sinkId, TQString name, KConfig* pConfig, KWallet::Wallet* pWallet) : Sink(sinkId, name, pConfig, pWallet) { mName = "Sink2"; } -QString Sink2::Type() { return "Sink2"; } -QString Sink2::TypeDescription() { return "Sink2"; } +TQString Sink2::Type() { return "Sink2"; } +TQString Sink2::TypeDescription() { return "Sink2"; } KIPI2::CollectionList* Sink2::getCollections() { diff --git a/kipi-plugins/sync/sink.h b/kipi-plugins/sync/sink.h index feabf3d..3ef8cfc 100644 --- a/kipi-plugins/sync/sink.h +++ b/kipi-plugins/sync/sink.h @@ -19,7 +19,7 @@ #ifndef SINK_H #define SINK_H -#include <qstring.h> +#include <tqstring.h> #include "libkipi2/interface.h" #include <kconfig.h> @@ -41,18 +41,18 @@ namespace KIPISyncPlugin class Sink : public KIPI2::Interface { public: - Sink(unsigned int sinkId, QString name, KConfig* pConfig, KWallet::Wallet* pWallet); + Sink(unsigned int sinkId, TQString name, KConfig* pConfig, KWallet::Wallet* pWallet); unsigned int SinkId(); /// The Name of the Sink as chosen by the user. - QString Name(); + TQString Name(); /// An internal, unique type as specified by the sink. - virtual QString Type() = 0; + virtual TQString Type() = 0; /// Some information about the sink type for the benefit of the user. - virtual QString TypeDescription() = 0; + virtual TQString TypeDescription() = 0; virtual const KIPI2::CollectionList* getCollections() = 0; @@ -63,12 +63,12 @@ public: virtual void Disconnect() { }; - //virtual void asQListViewItem(QListView* pParent) = 0; + //virtual void asTQListViewItem(TQListView* pParent) = 0; protected: unsigned int mSinkId; - QString mName; + TQString mName; }; @@ -77,9 +77,9 @@ protected: class Sink2 : Sink { public: - Sink2(unsigned int sinkId, QString name, KConfig* pConfig, KWallet::Wallet* pWallet); - QString Type(); - QString TypeDescription(); + Sink2(unsigned int sinkId, TQString name, KConfig* pConfig, KWallet::Wallet* pWallet); + TQString Type(); + TQString TypeDescription(); KIPI2::CollectionList* getCollections(); void Save(KConfig* pConfig, KWallet::Wallet* pWallet); }; diff --git a/kipi-plugins/sync/sinkfactory.cpp b/kipi-plugins/sync/sinkfactory.cpp index bd34bcc..f3ebe28 100644 --- a/kipi-plugins/sync/sinkfactory.cpp +++ b/kipi-plugins/sync/sinkfactory.cpp @@ -25,9 +25,9 @@ namespace KIPISyncPlugin SinkMap SinkFactory::mSinkProxies; // Define the register method -bool SinkFactory::Register(QString type, SinkProxy* pSinkProxy) +bool SinkFactory::Register(TQString type, SinkProxy* pSinkProxy) { - if (mSinkProxies.contains(type)) + if (mSinkProxies.tqcontains(type)) return false; mSinkProxies[type] = pSinkProxy; @@ -35,9 +35,9 @@ bool SinkFactory::Register(QString type, SinkProxy* pSinkProxy) } // The main creation method -Sink* SinkFactory::Create(QString type, unsigned int sinkId, QString name, KConfig* pConfig, KWallet::Wallet* pWallet) +Sink* SinkFactory::Create(TQString type, unsigned int sinkId, TQString name, KConfig* pConfig, KWallet::Wallet* pWallet) { - if (!mSinkProxies.contains(type)) + if (!mSinkProxies.tqcontains(type)) return NULL; return (*(mSinkProxies[type]))(sinkId, name, pConfig, pWallet); diff --git a/kipi-plugins/sync/sinkfactory.h b/kipi-plugins/sync/sinkfactory.h index 19f9cd9..dd0bd0d 100644 --- a/kipi-plugins/sync/sinkfactory.h +++ b/kipi-plugins/sync/sinkfactory.h @@ -19,8 +19,8 @@ #ifndef SINKFACTORY_H #define SINKFACTORY_H -#include <qmap.h> -class QListView; +#include <tqmap.h> +class TQListView; class KConfig; namespace KWallet { @@ -35,23 +35,23 @@ class Sink; // Create a templated creator function to allow our "sinks" to // register themselves with the factory. template <class T> -Sink* SinkCreator(unsigned int sinkId, QString name, KConfig* pConfig, KWallet::Wallet* pWallet) +Sink* SinkCreator(unsigned int sinkId, TQString name, KConfig* pConfig, KWallet::Wallet* pWallet) { return (Sink*) new T(sinkId, name, pConfig, pWallet); } // Define a type that is a pointer to the templated function above. -typedef Sink* SinkProxy(unsigned int sinkId, QString name, KConfig* pConfig, KWallet::Wallet* pWallet); +typedef Sink* SinkProxy(unsigned int sinkId, TQString name, KConfig* pConfig, KWallet::Wallet* pWallet); // And define a type that is a Map of names to creator functions. -typedef QMap<QString, SinkProxy*> SinkMap; +typedef TQMap<TQString, SinkProxy*> SinkMap; // The factory to register and create the sinks class SinkFactory { public: - static bool Register(QString name, SinkProxy* pSinkProxy); - static Sink* Create(QString name, unsigned int sinkId, QString name, KConfig* pConfig, KWallet::Wallet* pWallet); + static bool Register(TQString name, SinkProxy* pSinkProxy); + static Sink* Create(TQString name, unsigned int sinkId, TQString name, KConfig* pConfig, KWallet::Wallet* pWallet); private: static SinkMap mSinkProxies; diff --git a/kipi-plugins/sync/sinklist.cpp b/kipi-plugins/sync/sinklist.cpp index 5e290ad..77c12ff 100644 --- a/kipi-plugins/sync/sinklist.cpp +++ b/kipi-plugins/sync/sinklist.cpp @@ -34,7 +34,7 @@ namespace KIPISyncPlugin { -SinkList::SinkList(QWidget *pParent, Sinks* pSinks, bool blnShowOpen) +SinkList::SinkList(TQWidget *pParent, Sinks* pSinks, bool blnShowOpen) : SinkListBase(pParent), mpSinks(pSinks), mpCurrentSink(0) @@ -45,7 +45,7 @@ SinkList::SinkList(QWidget *pParent, Sinks* pSinks, bool blnShowOpen) listSinks->addColumn(i18n("Name")); listSinks->addColumn(i18n("Type")); - mpSinks->asQListView(listSinks); + mpSinks->asTQListView(listSinks); } SinkList::~SinkList() @@ -60,7 +60,7 @@ Sink* SinkList::GetSink() void SinkList::selectionChanged() { - QListViewItem* p_lvi = listSinks->selectedItem(); + TQListViewItem* p_lvi = listSinks->selectedItem(); bool bln_selected = (p_lvi ? true : false); buttonRemove->setEnabled(bln_selected); buttonConfigure->setEnabled(bln_selected); @@ -68,7 +68,7 @@ void SinkList::selectionChanged() if (bln_selected) { - SinkQListViewItem* p_glvi = dynamic_cast<SinkQListViewItem*>(p_lvi); + SinkTQListViewItem* p_glvi = dynamic_cast<SinkTQListViewItem*>(p_lvi); mpCurrentSink = p_glvi->GetSink(); } else @@ -77,7 +77,7 @@ void SinkList::selectionChanged() } } -void SinkList::doubleClicked(QListViewItem* pCurrent, const QPoint&, int) +void SinkList::doubleClicked(TQListViewItem* pCurrent, const TQPoint&, int) { if (!pCurrent) return; @@ -98,11 +98,11 @@ void SinkList::buttonAdd_clicked(void) /* Sink* p_sink = new Sink(); SinkEdit dlg(this, p_sink, i18n("New Sink")); - if (QDialog::Accepted == dlg.exec()) + if (TQDialog::Accepted == dlg.exec()) { mpSinks->Add(p_sink); mpSinks->Save(); - p_sink->asQListViewItem(mpSinkList); + p_sink->asTQListViewItem(mpSinkList); } else { @@ -115,7 +115,7 @@ void SinkList::buttonAdd_clicked(void) //================== Edit ====== void SinkList::buttonConfigure_clicked(void) { - QListViewItem* p_lvi = listSinks->selectedItem(); + TQListViewItem* p_lvi = listSinks->selectedItem(); if (!p_lvi) { KMessageBox::error(kapp->activeWindow(), i18n("No sink selected!")); @@ -123,9 +123,9 @@ void SinkList::buttonConfigure_clicked(void) else { /* - SinkQListViewItem* p_glvi = dynamic_cast<SinkQListViewItem*>(p_lvi); + SinkTQListViewItem* p_glvi = dynamic_cast<SinkTQListViewItem*>(p_lvi); SinkEdit dlg(this, p_glvi->GetSink(), i18n("Edit Sink")); - if (QDialog::Accepted == dlg.exec()) + if (TQDialog::Accepted == dlg.exec()) { p_glvi->Refresh(); mpSinks->Save(); @@ -138,7 +138,7 @@ void SinkList::buttonConfigure_clicked(void) //================== Remove ====== void SinkList::buttonRemove_clicked(void) { - QListViewItem* p_lvi = listSinks->selectedItem(); + TQListViewItem* p_lvi = listSinks->selectedItem(); if (!p_lvi) { KMessageBox::error(kapp->activeWindow(), i18n("No sink selected!")); @@ -152,9 +152,9 @@ void SinkList::buttonRemove_clicked(void) "You cannot undo this action."), i18n("Remove Sink?"), KStdGuiItem::yes(), KStdGuiItem::no(), - QString::null, KMessageBox::Dangerous)) + TQString(), KMessageBox::Dangerous)) { - SinkQListViewItem* p_glvi = dynamic_cast<SinkQListViewItem*>(p_lvi); + SinkTQListViewItem* p_glvi = dynamic_cast<SinkTQListViewItem*>(p_lvi); Sink* p_sink = p_glvi->GetSink(); delete p_glvi; mpSinks->Remove(p_sink); diff --git a/kipi-plugins/sync/sinklist.h b/kipi-plugins/sync/sinklist.h index 850b3f4..c7171fd 100644 --- a/kipi-plugins/sync/sinklist.h +++ b/kipi-plugins/sync/sinklist.h @@ -20,7 +20,7 @@ #include "sinklistbase.h" -class QWidget; +class TQWidget; namespace KIPISyncPlugin { @@ -31,10 +31,11 @@ class Sinks; class SinkList : public SinkListBase { Q_OBJECT + TQ_OBJECT public: - SinkList(QWidget* pParent, Sinks* pSinks, bool blnShowOpen = true); + SinkList(TQWidget* pParent, Sinks* pSinks, bool blnShowOpen = true); ~SinkList(); Sink* GetSink(void); @@ -43,7 +44,7 @@ private: Sinks* mpSinks; Sink* mpCurrentSink; - QListView* mpSinkList; + TQListView* mpSinkList; private slots: @@ -52,7 +53,7 @@ private slots: void buttonAdd_clicked(); void selectionChanged(); - void doubleClicked(QListViewItem*, const QPoint&, int); + void doubleClicked(TQListViewItem*, const TQPoint&, int); }; } diff --git a/kipi-plugins/sync/sinklistbase.ui b/kipi-plugins/sync/sinklistbase.ui index 804ab72..85e73ad 100644 --- a/kipi-plugins/sync/sinklistbase.ui +++ b/kipi-plugins/sync/sinklistbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>SinkListBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,11 +18,11 @@ <property name="sizeGripEnabled"> <bool>true</bool> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapEyeCandy</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>10</y> @@ -37,11 +37,11 @@ <pixmap>image0</pixmap> </property> </widget> - <widget class="QListView"> + <widget class="TQListView"> <property name="name"> <cstring>listSinks</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>120</x> <y>10</y> @@ -56,11 +56,11 @@ <enum>AllColumns</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layoutButtons</cstring> + <cstring>tqlayoutButtons</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>270</y> @@ -167,12 +167,12 @@ <slot>accept()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot access="protected">buttonRemove_clicked()</slot> <slot access="protected">buttonConfigure_clicked()</slot> <slot access="protected">buttonAdd_clicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdialog.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kipi-plugins/sync/sinks.cpp b/kipi-plugins/sync/sinks.cpp index 9dc9f14..b4363b8 100644 --- a/kipi-plugins/sync/sinks.cpp +++ b/kipi-plugins/sync/sinks.cpp @@ -16,9 +16,9 @@ * GNU General Public License for more details. * ============================================================ */ -#include <qstring.h> +#include <tqstring.h> -#include <qwidget.h> +#include <tqwidget.h> #include <kapplication.h> #include <kdebug.h> #include <kconfig.h> @@ -35,18 +35,18 @@ namespace KIPISyncPlugin { -SinkQListViewItem::SinkQListViewItem(Sink* pSink, QListView* pParent) - : QListViewItem(pParent, pSink->Name(), pSink->Type()), +SinkTQListViewItem::SinkTQListViewItem(Sink* pSink, TQListView* pParent) + : TQListViewItem(pParent, pSink->Name(), pSink->Type()), mpSink(pSink) { } -Sink* SinkQListViewItem::GetSink() +Sink* SinkTQListViewItem::GetSink() { return mpSink; } -void SinkQListViewItem::Refresh() +void SinkTQListViewItem::Refresh() { setText(0, mpSink->Name()); setText(1, mpSink->Type()); @@ -85,19 +85,19 @@ Sinks::Sinks() // Read config KConfig config("kipirc"); config.setGroup("Sync Settings"); - QValueList<int> sink_ids = config.readIntListEntry("Sinks"); + TQValueList<int> sink_ids = config.readIntListEntry("Sinks"); config.setGroup("Sync Sinks"); - QString name, type; - for (QValueList<int>::Iterator it = sink_ids.begin(); it != sink_ids.end(); ++it) + TQString name, type; + for (TQValueList<int>::Iterator it = sink_ids.begin(); it != sink_ids.end(); ++it) { unsigned int sink_id = (*it); if (sink_id > mMaxSinkId) mMaxSinkId = sink_id; - type = config.readEntry(QString("Type%1").arg(sink_id)); - name = config.readEntry(QString("Name%1").arg(sink_id)); + type = config.readEntry(TQString("Type%1").tqarg(sink_id)); + name = config.readEntry(TQString("Name%1").tqarg(sink_id)); Sink* p_sink = SinkFactory::Create(type, sink_id, name, &config, p_wallet); if (p_sink) mSinks.append(p_sink); @@ -123,7 +123,7 @@ void Sinks::Load() } -Sink* Sinks::Add(QString type, QString name) +Sink* Sinks::Add(TQString type, TQString name) { Sink* p_sink = SinkFactory::Create(type, ++mMaxSinkId, name, NULL, NULL); // This actually needs to be a call to sync factory creation... pass in the new SinkId @@ -144,7 +144,7 @@ void Sinks::Remove(Sink* pSink) /// @todo Abstract this to per-sink-type save void Sinks::Save() { - QValueList<int> sink_ids; + TQValueList<int> sink_ids; KConfig config("kipirc"); config.deleteGroup("Sync Sinks"); config.setGroup("Sync Sinks"); @@ -177,14 +177,14 @@ void Sinks::Save() config.writeEntry("Sinks", sink_ids); } -void Sinks::asQListView(QListView* pListView) +void Sinks::asTQListView(TQListView* pListView) { Load(); pListView->clear(); for (SinkPtrList::iterator it = mSinks.begin(); it != mSinks.end(); ++it) { - //(*it)->asQListViewItem(pListView); + //(*it)->asTQListViewItem(pListView); } } diff --git a/kipi-plugins/sync/sinks.h b/kipi-plugins/sync/sinks.h index 21d70fa..3636c97 100644 --- a/kipi-plugins/sync/sinks.h +++ b/kipi-plugins/sync/sinks.h @@ -19,8 +19,8 @@ #ifndef SINKS_H #define SINKS_H -#include <qptrlist.h> -#include <qlistview.h> +#include <tqptrlist.h> +#include <tqlistview.h> // Some sinks may wish to make use of the Wallet to store sensitive // information so we manage it here. @@ -36,11 +36,11 @@ namespace KIPISyncPlugin class Sink; /* Simple Stub Class to allow easy access to Sinks from GUI elements */ -class SinkQListViewItem : public QListViewItem +class SinkTQListViewItem : public TQListViewItem { public: - SinkQListViewItem(Sink* pSink, QListView* pParent); + SinkTQListViewItem(Sink* pSink, TQListView* pParent); Sink* GetSink(); void Refresh(); @@ -51,7 +51,7 @@ private: }; -typedef QPtrList<Sink> SinkPtrList; +typedef TQPtrList<Sink> SinkPtrList; /* Container class for all Sinks */ class Sinks @@ -61,10 +61,10 @@ public: Sinks(); ~Sinks(); - Sink* Add(QString type, QString name); + Sink* Add(TQString type, TQString name); void Remove(Sink* pSink); void Save(); - void asQListView(QListView* pListView); + void asTQListView(TQListView* pListView); private: void Load(); diff --git a/kipi-plugins/sync/sinks/gallery/galleryform.cpp b/kipi-plugins/sync/sinks/gallery/galleryform.cpp index 44a15ce..9c90dfa 100644 --- a/kipi-plugins/sync/sinks/gallery/galleryform.cpp +++ b/kipi-plugins/sync/sinks/gallery/galleryform.cpp @@ -23,9 +23,9 @@ #include <kmimetype.h> #include <kurl.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qtextstream.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqtextstream.h> //#include <cstring> //#include <cstdio> @@ -35,7 +35,7 @@ namespace KIPISyncPlugin { -GalleryForm::GalleryForm(GalleryVersion version, QString authToken) +GalleryForm::GalleryForm(GalleryVersion version, TQString authToken) : mVersion(version) { mBoundary = "----------"; @@ -55,33 +55,33 @@ GalleryForm::~GalleryForm() } -void GalleryForm::addPair(const QString& name, const QString& value) +void GalleryForm::addPair(const TQString& name, const TQString& value) { if (Gallery2 == mVersion) - return addPairRaw(QString("g2_form[%1]").arg(name), value); + return addPairRaw(TQString("g2_form[%1]").tqarg(name), value); return addPairRaw(name, value); } -void GalleryForm::addPairRaw(const QString& name, const QString& value) +void GalleryForm::addPairRaw(const TQString& name, const TQString& value) { - 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 << "--" << mBoundary << "\r\n"; ts << "Content-Disposition: form-data; name=\"" << name.ascii() << "\"\r\n\r\n"; ts << value.ascii() << "\r\n"; } -bool GalleryForm::addFile(const QString& path, const QString& displayFilename) +bool GalleryForm::addFile(const TQString& path, const TQString& displayFilename) { - QString filename = "userfile_name"; + TQString filename = "userfile_name"; if (Gallery2 == mVersion) filename = "g2_userfile_name"; addPairRaw(filename, displayFilename); 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, @@ -89,21 +89,21 @@ bool GalleryForm::addFile(const QString& path, const QString& displayFilename) return false; } - QFile imageFile(path); + TQFile imageFile(path); if ( !imageFile.open( IO_ReadOnly ) ) return false; - QByteArray imageData = imageFile.readAll(); + TQByteArray imageData = imageFile.readAll(); 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 << "--" << mBoundary << "\r\n"; ts << "Content-Disposition: form-data; name=\""; if (Gallery2 == mVersion) ts << "g2_userfile"; else ts << "userfile"; - ts << "\"; filename=\"" << QFile::encodeName(KURL(path).filename()) << "\"\r\n"; + ts << "\"; filename=\"" << TQFile::encodeName(KURL(path).filename()) << "\"\r\n"; ts << "Content-Type: " << mime.ascii() << "\r\n\r\n"; int oldSize = m_buffer.size(); @@ -117,16 +117,16 @@ bool GalleryForm::addFile(const QString& path, const QString& displayFilename) } -QString GalleryForm::contentType() const +TQString GalleryForm::contentType() const { - return QString("Content-Type: multipart/form-data; boundary=" + mBoundary); + return TQString("Content-Type: multipart/form-data; boundary=" + mBoundary); } -QByteArray GalleryForm::formData() +TQByteArray GalleryForm::formData() { - 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 << "--" << mBoundary << "--" << "\r\n"; return m_buffer; diff --git a/kipi-plugins/sync/sinks/gallery/galleryform.h b/kipi-plugins/sync/sinks/gallery/galleryform.h index e8f39a2..9318efc 100644 --- a/kipi-plugins/sync/sinks/gallery/galleryform.h +++ b/kipi-plugins/sync/sinks/gallery/galleryform.h @@ -19,8 +19,8 @@ #ifndef GALLERYFORM_H #define GALLERYFORM_H -#include <qcstring.h> -#include <qstring.h> +#include <tqcstring.h> +#include <tqstring.h> class KURL; @@ -38,22 +38,22 @@ class GalleryForm { public: - GalleryForm(GalleryVersion version, QString authToken = ""); + GalleryForm(GalleryVersion version, TQString authToken = ""); ~GalleryForm(); - void addPair(const QString& name, const QString& value); - bool addFile(const QString& path, const QString& displayFilename); + void addPair(const TQString& name, const TQString& value); + bool addFile(const TQString& path, const TQString& displayFilename); - QString contentType() const; - QByteArray formData(); + TQString contentType() const; + TQByteArray formData(); private: - void addPairRaw(const QString& name, const QString& value); + void addPairRaw(const TQString& name, const TQString& value); GalleryVersion mVersion; - QByteArray m_buffer; - QCString mBoundary; + TQByteArray m_buffer; + TQCString mBoundary; }; } diff --git a/kipi-plugins/sync/sinks/gallery/gallerysink.cpp b/kipi-plugins/sync/sinks/gallery/gallerysink.cpp index 8578b9c..d19c73e 100644 --- a/kipi-plugins/sync/sinks/gallery/gallerysink.cpp +++ b/kipi-plugins/sync/sinks/gallery/gallerysink.cpp @@ -18,11 +18,11 @@ * * ============================================================ */ -#include <qcstring.h> -#include <qtextstream.h> -#include <qfile.h> -#include <qimage.h> -#include <qregexp.h> +#include <tqcstring.h> +#include <tqtextstream.h> +#include <tqfile.h> +#include <tqimage.h> +#include <tqregexp.h> #include <klocale.h> #include <kio/job.h> @@ -44,18 +44,18 @@ namespace KIPISyncPlugin { -GallerySink::GallerySink(unsigned int sinkId, QString name, KConfig* pConfig, KWallet::Wallet* pWallet, GalleryVersion version) +GallerySink::GallerySink(unsigned int sinkId, TQString name, KConfig* pConfig, KWallet::Wallet* pWallet, GalleryVersion version) : Sink(sinkId, name, pConfig, pWallet), mVersion(version), mAuthToken(""), mpJob(0), m_loggedIn(false) { - QString tmp = pConfig->readEntry(QString("URL%1").arg(sinkId)); + TQString tmp = pConfig->readEntry(TQString("URL%1").tqarg(sinkId)); mURL = KURL(tmp); - mUsername = pConfig->readEntry(QString("Username%1").arg(sinkId)); + mUsername = pConfig->readEntry(TQString("Username%1").tqarg(sinkId)); if (pWallet) - pWallet->readPassword(QString("Password%1").arg(sinkId), mPassword); + pWallet->readPassword(TQString("Password%1").tqarg(sinkId), mPassword); } GallerySink::~GallerySink() @@ -72,12 +72,12 @@ const KIPI2::CollectionList* GallerySink::getCollections() void GallerySink::Save(KConfig* pConfig, KWallet::Wallet* pWallet) { - pConfig->writeEntry(QString("Name%1").arg(mSinkId), mName); - pConfig->writeEntry(QString("Type%1").arg(mSinkId), Type()); - pConfig->writeEntry(QString("URL%1").arg(mSinkId), QString(mURL.url())); - pConfig->writeEntry(QString("Username%1").arg(mSinkId), mUsername); + pConfig->writeEntry(TQString("Name%1").tqarg(mSinkId), mName); + pConfig->writeEntry(TQString("Type%1").tqarg(mSinkId), Type()); + pConfig->writeEntry(TQString("URL%1").tqarg(mSinkId), TQString(mURL.url())); + pConfig->writeEntry(TQString("Username%1").tqarg(mSinkId), mUsername); if (pWallet) - pWallet->writePassword(QString("Password%1").arg(mSinkId), mPassword); + pWallet->writePassword(TQString("Password%1").tqarg(mSinkId), mPassword); } @@ -100,10 +100,10 @@ bool GallerySink::Connect() KIO::TransferJob* job = KIO::http_post(mURL, form.formData(), false); job->addMetaData("content-type", form.contentType() ); job->addMetaData("cookies", "manual"); - connect(job, SIGNAL(data(KIO::Job*, const QByteArray&)), - SLOT(data(KIO::Job*, const QByteArray&))); - connect(job, SIGNAL(result(KIO::Job *)), - SLOT(slotResult(KIO::Job *))); + connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), + TQT_SLOT(data(KIO::Job*, const TQByteArray&))); + connect(job, TQT_SIGNAL(result(KIO::Job *)), + TQT_SLOT(slotResult(KIO::Job *))); mState = GE_LOGIN; mpJob = job; @@ -115,7 +115,7 @@ void GallerySink::listAlbums() { GalleryForm form(mVersion, mAuthToken); - QString task = "fetch-albums"; + TQString task = "fetch-albums"; if (Gallery2 == mVersion) task = "fetch-albums-prune"; @@ -126,10 +126,10 @@ void GallerySink::listAlbums() job->addMetaData("content-type", form.contentType() ); job->addMetaData("cookies", "manual"); job->addMetaData("setcookies", m_cookie); - connect(job, SIGNAL(data(KIO::Job*, const QByteArray&)), - SLOT(data(KIO::Job*, const QByteArray&))); - connect(job, SIGNAL(result(KIO::Job *)), - SLOT(slotResult(KIO::Job *))); + connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), + TQT_SLOT(data(KIO::Job*, const TQByteArray&))); + connect(job, TQT_SIGNAL(result(KIO::Job *)), + TQT_SLOT(slotResult(KIO::Job *))); mState = GE_LISTALBUMS; mpJob = job; @@ -137,7 +137,7 @@ void GallerySink::listAlbums() emit signalBusy( true ); } -void GallerySink::listPhotos( const QString& albumName ) +void GallerySink::listPhotos( const TQString& albumName ) { if (mpJob) { @@ -155,10 +155,10 @@ void GallerySink::listPhotos( const QString& albumName ) job->addMetaData("content-type", form.contentType() ); job->addMetaData("cookies", "manual"); job->addMetaData("setcookies", m_cookie); - connect(job, SIGNAL(data(KIO::Job*, const QByteArray&)), - SLOT(data(KIO::Job*, const QByteArray&))); - connect(job, SIGNAL(result(KIO::Job *)), - SLOT(slotResult(KIO::Job *))); + connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), + TQT_SLOT(data(KIO::Job*, const TQByteArray&))); + connect(job, TQT_SIGNAL(result(KIO::Job *)), + TQT_SLOT(slotResult(KIO::Job *))); mState = GE_LISTPHOTOS; mpJob = job; @@ -166,10 +166,10 @@ void GallerySink::listPhotos( const QString& albumName ) emit signalBusy( true ); } -void GallerySink::createAlbum( const QString& parentAlbumName, - const QString& albumName, - const QString& albumTitle, - const QString& albumCaption ) +void GallerySink::createAlbum( const TQString& tqparentAlbumName, + const TQString& albumName, + const TQString& albumTitle, + const TQString& albumCaption ) { if (mpJob) { @@ -181,7 +181,7 @@ void GallerySink::createAlbum( const QString& parentAlbumName, form.addPair("cmd", "new-album"); form.addPair("protocol_version", "2.3"); - form.addPair("set_albumName", parentAlbumName); + form.addPair("set_albumName", tqparentAlbumName); if (!albumName.isEmpty()) form.addPair("newAlbumName", albumName); if (!albumTitle.isEmpty()) @@ -193,10 +193,10 @@ void GallerySink::createAlbum( const QString& parentAlbumName, job->addMetaData("content-type", form.contentType() ); job->addMetaData("cookies", "manual"); job->addMetaData("setcookies", m_cookie); - connect(job, SIGNAL(data(KIO::Job*, const QByteArray&)), - SLOT(data(KIO::Job*, const QByteArray&))); - connect(job, SIGNAL(result(KIO::Job *)), - SLOT(slotResult(KIO::Job *))); + connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), + TQT_SLOT(data(KIO::Job*, const TQByteArray&))); + connect(job, TQT_SIGNAL(result(KIO::Job *)), + TQT_SLOT(slotResult(KIO::Job *))); mState = GE_CREATEALBUM; mpJob = job; @@ -204,9 +204,9 @@ void GallerySink::createAlbum( const QString& parentAlbumName, emit signalBusy( true ); } -bool GallerySink::addPhoto( const QString& albumName, - const QString& photoPath, - const QString& caption, +bool GallerySink::addPhoto( const TQString& albumName, + const TQString& photoPath, + const TQString& caption, bool rescale, int maxDim ) { if (mpJob) @@ -215,8 +215,8 @@ bool GallerySink::addPhoto( const QString& albumName, mpJob = 0; } - QString path = photoPath; - QString display_filename = QFile::encodeName(KURL(path).filename()); + TQString path = photoPath; + TQString display_filename = TQFile::encodeName(KURL(path).filename()); GalleryForm form(mVersion, mAuthToken); @@ -226,18 +226,18 @@ bool GallerySink::addPhoto( const QString& albumName, if (!caption.isEmpty()) form.addPair("caption", caption); - QImage image(photoPath); + TQImage image(photoPath); if (!image.isNull()) { // image file - see if we need to rescale it if (rescale && (image.width() > maxDim || image.height() > maxDim)) { - image = image.smoothScale(maxDim, maxDim, QImage::ScaleMin); + image = image.smoothScale(maxDim, maxDim, TQ_ScaleMin); path = locateLocal("tmp", KURL(photoPath).filename()); - image.save(path, QImageIO::imageFormat(photoPath)); + image.save(path, TQImageIO::imageFormat(photoPath)); - if ("JPEG" == QString(QImageIO::imageFormat(photoPath)).upper()) + if ("JPEG" == TQString(TQImageIO::imageFormat(photoPath)).upper()) { KExiv2Library::LibKExiv2 exiv2; if (exiv2.load(photoPath)) @@ -260,10 +260,10 @@ bool GallerySink::addPhoto( const QString& albumName, job->addMetaData("content-type", form.contentType()); job->addMetaData("cookies", "manual"); job->addMetaData("setcookies", m_cookie); - connect(job, SIGNAL(data(KIO::Job*, const QByteArray&)), - SLOT(data(KIO::Job*, const QByteArray&))); - connect(job, SIGNAL(result(KIO::Job *)), - SLOT(slotResult(KIO::Job *))); + connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), + TQT_SLOT(data(KIO::Job*, const TQByteArray&))); + connect(job, TQT_SIGNAL(result(KIO::Job *)), + TQT_SLOT(slotResult(KIO::Job *))); mState = GE_ADDPHOTO; mpJob = job; @@ -282,7 +282,7 @@ void GallerySink::cancel() } } -void GallerySink::data(KIO::Job*, const QByteArray& data) +void GallerySink::data(KIO::Job*, const TQByteArray& data) { if (data.isEmpty()) return; @@ -329,11 +329,11 @@ void GallerySink::slotResult(KIO::Job *job) if (mState == GE_LOGIN && m_loggedIn) { - QStringList cookielist = QStringList::split("\n", job->queryMetaData("setcookies")); + TQStringList cookielist = TQStringList::split("\n", job->queryMetaData("setcookies")); m_cookie = "Cookie:"; - for (QStringList::Iterator it = cookielist.begin(); it != cookielist.end(); ++it) + for (TQStringList::Iterator it = cookielist.begin(); it != cookielist.end(); ++it) { - QRegExp rx("^Set-Cookie: ([^;]+)"); + TQRegExp rx("^Set-Cookie: ([^;]+)"); if (rx.search(*it) > -1) m_cookie += " " + rx.cap(1) + ";"; } @@ -341,11 +341,11 @@ void GallerySink::slotResult(KIO::Job *job) } } -void GallerySink::parseResponseLogin(const QByteArray &data) +void GallerySink::parseResponseLogin(const TQByteArray &data) { - QTextStream ts(data, IO_ReadOnly ); - ts.setEncoding(QTextStream::UnicodeUTF8); - QString line; + TQTextStream ts(data, IO_ReadOnly ); + ts.setEncoding(TQTextStream::UnicodeUTF8); + TQString line; bool foundResponse = false; m_loggedIn = false; @@ -360,7 +360,7 @@ void GallerySink::parseResponseLogin(const QByteArray &data) } else { - QStringList strlist = QStringList::split("=", line); + TQStringList strlist = TQStringList::split("=", line); if (strlist.count() == 2) { if (("status" == strlist[0]) && ("0" == strlist[1])) @@ -387,15 +387,15 @@ void GallerySink::parseResponseLogin(const QByteArray &data) } } -void GallerySink::parseResponseListAlbums(const QByteArray &data) +void GallerySink::parseResponseListAlbums(const TQByteArray &data) { - QTextStream ts(data, IO_ReadOnly ); - ts.setEncoding(QTextStream::UnicodeUTF8); - QString line; + TQTextStream ts(data, IO_ReadOnly ); + ts.setEncoding(TQTextStream::UnicodeUTF8); + TQString line; bool foundResponse = false; bool success = false; - typedef QValueList<GAlbum> GAlbumList; + typedef TQValueList<GAlbum> GAlbumList; GAlbumList albumList; GAlbumList::iterator iter = albumList.begin(); @@ -408,11 +408,11 @@ void GallerySink::parseResponseListAlbums(const QByteArray &data) } else { - QStringList strlist = QStringList::split("=", line); + TQStringList strlist = TQStringList::split("=", line); if (strlist.count() == 2) { - QString key = strlist[0]; - QString value = strlist[1]; + TQString key = strlist[0]; + TQString value = strlist[1]; if (key == "status") { @@ -438,10 +438,10 @@ void GallerySink::parseResponseListAlbums(const QByteArray &data) if (iter != albumList.end()) (*iter).summary = value; } - else if (key.startsWith("album.parent")) + else if (key.startsWith("album.tqparent")) { if (iter != albumList.end()) - (*iter).parent_ref_num = value.toInt(); + (*iter).tqparent_ref_num = value.toInt(); } else if (key.startsWith("album.perms.add")) { @@ -484,25 +484,25 @@ void GallerySink::parseResponseListAlbums(const QByteArray &data) return; } - // We need parent albums to come first for rest of the code to work + // We need tqparent albums to come first for rest of the code to work qHeapSort(albumList); emit signalAlbums( albumList ); } -void GallerySink::parseResponseListPhotos(const QByteArray &data) +void GallerySink::parseResponseListPhotos(const TQByteArray &data) { - QTextStream ts(data, IO_ReadOnly ); - ts.setEncoding(QTextStream::UnicodeUTF8); - QString line; + TQTextStream ts(data, IO_ReadOnly ); + ts.setEncoding(TQTextStream::UnicodeUTF8); + TQString line; bool foundResponse = false; bool success = false; - typedef QValueList<GPhoto> GPhotoList; + typedef TQValueList<GPhoto> GPhotoList; GPhotoList photoList; GPhotoList::iterator iter = photoList.begin(); - QString albumURL; + TQString albumURL; while (!ts.atEnd()) { @@ -514,13 +514,13 @@ void GallerySink::parseResponseListPhotos(const QByteArray &data) } else { - // Boris the Gallery default URL contains "=" char. So we will split the string only from the first "=" char - QStringList strlist = QStringList(); - strlist << line.left(line.find('=')) << line.mid(line.find('=')+1); + // Boris the Gallery default URL tqcontains "=" char. So we will split the string only from the first "=" char + TQStringList strlist = TQStringList(); + strlist << line.left(line.tqfind('=')) << line.mid(line.tqfind('=')+1); if (strlist.count() >= 2) { - QString key = strlist[0]; - QString value = strlist[1]; + TQString key = strlist[0]; + TQString value = strlist[1]; if (key == "status") { @@ -545,7 +545,7 @@ void GallerySink::parseResponseListPhotos(const QByteArray &data) } else if (key.startsWith("baseurl")) { - albumURL = value.replace("\\",""); + albumURL = value.tqreplace("\\",""); } } } @@ -571,11 +571,11 @@ void GallerySink::parseResponseListPhotos(const QByteArray &data) emit signalPhotos( photoList ); } -void GallerySink::parseResponseCreateAlbum(const QByteArray &data) +void GallerySink::parseResponseCreateAlbum(const TQByteArray &data) { - QTextStream ts(data, IO_ReadOnly ); - ts.setEncoding(QTextStream::UnicodeUTF8); - QString line; + TQTextStream ts(data, IO_ReadOnly ); + ts.setEncoding(TQTextStream::UnicodeUTF8); + TQString line; bool foundResponse = false; bool success = false; @@ -589,11 +589,11 @@ void GallerySink::parseResponseCreateAlbum(const QByteArray &data) } else { - QStringList strlist = QStringList::split("=", line); + TQStringList strlist = TQStringList::split("=", line); if (strlist.count() == 2) { - QString key = strlist[0]; - QString value = strlist[1]; + TQString key = strlist[0]; + TQString value = strlist[1]; if (key == "status") { @@ -623,11 +623,11 @@ void GallerySink::parseResponseCreateAlbum(const QByteArray &data) listAlbums(); } -void GallerySink::parseResponseAddPhoto(const QByteArray &data) +void GallerySink::parseResponseAddPhoto(const TQByteArray &data) { - QTextStream ts(data, IO_ReadOnly ); - ts.setEncoding(QTextStream::UnicodeUTF8); - QString line; + TQTextStream ts(data, IO_ReadOnly ); + ts.setEncoding(TQTextStream::UnicodeUTF8); + TQString line; bool foundResponse = false; bool success = false; @@ -645,11 +645,11 @@ void GallerySink::parseResponseAddPhoto(const QByteArray &data) } else { - QStringList strlist = QStringList::split("=", line); + TQStringList strlist = TQStringList::split("=", line); if (strlist.count() == 2) { - QString key = strlist[0]; - QString value = strlist[1]; + TQString key = strlist[0]; + TQString value = strlist[1]; if (key == "status") { diff --git a/kipi-plugins/sync/sinks/gallery/gallerysink.h b/kipi-plugins/sync/sinks/gallery/gallerysink.h index 1e76968..27d5b48 100644 --- a/kipi-plugins/sync/sinks/gallery/gallerysink.h +++ b/kipi-plugins/sync/sinks/gallery/gallerysink.h @@ -20,7 +20,7 @@ #ifndef GALLERYSINK_H #define GALLERYSINK_H -#include <qobject.h> +#include <tqobject.h> #include <kurl.h> #include "../../sink.h" @@ -32,7 +32,7 @@ namespace KIO } class KURL; -template <class T> class QValueList; +template <class T> class TQValueList; namespace KIPISyncPlugin { @@ -51,7 +51,7 @@ public: GE_ADDPHOTO }; - GallerySink(unsigned int sinkId, QString name, KConfig* pConfig, KWallet::Wallet* pWallet, GalleryVersion version); + GallerySink(unsigned int sinkId, TQString name, KConfig* pConfig, KWallet::Wallet* pWallet, GalleryVersion version); ~GallerySink(); const KIPI2::CollectionList* getCollections(); @@ -63,54 +63,54 @@ public: /* bool loggedIn() const; - void login( const KURL& url, const QString& name, - const QString& passwd ); + void login( const KURL& url, const TQString& name, + const TQString& passwd ); void listAlbums(); - void listPhotos( const QString& albumName ); - void createAlbum( const QString& parentAlbumName, - const QString& albumName, - const QString& albumTitle, - const QString& albumCaption ); - bool addPhoto( const QString& albumName, - const QString& photoPath, - const QString& caption=QString(), + void listPhotos( const TQString& albumName ); + void createAlbum( const TQString& tqparentAlbumName, + const TQString& albumName, + const TQString& albumTitle, + const TQString& albumCaption ); + bool addPhoto( const TQString& albumName, + const TQString& photoPath, + const TQString& caption=TQString(), bool rescale=false, int maxDim=600); void cancel(); */ private: GalleryVersion mVersion; - QString mAuthToken; + TQString mAuthToken; - QString mName; + TQString mName; KURL mURL; - QString mUsername; - QString mPassword; + TQString mUsername; + TQString mPassword; State mState; - QString m_cookie; + TQString m_cookie; KURL m_url; KIO::Job* mpJob; bool m_loggedIn; - QByteArray mBuffer; + TQByteArray mBuffer; /* - 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 parseResponseLogin(const TQByteArray &data); + void parseResponseListAlbums(const TQByteArray &data); + void parseResponseListPhotos(const TQByteArray &data); + void parseResponseCreateAlbum(const TQByteArray &data); + void parseResponseAddPhoto(const TQByteArray &data); 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 signalAddPhotoFailed( const QString& msg ); + void signalAddPhotoFailed( const TQString& msg ); private slots: - void data(KIO::Job *job, const QByteArray &data); + void data(KIO::Job *job, const TQByteArray &data); void slotResult (KIO::Job *job); */ }; |