From 22cab9bbfa589eb197eb5b7dfb91d8968775b391 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:18:20 -0600 Subject: Rename old tq methods that no longer need a unique name (cherry picked from commit 8d3892fee88fd0eef3363aeca316ff5c93d9da19) --- kipi-plugins/acquireimages/acquireimagedialog.cpp | 16 ++--- kipi-plugins/acquireimages/screenshotdialog.cpp | 2 +- .../batchprocessimagesdialog.cpp | 46 +++++++------- .../batchprocessimages/batchprocessimagesdialog.h | 4 +- .../batchprocessimages/renameimagesbase.ui | 12 ++-- .../batchprocessimages/renameimageswidget.cpp | 4 +- kipi-plugins/calendar/caleventsbase.ui | 6 +- kipi-plugins/calendar/calselect.cpp | 4 +- kipi-plugins/calendar/calwidget.cpp | 6 +- kipi-plugins/calendar/calwizard.cpp | 6 +- kipi-plugins/cdarchiving/cdarchiving.cpp | 38 ++++++------ kipi-plugins/cdarchiving/cdarchivingdialog.cpp | 4 +- kipi-plugins/findimages/displaycompare.cpp | 32 +++++----- kipi-plugins/flickrexport/flickralbumdialog.ui | 2 +- kipi-plugins/flickrexport/flickrwidget.cpp | 6 +- kipi-plugins/flickrexport/imageslist.cpp | 2 +- kipi-plugins/flickrexport/login.cpp | 4 +- kipi-plugins/galleryexport/galleryalbumdialog.ui | 2 +- kipi-plugins/galleryexport/galleryconfig.cpp | 4 +- kipi-plugins/galleryexport/gallerylist.cpp | 2 +- kipi-plugins/galleryexport/gallerywidget.cpp | 8 +-- kipi-plugins/galleryexport/gallerywindow.cpp | 6 +- kipi-plugins/gpssync/gpsmapwidget.cpp | 8 +-- kipi-plugins/gpssync/gpssyncdialog.cpp | 2 +- kipi-plugins/gpssync/kmlexportconfig.cpp | 10 +-- kipi-plugins/htmlexport/imagesettingspage.ui | 20 +++--- kipi-plugins/htmlexport/outputpage.ui | 2 +- kipi-plugins/htmlexport/themeparameterspage.ui | 4 +- kipi-plugins/htmlexport/wizard.cpp | 2 +- kipi-plugins/ipodexport/imagelist.cpp | 4 +- kipi-plugins/ipodexport/ipodexportdialog.cpp | 10 +-- kipi-plugins/ipodexport/ipodheader.cpp | 4 +- kipi-plugins/kameraklient/cameraiconitem.cpp | 2 +- kipi-plugins/kameraklient/cameraiconview.cpp | 4 +- kipi-plugins/kameraklient/cameraselection.cpp | 6 +- kipi-plugins/kameraklient/cameraui.cpp | 8 +-- kipi-plugins/kameraklient/dmessagebox.cpp | 4 +- kipi-plugins/kameraklient/gpcamera.cpp | 24 ++++---- kipi-plugins/kameraklient/gpcamera.h | 4 +- kipi-plugins/kameraklient/gpfileiteminfodlg.cpp | 2 +- kipi-plugins/kameraklient/gpmessages.h | 2 +- kipi-plugins/kameraklient/gpstatus.cpp | 22 +++---- kipi-plugins/kameraklient/gpstatus.h | 6 +- kipi-plugins/kameraklient/kameraklient.h | 2 +- kipi-plugins/kameraklient/setupcamera.cpp | 2 +- kipi-plugins/kameraklient/thumbitem.cpp | 2 +- kipi-plugins/kameraklient/thumbview.cpp | 6 +- kipi-plugins/metadataedit/exifdatetime.cpp | 12 ++-- kipi-plugins/metadataedit/exifdevice.cpp | 2 +- kipi-plugins/metadataedit/iptccategories.cpp | 2 +- kipi-plugins/metadataedit/iptcdatetime.cpp | 16 ++--- kipi-plugins/metadataedit/iptceditdialog.cpp | 4 +- kipi-plugins/metadataedit/iptckeywords.cpp | 2 +- kipi-plugins/metadataedit/iptcstatus.cpp | 8 +-- kipi-plugins/metadataedit/iptcstatus.h | 6 +- kipi-plugins/metadataedit/iptcsubjects.cpp | 2 +- kipi-plugins/mpegencoder/kimg2mpg.cpp | 4 +- kipi-plugins/mpegencoder/kimg2mpgbase.ui | 62 +++++++++---------- kipi-plugins/picasawebexport/picasaweblogin.cpp | 4 +- kipi-plugins/picasawebexport/picasawebwidget.cpp | 2 +- kipi-plugins/picasawebexport/picasawebwindow.cpp | 2 +- kipi-plugins/printwizard/frmprintwizardbase.ui | 72 +++++++++++----------- kipi-plugins/rawconverter/batchdialog.cpp | 2 +- kipi-plugins/rawconverter/previewwidget.cpp | 2 +- kipi-plugins/sendimages/sendimagesdialog.cpp | 12 ++-- .../simpleviewerexport/simpleviewerexport.cpp | 40 ++++++------ kipi-plugins/slideshow/slideshowconfigbase.ui | 58 ++++++++--------- kipi-plugins/slideshow/toolbar.cpp | 2 +- kipi-plugins/sync/galleryalbumdialog.ui | 2 +- kipi-plugins/sync/galleryconfig.cpp | 4 +- kipi-plugins/sync/gallerywidget.cpp | 8 +-- kipi-plugins/sync/gallerywindow.cpp | 6 +- kipi-plugins/timeadjust/timeadjustdialog.cpp | 6 +- 73 files changed, 360 insertions(+), 360 deletions(-) diff --git a/kipi-plugins/acquireimages/acquireimagedialog.cpp b/kipi-plugins/acquireimages/acquireimagedialog.cpp index eff0872..db0ef00 100644 --- a/kipi-plugins/acquireimages/acquireimagedialog.cpp +++ b/kipi-plugins/acquireimages/acquireimagedialog.cpp @@ -211,8 +211,8 @@ void AcquireImageDialog::setupImageOptions(void) m_preview = new TQLabel( groupBox1, "preview" ); m_preview->setFixedHeight( 120 ); - m_preview->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); - m_preview->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); + m_preview->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); + m_preview->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); TQWhatsThis::add( m_preview, i18n( "

The preview of the target image." ) ); m_preview->setScaledContents( false ); TQImage scanned = m_qimageScanned.smoothScale((m_qimageScanned.width() * 100) / m_qimageScanned.height(), 100); @@ -232,7 +232,7 @@ void AcquireImageDialog::setupImageOptions(void) TQWhatsThis::add( groupBox2, i18n("

The saving options of the target image.") ); TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() ); - groupBox2Layout->tqsetAlignment( TQt::AlignTop ); + groupBox2Layout->setAlignment( TQt::AlignTop ); m_imageCompression = new KIntNumInput(75, groupBox2); m_imageCompression->setRange(1, 100, 1, true ); @@ -332,22 +332,22 @@ void AcquireImageDialog::setupAlbumsList(void) TQWhatsThis::add( groupBox2, i18n("

The description of the current Album in the selection list.") ); TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() ); - groupBox2Layout->tqsetAlignment( TQt::AlignTop ); + groupBox2Layout->setAlignment( TQt::AlignTop ); m_AlbumComments = new KSqueezedTextLabel( groupBox2 ); - m_AlbumComments->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); + m_AlbumComments->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); groupBox2Layout->addWidget( m_AlbumComments ); m_AlbumCollection = new KSqueezedTextLabel( groupBox2 ); - m_AlbumCollection->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); + m_AlbumCollection->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); groupBox2Layout->addWidget( m_AlbumCollection ); m_AlbumDate = new KSqueezedTextLabel( groupBox2 ); - m_AlbumDate->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); + m_AlbumDate->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); groupBox2Layout->addWidget( m_AlbumDate ); m_AlbumItems = new KSqueezedTextLabel( groupBox2 ); - m_AlbumItems->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); + m_AlbumItems->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); groupBox2Layout->addWidget( m_AlbumItems ); vlay->addWidget( groupBox2 ); diff --git a/kipi-plugins/acquireimages/screenshotdialog.cpp b/kipi-plugins/acquireimages/screenshotdialog.cpp index 4e47f1a..62478da 100644 --- a/kipi-plugins/acquireimages/screenshotdialog.cpp +++ b/kipi-plugins/acquireimages/screenshotdialog.cpp @@ -201,7 +201,7 @@ void ScreenGrabDialog::slotGrab() m_hiddenWindows.clear(); if (m_hideCB->isChecked()) { - TQWidgetList *list = TQApplication::tqtopLevelWidgets(); + TQWidgetList *list = TQApplication::topLevelWidgets(); TQWidgetListIt it( *list ); TQWidget * w; while ( (w=it.current()) != 0 ) diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp index cadcbf2..61d29a0 100644 --- a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp @@ -108,8 +108,8 @@ BatchProcessImagesDialog::BatchProcessImagesDialog( KURL::List urlList, KIPI::In m_tmpFolder = dir.saveLocation("tmp", "kipi-batchprocessimagesplugin-" + TQString::number(getpid()) ); - m_converttqStatus = NO_PROCESS; - m_progresstqStatus = 0; + m_convertStatus = NO_PROCESS; + m_progressStatus = 0; m_ProcessusProc = 0; m_PreviewProc = 0; @@ -207,7 +207,7 @@ BatchProcessImagesDialog::BatchProcessImagesDialog( KURL::List urlList, KIPI::In m_listFiles = new BatchProcessImagesList( box41 ); lay2->addWidget( m_listFiles ); - m_listFiles->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding); + m_listFiles->setSizePolicy(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->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); - m_imageLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); + m_imageLabel->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); + m_imageLabel->setSizePolicy( 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_converttqStatus = UNDER_PROCESS; + m_convertStatus = 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_converttqStatus == STOP_PROCESS ) + if ( m_convertStatus == 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_progresstqStatus; - m_progress->setValue((int)((float)m_progresstqStatus *(float)100 / (float)m_nbItem)); + ++m_progressStatus; + m_progress->setValue((int)((float)m_progressStatus *(float)100 / (float)m_nbItem)); item = static_cast( m_listFile2Process_iterator->current() ); m_listFiles->setCurrentItem(item); @@ -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_progresstqStatus; - m_progress->setValue((int)((float)m_progresstqStatus *(float)100 / (float)m_nbItem)); + ++m_progressStatus; + m_progress->setValue((int)((float)m_progressStatus *(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_progresstqStatus; - m_progress->setValue((int)((float)m_progresstqStatus *(float)100 / (float)m_nbItem)); + ++m_progressStatus; + m_progress->setValue((int)((float)m_progressStatus *(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_progresstqStatus; - m_progress->setValue((int)((float)m_progresstqStatus *(float)100 / (float)m_nbItem)); + ++m_progressStatus; + m_progress->setValue((int)((float)m_progressStatus *(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_converttqStatus == PROCESS_DONE ) + if ( m_convertStatus == 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_progresstqStatus; - m_progress->setValue((int)((float)m_progresstqStatus *(float)100 / (float)m_nbItem)); + ++m_progressStatus; + m_progress->setValue((int)((float)m_progressStatus *(float)100 / (float)m_nbItem)); if ( m_listFile2Process_iterator->current() ) startProcess(); @@ -742,8 +742,8 @@ void BatchProcessImagesDialog::slotProcessDone(KProcess* proc) } ++*m_listFile2Process_iterator; - ++m_progresstqStatus; - m_progress->setValue((int)((float)m_progresstqStatus *(float)100 / (float)m_nbItem)); + ++m_progressStatus; + m_progress->setValue((int)((float)m_progressStatus *(float)100 / (float)m_nbItem)); if ( m_listFile2Process_iterator->current() ) startProcess(); @@ -755,7 +755,7 @@ void BatchProcessImagesDialog::slotListDoubleClicked(TQListViewItem *itemClicked { BatchProcessImagesItem *item = static_cast( itemClicked ); - if (m_converttqStatus == PROCESS_DONE) + if (m_convertStatus == PROCESS_DONE) { OutputDialog *infoDialog = new OutputDialog(this, i18n("Image processing error"), @@ -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_converttqStatus == UNDER_PROCESS ) m_converttqStatus = STOP_PROCESS; + if ( m_convertStatus == UNDER_PROCESS ) m_convertStatus = STOP_PROCESS; processAborted(true); } @@ -1042,7 +1042,7 @@ void BatchProcessImagesDialog::processAborted(bool removeFlag) void BatchProcessImagesDialog::endProcess(void) { - m_converttqStatus = PROCESS_DONE; + m_convertStatus = 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 a606d1b..9ad1d0d 100644 --- a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h +++ b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h @@ -157,8 +157,8 @@ private slots: KConfig *m_config; - int m_converttqStatus; - int m_progresstqStatus; + int m_convertStatus; + int m_progressStatus; int m_nbItem; KProcess *m_ProcessusProc; diff --git a/kipi-plugins/batchprocessimages/renameimagesbase.ui b/kipi-plugins/batchprocessimages/renameimagesbase.ui index 168625f..75c390f 100644 --- a/kipi-plugins/batchprocessimages/renameimagesbase.ui +++ b/kipi-plugins/batchprocessimages/renameimagesbase.ui @@ -93,7 +93,7 @@ Fixed - + 12 14 @@ -139,7 +139,7 @@ Expanding - + 261 21 @@ -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/renameimageswidget.cpp b/kipi-plugins/batchprocessimages/renameimageswidget.cpp index 67958ab..6ad50ff 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::tqfromLatin1(s); + newName += TQString::fromLatin1(s); newName += "_"; } @@ -378,7 +378,7 @@ TQString RenameImagesWidget::oldToNewName(BatchProcessImagesItem* item, seq.sprintf(format.latin1(), itemPosition + m_seqSpin->value()); newName += seq; - newName += TQString::tqfromLatin1(".") + fi.extension(); + newName += TQString::fromLatin1(".") + fi.extension(); return newName; } diff --git a/kipi-plugins/calendar/caleventsbase.ui b/kipi-plugins/calendar/caleventsbase.ui index d9aa2cb..80dff76 100644 --- a/kipi-plugins/calendar/caleventsbase.ui +++ b/kipi-plugins/calendar/caleventsbase.ui @@ -44,7 +44,7 @@ ohFileEdit - + 300 0 @@ -120,7 +120,7 @@ This is fully optional. All the events from this calendar will be printed red. fhFileEdit - + 300 0 @@ -175,7 +175,7 @@ This is fully optional. All the events from this calendar will be printed green. Expanding - + 41 140 diff --git a/kipi-plugins/calendar/calselect.cpp b/kipi-plugins/calendar/calselect.cpp index c29809a..f7479db 100644 --- a/kipi-plugins/calendar/calselect.cpp +++ b/kipi-plugins/calendar/calselect.cpp @@ -74,7 +74,7 @@ void CalSelect::setupView( KIPI::Interface* interface ) yearSpin_ = new TQSpinBox(KGlobal::locale()->calendar()->minValidYear(), KGlobal::locale()->calendar()->maxValidYear(), 1,yearBox); - yearSpin_->setValue(KGlobal::locale()->calendar()->year(TQDate::tqcurrentDate())); + yearSpin_->setValue(KGlobal::locale()->calendar()->year(TQDate::currentDate())); slotYearChanged(yearSpin_->value()); connect(yearSpin_, TQT_SIGNAL(valueChanged(int)), @@ -90,7 +90,7 @@ void CalSelect::setupView( KIPI::Interface* interface ) monthBox->tqlayout()->setMargin( 11 ); monthBoxLayout_ = new TQGridLayout(monthBox->tqlayout()); - monthBoxLayout_->tqsetAlignment( TQt::AlignCenter ); + monthBoxLayout_->setAlignment( TQt::AlignCenter ); KURL::List urlList; KIPI::ImageCollection images = interface->currentSelection(); diff --git a/kipi-plugins/calendar/calwidget.cpp b/kipi-plugins/calendar/calwidget.cpp index 235fb0f..9f40e39 100644 --- a/kipi-plugins/calendar/calwidget.cpp +++ b/kipi-plugins/calendar/calwidget.cpp @@ -48,7 +48,7 @@ namespace KIPICalendarPlugin CalWidget::CalWidget(TQWidget *parent) : TQWidget(parent,0,TQt::WRepaintNoErase|TQt::WResizeNoErase) { - tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); calPainter_ = 0; pix_ = new TQPixmap(); } @@ -78,8 +78,8 @@ void CalWidget::recreate() if (!calPainter_) calPainter_ = new CalPainter(TQT_TQPAINTDEVICE(pix_)); - calPainter_->setYearMonth(KGlobal::locale()->calendar()->year(TQDate::tqcurrentDate()), - KGlobal::locale()->calendar()->month(TQDate::tqcurrentDate())); + calPainter_->setYearMonth(KGlobal::locale()->calendar()->year(TQDate::currentDate()), + KGlobal::locale()->calendar()->month(TQDate::currentDate())); calPainter_->paint(); update(); } diff --git a/kipi-plugins/calendar/calwizard.cpp b/kipi-plugins/calendar/calwizard.cpp index 749183c..6067f3b 100644 --- a/kipi-plugins/calendar/calwizard.cpp +++ b/kipi-plugins/calendar/calwizard.cpp @@ -215,9 +215,9 @@ void CalWizard::slotPageSelected(const TQString&) TQString year = TQString::number(cSettings_->getYear()); TQString extra; - if ((KGlobal::locale()->calendar()->month(TQDate::tqcurrentDate()) >= 6 && - KGlobal::locale()->calendar()->year(TQDate::tqcurrentDate()) == cSettings_->getYear()) || - KGlobal::locale()->calendar()->year(TQDate::tqcurrentDate()) > cSettings_->getYear()) + if ((KGlobal::locale()->calendar()->month(TQDate::currentDate()) >= 6 && + KGlobal::locale()->calendar()->year(TQDate::currentDate()) == cSettings_->getYear()) || + KGlobal::locale()->calendar()->year(TQDate::currentDate()) > cSettings_->getYear()) extra = "

"+i18n("Please note that you are making a " "calendar for
the current year or a year in the " "past.")+""; diff --git a/kipi-plugins/cdarchiving/cdarchiving.cpp b/kipi-plugins/cdarchiving/cdarchiving.cpp index 6019187..d9519ab 100644 --- a/kipi-plugins/cdarchiving/cdarchiving.cpp +++ b/kipi-plugins/cdarchiving/cdarchiving.cpp @@ -528,7 +528,7 @@ bool CDArchiving::buildHTMLInterface (void) dir = KGlobal::dirs()->findResourceDir("kipi_data", "up.png"); dir = dir + "up.png"; srcURL = dir; - destURL = MainTPath + TQString::tqfromLatin1("/up.png"); + destURL = MainTPath + TQString::fromLatin1("/up.png"); KIO::file_copy(srcURL, destURL, -1, true, false, false); //clear the temporary list for unique names @@ -678,7 +678,7 @@ void CDArchiving::createHead(TQTextStream& stream) stream << "" << endl; stream << "" << endl; - stream << "formatDate(TQDate::tqcurrentDate()) + stream << "formatDate(TQDate::currentDate()) + "\">" << endl; stream << "" << m_mainTitle << "" << endl; createCSSSection(stream); @@ -736,7 +736,7 @@ void CDArchiving::createBody(TQTextStream& stream, int numOfImages = images.count(); const TQString imgGalleryDir = targetURL.directory(); - const TQString today(KGlobal::locale()->formatDate(TQDate::tqcurrentDate())); + const TQString today(KGlobal::locale()->formatDate(TQDate::currentDate())); stream << "\n" << endl; @@ -952,7 +952,7 @@ void CDArchiving::createBody(TQTextStream& stream, dir = dir + "valid-html401.png"; KURL srcURL(dir); - KURL destURL(imgGalleryDir + TQString::tqfromLatin1("/thumbs/valid-html401.png")); + KURL destURL(imgGalleryDir + TQString::fromLatin1("/thumbs/valid-html401.png")); KIO::file_copy(srcURL, destURL, -1, true, false, false); stream << "

" << endl; @@ -974,7 +974,7 @@ void CDArchiving::createBody(TQTextStream& stream, void CDArchiving::createBodyMainPage(TQTextStream& stream, KURL& url) { TQString Temp; - const TQString today(KGlobal::locale()->formatDate(TQDate::tqcurrentDate())); + const TQString today(KGlobal::locale()->formatDate(TQDate::currentDate())); Temp = m_mainTitle; stream << "\n

" << Temp << "

\n" << endl; @@ -992,7 +992,7 @@ void CDArchiving::createBodyMainPage(TQTextStream& stream, KURL& url) dir = dir + "valid-html401.png"; KURL srcURL(dir); - KURL destURL(url.directory() + TQString::tqfromLatin1("/valid-html401.png")); + KURL destURL(url.directory() + TQString::fromLatin1("/valid-html401.png")); KIO::file_copy(srcURL, destURL, -1, true, false, false); stream << "

" << endl; @@ -1023,12 +1023,12 @@ bool CDArchiving::createHtml( const KIPI::ImageCollection& album, // Create the "thumbs" subdirectory - TQDir thumb_dir( imgGalleryDir + TQString::tqfromLatin1("/thumbs/")); + TQDir thumb_dir( imgGalleryDir + TQString::fromLatin1("/thumbs/")); if (createDirectory(thumb_dir, imgGalleryDir, "thumbs") == false) return false; - TQDir pages_dir( imgGalleryDir + TQString::tqfromLatin1("/pages/")); + TQDir pages_dir( imgGalleryDir + TQString::fromLatin1("/pages/")); if (createDirectory(pages_dir, imgGalleryDir, "pages") == false) return false; @@ -1073,8 +1073,8 @@ bool CDArchiving::createPage(const TQString& imgGalleryDir, const TQString& comment) { - const TQDir pagesDir(imgGalleryDir + TQString::tqfromLatin1("/pages/")); - const TQDir thumbsDir(imgGalleryDir + TQString::tqfromLatin1("/thumbs/")); + const TQDir pagesDir(imgGalleryDir + TQString::fromLatin1("/pages/")); + const TQDir thumbsDir(imgGalleryDir + TQString::fromLatin1("/thumbs/")); const TQFileInfo fi (imgURL.fileName()); const TQString imgName = uniqueImgName + "." + fi.extension(FALSE); kdDebug( 51000 ) << "CreatePage: FileName: " << imgURL.fileName() << endl; @@ -1086,21 +1086,21 @@ bool CDArchiving::createPage(const TQString& imgGalleryDir, // Html pages filenames const TQString pageFilename = pagesDir.path() + - TQString::tqfromLatin1("/") + + TQString::fromLatin1("/") + webifyFileName(uniqueImgName)+ - TQString::tqfromLatin1(".htm"); + TQString::fromLatin1(".htm"); const TQString nextPageFilename = webifyFileName(nextUniqueImgName) + - TQString::tqfromLatin1(".htm"); + TQString::fromLatin1(".htm"); const TQString prevPageFilename = webifyFileName(prevUniqueImgName) + - TQString::tqfromLatin1(".htm"); + TQString::fromLatin1(".htm"); // Thumbs filenames - const TQString prevThumb = TQString::tqfromLatin1("../thumbs/") + + const TQString prevThumb = TQString::fromLatin1("../thumbs/") + webifyFileName(prevUniqueImgName) + extension(m_imageFormat); - const TQString nextThumb = TQString::tqfromLatin1("../thumbs/") + + const TQString nextThumb = TQString::fromLatin1("../thumbs/") + webifyFileName(nextUniqueImgName) + extension(m_imageFormat); @@ -1122,7 +1122,7 @@ bool CDArchiving::createPage(const TQString& imgGalleryDir, << m_hostName << " [" << m_hostURL << "]\">" << endl; stream << "formatDate(TQDate::tqcurrentDate()) + << KGlobal::locale()->formatDate(TQDate::currentDate()) << "\">" << endl; stream << "" << m_mainTitle << " : "<< imgName/*imgURL.fileName()*/ <<"" << endl; @@ -1239,7 +1239,7 @@ bool CDArchiving::createPage(const TQString& imgGalleryDir, // Footer TQString valid = i18n("Valid HTML 4.01."); - const TQString today(KGlobal::locale()->formatDate(TQDate::tqcurrentDate())); + const TQString today(KGlobal::locale()->formatDate(TQDate::currentDate())); stream << "

\""" << endl; @@ -1270,7 +1270,7 @@ int CDArchiving::createThumb( const TQString& imgName, const TQString& sourceDir // Create the thumbnails for the HTML interface. const TQString ImageNameFormat = webifyFileName(uniqueFileName) + extension(imageFormat); - const TQString thumbDir = imgGalleryDir + TQString::tqfromLatin1("/thumbs/"); + const TQString thumbDir = imgGalleryDir + TQString::fromLatin1("/thumbs/"); int extent = m_thumbnailsSize; m_imgWidth = 120; // Setting the size of the images is diff --git a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp index 5121432..9d80807 100644 --- a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp +++ b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp @@ -154,7 +154,7 @@ void CDArchivingDialog::setupSelection(void) TQWhatsThis::add( groupBox3, i18n("

Information about the backup medium.") ); m_mediaSize = new TQLabel( groupBox3 ); - m_mediaSize->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); + m_mediaSize->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); m_mediaFormat = new TQComboBox(false, groupBox3); m_mediaFormat->insertItem(i18n("CD (650Mb)")); @@ -543,7 +543,7 @@ void CDArchivingDialog::setupBurning(void) groupBoxAdvancedOptions->tqlayout()->setMargin( 11 ); TQVBoxLayout * groupBoxAOLayout = new TQVBoxLayout( groupBoxAdvancedOptions->tqlayout() ); - groupBoxAOLayout->tqsetAlignment( TQt::AlignTop ); + groupBoxAOLayout->setAlignment( TQt::AlignTop ); m_burnOnTheFly = new TQCheckBox( i18n("Media burning On-The-Fly"), groupBoxAdvancedOptions); m_burnOnTheFly->setChecked( false ); diff --git a/kipi-plugins/findimages/displaycompare.cpp b/kipi-plugins/findimages/displaycompare.cpp index 2dd7ca2..a11966e 100644 --- a/kipi-plugins/findimages/displaycompare.cpp +++ b/kipi-plugins/findimages/displaycompare.cpp @@ -172,24 +172,24 @@ DisplayCompare::DisplayCompare(TQWidget* parent, KIPI::Interface* interface, OriginalNameLabel = new KSqueezedTextLabel( GroupBox1, "OriginalNameLabel" ); OriginalNameLabel->setFrameShape( TQLabel::Box ); - OriginalNameLabel->tqsetAlignment( int( TQLabel::AlignCenter ) ); + OriginalNameLabel->setAlignment( int( TQLabel::AlignCenter ) ); preview1 = new TQLabel( GroupBox1, "preview1" ); preview1->setFixedHeight( 120 ); - preview1->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); - preview1->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); + preview1->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); + preview1->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); TQWhatsThis::add( preview1, i18n( "

The preview of files with duplicates." ) ); originalInfoLabel1 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel1" ); - originalInfoLabel1->tqsetAlignment( int( TQLabel::AlignCenter ) ); + originalInfoLabel1->setAlignment( int( TQLabel::AlignCenter ) ); originalInfoLabel2 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel2" ); - originalInfoLabel2->tqsetAlignment( int( TQLabel::AlignCenter ) ); + originalInfoLabel2->setAlignment( int( TQLabel::AlignCenter ) ); originalInfoLabel3 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel3" ); - originalInfoLabel3->tqsetAlignment( int( TQLabel::AlignCenter ) ); + originalInfoLabel3->setAlignment( int( TQLabel::AlignCenter ) ); originalInfoLabel4 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel4" ); - originalInfoLabel4->tqsetAlignment( int( TQLabel::AlignCenter ) ); + originalInfoLabel4->setAlignment( int( TQLabel::AlignCenter ) ); originalInfoLabel5 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel5" ); - originalInfoLabel5->tqsetAlignment( int( TQLabel::AlignCenter ) ); + originalInfoLabel5->setAlignment( int( TQLabel::AlignCenter ) ); listName = new KListView( GroupBox1, "listName" ); listName->header()->setLabel( 0, i18n( "Files" ) ); @@ -207,24 +207,24 @@ DisplayCompare::DisplayCompare(TQWidget* parent, KIPI::Interface* interface, similarNameLabel = new KSqueezedTextLabel( GroupBox2, "similarNameLabel" ); similarNameLabel->setFrameShape( TQLabel::Box ); - similarNameLabel->tqsetAlignment( int( TQLabel::AlignCenter ) ); + similarNameLabel->setAlignment( int( TQLabel::AlignCenter ) ); preview2 = new TQLabel( GroupBox2, "preview2" ); preview2->setFixedHeight( 120 ); - preview2->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); - preview2->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); + preview2->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); + preview2->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); TQWhatsThis::add( preview2, i18n( "

The preview of duplicate files." ) ); similarInfoLabel1 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel1" ); - similarInfoLabel1->tqsetAlignment( int( TQLabel::AlignCenter ) ); + similarInfoLabel1->setAlignment( int( TQLabel::AlignCenter ) ); similarInfoLabel2 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel2" ); - similarInfoLabel2->tqsetAlignment( int( TQLabel::AlignCenter ) ); + similarInfoLabel2->setAlignment( int( TQLabel::AlignCenter ) ); similarInfoLabel3 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel3" ); - similarInfoLabel3->tqsetAlignment( int( TQLabel::AlignCenter ) ); + similarInfoLabel3->setAlignment( int( TQLabel::AlignCenter ) ); similarInfoLabel4 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel4" ); - similarInfoLabel4->tqsetAlignment( int( TQLabel::AlignCenter ) ); + similarInfoLabel4->setAlignment( int( TQLabel::AlignCenter ) ); similarInfoLabel5 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel5" ); - similarInfoLabel5->tqsetAlignment( int( TQLabel::AlignCenter ) ); + similarInfoLabel5->setAlignment( int( TQLabel::AlignCenter ) ); listEq = new KListView( GroupBox2, "listEq" ); listEq->header()->setLabel( 0, i18n( "Files" ) ); diff --git a/kipi-plugins/flickrexport/flickralbumdialog.ui b/kipi-plugins/flickrexport/flickralbumdialog.ui index 20d5749..7d8e498 100644 --- a/kipi-plugins/flickrexport/flickralbumdialog.ui +++ b/kipi-plugins/flickrexport/flickralbumdialog.ui @@ -137,7 +137,7 @@ Expanding - + 20 20 diff --git a/kipi-plugins/flickrexport/flickrwidget.cpp b/kipi-plugins/flickrexport/flickrwidget.cpp index f7279c1..81537f5 100644 --- a/kipi-plugins/flickrexport/flickrwidget.cpp +++ b/kipi-plugins/flickrexport/flickrwidget.cpp @@ -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->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + //m_newAlbumBtn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); //m_newAlbumBtn->setText(i18n("&New Album")); TQGridLayout* tagsLayout = new TQGridLayout(1, 1); @@ -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->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_dimensionSpinBox->setSizePolicy(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->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_imageQualitySpinBox->setSizePolicy(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); diff --git a/kipi-plugins/flickrexport/imageslist.cpp b/kipi-plugins/flickrexport/imageslist.cpp index fee6062..06f2f9d 100644 --- a/kipi-plugins/flickrexport/imageslist.cpp +++ b/kipi-plugins/flickrexport/imageslist.cpp @@ -98,7 +98,7 @@ ImagesListView::ImagesListView(TQWidget *parent) setResizeMode(TQListView::AllColumns); setAllColumnsShowFocus(true); setSorting(-1); - tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); setSelectionMode(TQListView::Extended); } diff --git a/kipi-plugins/flickrexport/login.cpp b/kipi-plugins/flickrexport/login.cpp index 0686a09..9a3fb1c 100644 --- a/kipi-plugins/flickrexport/login.cpp +++ b/kipi-plugins/flickrexport/login.cpp @@ -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->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); + m_headerLabel->setSizePolicy(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(tqminimumSizeHint()) ); + resize( TQSize(300, 150).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); m_nameEdit->setText(_name); diff --git a/kipi-plugins/galleryexport/galleryalbumdialog.ui b/kipi-plugins/galleryexport/galleryalbumdialog.ui index 26ee8d9..bd62ba2 100644 --- a/kipi-plugins/galleryexport/galleryalbumdialog.ui +++ b/kipi-plugins/galleryexport/galleryalbumdialog.ui @@ -137,7 +137,7 @@ Expanding - + 20 20 diff --git a/kipi-plugins/galleryexport/galleryconfig.cpp b/kipi-plugins/galleryexport/galleryconfig.cpp index 9fc79f4..f0f19ff 100644 --- a/kipi-plugins/galleryexport/galleryconfig.cpp +++ b/kipi-plugins/galleryexport/galleryconfig.cpp @@ -74,7 +74,7 @@ GalleryEdit::GalleryEdit(TQWidget* pParent, tll->addItem(vbox); mpHeaderLabel = new TQLabel(page); - mpHeaderLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, + mpHeaderLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); mpHeaderLabel->setText(title); vbox->addWidget(mpHeaderLabel); @@ -124,7 +124,7 @@ GalleryEdit::GalleryEdit(TQWidget* pParent, vbox->addLayout( centerLayout ); - resize( TQSize(300, 150).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(300, 150).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); mpNameEdit->setText(pGallery->name()); diff --git a/kipi-plugins/galleryexport/gallerylist.cpp b/kipi-plugins/galleryexport/gallerylist.cpp index 314ebd2..740139f 100644 --- a/kipi-plugins/galleryexport/gallerylist.cpp +++ b/kipi-plugins/galleryexport/gallerylist.cpp @@ -79,7 +79,7 @@ GalleryList::GalleryList(TQWidget *pParent, Galleries* pGalleries, bool blnShowO hb->addWidget(label); label->setPixmap(UserIcon("gallery")); label->setFrameStyle (TQFrame::Panel | TQFrame::Sunken); - label->tqsetAlignment(TQt::AlignTop); + label->setAlignment(TQt::AlignTop); TQVBoxLayout *vb = new TQVBoxLayout(); vb->setSpacing (KDialog::spacingHint()); tll->addItem(vb); diff --git a/kipi-plugins/galleryexport/gallerywidget.cpp b/kipi-plugins/galleryexport/gallerywidget.cpp index 769c4e5..899b48b 100644 --- a/kipi-plugins/galleryexport/gallerywidget.cpp +++ b/kipi-plugins/galleryexport/gallerywidget.cpp @@ -87,11 +87,11 @@ GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl ) rightButtonGroupLayout->setMargin( 5 ); m_newAlbumBtn = new TQPushButton( rightButtonGroup, "m_newAlbumBtn" ); - m_newAlbumBtn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_newAlbumBtn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); rightButtonGroupLayout->addWidget( m_newAlbumBtn, 0, TQt::AlignHCenter ); m_addPhotoBtn = new TQPushButton( rightButtonGroup, "m_addPhotoBtn" ); - m_addPhotoBtn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_addPhotoBtn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); rightButtonGroupLayout->addWidget( m_addPhotoBtn, 0, TQt::AlignHCenter ); // ------------------------------------------------------------------------ @@ -118,7 +118,7 @@ GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl ) m_dimensionSpinBox = new TQSpinBox(0, 5000, 10, optionsBox); m_dimensionSpinBox->setValue(600); - m_dimensionSpinBox->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_dimensionSpinBox->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); optionsBoxLayout->addWidget(m_dimensionSpinBox, 3, 1); TQLabel* resizeLabel = new TQLabel(i18n("Maximum dimension:"), optionsBox); @@ -149,7 +149,7 @@ GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl ) // ------------------------------------------------------------------------ - resize( TQSize(600, 400).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(600, 400).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/kipi-plugins/galleryexport/gallerywindow.cpp b/kipi-plugins/galleryexport/gallerywindow.cpp index ac37a31..e58713c 100644 --- a/kipi-plugins/galleryexport/gallerywindow.cpp +++ b/kipi-plugins/galleryexport/gallerywindow.cpp @@ -347,13 +347,13 @@ void GalleryWindow::slotPhotos( const TQValueList& photoList) TQString( "body { margin: 8px; font-size: %1px; " " color: %2; background-color: %3;}" ) .tqarg( pxSize ) - .tqarg( tqcolorGroup().text().name() ) - .tqarg( tqcolorGroup().base().name() ); + .tqarg( colorGroup().text().name() ) + .tqarg( colorGroup().base().name() ); styleSheet += TQString( "a { font-size: %1px; color: %2; " "text-decoration: none;}" ) .tqarg( pxSize ) - .tqarg( tqcolorGroup().text().name() ); + .tqarg( colorGroup().text().name() ); styleSheet += TQString( "i { font-size: %1px; color: %2; " "text-decoration: none;}" ) .tqarg( pxSize-2 ) diff --git a/kipi-plugins/gpssync/gpsmapwidget.cpp b/kipi-plugins/gpssync/gpsmapwidget.cpp index 82132ac..a5874b6 100644 --- a/kipi-plugins/gpssync/gpsmapwidget.cpp +++ b/kipi-plugins/gpssync/gpsmapwidget.cpp @@ -126,7 +126,7 @@ void GPSMapWidget::khtmlMouseMoveEvent(khtml::MouseMoveEvent *e) { TQString status = jsStatusBarText(); - // If a new point to the map have been moved, the tqStatus + // If a new point to the map have been moved, the Status // string is like : "(lat:25.5894748, lon:47.6897455478, alt:211)" if (status.startsWith(TQString("(lat:"))) extractGPSPositionfromStatusbar(status); @@ -138,12 +138,12 @@ void GPSMapWidget::khtmlMouseReleaseEvent(khtml::MouseReleaseEvent *e) { TQString status = jsStatusBarText(); - // If a new point to the map have been moved, the tqStatus + // If a new point to the map have been moved, the Status // string is like : "(lat:25.5894748, lon:47.6897455478, alt:211)" if (status.startsWith(TQString("(lat:"))) extractGPSPositionfromStatusbar(status); - // If a new map zoom level have been selected, the tqStatus + // If a new map zoom level have been selected, the Status // string is like : "newZoomLevel:5" if (status.startsWith(TQString("newZoomLevel:"))) { @@ -151,7 +151,7 @@ void GPSMapWidget::khtmlMouseReleaseEvent(khtml::MouseReleaseEvent *e) d->zoomLevel = status; } - // If a new map type have been selected, the tqStatus + // If a new map type have been selected, the Status // string is like : "newMapType:G_SATELLITE_TYPE" if (status.startsWith(TQString("newMapType:"))) { diff --git a/kipi-plugins/gpssync/gpssyncdialog.cpp b/kipi-plugins/gpssync/gpssyncdialog.cpp index 597bb10..37799af 100644 --- a/kipi-plugins/gpssync/gpssyncdialog.cpp +++ b/kipi-plugins/gpssync/gpssyncdialog.cpp @@ -138,7 +138,7 @@ GPSSyncDialog::GPSSyncDialog( KIPI::Interface* interface, TQWidget* parent) d->listView->setResizeMode(TQListView::AllColumns); d->listView->setAllColumnsShowFocus(true); d->listView->setSorting(-1); - d->listView->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + d->listView->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); d->listView->setSelectionMode(TQListView::Extended); d->listView->setMinimumWidth(450); diff --git a/kipi-plugins/gpssync/kmlexportconfig.cpp b/kipi-plugins/gpssync/kmlexportconfig.cpp index 10602d8..78d1b00 100644 --- a/kipi-plugins/gpssync/kmlexportconfig.cpp +++ b/kipi-plugins/gpssync/kmlexportconfig.cpp @@ -68,7 +68,7 @@ KMLExportConfig::KMLExportConfig( TQWidget* parent, const char* name) parent, 0, true, false) { if ( !name ) setName( "KMLExportConfig" ); - tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, + setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, sizePolicy().hasHeightForWidth() ) ); KMLExportConfigLayout = new TQGridLayout ( plainPage(), 1, 3, 0, spacingHint()); @@ -76,12 +76,12 @@ KMLExportConfig::KMLExportConfig( TQWidget* parent, const char* name) // Target preferences TargetPreferenceGroupBox = new TQGroupBox(0, Qt::Vertical, i18n( "Target Preferences" ), plainPage()); TargetPreferenceGroupBoxLayout = new TQGridLayout( TargetPreferenceGroupBox->tqlayout(), 6, 5, KDialog::spacingHint()); - TargetPreferenceGroupBoxLayout->tqsetAlignment( TQt::AlignTop ); + TargetPreferenceGroupBoxLayout->setAlignment( TQt::AlignTop ); // target type buttonGroupTargetType = new TQButtonGroup(0, Qt::Vertical, i18n( "Target Type" ), TargetPreferenceGroupBox, "buttonGroupTargetType" ); buttonGroupTargetTypeLayout = new TQGridLayout( buttonGroupTargetType->tqlayout(), 2, 1, KDialog::spacingHint() ); - buttonGroupTargetTypeLayout->tqsetAlignment( TQt::AlignTop ); + buttonGroupTargetTypeLayout->setAlignment( TQt::AlignTop ); LocalTargetRadioButton_ = new TQRadioButton( i18n( "&Local or web target used by GoogleEarth" ), buttonGroupTargetType, "LocalTargetRadioButton_" ); @@ -147,7 +147,7 @@ KMLExportConfig::KMLExportConfig( TQWidget* parent, const char* name) TQGroupBox *SizeGroupBox = new TQGroupBox(0, Qt::Vertical, i18n( "Sizes" ), plainPage() ); SizeGroupBox->setColumnLayout(0, Qt::Vertical ); SizeGroupBoxLayout = new TQGridLayout( SizeGroupBox->tqlayout(), 2, 3, KDialog::spacingHint() ); - SizeGroupBoxLayout->tqsetAlignment( TQt::AlignTop ); + SizeGroupBoxLayout->setAlignment( TQt::AlignTop ); IconSizeLabel = new TQLabel( i18n( "Icon size" ), SizeGroupBox, "IconSizeLabel" ); @@ -178,7 +178,7 @@ KMLExportConfig::KMLExportConfig( TQWidget* parent, const char* name) TQGroupBox *GPXTracksGroupBox = new TQGroupBox(0, Qt::Vertical, i18n( "GPX Tracks" ), plainPage()); TQGridLayout *GPXTracksGroupBoxLayout = new TQGridLayout(GPXTracksGroupBox->tqlayout(), 5, 4, KDialog::spacingHint()); - GPXTracksGroupBoxLayout->tqsetAlignment( TQt::AlignTop ); + GPXTracksGroupBoxLayout->setAlignment( TQt::AlignTop ); // add a gpx track checkbox GPXTracksCheckBox_ = new TQCheckBox( i18n( "Draw GPX track" ), GPXTracksGroupBox, "GPXTracksCheckBox"); diff --git a/kipi-plugins/htmlexport/imagesettingspage.ui b/kipi-plugins/htmlexport/imagesettingspage.ui index d200786..42e8b5c 100644 --- a/kipi-plugins/htmlexport/imagesettingspage.ui +++ b/kipi-plugins/htmlexport/imagesettingspage.ui @@ -45,7 +45,7 @@ Expanding - + 58 20 @@ -62,7 +62,7 @@ Fixed - + 16 20 @@ -79,7 +79,7 @@ Expanding - + 20 104 @@ -109,7 +109,7 @@ Fixed - + 16 20 @@ -126,7 +126,7 @@ Fixed - + 20 20 @@ -244,7 +244,7 @@ Expanding - + 20 20 @@ -288,7 +288,7 @@ Fixed - + 16 20 @@ -305,7 +305,7 @@ Fixed - + 20 19 @@ -332,7 +332,7 @@ Expanding - + 40 20 @@ -401,7 +401,7 @@ Expanding - + 20 20 diff --git a/kipi-plugins/htmlexport/outputpage.ui b/kipi-plugins/htmlexport/outputpage.ui index 6ece24d..6e49fb2 100644 --- a/kipi-plugins/htmlexport/outputpage.ui +++ b/kipi-plugins/htmlexport/outputpage.ui @@ -63,7 +63,7 @@ Expanding - + 20 51 diff --git a/kipi-plugins/htmlexport/themeparameterspage.ui b/kipi-plugins/htmlexport/themeparameterspage.ui index 2d05fda..a6bfd03 100644 --- a/kipi-plugins/htmlexport/themeparameterspage.ui +++ b/kipi-plugins/htmlexport/themeparameterspage.ui @@ -51,7 +51,7 @@ Fixed - + 16 20 @@ -79,7 +79,7 @@ Fixed - + 20 16 diff --git a/kipi-plugins/htmlexport/wizard.cpp b/kipi-plugins/htmlexport/wizard.cpp index acc7f6e..28aa1f2 100644 --- a/kipi-plugins/htmlexport/wizard.cpp +++ b/kipi-plugins/htmlexport/wizard.cpp @@ -145,7 +145,7 @@ struct Wizard::Private { int row = tqlayout->numRows(); tqlayout->addWidget(label, row, 0); - if (widget->tqsizePolicy().expanding() & TQSizePolicy::Horizontally) { + if (widget->sizePolicy().expanding() & TQSizePolicy::Horizontally) { // Widget wants full width tqlayout->addMultiCellWidget(widget, row, row, 1, 2); } else { diff --git a/kipi-plugins/ipodexport/imagelist.cpp b/kipi-plugins/ipodexport/imagelist.cpp index 940b920..f0bcfdc 100644 --- a/kipi-plugins/ipodexport/imagelist.cpp +++ b/kipi-plugins/ipodexport/imagelist.cpp @@ -91,9 +91,9 @@ ImageList::viewportPaintEvent( TQPaintEvent *e ) const uint x = (viewport()->width() - w - 30) / 2 ; const uint y = (viewport()->height() - h - 30) / 2 ; - p.setBrush( tqcolorGroup().background() ); + p.setBrush( colorGroup().background() ); p.drawRoundRect( x, y, w+30, h+30, (8*200)/w, (8*200)/h ); - t.draw( &p, x+15, y+15, TQRect(), tqcolorGroup() ); + t.draw( &p, x+15, y+15, TQRect(), colorGroup() ); } } diff --git a/kipi-plugins/ipodexport/ipodexportdialog.cpp b/kipi-plugins/ipodexport/ipodexportdialog.cpp index 387f77d..cb54703 100644 --- a/kipi-plugins/ipodexport/ipodexportdialog.cpp +++ b/kipi-plugins/ipodexport/ipodexportdialog.cpp @@ -107,8 +107,8 @@ UploadDialog::UploadDialog( m_ipodPreview = new TQLabel( buttons ); m_ipodPreview->setFixedHeight( 80 ); - m_ipodPreview->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); - m_ipodPreview->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); + m_ipodPreview->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); + m_ipodPreview->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); buttonLayout->addWidget( m_createAlbumButton ); buttonLayout->addWidget( m_removeAlbumButton ); @@ -126,7 +126,7 @@ UploadDialog::UploadDialog( m_uploadList->setMinimumHeight( 80 ); urlLayout->addWidget( m_uploadList ); - m_uploadList->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding ); + m_uploadList->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding ); TQVBoxLayout* uploadPaneLayout = new TQVBoxLayout( urlLayout ); m_addImagesButton = new TQPushButton ( i18n( "&Add..." ), urlBox ); @@ -143,8 +143,8 @@ UploadDialog::UploadDialog( m_imagePreview = new TQLabel( urlBox ); m_imagePreview->setFixedHeight( 80 ); - m_imagePreview->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); - m_imagePreview->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); + m_imagePreview->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); + m_imagePreview->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); TQWhatsThis::add( m_imagePreview, i18n( "The preview of the selected image in the list." ) ); TQLabel *hdd_icon = new TQLabel( urlBox ); diff --git a/kipi-plugins/ipodexport/ipodheader.cpp b/kipi-plugins/ipodexport/ipodheader.cpp index 9fbf092..51b9784 100644 --- a/kipi-plugins/ipodexport/ipodheader.cpp +++ b/kipi-plugins/ipodexport/ipodheader.cpp @@ -27,10 +27,10 @@ IpodHeader::IpodHeader( TQWidget *parent, const char *name, WFlags f ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 10/*margin*/, 5/*spacing*/ ); - tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); m_messageLabel = new TQLabel( TQString(), this ); - m_messageLabel->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + m_messageLabel->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); TQHBoxLayout *buttonLayout = new TQHBoxLayout; m_button = new KPushButton( this ); diff --git a/kipi-plugins/kameraklient/cameraiconitem.cpp b/kipi-plugins/kameraklient/cameraiconitem.cpp index b41085f..717af09 100644 --- a/kipi-plugins/kameraklient/cameraiconitem.cpp +++ b/kipi-plugins/kameraklient/cameraiconitem.cpp @@ -90,7 +90,7 @@ void CameraIconItem::setPixmap(const TQImage& thumb) { pixHeight_ = thumb.height(); TQPainter painter; painter.begin(pixmap()); - painter.fillRect(0, 0, size, size, TQBrush(iconView()->tqcolorGroup().base())); + painter.fillRect(0, 0, size, size, TQBrush(iconView()->colorGroup().base())); painter.drawImage((size-thumb.width())/2, (size-thumb.height())/2, thumb); painter.end(); tqrepaint(); diff --git a/kipi-plugins/kameraklient/cameraiconview.cpp b/kipi-plugins/kameraklient/cameraiconview.cpp index 0ff21f9..8f8bacf 100644 --- a/kipi-plugins/kameraklient/cameraiconview.cpp +++ b/kipi-plugins/kameraklient/cameraiconview.cpp @@ -73,9 +73,9 @@ void CameraIconView::setThumbnailSize() { double scale = double(w-10) / double(image.width()); image = image.smoothScale(w-10, h-10, TQ_ScaleMin); TQPixmap pix(w, h); - pix.fill(tqcolorGroup().base()); + pix.fill(colorGroup().base()); TQPainter p(&pix); - p.fillRect(0, 0, w, h, TQBrush(tqcolorGroup().base())); + p.fillRect(0, 0, w, h, TQBrush(colorGroup().base())); if(!image.isNull()) { p.drawImage((w-image.width())/2, (h-image.height())/2, image); } diff --git a/kipi-plugins/kameraklient/cameraselection.cpp b/kipi-plugins/kameraklient/cameraselection.cpp index 79439fe..3e90a11 100644 --- a/kipi-plugins/kameraklient/cameraselection.cpp +++ b/kipi-plugins/kameraklient/cameraselection.cpp @@ -89,11 +89,11 @@ CameraSelection::CameraSelection(TQWidget* parent) mainBox->tqlayout()->setSpacing( 5 ); mainBox->tqlayout()->setMargin( 5 ); TQGridLayout* mainBoxLayout = new TQGridLayout(mainBox->tqlayout()); - mainBoxLayout->tqsetAlignment(TQt::AlignTop); + mainBoxLayout->setAlignment(TQt::AlignTop); listView_ = new TQListView( mainBox ); listView_->addColumn( i18n("Cameras") ); - listView_->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); + listView_->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); mainBoxLayout->addMultiCellWidget(listView_, 0, 4, 0, 0); portButtonGroup_ = new TQVButtonGroup(mainBox); @@ -116,7 +116,7 @@ CameraSelection::CameraSelection(TQWidget* parent) portPathBox->tqlayout()->setSpacing( 5 ); portPathBox->tqlayout()->setMargin( 5 ); TQVBoxLayout* portPathBoxLayout = new TQVBoxLayout( portPathBox->tqlayout() ); - portPathBoxLayout->tqsetAlignment( TQt::AlignTop ); + portPathBoxLayout->setAlignment( TQt::AlignTop ); TQLabel* portPathLabel_ = new TQLabel( portPathBox); portPathLabel_->setText( i18n("only for serial port\n" "cameras")); diff --git a/kipi-plugins/kameraklient/cameraui.cpp b/kipi-plugins/kameraklient/cameraui.cpp index c936800..b4a3635 100644 --- a/kipi-plugins/kameraklient/cameraui.cpp +++ b/kipi-plugins/kameraklient/cameraui.cpp @@ -170,7 +170,7 @@ CameraUI::CameraUI() : TQWidget() mCameraBoxLayout->addWidget(mCameraConnectBtn); mCameraComboBox = new TQComboBox(this, "camera"); mCameraComboBox->setInsertionPolicy(TQComboBox::AtBottom); - mCameraComboBox->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); + mCameraComboBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); mCameraBoxLayout->addWidget(mCameraComboBox); // create Download Directory Camera Box --------------------------------------------------- @@ -180,14 +180,14 @@ CameraUI::CameraUI() : TQWidget() TQLabel* mDownloadDirectoryLabel = new TQLabel(i18n("Download to: "), this); mDownloadDirectoryBoxLayout->addWidget(mDownloadDirectoryLabel); mDownloadDirectoryEdit = new TQLineEdit(this); - mDownloadDirectoryEdit->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); + mDownloadDirectoryEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); mDownloadDirectoryEdit->setReadOnly(true); mDownloadDirectoryBoxLayout->addWidget(mDownloadDirectoryEdit); mChangeDownloadDirectoryBtn = new TQPushButton(i18n("&Change"), this); mDownloadDirectoryBoxLayout->addWidget(mChangeDownloadDirectoryBtn); // ------------------------- mSplitter = new TQSplitter(this); mLeftBoxLayout->addWidget(mSplitter); - mSplitter->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); + mSplitter->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); mFolderView = new CameraFolderView(mSplitter); mIconView = new CameraIconView(mSplitter); mSplitter->setOpaqueResize(true); @@ -199,7 +199,7 @@ CameraUI::CameraUI() : TQWidget() controller_->start(); cameraConnected_ = false; - // create tqStatus Bar ----------------------------------------------------------------------------- + // create Status Bar ----------------------------------------------------------------------------- mStatusBar = new KStatusBar(this); mLeftBoxLayout->addWidget(mStatusBar); diff --git a/kipi-plugins/kameraklient/dmessagebox.cpp b/kipi-plugins/kameraklient/dmessagebox.cpp index f29bc85..6399111 100644 --- a/kipi-plugins/kameraklient/dmessagebox.cpp +++ b/kipi-plugins/kameraklient/dmessagebox.cpp @@ -58,9 +58,9 @@ DMessageBox::DMessageBox() : TQWidget(0, 0, WShowModal | WStyle_DialogBorder| WD 0, true); TQLabel *pixLabel = new TQLabel(hbox); pixLabel->setPixmap(pix); - pixLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); + pixLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); msgBox_ = new TQLabel(hbox); - msgBox_->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); + msgBox_->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); grid->addMultiCellWidget(hbox, 0, 0, 0, 2); // --------------------------------------------------- extraMsgBox_ = new TQTextEdit(this); diff --git a/kipi-plugins/kameraklient/gpcamera.cpp b/kipi-plugins/kameraklient/gpcamera.cpp index 6858e0e..6c5aabb 100644 --- a/kipi-plugins/kameraklient/gpcamera.cpp +++ b/kipi-plugins/kameraklient/gpcamera.cpp @@ -95,7 +95,7 @@ int GPCamera::setup() { status = 0; } - status = new GPtqStatus(); + status = new GPStatus(); gp_abilities_list_new(&abilList); gp_abilities_list_load(abilList, status->context); @@ -160,7 +160,7 @@ int GPCamera::initialize() { delete status; status = 0; } - status = new GPtqStatus(); + status = new GPStatus(); // Try and initialize the camera to see if its connected if (gp_camera_init(d->camera, status->context) != GP_OK) { gp_camera_unref(d->camera); @@ -209,7 +209,7 @@ int GPCamera::getSubFolders(const TQString& folder, TQValueList& subFo delete status; status = 0; } - status = new GPtqStatus(); + status = new GPStatus(); if (gp_camera_folder_list_folders(d->camera, folder.latin1(), clist, status->context) != GP_OK) { gp_list_unref(clist); delete status; @@ -257,7 +257,7 @@ int GPCamera::getItemsInfo(const TQString& folder, GPFileItemInfoList& infoList) delete status; status = 0; } - status = new GPtqStatus; + status = new GPStatus; gp_list_new(&clist); if (gp_camera_folder_list_files(d->camera, folder.latin1(), clist, status->context) != GP_OK) { gp_list_unref(clist); @@ -337,7 +337,7 @@ int GPCamera::getThumbnail(const TQString& folder, const TQString& imageName, TQ delete status; status = 0; } - status = new GPtqStatus; + status = new GPStatus; if (gp_camera_file_get(d->camera, folder.latin1(), imageName.latin1(), GP_FILE_TYPE_PREVIEW, cfile, status->context) != GP_OK) { gp_file_unref(cfile); delete status; @@ -359,7 +359,7 @@ int GPCamera::downloadItem(const TQString& folder, const TQString& itemName, con delete status; status = 0; } - status = new GPtqStatus; + status = new GPStatus; if (gp_camera_file_get(d->camera, folder.latin1(), itemName.latin1(), GP_FILE_TYPE_NORMAL, cfile, status->context) != GP_OK) { gp_file_unref(cfile); delete status; @@ -381,7 +381,7 @@ int GPCamera::deleteItem(const TQString& folder, const TQString& itemName) { delete status; status = 0; } - status = new GPtqStatus; + status = new GPStatus; if(gp_camera_file_delete(d->camera, folder.latin1(), itemName.latin1(), status->context) != GP_OK) { delete status; status = 0; @@ -412,7 +412,7 @@ int GPCamera::deleteAllItems(const TQString& folder) { delete status; status = 0; } - status = new GPtqStatus; + status = new GPStatus; if (gp_camera_folder_delete_all(d->camera, folder.latin1(), status->context) != GP_OK) { delete status; status = 0; @@ -435,7 +435,7 @@ int GPCamera::uploadItem(const TQString& folder, const TQString& itemName, const delete status; status = 0; } - status = new GPtqStatus; + status = new GPStatus; if (gp_camera_folder_put_file(d->camera, folder.latin1(), cfile, status->context) != GP_OK) { gp_file_unref(cfile); delete status; @@ -454,7 +454,7 @@ void GPCamera::cameraSummary(TQString& summary) { delete status; status = 0; } - status = new GPtqStatus; + status = new GPStatus; gp_camera_get_summary(d->camera, &sum, status->context); summary = TQString(sum.text); delete status; @@ -467,7 +467,7 @@ void GPCamera::cameraManual(TQString& manual) { delete status; status = 0; } - status = new GPtqStatus; + status = new GPStatus; gp_camera_get_manual(d->camera, &man, status->context); manual = TQString(man.text); delete status; @@ -480,7 +480,7 @@ void GPCamera::cameraAbout(TQString& about) { delete status; status = 0; } - status = new GPtqStatus; + status = new GPStatus; gp_camera_get_about(d->camera, &abt, status->context); about = TQString(abt.text); delete status; diff --git a/kipi-plugins/kameraklient/gpcamera.h b/kipi-plugins/kameraklient/gpcamera.h index 864f87a..613af65 100644 --- a/kipi-plugins/kameraklient/gpcamera.h +++ b/kipi-plugins/kameraklient/gpcamera.h @@ -34,7 +34,7 @@ namespace KIPIKameraKlientPlugin { class GPCameraPrivate; -class GPtqStatus; +class GPStatus; class GPCamera { @@ -84,7 +84,7 @@ public: private: int setup(); GPCameraPrivate *d; - GPtqStatus *status; + GPStatus *status; }; } // NameSpace KIPIKameraKlientPlugin diff --git a/kipi-plugins/kameraklient/gpfileiteminfodlg.cpp b/kipi-plugins/kameraklient/gpfileiteminfodlg.cpp index 145e825..98ba033 100644 --- a/kipi-plugins/kameraklient/gpfileiteminfodlg.cpp +++ b/kipi-plugins/kameraklient/gpfileiteminfodlg.cpp @@ -53,7 +53,7 @@ GPFileItemInfoDlg::GPFileItemInfoDlg(const GPFileItemInfo& info, TQLabel *thumbLabel = new TQLabel( page ); thumbLabel->setFrameShape(TQFrame::Box); thumbLabel->setMargin(2); - thumbLabel->setPaletteBackgroundColor(tqcolorGroup().base()); + thumbLabel->setPaletteBackgroundColor(colorGroup().base()); if (!pixmap) { if (info.mime.contains("image")) thumbLabel->setPixmap(DesktopIcon("image")); diff --git a/kipi-plugins/kameraklient/gpmessages.h b/kipi-plugins/kameraklient/gpmessages.h index b255df1..ad9e9f6 100644 --- a/kipi-plugins/kameraklient/gpmessages.h +++ b/kipi-plugins/kameraklient/gpmessages.h @@ -28,7 +28,7 @@ class GPMessages : public TQObject { Q_OBJECT TQ_OBJECT - friend class GPtqStatus; + friend class GPStatus; public: diff --git a/kipi-plugins/kameraklient/gpstatus.cpp b/kipi-plugins/kameraklient/gpstatus.cpp index a54ca82..61b22a6 100644 --- a/kipi-plugins/kameraklient/gpstatus.cpp +++ b/kipi-plugins/kameraklient/gpstatus.cpp @@ -26,10 +26,10 @@ namespace KIPIKameraKlientPlugin { -float GPtqStatus::target = 0.0; -bool GPtqStatus::cancel = false; +float GPStatus::target = 0.0; +bool GPStatus::cancel = false; -GPtqStatus::GPtqStatus() : TQObject() { +GPStatus::GPStatus() : TQObject() { context = gp_context_new(); cancel = false; gp_context_set_cancel_func(context, cancel_func, 0); @@ -38,21 +38,21 @@ GPtqStatus::GPtqStatus() : TQObject() { gp_context_set_progress_funcs(context, progress_start_func, progress_update_func, progress_stop_func, 0); } -GPtqStatus::~GPtqStatus() { +GPStatus::~GPStatus() { if(context) { gp_context_unref(context); } } -void GPtqStatus::cancelOperation() { +void GPStatus::cancelOperation() { cancel = true; } -GPContextFeedback GPtqStatus::cancel_func(GPContext *, void *) { +GPContextFeedback GPStatus::cancel_func(GPContext *, void *) { return (cancel ? GP_CONTEXT_FEEDBACK_CANCEL : GP_CONTEXT_FEEDBACK_OK); } -void GPtqStatus::error_func(GPContext *, const char *format, va_list args, void *) { +void GPStatus::error_func(GPContext *, const char *format, va_list args, void *) { char buf[4096] = ""; int nSize = vsnprintf( buf, 4096, format, args ); if(nSize > 4094) { @@ -64,7 +64,7 @@ void GPtqStatus::error_func(GPContext *, const char *format, va_list args, void GPMessages::gpMessagesWrapper()->emit errorMessage(error); } -void GPtqStatus::status_func (GPContext *, const char *format, va_list args, void *) { +void GPStatus::status_func (GPContext *, const char *format, va_list args, void *) { char buf[4096] = ""; int nSize = vsnprintf( buf, 4096, format, args ); if(nSize > 4094) { @@ -76,7 +76,7 @@ void GPtqStatus::status_func (GPContext *, const char *format, va_list args, voi GPMessages::gpMessagesWrapper()->emit statusChanged(status); } -unsigned int GPtqStatus::progress_start_func(GPContext *, float _target, const char *format, va_list args, void *) { +unsigned int GPStatus::progress_start_func(GPContext *, float _target, const char *format, va_list args, void *) { char buf[4096] = ""; int nSize = vsnprintf( buf, 4096, format, args ); if(nSize > 4094) { @@ -89,12 +89,12 @@ unsigned int GPtqStatus::progress_start_func(GPContext *, float _target, const c return GP_OK; } -void GPtqStatus::progress_update_func(GPContext *, unsigned int, float current, void *) { +void GPStatus::progress_update_func(GPContext *, unsigned int, float current, void *) { int percentage = int(100.0 * current/target); GPMessages::gpMessagesWrapper()->emit progressChanged(percentage); } -void GPtqStatus::progress_stop_func(GPContext *, unsigned int, void *) { +void GPStatus::progress_stop_func(GPContext *, unsigned int, void *) { GPMessages::gpMessagesWrapper()->emit progressChanged(0); } diff --git a/kipi-plugins/kameraklient/gpstatus.h b/kipi-plugins/kameraklient/gpstatus.h index 1dccb13..132acc8 100644 --- a/kipi-plugins/kameraklient/gpstatus.h +++ b/kipi-plugins/kameraklient/gpstatus.h @@ -33,14 +33,14 @@ extern "C" { namespace KIPIKameraKlientPlugin { -class GPtqStatus : public TQObject { +class GPStatus : public TQObject { Q_OBJECT TQ_OBJECT friend class GPCamera; public: - GPtqStatus(); - ~GPtqStatus(); + GPStatus(); + ~GPStatus(); void cancelOperation(); private: diff --git a/kipi-plugins/kameraklient/kameraklient.h b/kipi-plugins/kameraklient/kameraklient.h index 9e4ca1a..eeee784 100644 --- a/kipi-plugins/kameraklient/kameraklient.h +++ b/kipi-plugins/kameraklient/kameraklient.h @@ -40,7 +40,7 @@ public: virtual void setup(TQWidget* widget); virtual KIPI::Category category(KAction*) const; TQString id() const { - return TQString::tqfromLatin1("kameraklient"); + return TQString::fromLatin1("kameraklient"); } KAction* mKameraKlientAction; diff --git a/kipi-plugins/kameraklient/setupcamera.cpp b/kipi-plugins/kameraklient/setupcamera.cpp index 1ebad16..5677182 100644 --- a/kipi-plugins/kameraklient/setupcamera.cpp +++ b/kipi-plugins/kameraklient/setupcamera.cpp @@ -94,7 +94,7 @@ SetupCamera::SetupCamera(TQWidget* parent, const char* name) groupBox->tqlayout()->setMargin(5); TQGridLayout* groupBoxLayout = new TQGridLayout(groupBox->tqlayout()); - groupBoxLayout->tqsetAlignment( TQt::AlignTop ); + groupBoxLayout->setAlignment( TQt::AlignTop ); listView_ = new TQListView( groupBox ); listView_->addColumn(i18n("Model")); listView_->addColumn(i18n("Port")); diff --git a/kipi-plugins/kameraklient/thumbitem.cpp b/kipi-plugins/kameraklient/thumbitem.cpp index 72dbd54..608fd1f 100644 --- a/kipi-plugins/kameraklient/thumbitem.cpp +++ b/kipi-plugins/kameraklient/thumbitem.cpp @@ -52,7 +52,7 @@ ThumbItemLineEdit::ThumbItemLineEdit(const TQString& text, TQWidget* parent, Thu setWrapColumnOrWidth(item->pixmapRect().width()); resize(200, 200); setText(text); - tqsetAlignment(TQt::AlignCenter); + setAlignment(TQt::AlignCenter); resize(wrapColumnOrWidth() + 2, heightForWidth(wrapColumnOrWidth()) + 2); } diff --git a/kipi-plugins/kameraklient/thumbview.cpp b/kipi-plugins/kameraklient/thumbview.cpp index cca8ee6..d1135ba 100644 --- a/kipi-plugins/kameraklient/thumbview.cpp +++ b/kipi-plugins/kameraklient/thumbview.cpp @@ -290,14 +290,14 @@ void ThumbView::viewportPaintEvent(TQPaintEvent *pe) { for ( ; item; item = c->items.next()) { TQRect ir(contentsRectToViewport(item->rect())); if (r.intersects(ir)) { - item->paintItem(&painter, tqcolorGroup()); + item->paintItem(&painter, colorGroup()); paintRegion -= TQRegion(ir); } } } } painter.setClipRegion(paintRegion); - painter.fillRect(r, tqcolorGroup().base()); + painter.fillRect(r, colorGroup().base()); painter.end(); } @@ -393,7 +393,7 @@ void ThumbView::drawRubber(TQPainter *p) { TQRect r(d->rubber->normalize()); r = contentsRectToViewport(r); TQPoint pnt(r.x(), r.y()); - tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, TQRect( pnt.x(), pnt.y(), r.width(), r.height()), tqcolorGroup(), TQStyle::Style_Default, TQStyleOption(tqcolorGroup().base())); + tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, TQRect( pnt.x(), pnt.y(), r.width(), r.height()), colorGroup(), TQStyle::Style_Default, TQStyleOption(colorGroup().base())); } void ThumbView::contentsMousePressEvent(TQMouseEvent *e) { diff --git a/kipi-plugins/metadataedit/exifdatetime.cpp b/kipi-plugins/metadataedit/exifdatetime.cpp index dac52c5..c5da242 100644 --- a/kipi-plugins/metadataedit/exifdatetime.cpp +++ b/kipi-plugins/metadataedit/exifdatetime.cpp @@ -104,7 +104,7 @@ EXIFDateTime::EXIFDateTime(TQWidget* parent) d->dateCreatedSubSecCheck = new TQCheckBox(i18n("Creation sub-second"), parent); d->dateCreatedSel = new KDateTimeWidget(parent); d->dateCreatedSubSecEdit = new KIntSpinBox(0, 999, 1, 0, 10, parent); - d->dateCreatedSel->setDateTime(TQDateTime::tqcurrentDateTime()); + d->dateCreatedSel->setDateTime(TQDateTime::currentDateTime()); d->syncHOSTDateCheck = new TQCheckBox(i18n("Sync creation date entered through %1") .tqarg(KApplication::kApplication()->aboutData()->appName()), parent); @@ -130,7 +130,7 @@ EXIFDateTime::EXIFDateTime(TQWidget* parent) d->dateOriginalSubSecCheck = new TQCheckBox(i18n("Original sub-second"), parent); d->dateOriginalSel = new KDateTimeWidget(parent); d->dateOriginalSubSecEdit = new KIntSpinBox(0, 999, 1, 0, 10, parent); - d->dateOriginalSel->setDateTime(TQDateTime::tqcurrentDateTime()); + d->dateOriginalSel->setDateTime(TQDateTime::currentDateTime()); grid->addMultiCellWidget(d->dateOriginalCheck, 5, 5, 0, 0); grid->addMultiCellWidget(d->dateOriginalSubSecCheck, 5, 5, 1, 2); grid->addMultiCellWidget(d->dateOriginalSel, 6, 6, 0, 0); @@ -147,7 +147,7 @@ EXIFDateTime::EXIFDateTime(TQWidget* parent) d->dateDigitalizedSubSecCheck = new TQCheckBox(i18n("Digitization sub-second"), parent); d->dateDigitalizedSel = new KDateTimeWidget(parent); d->dateDigitalizedSubSecEdit = new KIntSpinBox(0, 999, 1, 0, 10, parent); - d->dateDigitalizedSel->setDateTime(TQDateTime::tqcurrentDateTime()); + d->dateDigitalizedSel->setDateTime(TQDateTime::currentDateTime()); grid->addMultiCellWidget(d->dateDigitalizedCheck, 7, 7, 0, 0); grid->addMultiCellWidget(d->dateDigitalizedSubSecCheck, 7, 7, 1, 2); grid->addMultiCellWidget(d->dateDigitalizedSel, 8, 8, 0, 0); @@ -269,7 +269,7 @@ void EXIFDateTime::readMetadata(TQByteArray& exifData) TQDateTime datetime; TQString datetimeStr, data; - d->dateCreatedSel->setDateTime(TQDateTime::tqcurrentDateTime()); + d->dateCreatedSel->setDateTime(TQDateTime::currentDateTime()); d->dateCreatedCheck->setChecked(false); datetimeStr = exiv2Iface.getExifTagString("Exif.Image.DateTime", false); if (!datetimeStr.isEmpty()) @@ -300,7 +300,7 @@ void EXIFDateTime::readMetadata(TQByteArray& exifData) } d->dateCreatedSubSecEdit->setEnabled(d->dateCreatedSubSecCheck->isChecked()); - d->dateOriginalSel->setDateTime(TQDateTime::tqcurrentDateTime()); + d->dateOriginalSel->setDateTime(TQDateTime::currentDateTime()); d->dateOriginalCheck->setChecked(false); datetimeStr = exiv2Iface.getExifTagString("Exif.Photo.DateTimeOriginal", false); if (!datetimeStr.isEmpty()) @@ -329,7 +329,7 @@ void EXIFDateTime::readMetadata(TQByteArray& exifData) } d->dateOriginalSubSecEdit->setEnabled(d->dateOriginalSubSecCheck->isChecked()); - d->dateDigitalizedSel->setDateTime(TQDateTime::tqcurrentDateTime()); + d->dateDigitalizedSel->setDateTime(TQDateTime::currentDateTime()); d->dateDigitalizedCheck->setChecked(false); datetimeStr = exiv2Iface.getExifTagString("Exif.Photo.DateTimeDigitized", false); if (!datetimeStr.isEmpty()) diff --git a/kipi-plugins/metadataedit/exifdevice.cpp b/kipi-plugins/metadataedit/exifdevice.cpp index 890a1e3..6e073b0 100644 --- a/kipi-plugins/metadataedit/exifdevice.cpp +++ b/kipi-plugins/metadataedit/exifdevice.cpp @@ -176,7 +176,7 @@ EXIFDevice::EXIFDevice(TQWidget* parent) d->exposureTimeNumEdit = new KIntSpinBox(1, 100000, 1, 1, 10, parent); d->exposureTimeDenEdit = new KIntSpinBox(1, 100000, 1, 1, 10, parent); TQLabel *exposureLabel = new TQLabel("/", parent); - exposureLabel->tqsetAlignment (TQt::AlignRight|TQt::AlignVCenter); + exposureLabel->setAlignment (TQt::AlignRight|TQt::AlignVCenter); grid->addMultiCellWidget(d->exposureTimeCheck, 5, 5, 0, 0); grid->addMultiCellWidget(d->exposureTimeNumEdit, 5, 5, 2, 2); grid->addMultiCellWidget(exposureLabel, 5, 5, 3, 3); diff --git a/kipi-plugins/metadataedit/iptccategories.cpp b/kipi-plugins/metadataedit/iptccategories.cpp index 7cd3193..5aaf09c 100644 --- a/kipi-plugins/metadataedit/iptccategories.cpp +++ b/kipi-plugins/metadataedit/iptccategories.cpp @@ -84,7 +84,7 @@ IPTCCategories::IPTCCategories(TQWidget* parent) { d = new IPTCCategoriesPriv; TQGridLayout *grid = new TQGridLayout(parent, 6, 1, 0, KDialog::spacingHint()); - grid->tqsetAlignment( TQt::AlignTop ); + grid->setAlignment( TQt::AlignTop ); // IPTC only accept printable Ascii char. TQRegExp asciiRx("[\x20-\x7F]+$"); diff --git a/kipi-plugins/metadataedit/iptcdatetime.cpp b/kipi-plugins/metadataedit/iptcdatetime.cpp index df101d1..f7ff0e1 100644 --- a/kipi-plugins/metadataedit/iptcdatetime.cpp +++ b/kipi-plugins/metadataedit/iptcdatetime.cpp @@ -118,7 +118,7 @@ IPTCDateTime::IPTCDateTime(TQWidget* parent) parent); d->syncEXIFDateCheck = new TQCheckBox(i18n("Sync EXIF creation date"), parent); KSeparator *line = new KSeparator(Qt::Horizontal, parent); - d->dateCreatedSel->setDate(TQDate::tqcurrentDate()); + d->dateCreatedSel->setDate(TQDate::currentDate()); d->timeCreatedSel->setTime(TQTime::currentTime()); grid->addMultiCellWidget(d->dateCreatedCheck, 0, 0, 0, 0); grid->addMultiCellWidget(d->timeCreatedCheck, 0, 0, 1, 2); @@ -138,7 +138,7 @@ IPTCDateTime::IPTCDateTime(TQWidget* parent) d->timeReleasedCheck = new TQCheckBox(i18n("Release time"), parent); d->dateReleasedSel = new KDateWidget(parent); d->timeReleasedSel = new KTimeWidget(parent); - d->dateReleasedSel->setDate(TQDate::tqcurrentDate()); + d->dateReleasedSel->setDate(TQDate::currentDate()); d->timeReleasedSel->setTime(TQTime::currentTime()); grid->addMultiCellWidget(d->dateReleasedCheck, 5, 5, 0, 0); grid->addMultiCellWidget(d->timeReleasedCheck, 5, 5, 1, 2); @@ -155,7 +155,7 @@ IPTCDateTime::IPTCDateTime(TQWidget* parent) d->timeExpiredCheck = new TQCheckBox(i18n("Expiration time"), parent); d->dateExpiredSel = new KDateWidget(parent); d->timeExpiredSel = new KTimeWidget(parent); - d->dateExpiredSel->setDate(TQDate::tqcurrentDate()); + d->dateExpiredSel->setDate(TQDate::currentDate()); d->timeExpiredSel->setTime(TQTime::currentTime()); grid->addMultiCellWidget(d->dateExpiredCheck, 7, 7, 0, 0); grid->addMultiCellWidget(d->timeExpiredCheck, 7, 7, 1, 2); @@ -172,7 +172,7 @@ IPTCDateTime::IPTCDateTime(TQWidget* parent) d->timeDigitalizedCheck = new TQCheckBox(i18n("Digitization time"), parent); d->dateDigitalizedSel = new KDateWidget(parent); d->timeDigitalizedSel = new KTimeWidget(parent); - d->dateDigitalizedSel->setDate(TQDate::tqcurrentDate()); + d->dateDigitalizedSel->setDate(TQDate::currentDate()); d->timeDigitalizedSel->setTime(TQTime::currentTime()); grid->addMultiCellWidget(d->dateDigitalizedCheck, 9, 9, 0, 0); grid->addMultiCellWidget(d->timeDigitalizedCheck, 9, 9, 1, 2); @@ -314,7 +314,7 @@ void IPTCDateTime::readMetadata(TQByteArray& iptcData) dateStr = exiv2Iface.getIptcTagString("Iptc.Application2.DateCreated", false); timeStr = exiv2Iface.getIptcTagString("Iptc.Application2.TimeCreated", false); - d->dateCreatedSel->setDate(TQDate::tqcurrentDate()); + d->dateCreatedSel->setDate(TQDate::currentDate()); d->dateCreatedCheck->setChecked(false); if (!dateStr.isEmpty()) { @@ -345,7 +345,7 @@ void IPTCDateTime::readMetadata(TQByteArray& iptcData) dateStr = exiv2Iface.getIptcTagString("Iptc.Application2.ReleaseDate", false); timeStr = exiv2Iface.getIptcTagString("Iptc.Application2.ReleaseTime", false); - d->dateReleasedSel->setDate(TQDate::tqcurrentDate()); + d->dateReleasedSel->setDate(TQDate::currentDate()); d->dateReleasedCheck->setChecked(false); if (!dateStr.isEmpty()) { @@ -374,7 +374,7 @@ void IPTCDateTime::readMetadata(TQByteArray& iptcData) dateStr = exiv2Iface.getIptcTagString("Iptc.Application2.ExpirationDate", false); timeStr = exiv2Iface.getIptcTagString("Iptc.Application2.ExpirationTime", false); - d->dateExpiredSel->setDate(TQDate::tqcurrentDate()); + d->dateExpiredSel->setDate(TQDate::currentDate()); d->dateExpiredCheck->setChecked(false); if (!dateStr.isEmpty()) { @@ -403,7 +403,7 @@ void IPTCDateTime::readMetadata(TQByteArray& iptcData) dateStr = exiv2Iface.getIptcTagString("Iptc.Application2.DigitizationDate", false); timeStr = exiv2Iface.getIptcTagString("Iptc.Application2.DigitizationTime", false); - d->dateDigitalizedSel->setDate(TQDate::tqcurrentDate()); + d->dateDigitalizedSel->setDate(TQDate::currentDate()); d->dateDigitalizedCheck->setChecked(false); if (!dateStr.isEmpty()) { diff --git a/kipi-plugins/metadataedit/iptceditdialog.cpp b/kipi-plugins/metadataedit/iptceditdialog.cpp index 6be4f97..0b1d3ed 100644 --- a/kipi-plugins/metadataedit/iptceditdialog.cpp +++ b/kipi-plugins/metadataedit/iptceditdialog.cpp @@ -120,7 +120,7 @@ public: IPTCKeywords *keywordsPage; IPTCCategories *categoriesPage; IPTCCredits *creditsPage; - IPTCtqStatus *statusPage; + IPTCStatus *statusPage; IPTCOrigin *originPage; KIPI::Interface *interface; @@ -169,7 +169,7 @@ IPTCEditDialog::IPTCEditDialog(TQWidget* parent, KURL::List urls, KIPI::Interfac d->page_status = addPage(i18n("Status"), i18n("Status Information"), BarIcon("messagebox_info", KIcon::SizeMedium)); - d->statusPage = new IPTCtqStatus(d->page_status); + d->statusPage = new IPTCStatus(d->page_status); d->page_origin = addPage(i18n("Origin"), i18n("Origin Information"), BarIcon("www", KIcon::SizeMedium)); diff --git a/kipi-plugins/metadataedit/iptckeywords.cpp b/kipi-plugins/metadataedit/iptckeywords.cpp index ee85553..89ae7c1 100644 --- a/kipi-plugins/metadataedit/iptckeywords.cpp +++ b/kipi-plugins/metadataedit/iptckeywords.cpp @@ -80,7 +80,7 @@ IPTCKeywords::IPTCKeywords(TQWidget* parent) { d = new IPTCKeywordsPriv; TQGridLayout *grid = new TQGridLayout(parent, 5, 2, 0, KDialog::spacingHint()); - grid->tqsetAlignment( TQt::AlignTop ); + grid->setAlignment( TQt::AlignTop ); // IPTC only accept printable Ascii char. TQRegExp asciiRx("[\x20-\x7F]+$"); diff --git a/kipi-plugins/metadataedit/iptcstatus.cpp b/kipi-plugins/metadataedit/iptcstatus.cpp index e36bf74..6b05f46 100644 --- a/kipi-plugins/metadataedit/iptcstatus.cpp +++ b/kipi-plugins/metadataedit/iptcstatus.cpp @@ -88,7 +88,7 @@ public: MetadataCheckBox *objectAttributeCheck; }; -IPTCtqStatus::IPTCtqStatus(TQWidget* parent) +IPTCStatus::IPTCStatus(TQWidget* parent) : TQWidget(parent) { d = new IPTCStatusPriv; @@ -294,12 +294,12 @@ IPTCtqStatus::IPTCtqStatus(TQWidget* parent) this, TQT_SIGNAL(signalModified())); } -IPTCtqStatus::~IPTCtqStatus() +IPTCStatus::~IPTCStatus() { delete d; } -void IPTCtqStatus::readMetadata(TQByteArray& iptcData) +void IPTCStatus::readMetadata(TQByteArray& iptcData) { blockSignals(true); KExiv2Iface::KExiv2 exiv2Iface; @@ -417,7 +417,7 @@ void IPTCtqStatus::readMetadata(TQByteArray& iptcData) blockSignals(false); } -void IPTCtqStatus::applyMetadata(TQByteArray& iptcData) +void IPTCStatus::applyMetadata(TQByteArray& iptcData) { KExiv2Iface::KExiv2 exiv2Iface; exiv2Iface.setIptc(iptcData); diff --git a/kipi-plugins/metadataedit/iptcstatus.h b/kipi-plugins/metadataedit/iptcstatus.h index a28744c..79b77a4 100644 --- a/kipi-plugins/metadataedit/iptcstatus.h +++ b/kipi-plugins/metadataedit/iptcstatus.h @@ -33,15 +33,15 @@ namespace KIPIMetadataEditPlugin class IPTCStatusPriv; -class IPTCtqStatus : public TQWidget +class IPTCStatus : public TQWidget { Q_OBJECT TQ_OBJECT public: - IPTCtqStatus(TQWidget* parent); - ~IPTCtqStatus(); + IPTCStatus(TQWidget* parent); + ~IPTCStatus(); void applyMetadata(TQByteArray& iptcData); void readMetadata(TQByteArray& iptcData); diff --git a/kipi-plugins/metadataedit/iptcsubjects.cpp b/kipi-plugins/metadataedit/iptcsubjects.cpp index d21a96e..b84ae0e 100644 --- a/kipi-plugins/metadataedit/iptcsubjects.cpp +++ b/kipi-plugins/metadataedit/iptcsubjects.cpp @@ -80,7 +80,7 @@ IPTCSubjects::IPTCSubjects(TQWidget* parent) { d = new IPTCSubjectsPriv; TQGridLayout *grid = new TQGridLayout(parent, 5, 2, 0, KDialog::spacingHint()); - grid->tqsetAlignment( TQt::AlignTop ); + grid->setAlignment( TQt::AlignTop ); // IPTC only accept printable Ascii char. TQRegExp asciiRx("[\x20-\x7F]+$"); diff --git a/kipi-plugins/mpegencoder/kimg2mpg.cpp b/kipi-plugins/mpegencoder/kimg2mpg.cpp index be78b6d..49f3cd3 100644 --- a/kipi-plugins/mpegencoder/kimg2mpg.cpp +++ b/kipi-plugins/mpegencoder/kimg2mpg.cpp @@ -265,8 +265,8 @@ KImg2mpgData::KImg2mpgData(KIPI::Interface* interface, TQWidget *parent, const c readSettings(); - int maxW = TQMAX( m_VideoFormatComboBox->tqsizeHint().width(), - m_ChromaComboBox->tqsizeHint().width() ); + int maxW = TQMAX( m_VideoFormatComboBox->sizeHint().width(), + m_ChromaComboBox->sizeHint().width() ); m_ChromaComboBox->setMinimumWidth( maxW ); m_VideoFormatComboBox->setMinimumWidth( maxW ); diff --git a/kipi-plugins/mpegencoder/kimg2mpgbase.ui b/kipi-plugins/mpegencoder/kimg2mpgbase.ui index bcfee60..b83e644 100644 --- a/kipi-plugins/mpegencoder/kimg2mpgbase.ui +++ b/kipi-plugins/mpegencoder/kimg2mpgbase.ui @@ -23,13 +23,13 @@ 0 - + 0 0 - + 32767 32767 @@ -88,7 +88,7 @@ Fixed - + 20 5 @@ -301,7 +301,7 @@ Change it if you have problems with the default value. Minimum - + 20 5 @@ -339,7 +339,7 @@ Change it if you have problems with the default value. Fixed - + 20 5 @@ -540,7 +540,7 @@ Black is a good value for this. Minimum - + 20 5 @@ -622,7 +622,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr Fixed - + 20 20 @@ -649,7 +649,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr 0 - + 0 0 @@ -674,7 +674,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr 0 - + 0 0 @@ -699,7 +699,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr 0 - + 0 0 @@ -724,7 +724,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr 0 - + 0 0 @@ -749,7 +749,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr Fixed - + 20 20 @@ -776,7 +776,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr 0 - + 128 128 @@ -846,13 +846,13 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr 0 - + 0 0 - + 32767 32767 @@ -893,7 +893,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr Fixed - + 20 20 @@ -912,7 +912,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr 0 - + 22 22 @@ -932,7 +932,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr Fixed - + 20 20 @@ -953,13 +953,13 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr 0 - + 0 0 - + 32767 32767 @@ -1001,7 +1001,7 @@ This audio file name will be multiplexed with the portfolio video. Fixed - + 20 20 @@ -1020,7 +1020,7 @@ This audio file name will be multiplexed with the portfolio video. 0 - + 22 22 @@ -1040,7 +1040,7 @@ This audio file name will be multiplexed with the portfolio video. Fixed - + 20 20 @@ -1061,13 +1061,13 @@ This audio file name will be multiplexed with the portfolio video. 0 - + 50 25 - + 32767 30 @@ -1098,13 +1098,13 @@ This audio file name will be multiplexed with the portfolio video. 0 - + 0 27 - + 32767 30 @@ -1126,7 +1126,7 @@ This audio file name will be multiplexed with the portfolio video. Fixed - + 30 20 @@ -1171,7 +1171,7 @@ The program uses the 'images2mpg' bash script. Expanding - + 30 51 @@ -1190,7 +1190,7 @@ The program uses the 'images2mpg' bash script. 0 - + 62 0 @@ -1210,7 +1210,7 @@ The program uses the 'images2mpg' bash script. Expanding - + 30 51 diff --git a/kipi-plugins/picasawebexport/picasaweblogin.cpp b/kipi-plugins/picasawebexport/picasaweblogin.cpp index 413a824..9fcad57 100644 --- a/kipi-plugins/picasawebexport/picasaweblogin.cpp +++ b/kipi-plugins/picasawebexport/picasaweblogin.cpp @@ -50,7 +50,7 @@ PicasawebLogin::PicasawebLogin(TQWidget* parent, const TQString& header, TQVBoxLayout* vbox = new TQVBoxLayout( this, 5, 5, "vbox"); m_headerLabel = new TQLabel(this); - m_headerLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, + m_headerLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); m_headerLabel->setText(header); vbox->addWidget( m_headerLabel ); @@ -96,7 +96,7 @@ PicasawebLogin::PicasawebLogin(TQWidget* parent, const TQString& header, vbox->addLayout( btnLayout ); - resize( TQSize(300, 150).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(300, 150).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); m_nameEdit->setText(_name); diff --git a/kipi-plugins/picasawebexport/picasawebwidget.cpp b/kipi-plugins/picasawebexport/picasawebwidget.cpp index b6c6be9..f1a1901 100644 --- a/kipi-plugins/picasawebexport/picasawebwidget.cpp +++ b/kipi-plugins/picasawebexport/picasawebwidget.cpp @@ -58,7 +58,7 @@ PicasawebWidget::PicasawebWidget(TQWidget* parent, const char* name, WFlags fl) if ( !name ) setName("PicasawebWidget"); - //resize( TQSize(600, 400).expandedTo(tqminimumSizeHint()) ); + //resize( TQSize(600, 400).expandedTo(minimumSizeHint()) ); //clearWState( WState_Polished ); } diff --git a/kipi-plugins/picasawebexport/picasawebwindow.cpp b/kipi-plugins/picasawebexport/picasawebwindow.cpp index eaa0db4..b991bab 100644 --- a/kipi-plugins/picasawebexport/picasawebwindow.cpp +++ b/kipi-plugins/picasawebexport/picasawebwindow.cpp @@ -374,7 +374,7 @@ void PicasawebWindow::slotAuthCancel() void PicasawebWindow::slotCreateNewAlbum() { NewAlbumDialog *dlg = new NewAlbumDialog(TQT_TQWIDGET(kapp->activeWindow())); - dlg->m_dateAndTimeEdit->setDateTime(TQDateTime::tqcurrentDateTime()); + dlg->m_dateAndTimeEdit->setDateTime(TQDateTime::currentDateTime()); TQString test; int t = dlg->exec(); diff --git a/kipi-plugins/printwizard/frmprintwizardbase.ui b/kipi-plugins/printwizard/frmprintwizardbase.ui index 55ebac8..2d1a9fd 100644 --- a/kipi-plugins/printwizard/frmprintwizardbase.ui +++ b/kipi-plugins/printwizard/frmprintwizardbase.ui @@ -91,7 +91,7 @@ Expanding - + 16 300 @@ -132,7 +132,7 @@ Fixed - + 20 31 @@ -170,7 +170,7 @@ Click the 'Next' button to begin. Expanding - + 16 381 @@ -233,7 +233,7 @@ Click the 'Next' button to begin. Expanding - + 16 471 @@ -359,7 +359,7 @@ Click the 'Next' button to begin. Expanding - + 210 20 @@ -483,7 +483,7 @@ Click the 'Next' button to begin. 0 - + 200 110 @@ -725,7 +725,7 @@ Click the 'Next' button to begin. Expanding - + 40 20 @@ -768,7 +768,7 @@ Click the 'Next' button to begin. Fixed - + 19 26 @@ -817,7 +817,7 @@ Click the 'Next' button to begin. Fixed - + 19 26 @@ -916,7 +916,7 @@ Click the 'Next' button to begin. Expanding - + 0 20 @@ -988,7 +988,7 @@ Click the 'Next' button to begin. ListPhotoSizes - + 150 200 @@ -1063,7 +1063,7 @@ Click the 'Next' button to begin. 0 - + 30 0 @@ -1117,7 +1117,7 @@ Click the 'Next' button to begin. 0 - + 30 0 @@ -1171,7 +1171,7 @@ Click the 'Next' button to begin. 0 - + 30 0 @@ -1198,7 +1198,7 @@ Click the 'Next' button to begin. Expanding - + 21 105 @@ -1283,7 +1283,7 @@ Click the 'Next' button to begin. Expanding - + 20 80 @@ -1421,7 +1421,7 @@ Click the 'Next' button to begin. Expanding - + 20 20 @@ -1440,13 +1440,13 @@ Click the 'Next' button to begin. 0 - + 260 367 - + 260 367 @@ -1475,7 +1475,7 @@ Click the 'Next' button to begin. Expanding - + 21 21 @@ -1504,7 +1504,7 @@ Click the 'Next' button to begin. 0 - + 30 32767 @@ -1530,7 +1530,7 @@ Click the 'Next' button to begin. Expanding - + 161 21 @@ -1549,7 +1549,7 @@ Click the 'Next' button to begin. 0 - + 30 32767 @@ -1579,7 +1579,7 @@ Click the 'Next' button to begin. Expanding - + 20 20 @@ -1689,7 +1689,7 @@ Click the 'Next' button to begin. Expanding - + 41 21 @@ -1708,7 +1708,7 @@ Click the 'Next' button to begin. cropFrame - + 200 200 @@ -1750,7 +1750,7 @@ Click the 'Next' button to begin. Expanding - + 127 16 @@ -1801,7 +1801,7 @@ Click the 'Next' button to begin. Expanding - + 127 16 @@ -1838,7 +1838,7 @@ Click the 'Next' button to begin. Expanding - + 41 21 @@ -1912,7 +1912,7 @@ Click the 'Next' button to begin. Expanding - + 16 438 @@ -1953,7 +1953,7 @@ Click the 'Next' button to begin. Fixed - + 16 70 @@ -1989,7 +1989,7 @@ Click the 'Next' button to begin. Expanding - + 31 361 @@ -2014,7 +2014,7 @@ Click the 'Next' button to begin. Expanding - + 360 20 @@ -2112,7 +2112,7 @@ Click the 'Next' button to begin. Expanding - + 0 289 @@ -2153,7 +2153,7 @@ Click the 'Next' button to begin. Fixed - + 16 70 @@ -2194,7 +2194,7 @@ Click the 'Next' button to begin. Expanding - + 41 371 diff --git a/kipi-plugins/rawconverter/batchdialog.cpp b/kipi-plugins/rawconverter/batchdialog.cpp index b5cc905..729c8f7 100644 --- a/kipi-plugins/rawconverter/batchdialog.cpp +++ b/kipi-plugins/rawconverter/batchdialog.cpp @@ -104,7 +104,7 @@ BatchDialog::BatchDialog(TQWidget* /*parent*/) m_listView->setResizeMode(TQListView::AllColumns); m_listView->setAllColumnsShowFocus(true); m_listView->setSorting(-1); - m_listView->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_listView->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_listView->setSelectionMode(TQListView::Single); m_listView->setMinimumWidth(450); diff --git a/kipi-plugins/rawconverter/previewwidget.cpp b/kipi-plugins/rawconverter/previewwidget.cpp index ed9ee83..1906fdb 100644 --- a/kipi-plugins/rawconverter/previewwidget.cpp +++ b/kipi-plugins/rawconverter/previewwidget.cpp @@ -71,7 +71,7 @@ PreviewWidget::PreviewWidget(TQWidget *parent) setLineWidth(1); setMinimumSize(TQSize(400, 300)); - tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); d->pix = new TQPixmap(400, 300); d->pix->fill(TQt::black); diff --git a/kipi-plugins/sendimages/sendimagesdialog.cpp b/kipi-plugins/sendimages/sendimagesdialog.cpp index cd99279..7f828bc 100644 --- a/kipi-plugins/sendimages/sendimagesdialog.cpp +++ b/kipi-plugins/sendimages/sendimagesdialog.cpp @@ -276,8 +276,8 @@ void SendImagesDialog::setupImagesList(void) m_imageLabel = new TQLabel( m_groupBoxImageList ); m_imageLabel->setFixedHeight( 120 ); - m_imageLabel->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); - m_imageLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); + m_imageLabel->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); + m_imageLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); TQWhatsThis::add( m_imageLabel, i18n( "

Preview of the currently selected image on the list." ) ); grid->addMultiCellWidget(m_imageLabel, 2, 2, 2, 2); @@ -292,14 +292,14 @@ void SendImagesDialog::setupImagesList(void) TQWhatsThis::add( groupBox2, i18n("

The description of the currently selected image on the list.") ); TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() ); - groupBox2Layout->tqsetAlignment( TQt::AlignTop ); + groupBox2Layout->setAlignment( TQt::AlignTop ); m_ImageComments = new KSqueezedTextLabel( groupBox2 ); - m_ImageComments->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); + m_ImageComments->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); groupBox2Layout->addWidget( m_ImageComments ); m_ImageAlbum = new KSqueezedTextLabel( groupBox2 ); - m_ImageAlbum->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); + m_ImageAlbum->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); groupBox2Layout->addWidget( m_ImageAlbum ); vlay->addWidget( groupBox2 ); @@ -439,7 +439,7 @@ void SendImagesDialog::setupEmailOptions(void) TQWhatsThis::add( groupBox2, i18n("

The properties of images to send.") ); TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() ); - groupBox2Layout->tqsetAlignment( TQt::AlignTop ); + groupBox2Layout->setAlignment( TQt::AlignTop ); m_changeImagesProp = new TQCheckBox(i18n("Adjust image properties"), groupBox2); TQWhatsThis::add( m_changeImagesProp, i18n("

If you enable this option, " diff --git a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp index 2a64ab6..835db3d 100644 --- a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp +++ b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp @@ -336,24 +336,24 @@ bool SimpleViewerExport::exportImages() file.open(IO_WriteOnly); TQDomDocument xmlDoc; - xmlDoc.appendChild(xmlDoc.createProcessingInstruction( TQString::tqfromLatin1("xml"), - TQString::tqfromLatin1("version=\"1.0\" encoding=\"UTF-8\"") ) ); - TQDomElement galleryElem = xmlDoc.createElement(TQString::tqfromLatin1("simpleviewerGallery")); + xmlDoc.appendChild(xmlDoc.createProcessingInstruction( TQString::fromLatin1("xml"), + TQString::fromLatin1("version=\"1.0\" encoding=\"UTF-8\"") ) ); + TQDomElement galleryElem = xmlDoc.createElement(TQString::fromLatin1("simpleviewerGallery")); xmlDoc.appendChild( galleryElem ); - galleryElem.setAttribute(TQString::tqfromLatin1("maxImageWidth"), m_configDlg->maxImageDimension()); - galleryElem.setAttribute(TQString::tqfromLatin1("maxImageHeight"), m_configDlg->maxImageDimension()); - galleryElem.setAttribute(TQString::tqfromLatin1("textColor"), TQString(m_configDlg->textColor().name()).replace("#", "0x")); - galleryElem.setAttribute(TQString::tqfromLatin1("frameColor"), TQString(m_configDlg->frameColor().name()).replace("#", "0x")); - galleryElem.setAttribute(TQString::tqfromLatin1("bgColor"), TQString(m_configDlg->backgroundColor().name()).replace("#", "0x")); - galleryElem.setAttribute(TQString::tqfromLatin1("frameWidth"), m_configDlg->frameWidth()); - galleryElem.setAttribute(TQString::tqfromLatin1("stagePadding"), m_configDlg->stagePadding()); - galleryElem.setAttribute(TQString::tqfromLatin1("thumbnailColumns"), m_configDlg->thumbnailColumns()); - galleryElem.setAttribute(TQString::tqfromLatin1("thumbnailRows"), m_configDlg->thumbnailRows()); - galleryElem.setAttribute(TQString::tqfromLatin1("navPosition"), m_configDlg->navPosition()); - galleryElem.setAttribute(TQString::tqfromLatin1("navDirection"), m_configDlg->navDirection()); - galleryElem.setAttribute(TQString::tqfromLatin1("title"), m_configDlg->title()); - galleryElem.setAttribute(TQString::tqfromLatin1("imagePath"), TQString()); - galleryElem.setAttribute(TQString::tqfromLatin1("thumbPath"), TQString()); + galleryElem.setAttribute(TQString::fromLatin1("maxImageWidth"), m_configDlg->maxImageDimension()); + galleryElem.setAttribute(TQString::fromLatin1("maxImageHeight"), m_configDlg->maxImageDimension()); + galleryElem.setAttribute(TQString::fromLatin1("textColor"), TQString(m_configDlg->textColor().name()).replace("#", "0x")); + galleryElem.setAttribute(TQString::fromLatin1("frameColor"), TQString(m_configDlg->frameColor().name()).replace("#", "0x")); + galleryElem.setAttribute(TQString::fromLatin1("bgColor"), TQString(m_configDlg->backgroundColor().name()).replace("#", "0x")); + galleryElem.setAttribute(TQString::fromLatin1("frameWidth"), m_configDlg->frameWidth()); + galleryElem.setAttribute(TQString::fromLatin1("stagePadding"), m_configDlg->stagePadding()); + galleryElem.setAttribute(TQString::fromLatin1("thumbnailColumns"), m_configDlg->thumbnailColumns()); + galleryElem.setAttribute(TQString::fromLatin1("thumbnailRows"), m_configDlg->thumbnailRows()); + galleryElem.setAttribute(TQString::fromLatin1("navPosition"), m_configDlg->navPosition()); + galleryElem.setAttribute(TQString::fromLatin1("navDirection"), m_configDlg->navDirection()); + galleryElem.setAttribute(TQString::fromLatin1("title"), m_configDlg->title()); + galleryElem.setAttribute(TQString::fromLatin1("imagePath"), TQString()); + galleryElem.setAttribute(TQString::fromLatin1("thumbPath"), TQString()); KExiv2Iface::KExiv2 meta; TQImage image; @@ -510,15 +510,15 @@ void SimpleViewerExport::cfgAddImage(TQDomDocument &xmlDoc, TQDomElement &galler comment = TQString(); } - TQDomElement img = xmlDoc.createElement(TQString::tqfromLatin1("image")); + TQDomElement img = xmlDoc.createElement(TQString::fromLatin1("image")); galleryElem.appendChild(img); - TQDomElement name = xmlDoc.createElement(TQString::tqfromLatin1("name")); + TQDomElement name = xmlDoc.createElement(TQString::fromLatin1("name")); img.appendChild(name); TQDomText nametxt = xmlDoc.createTextNode(newName); name.appendChild(nametxt); - TQDomElement caption = xmlDoc.createElement(TQString::tqfromLatin1("caption")); + TQDomElement caption = xmlDoc.createElement(TQString::fromLatin1("caption")); img.appendChild(caption); TQDomText captiontxt = xmlDoc.createTextNode(comment); caption.appendChild(captiontxt); diff --git a/kipi-plugins/slideshow/slideshowconfigbase.ui b/kipi-plugins/slideshow/slideshowconfigbase.ui index 7231a60..07c2e71 100644 --- a/kipi-plugins/slideshow/slideshowconfigbase.ui +++ b/kipi-plugins/slideshow/slideshowconfigbase.ui @@ -23,13 +23,13 @@ 0 - + 0 0 - + 32767 32767 @@ -226,7 +226,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr Expanding - + 31 5 @@ -245,7 +245,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr 0 - + 0 0 @@ -273,7 +273,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr 0 - + 0 0 @@ -301,7 +301,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr 0 - + 0 0 @@ -329,7 +329,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr 0 - + 0 0 @@ -355,7 +355,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr Expanding - + 31 5 @@ -384,7 +384,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr 0 - + 128 128 @@ -473,7 +473,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr 0 - + 238 33 @@ -499,7 +499,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr Expanding - + 21 2 @@ -619,7 +619,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr Expanding - + 21 16 @@ -664,7 +664,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr 0 - + 32767 32767 @@ -689,7 +689,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr 0 - + 32767 32767 @@ -722,7 +722,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr 0 - + 32767 30 @@ -744,7 +744,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr 0 - + 32767 32767 @@ -785,7 +785,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr 0 - + 32767 30 @@ -807,13 +807,13 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr 0 - + 0 0 - + 32767 32767 @@ -841,7 +841,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr Expanding - + 31 2 @@ -862,7 +862,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr Expanding - + 21 5 @@ -940,7 +940,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr Minimum - + 15 21 @@ -990,7 +990,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr Minimum - + 15 21 @@ -1025,7 +1025,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr Expanding - + 81 31 @@ -1058,7 +1058,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr Minimum - + 15 21 @@ -1096,7 +1096,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr Expanding - + 21 5 @@ -1262,7 +1262,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr Expanding - + 31 21 @@ -1314,7 +1314,7 @@ Ken Burns effect doesn't use this cache mechanism. Expanding - + 41 90 @@ -1350,7 +1350,7 @@ Ken Burns effect doesn't use this cache mechanism. Expanding - + 50 20 diff --git a/kipi-plugins/slideshow/toolbar.cpp b/kipi-plugins/slideshow/toolbar.cpp index b8136aa..2f040f9 100644 --- a/kipi-plugins/slideshow/toolbar.cpp +++ b/kipi-plugins/slideshow/toolbar.cpp @@ -63,7 +63,7 @@ ToolBar::ToolBar(TQWidget* parent) lay->addWidget(m_stopBtn); adjustSize(); - tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); m_canHide = true; diff --git a/kipi-plugins/sync/galleryalbumdialog.ui b/kipi-plugins/sync/galleryalbumdialog.ui index 26ee8d9..bd62ba2 100644 --- a/kipi-plugins/sync/galleryalbumdialog.ui +++ b/kipi-plugins/sync/galleryalbumdialog.ui @@ -137,7 +137,7 @@ Expanding - + 20 20 diff --git a/kipi-plugins/sync/galleryconfig.cpp b/kipi-plugins/sync/galleryconfig.cpp index 9fc79f4..f0f19ff 100644 --- a/kipi-plugins/sync/galleryconfig.cpp +++ b/kipi-plugins/sync/galleryconfig.cpp @@ -74,7 +74,7 @@ GalleryEdit::GalleryEdit(TQWidget* pParent, tll->addItem(vbox); mpHeaderLabel = new TQLabel(page); - mpHeaderLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, + mpHeaderLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); mpHeaderLabel->setText(title); vbox->addWidget(mpHeaderLabel); @@ -124,7 +124,7 @@ GalleryEdit::GalleryEdit(TQWidget* pParent, vbox->addLayout( centerLayout ); - resize( TQSize(300, 150).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(300, 150).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); mpNameEdit->setText(pGallery->name()); diff --git a/kipi-plugins/sync/gallerywidget.cpp b/kipi-plugins/sync/gallerywidget.cpp index d9472da..e75c6b7 100644 --- a/kipi-plugins/sync/gallerywidget.cpp +++ b/kipi-plugins/sync/gallerywidget.cpp @@ -87,11 +87,11 @@ GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl ) rightButtonGroupLayout->setMargin( 5 ); m_newAlbumBtn = new TQPushButton( rightButtonGroup, "m_newAlbumBtn" ); - m_newAlbumBtn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_newAlbumBtn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); rightButtonGroupLayout->addWidget( m_newAlbumBtn, 0, TQt::AlignHCenter ); m_addPhotoBtn = new TQPushButton( rightButtonGroup, "m_addPhotoBtn" ); - m_addPhotoBtn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_addPhotoBtn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); rightButtonGroupLayout->addWidget( m_addPhotoBtn, 0, TQt::AlignHCenter ); // ------------------------------------------------------------------------ @@ -111,7 +111,7 @@ GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl ) m_dimensionSpinBox = new TQSpinBox(0, 5000, 10, optionsBox); m_dimensionSpinBox->setValue(600); - m_dimensionSpinBox->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_dimensionSpinBox->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); optionsBoxLayout->addWidget(m_dimensionSpinBox, 1, 1); TQLabel* resizeLabel = new TQLabel(i18n("Maximum dimension:"), optionsBox); @@ -139,7 +139,7 @@ GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl ) // ------------------------------------------------------------------------ - resize( TQSize(600, 400).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(600, 400).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/kipi-plugins/sync/gallerywindow.cpp b/kipi-plugins/sync/gallerywindow.cpp index 336e6d4..aa7c0fd 100644 --- a/kipi-plugins/sync/gallerywindow.cpp +++ b/kipi-plugins/sync/gallerywindow.cpp @@ -332,13 +332,13 @@ void GalleryWindow::slotPhotos( const TQValueList& photoList) TQString( "body { margin: 8px; font-size: %1px; " " color: %2; background-color: %3;}" ) .tqarg( pxSize ) - .tqarg( tqcolorGroup().text().name() ) - .tqarg( tqcolorGroup().base().name() ); + .tqarg( colorGroup().text().name() ) + .tqarg( colorGroup().base().name() ); styleSheet += TQString( "a { font-size: %1px; color: %2; " "text-decoration: none;}" ) .tqarg( pxSize ) - .tqarg( tqcolorGroup().text().name() ); + .tqarg( colorGroup().text().name() ); styleSheet += TQString( "i { font-size: %1px; color: %2; " "text-decoration: none;}" ) .tqarg( pxSize-2 ) diff --git a/kipi-plugins/timeadjust/timeadjustdialog.cpp b/kipi-plugins/timeadjust/timeadjustdialog.cpp index b693ee6..b29f3c7 100644 --- a/kipi-plugins/timeadjust/timeadjustdialog.cpp +++ b/kipi-plugins/timeadjust/timeadjustdialog.cpp @@ -252,7 +252,7 @@ TimeAdjustDialog::TimeAdjustDialog(KIPI::Interface* interface, TQWidget* parent) d->infoLabel = new TQLabel(d->exampleBox); d->exampleAdj = new TQLabel(d->exampleBox); - d->exampleAdj->tqsetAlignment(TQt::AlignCenter); + d->exampleAdj->setAlignment(TQt::AlignCenter); vlay->addStretch(); @@ -301,7 +301,7 @@ void TimeAdjustDialog::slotHelp() void TimeAdjustDialog::slotResetDateToCurrent() { - d->dateCreatedSel->setDateTime(TQDateTime::tqcurrentDateTime()); + d->dateCreatedSel->setDateTime(TQDateTime::currentDateTime()); } void TimeAdjustDialog::closeEvent(TQCloseEvent *e) @@ -328,7 +328,7 @@ void TimeAdjustDialog::readSettings() if (adjType == 2) d->exif->setChecked(true); if (adjType == 3) d->custom->setChecked(true); - TQDateTime current = TQDateTime::tqcurrentDateTime(); + TQDateTime current = TQDateTime::currentDateTime(); d->dateCreatedSel->setDateTime(config.readDateTimeEntry("Custom Date", ¤t)); d->syncEXIFDateCheck->setChecked(config.readBoolEntry("Sync EXIF Date", true)); -- cgit v1.2.1