diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:58:03 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:58:03 -0600 |
commit | 3ed629ae12e33ac8a9c744e79135a4100d16b036 (patch) | |
tree | 4517ed969da6be83410ef6cea3589864f6cab6a4 /kipi-plugins/flickrexport | |
parent | 650c190e4a29a2a17fd46b32ce78b956b9816215 (diff) | |
download | kipi-plugins-3ed629ae12e33ac8a9c744e79135a4100d16b036.tar.gz kipi-plugins-3ed629ae12e33ac8a9c744e79135a4100d16b036.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 650c190e4a29a2a17fd46b32ce78b956b9816215.
Diffstat (limited to 'kipi-plugins/flickrexport')
-rw-r--r-- | kipi-plugins/flickrexport/flickralbumdialog.ui | 4 | ||||
-rw-r--r-- | kipi-plugins/flickrexport/flickrtalker.cpp | 4 | ||||
-rw-r--r-- | kipi-plugins/flickrexport/flickrwidget.cpp | 20 | ||||
-rw-r--r-- | kipi-plugins/flickrexport/flickrwindow.cpp | 6 | ||||
-rw-r--r-- | kipi-plugins/flickrexport/imageslist.cpp | 4 | ||||
-rw-r--r-- | kipi-plugins/flickrexport/login.cpp | 6 | ||||
-rw-r--r-- | kipi-plugins/flickrexport/mpform.cpp | 2 |
7 files changed, 23 insertions, 23 deletions
diff --git a/kipi-plugins/flickrexport/flickralbumdialog.ui b/kipi-plugins/flickrexport/flickralbumdialog.ui index 6d17a1d..20d5749 100644 --- a/kipi-plugins/flickrexport/flickralbumdialog.ui +++ b/kipi-plugins/flickrexport/flickralbumdialog.ui @@ -52,7 +52,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <grid> <property name="name"> @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kipi-plugins/flickrexport/flickrtalker.cpp b/kipi-plugins/flickrexport/flickrtalker.cpp index 057855f..0a317ec 100644 --- a/kipi-plugins/flickrexport/flickrtalker.cpp +++ b/kipi-plugins/flickrexport/flickrtalker.cpp @@ -31,7 +31,7 @@ // TQt includes. #include <tqcstring.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqfile.h> #include <tqimage.h> #include <tqstringlist.h> @@ -542,7 +542,7 @@ void FlickrTalker::slotError(const TQString& error) }; KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), - i18n("Error Occured: %1\n We can not proceed further").arg(transError)); + i18n("Error Occured: %1\n We can not proceed further").tqarg(transError)); // kdDebug() << "Not handling the error now will see it later" << endl; } diff --git a/kipi-plugins/flickrexport/flickrwidget.cpp b/kipi-plugins/flickrexport/flickrwidget.cpp index aa222bd..f7279c1 100644 --- a/kipi-plugins/flickrexport/flickrwidget.cpp +++ b/kipi-plugins/flickrexport/flickrwidget.cpp @@ -32,7 +32,7 @@ #include <tqgroupbox.h> #include <tqspinbox.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -88,7 +88,7 @@ FlickrWidget::FlickrWidget(TQWidget* parent, KIPI::Interface *iface) TQVBoxLayout* settingsBoxLayout = new TQVBoxLayout(settingsBox); //m_newAlbumBtn = new TQPushButton(settingsBox, "m_newAlbumBtn"); - //m_newAlbumBtn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + //m_newAlbumBtn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); //m_newAlbumBtn->setText(i18n("&New Album")); TQGridLayout* tagsLayout = new TQGridLayout(1, 1); @@ -109,9 +109,9 @@ FlickrWidget::FlickrWidget(TQWidget* parent, KIPI::Interface *iface) TQGroupBox* optionsBox = new TQGroupBox(i18n("Override Default Options"), settingsBox); optionsBox->setColumnLayout(0, Qt::Vertical); - optionsBox->layout()->setSpacing(KDialog::spacingHint()); - optionsBox->layout()->setMargin(KDialog::spacingHint()); - TQGridLayout* optionsBoxLayout = new TQGridLayout(optionsBox->layout(), 5, 3); + optionsBox->tqlayout()->setSpacing(KDialog::spacingHint()); + optionsBox->tqlayout()->setMargin(KDialog::spacingHint()); + TQGridLayout* optionsBoxLayout = new TQGridLayout(optionsBox->tqlayout(), 5, 3); m_publicCheckBox = new TQCheckBox(optionsBox); m_publicCheckBox->setText(i18n("As in accessible for people", "Public (anyone can see them)")); @@ -128,14 +128,14 @@ FlickrWidget::FlickrWidget(TQWidget* parent, KIPI::Interface *iface) m_dimensionSpinBox = new TQSpinBox(0, 5000, 10, optionsBox); m_dimensionSpinBox->setValue(600); - m_dimensionSpinBox->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_dimensionSpinBox->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); m_dimensionSpinBox->setEnabled(false); TQLabel* resizeLabel = new TQLabel(i18n("Maximum dimension (pixels):"), optionsBox); m_imageQualitySpinBox = new TQSpinBox(0, 100, 1, optionsBox); m_imageQualitySpinBox->setValue(85); - m_imageQualitySpinBox->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_imageQualitySpinBox->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); // NOTE: The term Compression factor may be to technical to write in the label TQLabel* imageQualityLabel = new TQLabel(i18n("JPEG Image Quality (higher is better):"), optionsBox); @@ -157,9 +157,9 @@ FlickrWidget::FlickrWidget(TQWidget* parent, KIPI::Interface *iface) TQGroupBox* accountBox = new TQGroupBox(i18n("Account"), settingsBox); accountBox->setColumnLayout(0, Qt::Vertical); - accountBox->layout()->setSpacing(KDialog::spacingHint()); - accountBox->layout()->setMargin(KDialog::spacingHint()); - TQGridLayout* accountBoxLayout = new TQGridLayout(accountBox->layout(), 1, 3); + accountBox->tqlayout()->setSpacing(KDialog::spacingHint()); + accountBox->tqlayout()->setMargin(KDialog::spacingHint()); + TQGridLayout* accountBoxLayout = new TQGridLayout(accountBox->tqlayout(), 1, 3); TQLabel *userNameLabel = new TQLabel(i18n("User Name: "), accountBox); m_userNameDisplayLabel = new TQLabel(accountBox); diff --git a/kipi-plugins/flickrexport/flickrwindow.cpp b/kipi-plugins/flickrexport/flickrwindow.cpp index 7b8864d..8109c8a 100644 --- a/kipi-plugins/flickrexport/flickrwindow.cpp +++ b/kipi-plugins/flickrexport/flickrwindow.cpp @@ -292,7 +292,7 @@ void FlickrWindow::slotTokenObtained(const TQString& token) m_username = m_talker->getUserName(); m_userId = m_talker->getUserId(); kdDebug() << "SlotTokenObtained invoked setting user Display name to " << m_username << endl; - m_userNameDisplayLabel->setText(TQString("<qt><b>%1</b></qt>").arg(m_username)); + m_userNameDisplayLabel->setText(TQString("<qt><b>%1</b></qt>").tqarg(m_username)); m_widget->setEnabled(true); } @@ -531,7 +531,7 @@ void FlickrWindow::slotAddPhotoNext() return; } - m_progressDlg->setLabelText(i18n("Uploading file %1").arg(pathComments.first.filename())); + m_progressDlg->setLabelText(i18n("Uploading file %1").tqarg(pathComments.first.filename())); if (m_progressDlg->isHidden()) m_progressDlg->show(); @@ -550,7 +550,7 @@ void FlickrWindow::slotAddPhotoSucceeded() void FlickrWindow::slotAddPhotoFailed(const TQString& msg) { if (KMessageBox::warningContinueCancel(this, - i18n("Failed to upload photo into Flickr. %1\nDo you want to continue?").arg(msg)) + i18n("Failed to upload photo into Flickr. %1\nDo you want to continue?").tqarg(msg)) != KMessageBox::Continue) { m_uploadQueue.clear(); diff --git a/kipi-plugins/flickrexport/imageslist.cpp b/kipi-plugins/flickrexport/imageslist.cpp index dfb841f..fee6062 100644 --- a/kipi-plugins/flickrexport/imageslist.cpp +++ b/kipi-plugins/flickrexport/imageslist.cpp @@ -27,7 +27,7 @@ #include <tqpushbutton.h> #include <tqpainter.h> #include <tqfileinfo.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwhatsthis.h> #include <tqdragobject.h> #include <tqimage.h> @@ -98,7 +98,7 @@ ImagesListView::ImagesListView(TQWidget *parent) setResizeMode(TQListView::AllColumns); setAllColumnsShowFocus(true); setSorting(-1); - setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); setSelectionMode(TQListView::Extended); } diff --git a/kipi-plugins/flickrexport/login.cpp b/kipi-plugins/flickrexport/login.cpp index 0c42f1d..0686a09 100644 --- a/kipi-plugins/flickrexport/login.cpp +++ b/kipi-plugins/flickrexport/login.cpp @@ -26,7 +26,7 @@ #include <tqframe.h> #include <tqlineedit.h> #include <tqpushbutton.h> -#include <layout.h> +#include <tqlayout.h> // KDE includes. @@ -48,7 +48,7 @@ FlickrLogin::FlickrLogin(TQWidget* parent, const TQString& header, TQVBoxLayout* vbox = new TQVBoxLayout(this, 5, 5, "vbox"); m_headerLabel = new TQLabel(this); - m_headerLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); + m_headerLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); m_headerLabel->setText(header); TQFrame* hline = new TQFrame(this, "hline"); @@ -91,7 +91,7 @@ FlickrLogin::FlickrLogin(TQWidget* parent, const TQString& header, vbox->addLayout(centerLayout); vbox->addLayout(btnLayout); - resize( TQSize(300, 150).expandedTo(minimumSizeHint()) ); + resize( TQSize(300, 150).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); m_nameEdit->setText(_name); diff --git a/kipi-plugins/flickrexport/mpform.cpp b/kipi-plugins/flickrexport/mpform.cpp index 25488c9..35138f0 100644 --- a/kipi-plugins/flickrexport/mpform.cpp +++ b/kipi-plugins/flickrexport/mpform.cpp @@ -30,7 +30,7 @@ #include <tqfile.h> #include <tqfileinfo.h> -#include <textstream.h> +#include <tqtextstream.h> // KDE includes. |