From 3ed629ae12e33ac8a9c744e79135a4100d16b036 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:58:03 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 650c190e4a29a2a17fd46b32ce78b956b9816215. --- .../batchprocessimagesdialog.cpp | 64 +++++++++++----------- .../batchprocessimages/batchprocessimagesdialog.h | 6 +- .../batchprocessimages/batchprocessimagesitem.cpp | 8 +-- .../batchprocessimages/batchprocessimagesitem.h | 2 +- .../batchprocessimages/borderoptionsdialog.cpp | 2 +- .../batchprocessimages/coloroptionsdialog.cpp | 2 +- .../batchprocessimages/convertoptionsdialog.cpp | 2 +- .../batchprocessimages/effectoptionsdialog.cpp | 2 +- .../batchprocessimages/filteroptionsdialog.cpp | 2 +- kipi-plugins/batchprocessimages/imagepreview.cpp | 6 +- kipi-plugins/batchprocessimages/outputdialog.cpp | 4 +- .../batchprocessimages/recompressoptionsdialog.cpp | 2 +- .../batchprocessimages/renameimagesbase.ui | 18 +++--- .../batchprocessimages/renameimagesdialog.cpp | 2 +- .../batchprocessimages/renameimageswidget.cpp | 4 +- .../batchprocessimages/resizeoptionsdialog.cpp | 2 +- 16 files changed, 64 insertions(+), 64 deletions(-) (limited to 'kipi-plugins/batchprocessimages') diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp index 3c092c0..a07ba79 100644 --- a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp @@ -30,7 +30,7 @@ extern "C" // Include files for TQt #include -#include +#include #include #include #include @@ -41,7 +41,7 @@ extern "C" #include #include #include -#include +#include #include #include #include @@ -108,8 +108,8 @@ BatchProcessImagesDialog::BatchProcessImagesDialog( KURL::List urlList, KIPI::In m_tmpFolder = dir.saveLocation("tmp", "kipi-batchprocessimagesplugin-" + TQString::number(getpid()) ); - m_convertStatus = NO_PROCESS; - m_progressStatus = 0; + m_converttqStatus = NO_PROCESS; + m_progresstqStatus = 0; m_ProcessusProc = 0; m_PreviewProc = 0; @@ -122,9 +122,9 @@ BatchProcessImagesDialog::BatchProcessImagesDialog( KURL::List urlList, KIPI::In TQHBoxLayout *hlay = new TQHBoxLayout( dvlay ); groupBox1 = new TQGroupBox( 0, Qt::Vertical, box ); - groupBox1->layout()->setSpacing(KDialog::spacingHint()); - groupBox1->layout()->setMargin(KDialog::marginHint()); - TQGridLayout* grid = new TQGridLayout( groupBox1->layout(), 2, 3); + groupBox1->tqlayout()->setSpacing(KDialog::spacingHint()); + groupBox1->tqlayout()->setMargin(KDialog::marginHint()); + TQGridLayout* grid = new TQGridLayout( groupBox1->tqlayout(), 2, 3); m_labelType = new TQLabel( groupBox1 ); grid->addMultiCellWidget(m_labelType, 0, 0, 0, 0); @@ -207,7 +207,7 @@ BatchProcessImagesDialog::BatchProcessImagesDialog( KURL::List urlList, KIPI::In m_listFiles = new BatchProcessImagesList( box41 ); lay2->addWidget( m_listFiles ); - m_listFiles->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding); + m_listFiles->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding); TQVBoxLayout* lay3 = new TQVBoxLayout( lay2 ); m_addImagesButton = new TQPushButton ( i18n( "&Add..." ), box41 ); @@ -220,8 +220,8 @@ BatchProcessImagesDialog::BatchProcessImagesDialog( KURL::List urlList, KIPI::In m_imageLabel = new TQLabel( box41 ); m_imageLabel->setFixedHeight( 80 ); - m_imageLabel->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); - m_imageLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); + m_imageLabel->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); + m_imageLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); lay3->addWidget( m_imageLabel ); TQWhatsThis::add( m_imageLabel, i18n( "

The preview of the selected image on the list." ) ); lay3->addStretch( 1 ); @@ -406,7 +406,7 @@ void BatchProcessImagesDialog::slotProcessStart( void ) return; } - m_convertStatus = UNDER_PROCESS; + m_converttqStatus = UNDER_PROCESS; disconnect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotProcessStart())); showButtonCancel( false ); setButtonText( User1, i18n("&Stop") ); @@ -432,7 +432,7 @@ void BatchProcessImagesDialog::slotProcessStart( void ) bool BatchProcessImagesDialog::startProcess(void) { - if ( m_convertStatus == STOP_PROCESS ) + if ( m_converttqStatus == STOP_PROCESS ) { endProcess(); return true; @@ -456,8 +456,8 @@ bool BatchProcessImagesDialog::startProcess(void) if ( prepareStartProcess(item, targetAlbum) == false ) // If there is a problem during the { // preparation -> pass to the next item! ++*m_listFile2Process_iterator; - ++m_progressStatus; - m_progress->setValue((int)((float)m_progressStatus *(float)100 / (float)m_nbItem)); + ++m_progresstqStatus; + m_progress->setValue((int)((float)m_progresstqStatus *(float)100 / (float)m_nbItem)); item = static_cast( m_listFile2Process_iterator->current() ); m_listFiles->setCurrentItem(item); @@ -487,7 +487,7 @@ bool BatchProcessImagesDialog::startProcess(void) { int ValRet = KMessageBox::warningYesNoCancel(this, i18n("The destination file \"%1\" already exists;\n" - "do you want overwrite it?").arg(item->nameDest()), + "do you want overwrite it?").tqarg(item->nameDest()), i18n("Overwrite Destination Image File"), KStdGuiItem::cont()); if ( ValRet == KMessageBox::No ) @@ -495,8 +495,8 @@ bool BatchProcessImagesDialog::startProcess(void) item->changeResult(i18n("Skipped.")); item->changeError(i18n("destination image file already exists (skipped by user).")); ++*m_listFile2Process_iterator; - ++m_progressStatus; - m_progress->setValue((int)((float)m_progressStatus *(float)100 / (float)m_nbItem)); + ++m_progresstqStatus; + m_progress->setValue((int)((float)m_progresstqStatus *(float)100 / (float)m_nbItem)); if ( m_listFile2Process_iterator->current() ) { @@ -532,8 +532,8 @@ bool BatchProcessImagesDialog::startProcess(void) item->changeResult(i18n("Failed.")); item->changeError(i18n("destination image file already exists and cannot be renamed.")); ++*m_listFile2Process_iterator; - ++m_progressStatus; - m_progress->setValue((int)((float)m_progressStatus *(float)100 / (float)m_nbItem)); + ++m_progresstqStatus; + m_progress->setValue((int)((float)m_progresstqStatus *(float)100 / (float)m_nbItem)); if ( m_listFile2Process_iterator->current() ) { @@ -560,8 +560,8 @@ bool BatchProcessImagesDialog::startProcess(void) item->changeResult(i18n("Skipped.")); item->changeError(i18n("destination image file already exists (skipped automatically).")); ++*m_listFile2Process_iterator; - ++m_progressStatus; - m_progress->setValue((int)((float)m_progressStatus *(float)100 / (float)m_nbItem)); + ++m_progresstqStatus; + m_progress->setValue((int)((float)m_progresstqStatus *(float)100 / (float)m_nbItem)); if ( m_listFile2Process_iterator->current() ) { @@ -623,7 +623,7 @@ void BatchProcessImagesDialog::slotReadStd(KProcess* /*proc*/, char *buffer, int void BatchProcessImagesDialog::slotProcessDone(KProcess* proc) { - if ( m_convertStatus == PROCESS_DONE ) + if ( m_converttqStatus == PROCESS_DONE ) { // processAborted() has already been called. No need to show the warning. return; @@ -647,8 +647,8 @@ void BatchProcessImagesDialog::slotProcessDone(KProcess* proc) item->changeResult(i18n("Failed.")); item->changeError(i18n("'convert' program from 'ImageMagick' package has been stopped abnormally.")); ++*m_listFile2Process_iterator; - ++m_progressStatus; - m_progress->setValue((int)((float)m_progressStatus *(float)100 / (float)m_nbItem)); + ++m_progresstqStatus; + m_progress->setValue((int)((float)m_progresstqStatus *(float)100 / (float)m_nbItem)); if ( m_listFile2Process_iterator->current() ) startProcess(); @@ -690,7 +690,7 @@ void BatchProcessImagesDialog::slotProcessDone(KProcess* proc) { int code = KMessageBox::warningContinueCancel( this, i18n("Error adding image to application; error message was: " - "%1").arg( errmsg ), + "%1").tqarg( errmsg ), i18n("Error Adding Image to Application") ); if ( code == KMessageBox::Cancel ) @@ -742,8 +742,8 @@ void BatchProcessImagesDialog::slotProcessDone(KProcess* proc) } ++*m_listFile2Process_iterator; - ++m_progressStatus; - m_progress->setValue((int)((float)m_progressStatus *(float)100 / (float)m_nbItem)); + ++m_progresstqStatus; + m_progress->setValue((int)((float)m_progresstqStatus *(float)100 / (float)m_nbItem)); if ( m_listFile2Process_iterator->current() ) startProcess(); @@ -755,13 +755,13 @@ void BatchProcessImagesDialog::slotListDoubleClicked(TQListViewItem *itemClicked { BatchProcessImagesItem *item = static_cast( itemClicked ); - if (m_convertStatus == PROCESS_DONE) + if (m_converttqStatus == PROCESS_DONE) { OutputDialog *infoDialog = new OutputDialog(this, i18n("Image processing error"), item->outputMess(), i18n("Image \"%1\": %2\n\nThe output messages are:\n") - .arg(item->nameSrc()).arg(item->error()) + .tqarg(item->nameSrc()).tqarg(item->error()) ); infoDialog->exec(); } @@ -880,7 +880,7 @@ void BatchProcessImagesDialog::slotPreviewProcessDone(KProcess* proc) m_previewOutput, i18n("Cannot process preview for image \"%1\"." "\nThe output messages are:\n") - .arg(item->nameSrc()) + .tqarg(item->nameSrc()) ); infoDialog->exec(); } @@ -902,7 +902,7 @@ void BatchProcessImagesDialog::slotProcessStop( void ) if ( m_ProcessusProc->isRunning() == true ) m_ProcessusProc->kill(SIGTERM); // If kill operation failed, Stop the process at the next image ! - if ( m_convertStatus == UNDER_PROCESS ) m_convertStatus = STOP_PROCESS; + if ( m_converttqStatus == UNDER_PROCESS ) m_converttqStatus = STOP_PROCESS; processAborted(true); } @@ -1042,7 +1042,7 @@ void BatchProcessImagesDialog::processAborted(bool removeFlag) void BatchProcessImagesDialog::endProcess(void) { - m_convertStatus = PROCESS_DONE; + m_converttqStatus = PROCESS_DONE; setButtonText( User1, i18n("&Close") ); disconnect(this, TQT_SIGNAL(user1Clicked()), diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h index 631046e..a606d1b 100644 --- a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h +++ b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h @@ -81,7 +81,7 @@ Q_OBJECT public: // Don't forget to add the 'm_Type' and 'm_labelType' implementation in the constructor of - // children dialog class. + // tqchildren dialog class. BatchProcessImagesDialog( KURL::List urlList, KIPI::Interface* interface, TQString caption, TQWidget *parent=0 ); ~BatchProcessImagesDialog(); @@ -157,8 +157,8 @@ private slots: KConfig *m_config; - int m_convertStatus; - int m_progressStatus; + int m_converttqStatus; + int m_progresstqStatus; int m_nbItem; KProcess *m_ProcessusProc; diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp b/kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp index af5f2b8..6d69155 100644 --- a/kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp +++ b/kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp @@ -62,24 +62,24 @@ void BatchProcessImagesItem::changeError(TQString text) { _error = text; } void BatchProcessImagesItem::changeNameDest(TQString text) { _nameDest = text; setText(2, _nameDest); } void BatchProcessImagesItem::changeOutputMess(TQString text) { _outputMess.append(text); } -void BatchProcessImagesItem::paintCell (TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) +void BatchProcessImagesItem::paintCell (TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) { TQColorGroup _cg( cg ); if (text(3) != i18n("OK") && !text(3).isEmpty() ) { _cg.setColor( TQColorGroup::Text, TQt::red ); - KListViewItem::paintCell( p, _cg, column, width, alignment ); + KListViewItem::paintCell( p, _cg, column, width, tqalignment ); return; } if (text(3) == i18n("OK") ) { _cg.setColor( TQColorGroup::Text, TQt::darkGreen ); - KListViewItem::paintCell( p, _cg, column, width, alignment ); + KListViewItem::paintCell( p, _cg, column, width, tqalignment ); return; } - KListViewItem::paintCell( p, cg, column, width, alignment ); + KListViewItem::paintCell( p, cg, column, width, tqalignment ); } bool BatchProcessImagesItem::overWrote() diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesitem.h b/kipi-plugins/batchprocessimages/batchprocessimagesitem.h index d17f9e7..60b12c4 100644 --- a/kipi-plugins/batchprocessimages/batchprocessimagesitem.h +++ b/kipi-plugins/batchprocessimages/batchprocessimagesitem.h @@ -61,7 +61,7 @@ public: void changeNameDest(TQString text); void changeOutputMess(TQString text); - void paintCell (TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); + void paintCell (TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); void setKey(const TQString& val, bool reverseSort); TQString key(int column, bool ascending) const; diff --git a/kipi-plugins/batchprocessimages/borderoptionsdialog.cpp b/kipi-plugins/batchprocessimages/borderoptionsdialog.cpp index 808598e..f9d4f19 100644 --- a/kipi-plugins/batchprocessimages/borderoptionsdialog.cpp +++ b/kipi-plugins/batchprocessimages/borderoptionsdialog.cpp @@ -23,7 +23,7 @@ // Include files for TQt #include -#include +#include #include #include #include diff --git a/kipi-plugins/batchprocessimages/coloroptionsdialog.cpp b/kipi-plugins/batchprocessimages/coloroptionsdialog.cpp index 548476e..832b1b8 100644 --- a/kipi-plugins/batchprocessimages/coloroptionsdialog.cpp +++ b/kipi-plugins/batchprocessimages/coloroptionsdialog.cpp @@ -23,7 +23,7 @@ // Include files for TQt #include -#include +#include #include #include #include diff --git a/kipi-plugins/batchprocessimages/convertoptionsdialog.cpp b/kipi-plugins/batchprocessimages/convertoptionsdialog.cpp index ac995e7..395bba2 100644 --- a/kipi-plugins/batchprocessimages/convertoptionsdialog.cpp +++ b/kipi-plugins/batchprocessimages/convertoptionsdialog.cpp @@ -23,7 +23,7 @@ // Include files for TQt #include -#include +#include #include #include #include diff --git a/kipi-plugins/batchprocessimages/effectoptionsdialog.cpp b/kipi-plugins/batchprocessimages/effectoptionsdialog.cpp index c28d84b..745d3f8 100644 --- a/kipi-plugins/batchprocessimages/effectoptionsdialog.cpp +++ b/kipi-plugins/batchprocessimages/effectoptionsdialog.cpp @@ -23,7 +23,7 @@ // Include files for TQt #include -#include +#include #include #include #include diff --git a/kipi-plugins/batchprocessimages/filteroptionsdialog.cpp b/kipi-plugins/batchprocessimages/filteroptionsdialog.cpp index f7f0982..d22c43a 100644 --- a/kipi-plugins/batchprocessimages/filteroptionsdialog.cpp +++ b/kipi-plugins/batchprocessimages/filteroptionsdialog.cpp @@ -23,7 +23,7 @@ // Include files for TQt #include -#include +#include #include #include #include diff --git a/kipi-plugins/batchprocessimages/imagepreview.cpp b/kipi-plugins/batchprocessimages/imagepreview.cpp index badbed5..d3248bd 100644 --- a/kipi-plugins/batchprocessimages/imagepreview.cpp +++ b/kipi-plugins/batchprocessimages/imagepreview.cpp @@ -36,7 +36,7 @@ extern "C" #include #include #include -#include +#include #include #include #include @@ -80,8 +80,8 @@ int INIT_ZOOM_FACTOR; ImagePreview::ImagePreview(const TQString &fileOrig, const TQString &fileDest, const TQString &tmpPath, bool cropActionOrig, bool cropActionDest, const TQString &EffectName, const TQString &FileName, TQWidget *parent) - : KDialogBase( parent, "PreviewDialog", true, i18n("Batch Process Preview (%1 - %2)").arg(EffectName) - .arg(FileName), Help|Ok, Ok, true) + : KDialogBase( parent, "PreviewDialog", true, i18n("Batch Process Preview (%1 - %2)").tqarg(EffectName) + .tqarg(FileName), Help|Ok, Ok, true) { // About data and help button. diff --git a/kipi-plugins/batchprocessimages/outputdialog.cpp b/kipi-plugins/batchprocessimages/outputdialog.cpp index aaa77e2..2f12cbe 100644 --- a/kipi-plugins/batchprocessimages/outputdialog.cpp +++ b/kipi-plugins/batchprocessimages/outputdialog.cpp @@ -22,8 +22,8 @@ // TQt includes -#include -#include +#include +#include #include #include #include diff --git a/kipi-plugins/batchprocessimages/recompressoptionsdialog.cpp b/kipi-plugins/batchprocessimages/recompressoptionsdialog.cpp index 401a5b8..21975da 100644 --- a/kipi-plugins/batchprocessimages/recompressoptionsdialog.cpp +++ b/kipi-plugins/batchprocessimages/recompressoptionsdialog.cpp @@ -23,7 +23,7 @@ // Include files for TQt #include -#include +#include #include #include #include diff --git a/kipi-plugins/batchprocessimages/renameimagesbase.ui b/kipi-plugins/batchprocessimages/renameimagesbase.ui index 671a697..168625f 100644 --- a/kipi-plugins/batchprocessimages/renameimagesbase.ui +++ b/kipi-plugins/batchprocessimages/renameimagesbase.ui @@ -77,7 +77,7 @@ - layout1 + tqlayout1 @@ -93,7 +93,7 @@ Fixed - + 12 14 @@ -112,7 +112,7 @@ - layout2 + tqlayout2 @@ -139,7 +139,7 @@ Expanding - + 261 21 @@ -157,7 +157,7 @@ - + AlignTop|AlignHCenter @@ -251,7 +251,7 @@ Expanding - + 16 175 @@ -276,7 +276,7 @@ Fixed - + 16 19 @@ -319,7 +319,7 @@ 0 - + 96 96 @@ -339,7 +339,7 @@ Fixed - + 16 19 diff --git a/kipi-plugins/batchprocessimages/renameimagesdialog.cpp b/kipi-plugins/batchprocessimages/renameimagesdialog.cpp index 213e7b0..6fc88cf 100644 --- a/kipi-plugins/batchprocessimages/renameimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/renameimagesdialog.cpp @@ -23,7 +23,7 @@ // TQt includes. -#include +#include #include // KDE includes. diff --git a/kipi-plugins/batchprocessimages/renameimageswidget.cpp b/kipi-plugins/batchprocessimages/renameimageswidget.cpp index 4606cde..8c04f80 100644 --- a/kipi-plugins/batchprocessimages/renameimageswidget.cpp +++ b/kipi-plugins/batchprocessimages/renameimageswidget.cpp @@ -358,7 +358,7 @@ TQString RenameImagesWidget::oldToNewName(BatchProcessImagesItem* item, char s[100]; ::strftime(s, 100, TQFile::encodeName(format), time_tm); - newName += TQString::fromLatin1(s); + newName += TQString::tqfromLatin1(s); newName += "_"; } @@ -378,7 +378,7 @@ TQString RenameImagesWidget::oldToNewName(BatchProcessImagesItem* item, seq.sprintf(format.latin1(), itemPosition + m_seqSpin->value()); newName += seq; - newName += TQString::fromLatin1(".") + fi.extension(); + newName += TQString::tqfromLatin1(".") + fi.extension(); return newName; } diff --git a/kipi-plugins/batchprocessimages/resizeoptionsdialog.cpp b/kipi-plugins/batchprocessimages/resizeoptionsdialog.cpp index bf68fc1..bc063dc 100644 --- a/kipi-plugins/batchprocessimages/resizeoptionsdialog.cpp +++ b/kipi-plugins/batchprocessimages/resizeoptionsdialog.cpp @@ -23,7 +23,7 @@ // Include files for TQt #include -#include +#include #include #include #include -- cgit v1.2.3