Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 650c190e4a.
pull/1/head
Timothy Pearson 13 years ago
parent 650c190e4a
commit 3ed629ae12

@ -38,7 +38,7 @@ extern "C"
#undef Unsorted // x headers suck - make qdir.h work with --enable-final #undef Unsorted // x headers suck - make qdir.h work with --enable-final
#include <tqvbox.h> #include <tqvbox.h>
#include <layout.h> #include <tqlayout.h>
#include <tqdir.h> #include <tqdir.h>
#include <tqwidget.h> #include <tqwidget.h>
#include <tqlabel.h> #include <tqlabel.h>
@ -46,7 +46,7 @@ extern "C"
#include <tqgroupbox.h> #include <tqgroupbox.h>
#include <tqstring.h> #include <tqstring.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <textedit.h> #include <tqtextedit.h>
#include <tqimage.h> #include <tqimage.h>
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqcombobox.h> #include <tqcombobox.h>
@ -211,8 +211,8 @@ void AcquireImageDialog::setupImageOptions(void)
m_preview = new TQLabel( groupBox1, "preview" ); m_preview = new TQLabel( groupBox1, "preview" );
m_preview->setFixedHeight( 120 ); m_preview->setFixedHeight( 120 );
m_preview->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); m_preview->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
m_preview->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); m_preview->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
TQWhatsThis::add( m_preview, i18n( "<p>The preview of the target image." ) ); TQWhatsThis::add( m_preview, i18n( "<p>The preview of the target image." ) );
m_preview->setScaledContents( false ); m_preview->setScaledContents( false );
TQImage scanned = m_qimageScanned.smoothScale((m_qimageScanned.width() * 100) / m_qimageScanned.height(), 100); TQImage scanned = m_qimageScanned.smoothScale((m_qimageScanned.width() * 100) / m_qimageScanned.height(), 100);
@ -227,12 +227,12 @@ void AcquireImageDialog::setupImageOptions(void)
TQGroupBox * groupBox2 = new TQGroupBox( i18n("Saving Options"), page_setupImageOptions ); TQGroupBox * groupBox2 = new TQGroupBox( i18n("Saving Options"), page_setupImageOptions );
groupBox2->setColumnLayout(0, Qt::Vertical ); groupBox2->setColumnLayout(0, Qt::Vertical );
groupBox2->layout()->setSpacing( 6 ); groupBox2->tqlayout()->setSpacing( 6 );
groupBox2->layout()->setMargin( 11 ); groupBox2->tqlayout()->setMargin( 11 );
TQWhatsThis::add( groupBox2, i18n("<p>The saving options of the target image.") ); TQWhatsThis::add( groupBox2, i18n("<p>The saving options of the target image.") );
TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->layout() ); TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() );
groupBox2Layout->setAlignment( TQt::AlignTop ); groupBox2Layout->tqsetAlignment( TQt::AlignTop );
m_imageCompression = new KIntNumInput(75, groupBox2); m_imageCompression = new KIntNumInput(75, groupBox2);
m_imageCompression->setRange(1, 100, 1, true ); m_imageCompression->setRange(1, 100, 1, true );
@ -327,27 +327,27 @@ void AcquireImageDialog::setupAlbumsList(void)
TQGroupBox * groupBox2 = new TQGroupBox( i18n("Album Description"), page_setupAlbumsList ); TQGroupBox * groupBox2 = new TQGroupBox( i18n("Album Description"), page_setupAlbumsList );
groupBox2->setColumnLayout(0, Qt::Vertical ); groupBox2->setColumnLayout(0, Qt::Vertical );
groupBox2->layout()->setSpacing( 6 ); groupBox2->tqlayout()->setSpacing( 6 );
groupBox2->layout()->setMargin( 11 ); groupBox2->tqlayout()->setMargin( 11 );
TQWhatsThis::add( groupBox2, i18n("<p>The description of the current Album in the selection list.") ); TQWhatsThis::add( groupBox2, i18n("<p>The description of the current Album in the selection list.") );
TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->layout() ); TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() );
groupBox2Layout->setAlignment( TQt::AlignTop ); groupBox2Layout->tqsetAlignment( TQt::AlignTop );
m_AlbumComments = new KSqueezedTextLabel( groupBox2 ); m_AlbumComments = new KSqueezedTextLabel( groupBox2 );
m_AlbumComments->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); m_AlbumComments->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
groupBox2Layout->addWidget( m_AlbumComments ); groupBox2Layout->addWidget( m_AlbumComments );
m_AlbumCollection = new KSqueezedTextLabel( groupBox2 ); m_AlbumCollection = new KSqueezedTextLabel( groupBox2 );
m_AlbumCollection->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); m_AlbumCollection->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
groupBox2Layout->addWidget( m_AlbumCollection ); groupBox2Layout->addWidget( m_AlbumCollection );
m_AlbumDate = new KSqueezedTextLabel( groupBox2 ); m_AlbumDate = new KSqueezedTextLabel( groupBox2 );
m_AlbumDate->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); m_AlbumDate->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
groupBox2Layout->addWidget( m_AlbumDate ); groupBox2Layout->addWidget( m_AlbumDate );
m_AlbumItems = new KSqueezedTextLabel( groupBox2 ); m_AlbumItems = new KSqueezedTextLabel( groupBox2 );
m_AlbumItems->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); m_AlbumItems->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
groupBox2Layout->addWidget( m_AlbumItems ); groupBox2Layout->addWidget( m_AlbumItems );
vlay->addWidget( groupBox2 ); vlay->addWidget( groupBox2 );
@ -390,10 +390,10 @@ void AcquireImageDialog::slotAlbumSelected( const KURL &url )
items.setNum((*albumIt).images().count()); items.setNum((*albumIt).images().count());
} }
m_AlbumComments->setText( i18n("Caption: %1").arg(comments) ); m_AlbumComments->setText( i18n("Caption: %1").tqarg(comments) );
m_AlbumCollection->setText( i18n("Collection: %1").arg(category) ); m_AlbumCollection->setText( i18n("Collection: %1").tqarg(category) );
m_AlbumDate->setText( i18n("Date: %1").arg(date) ); m_AlbumDate->setText( i18n("Date: %1").tqarg(date) );
m_AlbumItems->setText( i18n("Items: %1").arg( items ) ); m_AlbumItems->setText( i18n("Items: %1").tqarg( items ) );
} }
void AcquireImageDialog::slotOk() void AcquireImageDialog::slotOk()
@ -432,7 +432,7 @@ void AcquireImageDialog::slotOk()
{ {
for (int idx = 1; idx < 100 ; ++idx) for (int idx = 1; idx < 100 ; ++idx)
{ {
url.setFileName(TQString("%1_%2%3").arg(fileName).arg(idx).arg(ext)); url.setFileName(TQString("%1_%2%3").tqarg(fileName).tqarg(idx).tqarg(ext));
kdDebug(51001) << "File already exist. Try to fixed target Url to: " << url.prettyURL() << endl; kdDebug(51001) << "File already exist. Try to fixed target Url to: " << url.prettyURL() << endl;
if (!KIO::NetAccess::exists(url, false NETACCESS_WIDGET)) if (!KIO::NetAccess::exists(url, false NETACCESS_WIDGET))
@ -471,7 +471,7 @@ void AcquireImageDialog::slotOk()
if ( !ok ) if ( !ok )
{ {
KMessageBox::error(this, i18n("Cannot write image file \"%1\".").arg(imagePath)); KMessageBox::error(this, i18n("Cannot write image file \"%1\".").tqarg(imagePath));
return; return;
} }
@ -480,7 +480,7 @@ void AcquireImageDialog::slotOk()
{ {
if (!KIO::NetAccess::upload(imagePath, url NETACCESS_WIDGET)) if (!KIO::NetAccess::upload(imagePath, url NETACCESS_WIDGET))
{ {
KMessageBox::error(this, i18n("Could not upload image to \"%1\".").arg(url.prettyURL())); KMessageBox::error(this, i18n("Could not upload image to \"%1\".").tqarg(url.prettyURL()));
return; return;
} }
} }
@ -491,7 +491,7 @@ void AcquireImageDialog::slotOk()
if ( !ok ) if ( !ok )
{ {
KMessageBox::error(this, i18n("<qt>Error when informing the application about the new image. " KMessageBox::error(this, i18n("<qt>Error when informing the application about the new image. "
"The error was: %1</qt>" ).arg( err ) ); "The error was: %1</qt>" ).tqarg( err ) );
return; return;
} }

@ -32,7 +32,7 @@ extern "C"
// Include files for TQt // Include files for TQt
#include <layout.h> #include <tqlayout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqfileinfo.h> #include <tqfileinfo.h>
#include <tqapplication.h> #include <tqapplication.h>
@ -75,7 +75,7 @@ ScreenGrabDialog::ScreenGrabDialog( KIPI::Interface* interface, TQWidget *parent
m_inSelect = false; m_inSelect = false;
TQWidget* box = new TQWidget( this ); TQWidget* box = new TQWidget( this );
setMainWidget(box); setMainWidget(box);
TQVBoxLayout *layout = new TQVBoxLayout(box); TQVBoxLayout *tqlayout = new TQVBoxLayout(box);
//--------------------------------------------- //---------------------------------------------
@ -83,31 +83,31 @@ ScreenGrabDialog::ScreenGrabDialog( KIPI::Interface* interface, TQWidget *parent
"application window. If you grab a single window your mouse\n" "application window. If you grab a single window your mouse\n"
"cursor will change into crosshairs; then, simply select the\n" "cursor will change into crosshairs; then, simply select the\n"
"window with your mouse."), box); "window with your mouse."), box);
layout->addWidget(label1); tqlayout->addWidget(label1);
//--------------------------------------------- //---------------------------------------------
m_desktopCB = new TQCheckBox(i18n("Grab the entire desktop"), box); m_desktopCB = new TQCheckBox(i18n("Grab the entire desktop"), box);
TQWhatsThis::add( m_desktopCB, i18n( "<p>If you enable this option, the entire desktop will be grabbed; " TQWhatsThis::add( m_desktopCB, i18n( "<p>If you enable this option, the entire desktop will be grabbed; "
"otherwise, only the active windows." ) ); "otherwise, only the active windows." ) );
layout->addWidget(m_desktopCB); tqlayout->addWidget(m_desktopCB);
//--------------------------------------------- //---------------------------------------------
m_hideCB = new TQCheckBox(i18n("Hide all host application windows"), box); m_hideCB = new TQCheckBox(i18n("Hide all host application windows"), box);
TQWhatsThis::add( m_hideCB, i18n( "<p>If you enable this option, all host application windows will be hidden " TQWhatsThis::add( m_hideCB, i18n( "<p>If you enable this option, all host application windows will be hidden "
"during the grab operation." ) ); "during the grab operation." ) );
layout->addWidget(m_hideCB); tqlayout->addWidget(m_hideCB);
//--------------------------------------------- //---------------------------------------------
TQLabel *label2 = new TQLabel(i18n("Delay:"), box); TQLabel *label2 = new TQLabel(i18n("Delay:"), box);
layout->addWidget(label2); tqlayout->addWidget(label2);
m_delay = new KIntNumInput(box); m_delay = new KIntNumInput(box);
TQWhatsThis::add( m_delay, i18n( "<p>The delay in seconds before the grab operation is started.") ); TQWhatsThis::add( m_delay, i18n( "<p>The delay in seconds before the grab operation is started.") );
m_delay->setRange(0, 60); m_delay->setRange(0, 60);
layout->addWidget(m_delay); tqlayout->addWidget(m_delay);
layout->addStretch(1); tqlayout->addStretch(1);
//--------------------------------------------- //---------------------------------------------
@ -201,7 +201,7 @@ void ScreenGrabDialog::slotGrab()
m_hiddenWindows.clear(); m_hiddenWindows.clear();
if (m_hideCB->isChecked()) if (m_hideCB->isChecked())
{ {
TQWidgetList *list = TQApplication::topLevelWidgets(); TQWidgetList *list = TQApplication::tqtopLevelWidgets();
TQWidgetListIt it( *list ); TQWidgetListIt it( *list );
TQWidget * w; TQWidget * w;
while ( (w=it.current()) != 0 ) while ( (w=it.current()) != 0 )

@ -30,7 +30,7 @@ extern "C"
// Include files for TQt // Include files for TQt
#include <tqvbox.h> #include <tqvbox.h>
#include <layout.h> #include <tqlayout.h>
#include <tqdir.h> #include <tqdir.h>
#include <tqwidget.h> #include <tqwidget.h>
#include <tqlabel.h> #include <tqlabel.h>
@ -41,7 +41,7 @@ extern "C"
#include <tqprocess.h> #include <tqprocess.h>
#include <tqcolor.h> #include <tqcolor.h>
#include <tqpainter.h> #include <tqpainter.h>
#include <palette.h> #include <tqpalette.h>
#include <tqimage.h> #include <tqimage.h>
#include <tqevent.h> #include <tqevent.h>
#include <tqdragobject.h> #include <tqdragobject.h>
@ -108,8 +108,8 @@ BatchProcessImagesDialog::BatchProcessImagesDialog( KURL::List urlList, KIPI::In
m_tmpFolder = dir.saveLocation("tmp", "kipi-batchprocessimagesplugin-" + m_tmpFolder = dir.saveLocation("tmp", "kipi-batchprocessimagesplugin-" +
TQString::number(getpid()) ); TQString::number(getpid()) );
m_convertStatus = NO_PROCESS; m_converttqStatus = NO_PROCESS;
m_progressStatus = 0; m_progresstqStatus = 0;
m_ProcessusProc = 0; m_ProcessusProc = 0;
m_PreviewProc = 0; m_PreviewProc = 0;
@ -122,9 +122,9 @@ BatchProcessImagesDialog::BatchProcessImagesDialog( KURL::List urlList, KIPI::In
TQHBoxLayout *hlay = new TQHBoxLayout( dvlay ); TQHBoxLayout *hlay = new TQHBoxLayout( dvlay );
groupBox1 = new TQGroupBox( 0, Qt::Vertical, box ); groupBox1 = new TQGroupBox( 0, Qt::Vertical, box );
groupBox1->layout()->setSpacing(KDialog::spacingHint()); groupBox1->tqlayout()->setSpacing(KDialog::spacingHint());
groupBox1->layout()->setMargin(KDialog::marginHint()); groupBox1->tqlayout()->setMargin(KDialog::marginHint());
TQGridLayout* grid = new TQGridLayout( groupBox1->layout(), 2, 3); TQGridLayout* grid = new TQGridLayout( groupBox1->tqlayout(), 2, 3);
m_labelType = new TQLabel( groupBox1 ); m_labelType = new TQLabel( groupBox1 );
grid->addMultiCellWidget(m_labelType, 0, 0, 0, 0); grid->addMultiCellWidget(m_labelType, 0, 0, 0, 0);
@ -207,7 +207,7 @@ BatchProcessImagesDialog::BatchProcessImagesDialog( KURL::List urlList, KIPI::In
m_listFiles = new BatchProcessImagesList( box41 ); m_listFiles = new BatchProcessImagesList( box41 );
lay2->addWidget( m_listFiles ); lay2->addWidget( m_listFiles );
m_listFiles->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding); m_listFiles->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding);
TQVBoxLayout* lay3 = new TQVBoxLayout( lay2 ); TQVBoxLayout* lay3 = new TQVBoxLayout( lay2 );
m_addImagesButton = new TQPushButton ( i18n( "&Add..." ), box41 ); 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 = new TQLabel( box41 );
m_imageLabel->setFixedHeight( 80 ); m_imageLabel->setFixedHeight( 80 );
m_imageLabel->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); m_imageLabel->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
m_imageLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); m_imageLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
lay3->addWidget( m_imageLabel ); lay3->addWidget( m_imageLabel );
TQWhatsThis::add( m_imageLabel, i18n( "<p>The preview of the selected image on the list." ) ); TQWhatsThis::add( m_imageLabel, i18n( "<p>The preview of the selected image on the list." ) );
lay3->addStretch( 1 ); lay3->addStretch( 1 );
@ -406,7 +406,7 @@ void BatchProcessImagesDialog::slotProcessStart( void )
return; return;
} }
m_convertStatus = UNDER_PROCESS; m_converttqStatus = UNDER_PROCESS;
disconnect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotProcessStart())); disconnect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotProcessStart()));
showButtonCancel( false ); showButtonCancel( false );
setButtonText( User1, i18n("&Stop") ); setButtonText( User1, i18n("&Stop") );
@ -432,7 +432,7 @@ void BatchProcessImagesDialog::slotProcessStart( void )
bool BatchProcessImagesDialog::startProcess(void) bool BatchProcessImagesDialog::startProcess(void)
{ {
if ( m_convertStatus == STOP_PROCESS ) if ( m_converttqStatus == STOP_PROCESS )
{ {
endProcess(); endProcess();
return true; return true;
@ -456,8 +456,8 @@ bool BatchProcessImagesDialog::startProcess(void)
if ( prepareStartProcess(item, targetAlbum) == false ) // If there is a problem during the if ( prepareStartProcess(item, targetAlbum) == false ) // If there is a problem during the
{ // preparation -> pass to the next item! { // preparation -> pass to the next item!
++*m_listFile2Process_iterator; ++*m_listFile2Process_iterator;
++m_progressStatus; ++m_progresstqStatus;
m_progress->setValue((int)((float)m_progressStatus *(float)100 / (float)m_nbItem)); m_progress->setValue((int)((float)m_progresstqStatus *(float)100 / (float)m_nbItem));
item = static_cast<BatchProcessImagesItem*>( m_listFile2Process_iterator->current() ); item = static_cast<BatchProcessImagesItem*>( m_listFile2Process_iterator->current() );
m_listFiles->setCurrentItem(item); m_listFiles->setCurrentItem(item);
@ -487,7 +487,7 @@ bool BatchProcessImagesDialog::startProcess(void)
{ {
int ValRet = KMessageBox::warningYesNoCancel(this, int ValRet = KMessageBox::warningYesNoCancel(this,
i18n("The destination file \"%1\" already exists;\n" i18n("The destination file \"%1\" already exists;\n"
"do you want overwrite it?").arg(item->nameDest()), "do you want overwrite it?").tqarg(item->nameDest()),
i18n("Overwrite Destination Image File"), KStdGuiItem::cont()); i18n("Overwrite Destination Image File"), KStdGuiItem::cont());
if ( ValRet == KMessageBox::No ) if ( ValRet == KMessageBox::No )
@ -495,8 +495,8 @@ bool BatchProcessImagesDialog::startProcess(void)
item->changeResult(i18n("Skipped.")); item->changeResult(i18n("Skipped."));
item->changeError(i18n("destination image file already exists (skipped by user).")); item->changeError(i18n("destination image file already exists (skipped by user)."));
++*m_listFile2Process_iterator; ++*m_listFile2Process_iterator;
++m_progressStatus; ++m_progresstqStatus;
m_progress->setValue((int)((float)m_progressStatus *(float)100 / (float)m_nbItem)); m_progress->setValue((int)((float)m_progresstqStatus *(float)100 / (float)m_nbItem));
if ( m_listFile2Process_iterator->current() ) if ( m_listFile2Process_iterator->current() )
{ {
@ -532,8 +532,8 @@ bool BatchProcessImagesDialog::startProcess(void)
item->changeResult(i18n("Failed.")); item->changeResult(i18n("Failed."));
item->changeError(i18n("destination image file already exists and cannot be renamed.")); item->changeError(i18n("destination image file already exists and cannot be renamed."));
++*m_listFile2Process_iterator; ++*m_listFile2Process_iterator;
++m_progressStatus; ++m_progresstqStatus;
m_progress->setValue((int)((float)m_progressStatus *(float)100 / (float)m_nbItem)); m_progress->setValue((int)((float)m_progresstqStatus *(float)100 / (float)m_nbItem));
if ( m_listFile2Process_iterator->current() ) if ( m_listFile2Process_iterator->current() )
{ {
@ -560,8 +560,8 @@ bool BatchProcessImagesDialog::startProcess(void)
item->changeResult(i18n("Skipped.")); item->changeResult(i18n("Skipped."));
item->changeError(i18n("destination image file already exists (skipped automatically).")); item->changeError(i18n("destination image file already exists (skipped automatically)."));
++*m_listFile2Process_iterator; ++*m_listFile2Process_iterator;
++m_progressStatus; ++m_progresstqStatus;
m_progress->setValue((int)((float)m_progressStatus *(float)100 / (float)m_nbItem)); m_progress->setValue((int)((float)m_progresstqStatus *(float)100 / (float)m_nbItem));
if ( m_listFile2Process_iterator->current() ) if ( m_listFile2Process_iterator->current() )
{ {
@ -623,7 +623,7 @@ void BatchProcessImagesDialog::slotReadStd(KProcess* /*proc*/, char *buffer, int
void BatchProcessImagesDialog::slotProcessDone(KProcess* proc) void BatchProcessImagesDialog::slotProcessDone(KProcess* proc)
{ {
if ( m_convertStatus == PROCESS_DONE ) if ( m_converttqStatus == PROCESS_DONE )
{ {
// processAborted() has already been called. No need to show the warning. // processAborted() has already been called. No need to show the warning.
return; return;
@ -647,8 +647,8 @@ void BatchProcessImagesDialog::slotProcessDone(KProcess* proc)
item->changeResult(i18n("Failed.")); item->changeResult(i18n("Failed."));
item->changeError(i18n("'convert' program from 'ImageMagick' package has been stopped abnormally.")); item->changeError(i18n("'convert' program from 'ImageMagick' package has been stopped abnormally."));
++*m_listFile2Process_iterator; ++*m_listFile2Process_iterator;
++m_progressStatus; ++m_progresstqStatus;
m_progress->setValue((int)((float)m_progressStatus *(float)100 / (float)m_nbItem)); m_progress->setValue((int)((float)m_progresstqStatus *(float)100 / (float)m_nbItem));
if ( m_listFile2Process_iterator->current() ) if ( m_listFile2Process_iterator->current() )
startProcess(); startProcess();
@ -690,7 +690,7 @@ void BatchProcessImagesDialog::slotProcessDone(KProcess* proc)
{ {
int code = KMessageBox::warningContinueCancel( this, int code = KMessageBox::warningContinueCancel( this,
i18n("<qt>Error adding image to application; error message was: " i18n("<qt>Error adding image to application; error message was: "
"<b>%1</b></qt>").arg( errmsg ), "<b>%1</b></qt>").tqarg( errmsg ),
i18n("Error Adding Image to Application") ); i18n("Error Adding Image to Application") );
if ( code == KMessageBox::Cancel ) if ( code == KMessageBox::Cancel )
@ -742,8 +742,8 @@ void BatchProcessImagesDialog::slotProcessDone(KProcess* proc)
} }
++*m_listFile2Process_iterator; ++*m_listFile2Process_iterator;
++m_progressStatus; ++m_progresstqStatus;
m_progress->setValue((int)((float)m_progressStatus *(float)100 / (float)m_nbItem)); m_progress->setValue((int)((float)m_progresstqStatus *(float)100 / (float)m_nbItem));
if ( m_listFile2Process_iterator->current() ) if ( m_listFile2Process_iterator->current() )
startProcess(); startProcess();
@ -755,13 +755,13 @@ void BatchProcessImagesDialog::slotListDoubleClicked(TQListViewItem *itemClicked
{ {
BatchProcessImagesItem *item = static_cast<BatchProcessImagesItem*>( itemClicked ); BatchProcessImagesItem *item = static_cast<BatchProcessImagesItem*>( itemClicked );
if (m_convertStatus == PROCESS_DONE) if (m_converttqStatus == PROCESS_DONE)
{ {
OutputDialog *infoDialog = new OutputDialog(this, OutputDialog *infoDialog = new OutputDialog(this,
i18n("Image processing error"), i18n("Image processing error"),
item->outputMess(), item->outputMess(),
i18n("Image \"%1\": %2\n\nThe output messages are:\n") i18n("Image \"%1\": %2\n\nThe output messages are:\n")
.arg(item->nameSrc()).arg(item->error()) .tqarg(item->nameSrc()).tqarg(item->error())
); );
infoDialog->exec(); infoDialog->exec();
} }
@ -880,7 +880,7 @@ void BatchProcessImagesDialog::slotPreviewProcessDone(KProcess* proc)
m_previewOutput, m_previewOutput,
i18n("Cannot process preview for image \"%1\"." i18n("Cannot process preview for image \"%1\"."
"\nThe output messages are:\n") "\nThe output messages are:\n")
.arg(item->nameSrc()) .tqarg(item->nameSrc())
); );
infoDialog->exec(); infoDialog->exec();
} }
@ -902,7 +902,7 @@ void BatchProcessImagesDialog::slotProcessStop( void )
if ( m_ProcessusProc->isRunning() == true ) m_ProcessusProc->kill(SIGTERM); if ( m_ProcessusProc->isRunning() == true ) m_ProcessusProc->kill(SIGTERM);
// If kill operation failed, Stop the process at the next image ! // If kill operation failed, Stop the process at the next image !
if ( m_convertStatus == UNDER_PROCESS ) m_convertStatus = STOP_PROCESS; if ( m_converttqStatus == UNDER_PROCESS ) m_converttqStatus = STOP_PROCESS;
processAborted(true); processAborted(true);
} }
@ -1042,7 +1042,7 @@ void BatchProcessImagesDialog::processAborted(bool removeFlag)
void BatchProcessImagesDialog::endProcess(void) void BatchProcessImagesDialog::endProcess(void)
{ {
m_convertStatus = PROCESS_DONE; m_converttqStatus = PROCESS_DONE;
setButtonText( User1, i18n("&Close") ); setButtonText( User1, i18n("&Close") );
disconnect(this, TQT_SIGNAL(user1Clicked()), disconnect(this, TQT_SIGNAL(user1Clicked()),

@ -81,7 +81,7 @@ Q_OBJECT
public: public:
// Don't forget to add the 'm_Type' and 'm_labelType' implementation in the constructor of // Don't forget to add the 'm_Type' and 'm_labelType' implementation in the constructor of
// children dialog class. // tqchildren dialog class.
BatchProcessImagesDialog( KURL::List urlList, KIPI::Interface* interface, TQString caption, TQWidget *parent=0 ); BatchProcessImagesDialog( KURL::List urlList, KIPI::Interface* interface, TQString caption, TQWidget *parent=0 );
~BatchProcessImagesDialog(); ~BatchProcessImagesDialog();
@ -157,8 +157,8 @@ private slots:
KConfig *m_config; KConfig *m_config;
int m_convertStatus; int m_converttqStatus;
int m_progressStatus; int m_progresstqStatus;
int m_nbItem; int m_nbItem;
KProcess *m_ProcessusProc; KProcess *m_ProcessusProc;

@ -62,24 +62,24 @@ void BatchProcessImagesItem::changeError(TQString text) { _error = text; }
void BatchProcessImagesItem::changeNameDest(TQString text) { _nameDest = text; setText(2, _nameDest); } void BatchProcessImagesItem::changeNameDest(TQString text) { _nameDest = text; setText(2, _nameDest); }
void BatchProcessImagesItem::changeOutputMess(TQString text) { _outputMess.append(text); } void BatchProcessImagesItem::changeOutputMess(TQString text) { _outputMess.append(text); }
void BatchProcessImagesItem::paintCell (TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) void BatchProcessImagesItem::paintCell (TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
{ {
TQColorGroup _cg( cg ); TQColorGroup _cg( cg );
if (text(3) != i18n("OK") && !text(3).isEmpty() ) if (text(3) != i18n("OK") && !text(3).isEmpty() )
{ {
_cg.setColor( TQColorGroup::Text, TQt::red ); _cg.setColor( TQColorGroup::Text, TQt::red );
KListViewItem::paintCell( p, _cg, column, width, alignment ); KListViewItem::paintCell( p, _cg, column, width, tqalignment );
return; return;
} }
if (text(3) == i18n("OK") ) if (text(3) == i18n("OK") )
{ {
_cg.setColor( TQColorGroup::Text, TQt::darkGreen ); _cg.setColor( TQColorGroup::Text, TQt::darkGreen );
KListViewItem::paintCell( p, _cg, column, width, alignment ); KListViewItem::paintCell( p, _cg, column, width, tqalignment );
return; return;
} }
KListViewItem::paintCell( p, cg, column, width, alignment ); KListViewItem::paintCell( p, cg, column, width, tqalignment );
} }
bool BatchProcessImagesItem::overWrote() bool BatchProcessImagesItem::overWrote()

@ -61,7 +61,7 @@ public:
void changeNameDest(TQString text); void changeNameDest(TQString text);
void changeOutputMess(TQString text); void changeOutputMess(TQString text);
void paintCell (TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); void paintCell (TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment);
void setKey(const TQString& val, bool reverseSort); void setKey(const TQString& val, bool reverseSort);
TQString key(int column, bool ascending) const; TQString key(int column, bool ascending) const;

@ -23,7 +23,7 @@
// Include files for TQt // Include files for TQt
#include <tqvbox.h> #include <tqvbox.h>
#include <layout.h> #include <tqlayout.h>
#include <tqwidget.h> #include <tqwidget.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqlabel.h> #include <tqlabel.h>

@ -23,7 +23,7 @@
// Include files for TQt // Include files for TQt
#include <tqvbox.h> #include <tqvbox.h>
#include <layout.h> #include <tqlayout.h>
#include <tqwidget.h> #include <tqwidget.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqlabel.h> #include <tqlabel.h>

@ -23,7 +23,7 @@
// Include files for TQt // Include files for TQt
#include <tqvbox.h> #include <tqvbox.h>
#include <layout.h> #include <tqlayout.h>
#include <tqwidget.h> #include <tqwidget.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqlabel.h> #include <tqlabel.h>

@ -23,7 +23,7 @@
// Include files for TQt // Include files for TQt
#include <tqvbox.h> #include <tqvbox.h>
#include <layout.h> #include <tqlayout.h>
#include <tqwidget.h> #include <tqwidget.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqlabel.h> #include <tqlabel.h>

@ -23,7 +23,7 @@
// Include files for TQt // Include files for TQt
#include <tqvbox.h> #include <tqvbox.h>
#include <layout.h> #include <tqlayout.h>
#include <tqwidget.h> #include <tqwidget.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqlabel.h> #include <tqlabel.h>

@ -36,7 +36,7 @@ extern "C"
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <tqvbox.h> #include <tqvbox.h>
#include <layout.h> #include <tqlayout.h>
#include <tqgroupbox.h> #include <tqgroupbox.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqslider.h> #include <tqslider.h>
@ -80,8 +80,8 @@ int INIT_ZOOM_FACTOR;
ImagePreview::ImagePreview(const TQString &fileOrig, const TQString &fileDest, const TQString &tmpPath, ImagePreview::ImagePreview(const TQString &fileOrig, const TQString &fileDest, const TQString &tmpPath,
bool cropActionOrig, bool cropActionDest, const TQString &EffectName, bool cropActionOrig, bool cropActionDest, const TQString &EffectName,
const TQString &FileName, TQWidget *parent) const TQString &FileName, TQWidget *parent)
: KDialogBase( parent, "PreviewDialog", true, i18n("Batch Process Preview (%1 - %2)").arg(EffectName) : KDialogBase( parent, "PreviewDialog", true, i18n("Batch Process Preview (%1 - %2)").tqarg(EffectName)
.arg(FileName), Help|Ok, Ok, true) .tqarg(FileName), Help|Ok, Ok, true)
{ {
// About data and help button. // About data and help button.

@ -22,8 +22,8 @@
// TQt includes // TQt includes
#include <textview.h> #include <tqtextview.h>
#include <layout.h> #include <tqlayout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <tqframe.h> #include <tqframe.h>

@ -23,7 +23,7 @@
// Include files for TQt // Include files for TQt
#include <tqvbox.h> #include <tqvbox.h>
#include <layout.h> #include <tqlayout.h>
#include <tqwidget.h> #include <tqwidget.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqlabel.h> #include <tqlabel.h>

@ -77,7 +77,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="4" column="0"> <widget class="TQLayoutWidget" row="4" column="0">
<property name="name"> <property name="name">
<cstring>layout1</cstring> <cstring>tqlayout1</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -93,7 +93,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>12</width> <width>12</width>
<height>14</height> <height>14</height>
@ -112,7 +112,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="1" column="1"> <widget class="TQLayoutWidget" row="1" column="1">
<property name="name"> <property name="name">
<cstring>layout2</cstring> <cstring>tqlayout2</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -139,7 +139,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>261</width> <width>261</width>
<height>21</height> <height>21</height>
@ -157,7 +157,7 @@
<property name="title"> <property name="title">
<string></string> <string></string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignTop|AlignHCenter</set> <set>AlignTop|AlignHCenter</set>
</property> </property>
<grid> <grid>
@ -251,7 +251,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>175</height> <height>175</height>
@ -276,7 +276,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>19</height> <height>19</height>
@ -319,7 +319,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>96</width> <width>96</width>
<height>96</height> <height>96</height>
@ -339,7 +339,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>19</height> <height>19</height>

@ -23,7 +23,7 @@
// TQt includes. // TQt includes.
#include <layout.h> #include <tqlayout.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
// KDE includes. // KDE includes.

@ -358,7 +358,7 @@ TQString RenameImagesWidget::oldToNewName(BatchProcessImagesItem* item,
char s[100]; char s[100];
::strftime(s, 100, TQFile::encodeName(format), time_tm); ::strftime(s, 100, TQFile::encodeName(format), time_tm);
newName += TQString::fromLatin1(s); newName += TQString::tqfromLatin1(s);
newName += "_"; newName += "_";
} }
@ -378,7 +378,7 @@ TQString RenameImagesWidget::oldToNewName(BatchProcessImagesItem* item,
seq.sprintf(format.latin1(), itemPosition + m_seqSpin->value()); seq.sprintf(format.latin1(), itemPosition + m_seqSpin->value());
newName += seq; newName += seq;
newName += TQString::fromLatin1(".") + fi.extension(); newName += TQString::tqfromLatin1(".") + fi.extension();
return newName; return newName;
} }

@ -23,7 +23,7 @@
// Include files for TQt // Include files for TQt
#include <tqvbox.h> #include <tqvbox.h>
#include <layout.h> #include <tqlayout.h>
#include <tqwidget.h> #include <tqwidget.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqlabel.h> #include <tqlabel.h>

@ -34,7 +34,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout6</cstring> <cstring>tqlayout6</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -44,7 +44,7 @@
<property name="name"> <property name="name">
<cstring>ohFileEdit</cstring> <cstring>ohFileEdit</cstring>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>300</width> <width>300</width>
<height>0</height> <height>0</height>
@ -77,7 +77,7 @@
<string>You can download a calendar for your country from http://www.icalshare.com/ or other sites. <string>You can download a calendar for your country from http://www.icalshare.com/ or other sites.
This is fully optional. All the events from this calendar will be printed red.</string> This is fully optional. All the events from this calendar will be printed red.</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -110,7 +110,7 @@ This is fully optional. All the events from this calendar will be printed red.</
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout7</cstring> <cstring>tqlayout7</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -120,7 +120,7 @@ This is fully optional. All the events from this calendar will be printed red.</
<property name="name"> <property name="name">
<cstring>fhFileEdit</cstring> <cstring>fhFileEdit</cstring>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>300</width> <width>300</width>
<height>0</height> <height>0</height>
@ -161,7 +161,7 @@ This is fully optional. All the events from this calendar will be printed red.</
<string>You can create such a calendar using KOrganizer or any other calendar program. <string>You can create such a calendar using KOrganizer or any other calendar program.
This is fully optional. All the events from this calendar will be printed green.</string> This is fully optional. All the events from this calendar will be printed green.</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -175,7 +175,7 @@ This is fully optional. All the events from this calendar will be printed green.
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>41</width> <width>41</width>
<height>140</height> <height>140</height>

@ -22,7 +22,7 @@
// TQt includes. // TQt includes.
#include <tqhgroupbox.h> #include <tqhgroupbox.h>
#include <layout.h> #include <tqlayout.h>
#include <tqspinbox.h> #include <tqspinbox.h>
#include <tqdatetime.h> #include <tqdatetime.h>
#include <tqlabel.h> #include <tqlabel.h>
@ -68,13 +68,13 @@ void CalSelect::setupView( KIPI::Interface* interface )
setCaption(i18n("Create Calendar")); setCaption(i18n("Create Calendar"));
TQHGroupBox *yearBox = new TQHGroupBox(i18n("Select Year"), this); TQHGroupBox *yearBox = new TQHGroupBox(i18n("Select Year"), this);
yearBox->layout()->addItem(new TQSpacerItem(5,5, yearBox->tqlayout()->addItem(new TQSpacerItem(5,5,
TQSizePolicy::Expanding, TQSizePolicy::Expanding,
TQSizePolicy::Minimum)); TQSizePolicy::Minimum));
yearSpin_ = new TQSpinBox(KGlobal::locale()->calendar()->minValidYear(), yearSpin_ = new TQSpinBox(KGlobal::locale()->calendar()->minValidYear(),
KGlobal::locale()->calendar()->maxValidYear(), KGlobal::locale()->calendar()->maxValidYear(),
1,yearBox); 1,yearBox);
yearSpin_->setValue(KGlobal::locale()->calendar()->year(TQDate::currentDate())); yearSpin_->setValue(KGlobal::locale()->calendar()->year(TQDate::tqcurrentDate()));
slotYearChanged(yearSpin_->value()); slotYearChanged(yearSpin_->value());
connect(yearSpin_, TQT_SIGNAL(valueChanged(int)), connect(yearSpin_, TQT_SIGNAL(valueChanged(int)),
@ -86,11 +86,11 @@ void CalSelect::setupView( KIPI::Interface* interface )
TQGroupBox *monthBox = new TQGroupBox(i18n("Select Images"), this); TQGroupBox *monthBox = new TQGroupBox(i18n("Select Images"), this);
monthBox->setColumnLayout(0, Qt::Vertical ); monthBox->setColumnLayout(0, Qt::Vertical );
monthBox->layout()->setSpacing( 6 ); monthBox->tqlayout()->setSpacing( 6 );
monthBox->layout()->setMargin( 11 ); monthBox->tqlayout()->setMargin( 11 );
monthBoxLayout_ = new TQGridLayout(monthBox->layout()); monthBoxLayout_ = new TQGridLayout(monthBox->tqlayout());
monthBoxLayout_->setAlignment( TQt::AlignCenter ); monthBoxLayout_->tqsetAlignment( TQt::AlignCenter );
KURL::List urlList; KURL::List urlList;
KIPI::ImageCollection images = interface->currentSelection(); KIPI::ImageCollection images = interface->currentSelection();

@ -31,7 +31,7 @@
#include <tqradiobutton.h> #include <tqradiobutton.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <tqslider.h> #include <tqslider.h>
#include <layout.h> #include <tqlayout.h>
#include <tqtimer.h> #include <tqtimer.h>
#include <tqfontdatabase.h> #include <tqfontdatabase.h>
#include <tqpaintdevicemetrics.h> #include <tqpaintdevicemetrics.h>
@ -65,9 +65,9 @@ CalTemplate::CalTemplate(TQWidget* parent, const char* name)
TQGroupBox *boxPreview_ = new TQGroupBox( i18n("Preview"), this ); TQGroupBox *boxPreview_ = new TQGroupBox( i18n("Preview"), this );
boxPreview_->setColumnLayout(0, Qt::Vertical); boxPreview_->setColumnLayout(0, Qt::Vertical);
boxPreview_->layout()->setMargin( 5 ); boxPreview_->tqlayout()->setMargin( 5 );
TQVBoxLayout *previewLayout = new TQVBoxLayout(boxPreview_->layout()); TQVBoxLayout *previewLayout = new TQVBoxLayout(boxPreview_->tqlayout());
calWidget_ = new CalWidget(boxPreview_); calWidget_ = new CalWidget(boxPreview_);
previewLayout->addWidget(calWidget_, 0, TQt::AlignCenter); previewLayout->addWidget(calWidget_, 0, TQt::AlignCenter);
@ -77,18 +77,18 @@ CalTemplate::CalTemplate(TQWidget* parent, const char* name)
TQGroupBox *gbox = new TQGroupBox( i18n("Settings"), this ); TQGroupBox *gbox = new TQGroupBox( i18n("Settings"), this );
gbox->setColumnLayout(0, Qt::Vertical ); gbox->setColumnLayout(0, Qt::Vertical );
gbox->layout()->setSpacing( 11 ); gbox->tqlayout()->setSpacing( 11 );
gbox->layout()->setMargin( 6 ); gbox->tqlayout()->setMargin( 6 );
TQVBoxLayout* gboxLayout = new TQVBoxLayout( gbox->layout() ); TQVBoxLayout* gboxLayout = new TQVBoxLayout( gbox->tqlayout() );
// --------------------------------------------------------------- // ---------------------------------------------------------------
TQHBoxLayout *hlayout = new TQHBoxLayout( 0, 0, 5 ); TQHBoxLayout *htqlayout = new TQHBoxLayout( 0, 0, 5 );
hlayout->addWidget( new TQLabel(i18n("Paper size:"), gbox) ); htqlayout->addWidget( new TQLabel(i18n("Paper size:"), gbox) );
comboPaperSize_ = new TQComboBox(false, gbox); comboPaperSize_ = new TQComboBox(false, gbox);
hlayout->addWidget(comboPaperSize_); htqlayout->addWidget(comboPaperSize_);
gboxLayout->addLayout( hlayout ); gboxLayout->addLayout( htqlayout );
TQStringList paperSizes; TQStringList paperSizes;
paperSizes << "A4"; paperSizes << "A4";
@ -131,29 +131,29 @@ CalTemplate::CalTemplate(TQWidget* parent, const char* name)
// --------------------------------------------------------------- // ---------------------------------------------------------------
hlayout = new TQHBoxLayout( 0, 0, 5 ); htqlayout = new TQHBoxLayout( 0, 0, 5 );
hlayout->addWidget(new TQLabel(i18n("Image to text ratio:"), gbox)); htqlayout->addWidget(new TQLabel(i18n("Image to text ratio:"), gbox));
sliderRatio_ = new TQSlider(50,300,5,100,Qt::Horizontal,gbox); sliderRatio_ = new TQSlider(50,300,5,100,Qt::Horizontal,gbox);
hlayout->addWidget( sliderRatio_ ); htqlayout->addWidget( sliderRatio_ );
gboxLayout->addLayout( hlayout ); gboxLayout->addLayout( htqlayout );
connect(sliderRatio_, TQT_SIGNAL(valueChanged(int)), connect(sliderRatio_, TQT_SIGNAL(valueChanged(int)),
TQT_SLOT(slotParamsChanged())); TQT_SLOT(slotParamsChanged()));
// --------------------------------------------------------------- // ---------------------------------------------------------------
hlayout = new TQHBoxLayout( 0, 0, 5 ); htqlayout = new TQHBoxLayout( 0, 0, 5 );
hlayout->addWidget(new TQLabel(i18n("Font:"), gbox)); htqlayout->addWidget(new TQLabel(i18n("Font:"), gbox));
comboFont_ = new TQComboBox(false, gbox); comboFont_ = new TQComboBox(false, gbox);
hlayout->addWidget( comboFont_ ); htqlayout->addWidget( comboFont_ );
TQFontDatabase fontDB; TQFontDatabase fontDB;
TQStringList families(fontDB.families()); TQStringList families(fontDB.tqfamilies());
TQStringList smoothScalableFamilies; TQStringList smoothScalableFamilies;
for (TQStringList::iterator it=families.begin(); it != families.end(); for (TQStringList::iterator it=families.begin(); it != families.end();
++it) ++it)
@ -167,7 +167,7 @@ CalTemplate::CalTemplate(TQWidget* parent, const char* name)
comboFont_->setCurrentText( f.family() ); comboFont_->setCurrentText( f.family() );
gboxLayout->addLayout( hlayout ); gboxLayout->addLayout( htqlayout );
connect(comboFont_, TQT_SIGNAL(activated(int)), connect(comboFont_, TQT_SIGNAL(activated(int)),
TQT_SLOT(slotParamsChanged())); TQT_SLOT(slotParamsChanged()));

@ -48,7 +48,7 @@ namespace KIPICalendarPlugin
CalWidget::CalWidget(TQWidget *parent) CalWidget::CalWidget(TQWidget *parent)
: TQWidget(parent,0,TQt::WRepaintNoErase|TQt::WResizeNoErase) : TQWidget(parent,0,TQt::WRepaintNoErase|TQt::WResizeNoErase)
{ {
setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
calPainter_ = 0; calPainter_ = 0;
pix_ = new TQPixmap(); pix_ = new TQPixmap();
} }
@ -78,8 +78,8 @@ void CalWidget::recreate()
if (!calPainter_) if (!calPainter_)
calPainter_ = new CalPainter(TQT_TQPAINTDEVICE(pix_)); calPainter_ = new CalPainter(TQT_TQPAINTDEVICE(pix_));
calPainter_->setYearMonth(KGlobal::locale()->calendar()->year(TQDate::currentDate()), calPainter_->setYearMonth(KGlobal::locale()->calendar()->year(TQDate::tqcurrentDate()),
KGlobal::locale()->calendar()->month(TQDate::currentDate())); KGlobal::locale()->calendar()->month(TQDate::tqcurrentDate()));
calPainter_->paint(); calPainter_->paint();
update(); update();
} }

@ -29,7 +29,7 @@
#include <tqtimer.h> #include <tqtimer.h>
#include <tqpainter.h> #include <tqpainter.h>
#include <tqprogressbar.h> #include <tqprogressbar.h>
#include <layout.h> #include <tqlayout.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <tqframe.h> #include <tqframe.h>
#include <tqpixmap.h> #include <tqpixmap.h>
@ -113,17 +113,17 @@ CalWizard::CalWizard( KIPI::Interface* interface, TQWidget *parent )
wFinishLabel_ = new TQLabel(wFinish_); wFinishLabel_ = new TQLabel(wFinish_);
wFinishLayout->addWidget(wFinishLabel_); wFinishLayout->addWidget(wFinishLabel_);
TQHBoxLayout *hboxlayout = new TQHBoxLayout(0, 5, 5); TQHBoxLayout *hboxtqlayout = new TQHBoxLayout(0, 5, 5);
hboxlayout->addWidget(new TQLabel(i18n("Current Page"), wFinish_)); hboxtqlayout->addWidget(new TQLabel(i18n("Current Page"), wFinish_));
wFinishProgressCurrent_ = new TQProgressBar(wFinish_); wFinishProgressCurrent_ = new TQProgressBar(wFinish_);
hboxlayout->addWidget(wFinishProgressCurrent_); hboxtqlayout->addWidget(wFinishProgressCurrent_);
wFinishLayout->addLayout(hboxlayout); wFinishLayout->addLayout(hboxtqlayout);
hboxlayout = new TQHBoxLayout(0, 5, 5); hboxtqlayout = new TQHBoxLayout(0, 5, 5);
hboxlayout->addWidget(new TQLabel(i18n("Total Pages"), wFinish_)); hboxtqlayout->addWidget(new TQLabel(i18n("Total Pages"), wFinish_));
wFinishProgressTotal_ = new TQProgressBar(wFinish_); wFinishProgressTotal_ = new TQProgressBar(wFinish_);
hboxlayout->addWidget(wFinishProgressTotal_); hboxtqlayout->addWidget(wFinishProgressTotal_);
wFinishLayout->addLayout(hboxlayout); wFinishLayout->addLayout(hboxtqlayout);
wFinishLayout->addStretch(); wFinishLayout->addStretch();
@ -215,9 +215,9 @@ void CalWizard::slotPageSelected(const TQString&)
TQString year = TQString::number(cSettings_->getYear()); TQString year = TQString::number(cSettings_->getYear());
TQString extra; TQString extra;
if ((KGlobal::locale()->calendar()->month(TQDate::currentDate()) >= 6 && if ((KGlobal::locale()->calendar()->month(TQDate::tqcurrentDate()) >= 6 &&
KGlobal::locale()->calendar()->year(TQDate::currentDate()) == cSettings_->getYear()) || KGlobal::locale()->calendar()->year(TQDate::tqcurrentDate()) == cSettings_->getYear()) ||
KGlobal::locale()->calendar()->year(TQDate::currentDate()) > cSettings_->getYear()) KGlobal::locale()->calendar()->year(TQDate::tqcurrentDate()) > cSettings_->getYear())
extra = "<br><br><b>"+i18n("Please note that you are making a " extra = "<br><br><b>"+i18n("Please note that you are making a "
"calendar for<br>the current year or a year in the " "calendar for<br>the current year or a year in the "
"past.")+"</b>"; "past.")+"</b>";
@ -229,7 +229,7 @@ void CalWizard::slotPageSelected(const TQString&)
"of that part of the generation of the calendar."); "of that part of the generation of the calendar.");
wPrintLabel_->setText(i18n("Click Next to start Printing<br><br>" wPrintLabel_->setText(i18n("Click Next to start Printing<br><br>"
"Following months will be printed for year %1:").arg(year) "Following months will be printed for year %1:").tqarg(year)
+ TQString("<br>") + TQString("<br>")
+ printList.join(" - ") + extra + extra2); + printList.join(" - ") + extra + extra2);
wPrintLabel_->setTextFormat(TQt::RichText); wPrintLabel_->setTextFormat(TQt::RichText);
@ -320,12 +320,12 @@ void CalWizard::slotPrintOnePage()
#if KDE_IS_VERSION(3,2,0) #if KDE_IS_VERSION(3,2,0)
wFinishLabel_->setText(i18n("Printing Calendar Page for %1 of %2") wFinishLabel_->setText(i18n("Printing Calendar Page for %1 of %2")
.arg(KGlobal::locale()->calendar()->monthName(month, cSettings_->getYear(), false)) .tqarg(KGlobal::locale()->calendar()->monthName(month, cSettings_->getYear(), false))
.arg(yearName)); .tqarg(yearName));
#else #else
wFinishLabel_->setText(i18n("Printing Calendar Page for %1 of %2") wFinishLabel_->setText(i18n("Printing Calendar Page for %1 of %2")
.arg(KGlobal::locale()->monthName(month)). .tqarg(KGlobal::locale()->monthName(month)).
.arg(yearName)); .tqarg(yearName));
#endif #endif
currPage_++; currPage_++;

@ -36,8 +36,8 @@ extern "C"
#include <tqfont.h> #include <tqfont.h>
#include <tqimage.h> #include <tqimage.h>
#include <tqregexp.h> #include <tqregexp.h>
#include <textcodec.h> #include <tqtextcodec.h>
#include <textstream.h> #include <tqtextstream.h>
#include <tqtimer.h> #include <tqtimer.h>
// Include files for KDE // Include files for KDE
@ -464,7 +464,7 @@ void CDArchiving::slotK3bDone(KProcess*)
d->action = KIPICDArchivingPlugin::Error; d->action = KIPICDArchivingPlugin::Error;
d->starting = false; d->starting = false;
d->success = false; d->success = false;
d->message = i18n("Cannot remove temporary folder '%1'.").arg(m_tmpFolder); d->message = i18n("Cannot remove temporary folder '%1'.").tqarg(m_tmpFolder);
TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d)); TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d));
usleep(1000); usleep(1000);
} }
@ -494,7 +494,7 @@ bool CDArchiving::buildHTMLInterface (void)
d->action = KIPICDArchivingPlugin::Error; d->action = KIPICDArchivingPlugin::Error;
d->starting = false; d->starting = false;
d->success = false; d->success = false;
d->message = i18n("Cannot remove folder '%1'.").arg(MainTPath); d->message = i18n("Cannot remove folder '%1'.").tqarg(MainTPath);
TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d)); TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d));
usleep(1000); usleep(1000);
return false; return false;
@ -507,7 +507,7 @@ bool CDArchiving::buildHTMLInterface (void)
d->action = KIPICDArchivingPlugin::Error; d->action = KIPICDArchivingPlugin::Error;
d->starting = false; d->starting = false;
d->success = false; d->success = false;
d->message = i18n("Could not create folder '%1'.").arg(MainTPath); d->message = i18n("Could not create folder '%1'.").tqarg(MainTPath);
TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d)); TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d));
usleep(1000); usleep(1000);
return false; return false;
@ -528,7 +528,7 @@ bool CDArchiving::buildHTMLInterface (void)
dir = KGlobal::dirs()->findResourceDir("kipi_data", "up.png"); dir = KGlobal::dirs()->findResourceDir("kipi_data", "up.png");
dir = dir + "up.png"; dir = dir + "up.png";
srcURL = dir; srcURL = dir;
destURL = MainTPath + TQString::fromLatin1("/up.png"); destURL = MainTPath + TQString::tqfromLatin1("/up.png");
KIO::file_copy(srcURL, destURL, -1, true, false, false); KIO::file_copy(srcURL, destURL, -1, true, false, false);
//clear the temporary list for unique names //clear the temporary list for unique names
@ -556,7 +556,7 @@ bool CDArchiving::buildHTMLInterface (void)
d->action = KIPICDArchivingPlugin::Error; d->action = KIPICDArchivingPlugin::Error;
d->starting = false; d->starting = false;
d->success = false; d->success = false;
d->message = i18n("Could not create folder '%1'.").arg(SubTPath); d->message = i18n("Could not create folder '%1'.").tqarg(SubTPath);
TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d)); TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d));
usleep(1000); usleep(1000);
return false; return false;
@ -586,7 +586,7 @@ bool CDArchiving::buildHTMLInterface (void)
d->action = KIPICDArchivingPlugin::Error; d->action = KIPICDArchivingPlugin::Error;
d->starting = false; d->starting = false;
d->success = false; d->success = false;
d->message = i18n("Cannot remove folder '%1'.").arg(MainTPath); d->message = i18n("Cannot remove folder '%1'.").tqarg(MainTPath);
TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d)); TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d));
usleep(1000); usleep(1000);
return false; return false;
@ -623,7 +623,7 @@ bool CDArchiving::buildHTMLInterface (void)
d->action = KIPICDArchivingPlugin::Error; d->action = KIPICDArchivingPlugin::Error;
d->starting = false; d->starting = false;
d->success = false; d->success = false;
d->message = i18n("Could not open file '%1'.").arg(MainUrl.path(+1)); d->message = i18n("Could not open file '%1'.").tqarg(MainUrl.path(+1));
TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d)); TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d));
usleep(1000); usleep(1000);
return false; return false;
@ -649,7 +649,7 @@ bool CDArchiving::createDirectory(TQDir thumb_dir, TQString imgGalleryDir, TQStr
d->starting = false; d->starting = false;
d->success = false; d->success = false;
d->message = i18n("Could not create folder '%1' in '%2'.") d->message = i18n("Could not create folder '%1' in '%2'.")
.arg(dirName).arg(imgGalleryDir); .tqarg(dirName).tqarg(imgGalleryDir);
TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d)); TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d));
usleep(1000); usleep(1000);
return false; return false;
@ -678,7 +678,7 @@ void CDArchiving::createHead(TQTextStream& stream)
stream << "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">" << endl; stream << "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">" << endl;
stream << "<meta name=\"Generator\" content=\"Albums HTML interface for CD archiving generated by " stream << "<meta name=\"Generator\" content=\"Albums HTML interface for CD archiving generated by "
<< m_hostName << " [" << m_hostURL << "]\">" << endl; << m_hostName << " [" << m_hostURL << "]\">" << endl;
stream << "<meta name=\"date\" content=\"" + KGlobal::locale()->formatDate(TQDate::currentDate()) stream << "<meta name=\"date\" content=\"" + KGlobal::locale()->formatDate(TQDate::tqcurrentDate())
+ "\">" << endl; + "\">" << endl;
stream << "<title>" << m_mainTitle << "</title>" << endl; stream << "<title>" << m_mainTitle << "</title>" << endl;
createCSSSection(stream); createCSSSection(stream);
@ -736,7 +736,7 @@ void CDArchiving::createBody(TQTextStream& stream,
int numOfImages = images.count(); int numOfImages = images.count();
const TQString imgGalleryDir = targetURL.directory(); const TQString imgGalleryDir = targetURL.directory();
const TQString today(KGlobal::locale()->formatDate(TQDate::currentDate())); const TQString today(KGlobal::locale()->formatDate(TQDate::tqcurrentDate()));
stream << "<body>\n" << endl; stream << "<body>\n" << endl;
@ -952,7 +952,7 @@ void CDArchiving::createBody(TQTextStream& stream,
dir = dir + "valid-html401.png"; dir = dir + "valid-html401.png";
KURL srcURL(dir); KURL srcURL(dir);
KURL destURL(imgGalleryDir + TQString::fromLatin1("/thumbs/valid-html401.png")); KURL destURL(imgGalleryDir + TQString::tqfromLatin1("/thumbs/valid-html401.png"));
KIO::file_copy(srcURL, destURL, -1, true, false, false); KIO::file_copy(srcURL, destURL, -1, true, false, false);
stream << "<p>" << endl; stream << "<p>" << endl;
@ -961,7 +961,7 @@ void CDArchiving::createBody(TQTextStream& stream,
<< "\" height=\"31\" width=\"88\" title=\"" << Temp << "\" />" << endl; << "\" height=\"31\" width=\"88\" title=\"" << Temp << "\" />" << endl;
Temp = i18n("Album archive created with " Temp = i18n("Album archive created with "
"<a href=\"%1\">%2</a> on %3").arg(m_hostURL).arg(m_hostName).arg(today); "<a href=\"%1\">%2</a> on %3").tqarg(m_hostURL).tqarg(m_hostName).tqarg(today);
stream << Temp << endl; stream << Temp << endl;
stream << "</p>" << endl; stream << "</p>" << endl;
@ -974,7 +974,7 @@ void CDArchiving::createBody(TQTextStream& stream,
void CDArchiving::createBodyMainPage(TQTextStream& stream, KURL& url) void CDArchiving::createBodyMainPage(TQTextStream& stream, KURL& url)
{ {
TQString Temp; TQString Temp;
const TQString today(KGlobal::locale()->formatDate(TQDate::currentDate())); const TQString today(KGlobal::locale()->formatDate(TQDate::tqcurrentDate()));
Temp = m_mainTitle; Temp = m_mainTitle;
stream << "<body>\n<h1>" << Temp << "</h1><p>\n" << endl; stream << "<body>\n<h1>" << Temp << "</h1><p>\n" << endl;
@ -992,7 +992,7 @@ void CDArchiving::createBodyMainPage(TQTextStream& stream, KURL& url)
dir = dir + "valid-html401.png"; dir = dir + "valid-html401.png";
KURL srcURL(dir); KURL srcURL(dir);
KURL destURL(url.directory() + TQString::fromLatin1("/valid-html401.png")); KURL destURL(url.directory() + TQString::tqfromLatin1("/valid-html401.png"));
KIO::file_copy(srcURL, destURL, -1, true, false, false); KIO::file_copy(srcURL, destURL, -1, true, false, false);
stream << "<p>" << endl; stream << "<p>" << endl;
@ -1001,7 +1001,7 @@ void CDArchiving::createBodyMainPage(TQTextStream& stream, KURL& url)
<< Temp << "\" />" << endl; << Temp << "\" />" << endl;
Temp = i18n("Album archive created with " Temp = i18n("Album archive created with "
"<a href=\"%1\">%2</a> on %3").arg(m_hostURL).arg(m_hostName).arg(today); "<a href=\"%1\">%2</a> on %3").tqarg(m_hostURL).tqarg(m_hostName).tqarg(today);
stream << Temp << endl; stream << Temp << endl;
stream << "</p>" << endl; stream << "</p>" << endl;
stream << "</body>\n</html>\n" << endl; stream << "</body>\n</html>\n" << endl;
@ -1023,12 +1023,12 @@ bool CDArchiving::createHtml( const KIPI::ImageCollection& album,
// Create the "thumbs" subdirectory // Create the "thumbs" subdirectory
TQDir thumb_dir( imgGalleryDir + TQString::fromLatin1("/thumbs/")); TQDir thumb_dir( imgGalleryDir + TQString::tqfromLatin1("/thumbs/"));
if (createDirectory(thumb_dir, imgGalleryDir, "thumbs") == false) if (createDirectory(thumb_dir, imgGalleryDir, "thumbs") == false)
return false; return false;
TQDir pages_dir( imgGalleryDir + TQString::fromLatin1("/pages/")); TQDir pages_dir( imgGalleryDir + TQString::tqfromLatin1("/pages/"));
if (createDirectory(pages_dir, imgGalleryDir, "pages") == false) if (createDirectory(pages_dir, imgGalleryDir, "pages") == false)
return false; return false;
@ -1053,7 +1053,7 @@ bool CDArchiving::createHtml( const KIPI::ImageCollection& album,
d->action = KIPICDArchivingPlugin::Error; d->action = KIPICDArchivingPlugin::Error;
d->starting = false; d->starting = false;
d->success = false; d->success = false;
d->message = i18n("Could not open file '%1'.").arg(targetURL.path(+1)); d->message = i18n("Could not open file '%1'.").tqarg(targetURL.path(+1));
TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d)); TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d));
usleep(1000); usleep(1000);
return false; return false;
@ -1073,8 +1073,8 @@ bool CDArchiving::createPage(const TQString& imgGalleryDir,
const TQString& comment) const TQString& comment)
{ {
const TQDir pagesDir(imgGalleryDir + TQString::fromLatin1("/pages/")); const TQDir pagesDir(imgGalleryDir + TQString::tqfromLatin1("/pages/"));
const TQDir thumbsDir(imgGalleryDir + TQString::fromLatin1("/thumbs/")); const TQDir thumbsDir(imgGalleryDir + TQString::tqfromLatin1("/thumbs/"));
const TQFileInfo fi (imgURL.fileName()); const TQFileInfo fi (imgURL.fileName());
const TQString imgName = uniqueImgName + "." + fi.extension(FALSE); const TQString imgName = uniqueImgName + "." + fi.extension(FALSE);
kdDebug( 51000 ) << "CreatePage: FileName: " << imgURL.fileName() << endl; kdDebug( 51000 ) << "CreatePage: FileName: " << imgURL.fileName() << endl;
@ -1086,21 +1086,21 @@ bool CDArchiving::createPage(const TQString& imgGalleryDir,
// Html pages filenames // Html pages filenames
const TQString pageFilename = pagesDir.path() + const TQString pageFilename = pagesDir.path() +
TQString::fromLatin1("/") + TQString::tqfromLatin1("/") +
webifyFileName(uniqueImgName)+ webifyFileName(uniqueImgName)+
TQString::fromLatin1(".htm"); TQString::tqfromLatin1(".htm");
const TQString nextPageFilename = webifyFileName(nextUniqueImgName) + const TQString nextPageFilename = webifyFileName(nextUniqueImgName) +
TQString::fromLatin1(".htm"); TQString::tqfromLatin1(".htm");
const TQString prevPageFilename = webifyFileName(prevUniqueImgName) + const TQString prevPageFilename = webifyFileName(prevUniqueImgName) +
TQString::fromLatin1(".htm"); TQString::tqfromLatin1(".htm");
// Thumbs filenames // Thumbs filenames
const TQString prevThumb = TQString::fromLatin1("../thumbs/") + const TQString prevThumb = TQString::tqfromLatin1("../thumbs/") +
webifyFileName(prevUniqueImgName) + webifyFileName(prevUniqueImgName) +
extension(m_imageFormat); extension(m_imageFormat);
const TQString nextThumb = TQString::fromLatin1("../thumbs/") + const TQString nextThumb = TQString::tqfromLatin1("../thumbs/") +
webifyFileName(nextUniqueImgName) + webifyFileName(nextUniqueImgName) +
extension(m_imageFormat); extension(m_imageFormat);
@ -1122,7 +1122,7 @@ bool CDArchiving::createPage(const TQString& imgGalleryDir,
<< m_hostName << " [" << m_hostURL << "]\">" << endl; << m_hostName << " [" << m_hostURL << "]\">" << endl;
stream << "<meta name=\"date\" content=\"" stream << "<meta name=\"date\" content=\""
<< KGlobal::locale()->formatDate(TQDate::currentDate()) << KGlobal::locale()->formatDate(TQDate::tqcurrentDate())
<< "\">" << endl; << "\">" << endl;
stream << "<title>" << m_mainTitle << " : "<< imgName/*imgURL.fileName()*/ <<"</title>" << endl; stream << "<title>" << m_mainTitle << " : "<< imgName/*imgURL.fileName()*/ <<"</title>" << endl;
@ -1239,13 +1239,13 @@ bool CDArchiving::createPage(const TQString& imgGalleryDir,
// Footer // Footer
TQString valid = i18n("Valid HTML 4.01."); TQString valid = i18n("Valid HTML 4.01.");
const TQString today(KGlobal::locale()->formatDate(TQDate::currentDate())); const TQString today(KGlobal::locale()->formatDate(TQDate::tqcurrentDate()));
stream << "<div align=\"center\"><hr><img src=\"../thumbs/valid-html401.png\" alt=\"" stream << "<div align=\"center\"><hr><img src=\"../thumbs/valid-html401.png\" alt=\""
<< valid << "\" height=\"31\" width=\"88\" title=\"" << valid << "\" />" << endl; << valid << "\" height=\"31\" width=\"88\" title=\"" << valid << "\" />" << endl;
valid = i18n("Image gallery created with " valid = i18n("Image gallery created with "
"<a href=\"%1\">%2</a> on %3").arg(m_hostURL).arg(m_hostName).arg(today); "<a href=\"%1\">%2</a> on %3").tqarg(m_hostURL).tqarg(m_hostName).tqarg(today);
stream << valid << "</div>" << endl; stream << valid << "</div>" << endl;
@ -1270,7 +1270,7 @@ int CDArchiving::createThumb( const TQString& imgName, const TQString& sourceDir
// Create the thumbnails for the HTML interface. // Create the thumbnails for the HTML interface.
const TQString ImageNameFormat = webifyFileName(uniqueFileName) + extension(imageFormat); const TQString ImageNameFormat = webifyFileName(uniqueFileName) + extension(imageFormat);
const TQString thumbDir = imgGalleryDir + TQString::fromLatin1("/thumbs/"); const TQString thumbDir = imgGalleryDir + TQString::tqfromLatin1("/thumbs/");
int extent = m_thumbnailsSize; int extent = m_thumbnailsSize;
m_imgWidth = 120; // Setting the size of the images is m_imgWidth = 120; // Setting the size of the images is
@ -1580,7 +1580,7 @@ bool CDArchiving::BuildK3bXMLprojectfile (TQString HTMLinterfaceFolder, TQString
d->action = KIPICDArchivingPlugin::Progress; d->action = KIPICDArchivingPlugin::Progress;
d->starting = true; d->starting = true;
d->success = false; d->success = false;
d->message = i18n("Adding Album '%1' into project...").arg( (*it).name() ); d->message = i18n("Adding Album '%1' into project...").tqarg( (*it).name() );
TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d)); TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d));
usleep(1000); usleep(1000);
addCollectionToK3bXMLProjectFile( *it, &stream); addCollectionToK3bXMLProjectFile( *it, &stream);
@ -1847,7 +1847,7 @@ TQString CDArchiving::EscapeSgmlText(const TQTextCodec* codec,
for (uint i = 0 ; i < strIn.length() ; ++i) for (uint i = 0 ; i < strIn.length() ; ++i)
{ {
ch=strIn[i]; ch=strIn[i];
switch (ch.unicode()) switch (ch.tqunicode())
{ {
case 38: // & case 38: // &
{ {
@ -1889,7 +1889,7 @@ TQString CDArchiving::EscapeSgmlText(const TQTextCodec* codec,
{ {
if (!codec->canEncode(ch)) if (!codec->canEncode(ch))
{ {
strReturn += TQString("&#%1;").arg(ch.unicode()); strReturn += TQString("&#%1;").tqarg(ch.tqunicode());
break; break;
} }
} }

@ -33,7 +33,7 @@
#include <tqgroupbox.h> #include <tqgroupbox.h>
#include <tqheader.h> #include <tqheader.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <layout.h> #include <tqlayout.h>
#include <tqlineedit.h> #include <tqlineedit.h>
#include <tqlistview.h> #include <tqlistview.h>
#include <tqprogressdialog.h> #include <tqprogressdialog.h>
@ -140,21 +140,21 @@ void CDArchivingDialog::setupSelection(void)
page_setupSelection = addPage(i18n("Selection"), i18n("Album Selection"), page_setupSelection = addPage(i18n("Selection"), i18n("Album Selection"),
BarIcon("folder_image", KIcon::SizeMedium)); BarIcon("folder_image", KIcon::SizeMedium));
TQVBoxLayout *layout = new TQVBoxLayout(page_setupSelection, 0, spacingHint() ); TQVBoxLayout *tqlayout = new TQVBoxLayout(page_setupSelection, 0, spacingHint() );
m_imageCollectionSelector = new KIPI::ImageCollectionSelector(page_setupSelection, m_interface); m_imageCollectionSelector = new KIPI::ImageCollectionSelector(page_setupSelection, m_interface);
layout->addWidget(m_imageCollectionSelector); tqlayout->addWidget(m_imageCollectionSelector);
//--------------------------------------------- //---------------------------------------------
TQGroupBox * groupBox3 = new TQGroupBox( 2, Qt::Horizontal, TQGroupBox * groupBox3 = new TQGroupBox( 2, Qt::Horizontal,
i18n("Target Media Information"), i18n("Target Media Information"),
page_setupSelection ); page_setupSelection );
groupBox3->layout()->setSpacing( 6 ); groupBox3->tqlayout()->setSpacing( 6 );
groupBox3->layout()->setMargin( 11 ); groupBox3->tqlayout()->setMargin( 11 );
TQWhatsThis::add( groupBox3, i18n("<p>Information about the backup medium.") ); TQWhatsThis::add( groupBox3, i18n("<p>Information about the backup medium.") );
m_mediaSize = new TQLabel( groupBox3 ); m_mediaSize = new TQLabel( groupBox3 );
m_mediaSize->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); m_mediaSize->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
m_mediaFormat = new TQComboBox(false, groupBox3); m_mediaFormat = new TQComboBox(false, groupBox3);
m_mediaFormat->insertItem(i18n("CD (650Mb)")); m_mediaFormat->insertItem(i18n("CD (650Mb)"));
@ -165,7 +165,7 @@ void CDArchivingDialog::setupSelection(void)
mediaFormatActived(m_mediaFormat->currentText()); mediaFormatActived(m_mediaFormat->currentText());
TQWhatsThis::add( m_mediaFormat, i18n("<p>Select here the backup media format.")); TQWhatsThis::add( m_mediaFormat, i18n("<p>Select here the backup media format."));
layout->addWidget( groupBox3 ); tqlayout->addWidget( groupBox3 );
//--------------------------------------------- //---------------------------------------------
@ -539,11 +539,11 @@ void CDArchivingDialog::setupBurning(void)
TQGroupBox * groupBoxAdvancedOptions = new TQGroupBox( i18n("Advanced Burning Options"), page_burning ); TQGroupBox * groupBoxAdvancedOptions = new TQGroupBox( i18n("Advanced Burning Options"), page_burning );
groupBoxAdvancedOptions->setColumnLayout(0, Qt::Vertical ); groupBoxAdvancedOptions->setColumnLayout(0, Qt::Vertical );
groupBoxAdvancedOptions->layout()->setSpacing( 6 ); groupBoxAdvancedOptions->tqlayout()->setSpacing( 6 );
groupBoxAdvancedOptions->layout()->setMargin( 11 ); groupBoxAdvancedOptions->tqlayout()->setMargin( 11 );
TQVBoxLayout * groupBoxAOLayout = new TQVBoxLayout( groupBoxAdvancedOptions->layout() ); TQVBoxLayout * groupBoxAOLayout = new TQVBoxLayout( groupBoxAdvancedOptions->tqlayout() );
groupBoxAOLayout->setAlignment( TQt::AlignTop ); groupBoxAOLayout->tqsetAlignment( TQt::AlignTop );
m_burnOnTheFly = new TQCheckBox( i18n("Media burning On-The-Fly"), groupBoxAdvancedOptions); m_burnOnTheFly = new TQCheckBox( i18n("Media burning On-The-Fly"), groupBoxAdvancedOptions);
m_burnOnTheFly->setChecked( false ); m_burnOnTheFly->setChecked( false );
@ -621,8 +621,8 @@ void CDArchivingDialog::ShowMediaCapacity(void)
Color = "<font color=\"red\">"; Color = "<font color=\"red\">";
m_mediaSize->setText( i18n("Total size: ") + Color + m_mediaSize->setText( i18n("Total size: ") + Color +
i18n("<b>%1</b></font> / <b>%2</b>").arg(KIO::convertSizeFromKB(TargetMediaSize)) i18n("<b>%1</b></font> / <b>%2</b>").tqarg(KIO::convertSizeFromKB(TargetMediaSize))
.arg(KIO::convertSizeFromKB (MaxMediaSize)) ); .tqarg(KIO::convertSizeFromKB (MaxMediaSize)) );
} }
void CDArchivingDialog::slotOk() void CDArchivingDialog::slotOk()

@ -157,7 +157,7 @@ void Plugin_CDArchiving::customEvent(TQCustomEvent *event)
case(KIPICDArchivingPlugin::BuildAlbumHTMLPage): case(KIPICDArchivingPlugin::BuildAlbumHTMLPage):
{ {
text = i18n("Making HTML pages for Album '%1'...").arg(d->albumName); text = i18n("Making HTML pages for Album '%1'...").tqarg(d->albumName);
break; break;
} }
@ -169,7 +169,7 @@ void Plugin_CDArchiving::customEvent(TQCustomEvent *event)
case(KIPICDArchivingPlugin::ResizeImages): case(KIPICDArchivingPlugin::ResizeImages):
{ {
text = i18n("Creating thumbnail for '%1'...").arg(d->fileName); text = i18n("Creating thumbnail for '%1'...").tqarg(d->fileName);
break; break;
} }
@ -211,14 +211,14 @@ void Plugin_CDArchiving::customEvent(TQCustomEvent *event)
case(KIPICDArchivingPlugin::BuildAlbumHTMLPage): case(KIPICDArchivingPlugin::BuildAlbumHTMLPage):
{ {
++m_current; ++m_current;
text = i18n("HTML page creation for Album '%1' completed.").arg(d->albumName); text = i18n("HTML page creation for Album '%1' completed.").tqarg(d->albumName);
break; break;
} }
case(KIPICDArchivingPlugin::ResizeImages): case(KIPICDArchivingPlugin::ResizeImages):
{ {
++m_current; ++m_current;
text = i18n("Creating thumbnail for '%1' done.").arg(d->fileName); text = i18n("Creating thumbnail for '%1' done.").tqarg(d->fileName);
break; break;
} }
@ -250,7 +250,7 @@ void Plugin_CDArchiving::customEvent(TQCustomEvent *event)
{ {
case(KIPICDArchivingPlugin::ResizeImages): case(KIPICDArchivingPlugin::ResizeImages):
{ {
text = i18n("Failed to create thumbnail for '%1'").arg(d->fileName); text = i18n("Failed to create thumbnail for '%1'").tqarg(d->fileName);
m_progressDlg->addedAction(text, KIPI::WarningMessage); m_progressDlg->addedAction(text, KIPI::WarningMessage);
m_progressDlg->setProgress(m_current, m_total); m_progressDlg->setProgress(m_current, m_total);
break; break;
@ -260,7 +260,7 @@ void Plugin_CDArchiving::customEvent(TQCustomEvent *event)
{ {
++m_current; ++m_current;
text = i18n("Failed to create HTML interface: %1") text = i18n("Failed to create HTML interface: %1")
.arg(d->message); .tqarg(d->message);
m_progressDlg->addedAction(text, KIPI::ErrorMessage); m_progressDlg->addedAction(text, KIPI::ErrorMessage);
m_progressDlg->setProgress(m_current, m_total); m_progressDlg->setProgress(m_current, m_total);
slotCancel(); slotCancel();
@ -271,7 +271,7 @@ void Plugin_CDArchiving::customEvent(TQCustomEvent *event)
case(KIPICDArchivingPlugin::BuildAlbumHTMLPage): case(KIPICDArchivingPlugin::BuildAlbumHTMLPage):
{ {
text = i18n("Failed to create HTML pages for Album '%1'") text = i18n("Failed to create HTML pages for Album '%1'")
.arg(d->albumName); .tqarg(d->albumName);
m_progressDlg->addedAction(text, KIPI::ErrorMessage); m_progressDlg->addedAction(text, KIPI::ErrorMessage);
m_progressDlg->setProgress(m_current, m_total); m_progressDlg->setProgress(m_current, m_total);
slotCancel(); slotCancel();

@ -32,7 +32,7 @@
#include <tqlistview.h> #include <tqlistview.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <tqheader.h> #include <tqheader.h>
#include <layout.h> #include <tqlayout.h>
#include <tqfileinfo.h> #include <tqfileinfo.h>
#include <tqimage.h> #include <tqimage.h>
#include <tqpixmap.h> #include <tqpixmap.h>
@ -167,29 +167,29 @@ DisplayCompare::DisplayCompare(TQWidget* parent, KIPI::Interface* interface,
//--------------------------------------------- //---------------------------------------------
GroupBox1 = new TQGroupBox( 1, Qt::Horizontal, i18n("Original Files"), box ); GroupBox1 = new TQGroupBox( 1, Qt::Horizontal, i18n("Original Files"), box );
GroupBox1->layout()->setSpacing( 6 ); GroupBox1->tqlayout()->setSpacing( 6 );
GroupBox1->layout()->setMargin( 11 ); GroupBox1->tqlayout()->setMargin( 11 );
OriginalNameLabel = new KSqueezedTextLabel( GroupBox1, "OriginalNameLabel" ); OriginalNameLabel = new KSqueezedTextLabel( GroupBox1, "OriginalNameLabel" );
OriginalNameLabel->setFrameShape( TQLabel::Box ); OriginalNameLabel->setFrameShape( TQLabel::Box );
OriginalNameLabel->setAlignment( int( TQLabel::AlignCenter ) ); OriginalNameLabel->tqsetAlignment( int( TQLabel::AlignCenter ) );
preview1 = new TQLabel( GroupBox1, "preview1" ); preview1 = new TQLabel( GroupBox1, "preview1" );
preview1->setFixedHeight( 120 ); preview1->setFixedHeight( 120 );
preview1->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); preview1->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
preview1->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); preview1->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
TQWhatsThis::add( preview1, i18n( "<p>The preview of files with duplicates." ) ); TQWhatsThis::add( preview1, i18n( "<p>The preview of files with duplicates." ) );
originalInfoLabel1 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel1" ); originalInfoLabel1 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel1" );
originalInfoLabel1->setAlignment( int( TQLabel::AlignCenter ) ); originalInfoLabel1->tqsetAlignment( int( TQLabel::AlignCenter ) );
originalInfoLabel2 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel2" ); originalInfoLabel2 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel2" );
originalInfoLabel2->setAlignment( int( TQLabel::AlignCenter ) ); originalInfoLabel2->tqsetAlignment( int( TQLabel::AlignCenter ) );
originalInfoLabel3 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel3" ); originalInfoLabel3 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel3" );
originalInfoLabel3->setAlignment( int( TQLabel::AlignCenter ) ); originalInfoLabel3->tqsetAlignment( int( TQLabel::AlignCenter ) );
originalInfoLabel4 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel4" ); originalInfoLabel4 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel4" );
originalInfoLabel4->setAlignment( int( TQLabel::AlignCenter ) ); originalInfoLabel4->tqsetAlignment( int( TQLabel::AlignCenter ) );
originalInfoLabel5 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel5" ); originalInfoLabel5 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel5" );
originalInfoLabel5->setAlignment( int( TQLabel::AlignCenter ) ); originalInfoLabel5->tqsetAlignment( int( TQLabel::AlignCenter ) );
listName = new KListView( GroupBox1, "listName" ); listName = new KListView( GroupBox1, "listName" );
listName->header()->setLabel( 0, i18n( "Files" ) ); listName->header()->setLabel( 0, i18n( "Files" ) );
@ -202,29 +202,29 @@ DisplayCompare::DisplayCompare(TQWidget* parent, KIPI::Interface* interface,
//--------------------------------------------- //---------------------------------------------
GroupBox2 = new TQGroupBox( 1, Qt::Horizontal, i18n("Similar Files"), box ); GroupBox2 = new TQGroupBox( 1, Qt::Horizontal, i18n("Similar Files"), box );
GroupBox2->layout()->setSpacing( 6 ); GroupBox2->tqlayout()->setSpacing( 6 );
GroupBox2->layout()->setMargin( 11 ); GroupBox2->tqlayout()->setMargin( 11 );
similarNameLabel = new KSqueezedTextLabel( GroupBox2, "similarNameLabel" ); similarNameLabel = new KSqueezedTextLabel( GroupBox2, "similarNameLabel" );
similarNameLabel->setFrameShape( TQLabel::Box ); similarNameLabel->setFrameShape( TQLabel::Box );
similarNameLabel->setAlignment( int( TQLabel::AlignCenter ) ); similarNameLabel->tqsetAlignment( int( TQLabel::AlignCenter ) );
preview2 = new TQLabel( GroupBox2, "preview2" ); preview2 = new TQLabel( GroupBox2, "preview2" );
preview2->setFixedHeight( 120 ); preview2->setFixedHeight( 120 );
preview2->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); preview2->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
preview2->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); preview2->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
TQWhatsThis::add( preview2, i18n( "<p>The preview of duplicate files." ) ); TQWhatsThis::add( preview2, i18n( "<p>The preview of duplicate files." ) );
similarInfoLabel1 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel1" ); similarInfoLabel1 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel1" );
similarInfoLabel1->setAlignment( int( TQLabel::AlignCenter ) ); similarInfoLabel1->tqsetAlignment( int( TQLabel::AlignCenter ) );
similarInfoLabel2 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel2" ); similarInfoLabel2 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel2" );
similarInfoLabel2->setAlignment( int( TQLabel::AlignCenter ) ); similarInfoLabel2->tqsetAlignment( int( TQLabel::AlignCenter ) );
similarInfoLabel3 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel3" ); similarInfoLabel3 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel3" );
similarInfoLabel3->setAlignment( int( TQLabel::AlignCenter ) ); similarInfoLabel3->tqsetAlignment( int( TQLabel::AlignCenter ) );
similarInfoLabel4 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel4" ); similarInfoLabel4 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel4" );
similarInfoLabel4->setAlignment( int( TQLabel::AlignCenter ) ); similarInfoLabel4->tqsetAlignment( int( TQLabel::AlignCenter ) );
similarInfoLabel5 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel5" ); similarInfoLabel5 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel5" );
similarInfoLabel5->setAlignment( int( TQLabel::AlignCenter ) ); similarInfoLabel5->tqsetAlignment( int( TQLabel::AlignCenter ) );
listEq = new KListView( GroupBox2, "listEq" ); listEq = new KListView( GroupBox2, "listEq" );
listEq->header()->setLabel( 0, i18n( "Files" ) ); listEq->header()->setLabel( 0, i18n( "Files" ) );
@ -308,7 +308,7 @@ void DisplayCompare::slotDelete( void )
KURL deleteImage(item->fullpath()); KURL deleteImage(item->fullpath());
if ( KIO::NetAccess::del(deleteImage) == false ) if ( KIO::NetAccess::del(deleteImage) == false )
KMessageBox::error(this, i18n("Cannot remove duplicate file:\n%1").arg(item->fullpath())); KMessageBox::error(this, i18n("Cannot remove duplicate file:\n%1").tqarg(item->fullpath()));
else else
m_interface->delImage( deleteImage ); m_interface->delImage( deleteImage );
@ -329,7 +329,7 @@ void DisplayCompare::slotDelete( void )
KURL deleteImage(item->fullpath()); KURL deleteImage(item->fullpath());
if ( KIO::NetAccess::del(deleteImage) == false ) if ( KIO::NetAccess::del(deleteImage) == false )
KMessageBox::error(this, i18n("Cannot remove original file:\n%1").arg(item->fullpath())); KMessageBox::error(this, i18n("Cannot remove original file:\n%1").tqarg(item->fullpath()));
item->setOn( false ); item->setOn( false );
} }
@ -350,14 +350,14 @@ void DisplayCompare::slotDisplayLeft(TQListViewItem * item)
if ( !im.isNull() ) if ( !im.isNull() )
{ {
OriginalNameLabel->setText(pitem->name()); OriginalNameLabel->setText(pitem->name());
originalInfoLabel1->setText(i18n("Image size: %1x%2 pixels").arg(im.width()).arg(im.height())); originalInfoLabel1->setText(i18n("Image size: %1x%2 pixels").tqarg(im.width()).tqarg(im.height()));
originalInfoLabel2->setText(i18n("File size: 1 byte", originalInfoLabel2->setText(i18n("File size: 1 byte",
"File size: %n bytes",TQFileInfo(pitem->fullpath()).size())); "File size: %n bytes",TQFileInfo(pitem->fullpath()).size()));
originalInfoLabel3->setText(i18n("Modified: %1").arg(KLocale(NULL) originalInfoLabel3->setText(i18n("Modified: %1").tqarg(KLocale(NULL)
.formatDateTime(TQFileInfo(pitem->fullpath()) .formatDateTime(TQFileInfo(pitem->fullpath())
.lastModified()))); .lastModified())));
originalInfoLabel4->setText(i18n("Album: %1").arg(pitem->album())); originalInfoLabel4->setText(i18n("Album: %1").tqarg(pitem->album()));
originalInfoLabel5->setText(i18n("Comments: %1").arg(pitem->comments())); originalInfoLabel5->setText(i18n("Comments: %1").tqarg(pitem->comments()));
} }
preview1->clear(); preview1->clear();
@ -427,14 +427,14 @@ void DisplayCompare::slotDisplayRight(TQListViewItem * item)
if ( !im.isNull() ) if ( !im.isNull() )
{ {
similarNameLabel->setText(pitem->name()); similarNameLabel->setText(pitem->name());
similarInfoLabel1->setText(i18n("Image size: %1x%2 pixels").arg(im.width()).arg(im.height())); similarInfoLabel1->setText(i18n("Image size: %1x%2 pixels").tqarg(im.width()).tqarg(im.height()));
similarInfoLabel2->setText(i18n("File size: 1 byte", similarInfoLabel2->setText(i18n("File size: 1 byte",
"File size: %n bytes", TQFileInfo(pitem->fullpath()).size())); "File size: %n bytes", TQFileInfo(pitem->fullpath()).size()));
similarInfoLabel3->setText(i18n("Modified: %1").arg(KLocale(NULL) similarInfoLabel3->setText(i18n("Modified: %1").tqarg(KLocale(NULL)
.formatDateTime(TQFileInfo(pitem->fullpath()) .formatDateTime(TQFileInfo(pitem->fullpath())
.lastModified()))); .lastModified())));
similarInfoLabel4->setText(i18n("Album: %1").arg(pitem->album())); similarInfoLabel4->setText(i18n("Album: %1").tqarg(pitem->album()));
similarInfoLabel5->setText(i18n("Caption: %1").arg(pitem->comments())); similarInfoLabel5->setText(i18n("Caption: %1").tqarg(pitem->comments()));
} }
preview2->clear(); preview2->clear();

@ -25,7 +25,7 @@
#include <tqlabel.h> #include <tqlabel.h>
#include <tqvbox.h> #include <tqvbox.h>
#include <tqgroupbox.h> #include <tqgroupbox.h>
#include <layout.h> #include <tqlayout.h>
#include <tqcombobox.h> #include <tqcombobox.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
@ -126,9 +126,9 @@ void FindDuplicateDialog::setupSelection(void)
i18n("Album's Selection"), i18n("Album's Selection"),
BarIcon("folder_image", KIcon::SizeMedium)); BarIcon("folder_image", KIcon::SizeMedium));
TQVBoxLayout *layout = new TQVBoxLayout(page_setupSelection, 0, spacingHint() ); TQVBoxLayout *tqlayout = new TQVBoxLayout(page_setupSelection, 0, spacingHint() );
m_imageCollectionSelector = new KIPI::ImageCollectionSelector(page_setupSelection, m_interface); m_imageCollectionSelector = new KIPI::ImageCollectionSelector(page_setupSelection, m_interface);
layout->addWidget(m_imageCollectionSelector); tqlayout->addWidget(m_imageCollectionSelector);
} }
@ -145,8 +145,8 @@ void FindDuplicateDialog::setupPageMethod(void)
//--------------------------------------------- //---------------------------------------------
TQGroupBox * groupBox1 = new TQGroupBox( 2, Qt::Horizontal, i18n("Method"), page_setupMethod ); TQGroupBox * groupBox1 = new TQGroupBox( 2, Qt::Horizontal, i18n("Method"), page_setupMethod );
groupBox1->layout()->setSpacing( 6 ); groupBox1->tqlayout()->setSpacing( 6 );
groupBox1->layout()->setMargin( 11 ); groupBox1->tqlayout()->setMargin( 11 );
TQLabel *m_labelsearchMethod = new TQLabel( i18n("Search method:"), groupBox1 ); TQLabel *m_labelsearchMethod = new TQLabel( i18n("Search method:"), groupBox1 );
m_findMethod = new TQComboBox(false, groupBox1); m_findMethod = new TQComboBox(false, groupBox1);

@ -143,26 +143,26 @@ void Plugin_FindImages::customEvent(TQCustomEvent *event)
{ {
case(KIPIFindDupplicateImagesPlugin::Similar): case(KIPIFindDupplicateImagesPlugin::Similar):
{ {
text = i18n("Similar comparison for '%1'").arg(TQFileInfo(d->fileName).fileName() ); text = i18n("Similar comparison for '%1'").tqarg(TQFileInfo(d->fileName).fileName() );
break; break;
} }
case(KIPIFindDupplicateImagesPlugin::Exact): case(KIPIFindDupplicateImagesPlugin::Exact):
{ {
m_total = d->total; // Needed because the total can change in this mode ! m_total = d->total; // Needed because the total can change in this mode !
text = i18n("Exact comparison for '%1'").arg(TQFileInfo(d->fileName).fileName()); text = i18n("Exact comparison for '%1'").tqarg(TQFileInfo(d->fileName).fileName());
break; break;
} }
case(KIPIFindDupplicateImagesPlugin::Matrix): case(KIPIFindDupplicateImagesPlugin::Matrix):
{ {
text = i18n("Creating fingerprint for '%1'").arg(TQFileInfo(d->fileName).fileName()); text = i18n("Creating fingerprint for '%1'").tqarg(TQFileInfo(d->fileName).fileName());
break; break;
} }
case(KIPIFindDupplicateImagesPlugin::FastParsing): case(KIPIFindDupplicateImagesPlugin::FastParsing):
{ {
text = i18n("Fast parsing for '%1'").arg(TQFileInfo(d->fileName).fileName()); text = i18n("Fast parsing for '%1'").tqarg(TQFileInfo(d->fileName).fileName());
break; break;
} }
@ -192,7 +192,7 @@ void Plugin_FindImages::customEvent(TQCustomEvent *event)
case(KIPIFindDupplicateImagesPlugin::Matrix): case(KIPIFindDupplicateImagesPlugin::Matrix):
{ {
text = i18n("Failed to create fingerprint for '%1'") text = i18n("Failed to create fingerprint for '%1'")
.arg(TQFileInfo(d->fileName).fileName()); .tqarg(TQFileInfo(d->fileName).fileName());
break; break;
} }
@ -232,28 +232,28 @@ void Plugin_FindImages::customEvent(TQCustomEvent *event)
case(KIPIFindDupplicateImagesPlugin::Matrix): case(KIPIFindDupplicateImagesPlugin::Matrix):
{ {
text = i18n("Fingerprint created for '%1'") text = i18n("Fingerprint created for '%1'")
.arg(TQFileInfo(d->fileName).fileName()); .tqarg(TQFileInfo(d->fileName).fileName());
break; break;
} }
case(KIPIFindDupplicateImagesPlugin::FastParsing): case(KIPIFindDupplicateImagesPlugin::FastParsing):
{ {
text = i18n("Fast parsing completed for '%1'") text = i18n("Fast parsing completed for '%1'")
.arg(TQFileInfo(d->fileName).fileName()); .tqarg(TQFileInfo(d->fileName).fileName());
break; break;
} }
case(KIPIFindDupplicateImagesPlugin::Similar): case(KIPIFindDupplicateImagesPlugin::Similar):
{ {
text = i18n("Finding similar images for '%1' completed.") text = i18n("Finding similar images for '%1' completed.")
.arg(TQFileInfo(d->fileName).fileName()); .tqarg(TQFileInfo(d->fileName).fileName());
break; break;
} }
case(KIPIFindDupplicateImagesPlugin::Exact): case(KIPIFindDupplicateImagesPlugin::Exact):
{ {
text = i18n("Finding exact images for '%1' completed.") text = i18n("Finding exact images for '%1' completed.")
.arg(TQFileInfo(d->fileName).fileName()); .tqarg(TQFileInfo(d->fileName).fileName());
break; break;
} }

@ -52,7 +52,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout3</cstring> <cstring>tqlayout3</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -137,7 +137,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

@ -31,7 +31,7 @@
// TQt includes. // TQt includes.
#include <tqcstring.h> #include <tqcstring.h>
#include <textstream.h> #include <tqtextstream.h>
#include <tqfile.h> #include <tqfile.h>
#include <tqimage.h> #include <tqimage.h>
#include <tqstringlist.h> #include <tqstringlist.h>
@ -542,7 +542,7 @@ void FlickrTalker::slotError(const TQString& error)
}; };
KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()),
i18n("Error Occured: %1\n We can not proceed further").arg(transError)); i18n("Error Occured: %1\n We can not proceed further").tqarg(transError));
// kdDebug() << "Not handling the error now will see it later" << endl; // kdDebug() << "Not handling the error now will see it later" << endl;
} }

@ -32,7 +32,7 @@
#include <tqgroupbox.h> #include <tqgroupbox.h>
#include <tqspinbox.h> #include <tqspinbox.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <layout.h> #include <tqlayout.h>
#include <tqtooltip.h> #include <tqtooltip.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
@ -88,7 +88,7 @@ FlickrWidget::FlickrWidget(TQWidget* parent, KIPI::Interface *iface)
TQVBoxLayout* settingsBoxLayout = new TQVBoxLayout(settingsBox); TQVBoxLayout* settingsBoxLayout = new TQVBoxLayout(settingsBox);
//m_newAlbumBtn = new TQPushButton(settingsBox, "m_newAlbumBtn"); //m_newAlbumBtn = new TQPushButton(settingsBox, "m_newAlbumBtn");
//m_newAlbumBtn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); //m_newAlbumBtn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
//m_newAlbumBtn->setText(i18n("&New Album")); //m_newAlbumBtn->setText(i18n("&New Album"));
TQGridLayout* tagsLayout = new TQGridLayout(1, 1); TQGridLayout* tagsLayout = new TQGridLayout(1, 1);
@ -109,9 +109,9 @@ FlickrWidget::FlickrWidget(TQWidget* parent, KIPI::Interface *iface)
TQGroupBox* optionsBox = new TQGroupBox(i18n("Override Default Options"), settingsBox); TQGroupBox* optionsBox = new TQGroupBox(i18n("Override Default Options"), settingsBox);
optionsBox->setColumnLayout(0, Qt::Vertical); optionsBox->setColumnLayout(0, Qt::Vertical);
optionsBox->layout()->setSpacing(KDialog::spacingHint()); optionsBox->tqlayout()->setSpacing(KDialog::spacingHint());
optionsBox->layout()->setMargin(KDialog::spacingHint()); optionsBox->tqlayout()->setMargin(KDialog::spacingHint());
TQGridLayout* optionsBoxLayout = new TQGridLayout(optionsBox->layout(), 5, 3); TQGridLayout* optionsBoxLayout = new TQGridLayout(optionsBox->tqlayout(), 5, 3);
m_publicCheckBox = new TQCheckBox(optionsBox); m_publicCheckBox = new TQCheckBox(optionsBox);
m_publicCheckBox->setText(i18n("As in accessible for people", "Public (anyone can see them)")); m_publicCheckBox->setText(i18n("As in accessible for people", "Public (anyone can see them)"));
@ -128,14 +128,14 @@ FlickrWidget::FlickrWidget(TQWidget* parent, KIPI::Interface *iface)
m_dimensionSpinBox = new TQSpinBox(0, 5000, 10, optionsBox); m_dimensionSpinBox = new TQSpinBox(0, 5000, 10, optionsBox);
m_dimensionSpinBox->setValue(600); m_dimensionSpinBox->setValue(600);
m_dimensionSpinBox->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); m_dimensionSpinBox->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
m_dimensionSpinBox->setEnabled(false); m_dimensionSpinBox->setEnabled(false);
TQLabel* resizeLabel = new TQLabel(i18n("Maximum dimension (pixels):"), optionsBox); TQLabel* resizeLabel = new TQLabel(i18n("Maximum dimension (pixels):"), optionsBox);
m_imageQualitySpinBox = new TQSpinBox(0, 100, 1, optionsBox); m_imageQualitySpinBox = new TQSpinBox(0, 100, 1, optionsBox);
m_imageQualitySpinBox->setValue(85); m_imageQualitySpinBox->setValue(85);
m_imageQualitySpinBox->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); m_imageQualitySpinBox->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
// NOTE: The term Compression factor may be to technical to write in the label // 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); TQLabel* imageQualityLabel = new TQLabel(i18n("JPEG Image Quality (higher is better):"), optionsBox);
@ -157,9 +157,9 @@ FlickrWidget::FlickrWidget(TQWidget* parent, KIPI::Interface *iface)
TQGroupBox* accountBox = new TQGroupBox(i18n("Account"), settingsBox); TQGroupBox* accountBox = new TQGroupBox(i18n("Account"), settingsBox);
accountBox->setColumnLayout(0, Qt::Vertical); accountBox->setColumnLayout(0, Qt::Vertical);
accountBox->layout()->setSpacing(KDialog::spacingHint()); accountBox->tqlayout()->setSpacing(KDialog::spacingHint());
accountBox->layout()->setMargin(KDialog::spacingHint()); accountBox->tqlayout()->setMargin(KDialog::spacingHint());
TQGridLayout* accountBoxLayout = new TQGridLayout(accountBox->layout(), 1, 3); TQGridLayout* accountBoxLayout = new TQGridLayout(accountBox->tqlayout(), 1, 3);
TQLabel *userNameLabel = new TQLabel(i18n("User Name: "), accountBox); TQLabel *userNameLabel = new TQLabel(i18n("User Name: "), accountBox);
m_userNameDisplayLabel = new TQLabel(accountBox); m_userNameDisplayLabel = new TQLabel(accountBox);

@ -292,7 +292,7 @@ void FlickrWindow::slotTokenObtained(const TQString& token)
m_username = m_talker->getUserName(); m_username = m_talker->getUserName();
m_userId = m_talker->getUserId(); m_userId = m_talker->getUserId();
kdDebug() << "SlotTokenObtained invoked setting user Display name to " << m_username << endl; kdDebug() << "SlotTokenObtained invoked setting user Display name to " << m_username << endl;
m_userNameDisplayLabel->setText(TQString("<qt><b>%1</b></qt>").arg(m_username)); m_userNameDisplayLabel->setText(TQString("<qt><b>%1</b></qt>").tqarg(m_username));
m_widget->setEnabled(true); m_widget->setEnabled(true);
} }
@ -531,7 +531,7 @@ void FlickrWindow::slotAddPhotoNext()
return; return;
} }
m_progressDlg->setLabelText(i18n("Uploading file %1").arg(pathComments.first.filename())); m_progressDlg->setLabelText(i18n("Uploading file %1").tqarg(pathComments.first.filename()));
if (m_progressDlg->isHidden()) if (m_progressDlg->isHidden())
m_progressDlg->show(); m_progressDlg->show();
@ -550,7 +550,7 @@ void FlickrWindow::slotAddPhotoSucceeded()
void FlickrWindow::slotAddPhotoFailed(const TQString& msg) void FlickrWindow::slotAddPhotoFailed(const TQString& msg)
{ {
if (KMessageBox::warningContinueCancel(this, if (KMessageBox::warningContinueCancel(this,
i18n("Failed to upload photo into Flickr. %1\nDo you want to continue?").arg(msg)) i18n("Failed to upload photo into Flickr. %1\nDo you want to continue?").tqarg(msg))
!= KMessageBox::Continue) != KMessageBox::Continue)
{ {
m_uploadQueue.clear(); m_uploadQueue.clear();

@ -27,7 +27,7 @@
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <tqpainter.h> #include <tqpainter.h>
#include <tqfileinfo.h> #include <tqfileinfo.h>
#include <layout.h> #include <tqlayout.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqdragobject.h> #include <tqdragobject.h>
#include <tqimage.h> #include <tqimage.h>
@ -98,7 +98,7 @@ ImagesListView::ImagesListView(TQWidget *parent)
setResizeMode(TQListView::AllColumns); setResizeMode(TQListView::AllColumns);
setAllColumnsShowFocus(true); setAllColumnsShowFocus(true);
setSorting(-1); setSorting(-1);
setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
setSelectionMode(TQListView::Extended); setSelectionMode(TQListView::Extended);
} }

@ -26,7 +26,7 @@
#include <tqframe.h> #include <tqframe.h>
#include <tqlineedit.h> #include <tqlineedit.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <layout.h> #include <tqlayout.h>
// KDE includes. // KDE includes.
@ -48,7 +48,7 @@ FlickrLogin::FlickrLogin(TQWidget* parent, const TQString& header,
TQVBoxLayout* vbox = new TQVBoxLayout(this, 5, 5, "vbox"); TQVBoxLayout* vbox = new TQVBoxLayout(this, 5, 5, "vbox");
m_headerLabel = new TQLabel(this); m_headerLabel = new TQLabel(this);
m_headerLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); m_headerLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
m_headerLabel->setText(header); m_headerLabel->setText(header);
TQFrame* hline = new TQFrame(this, "hline"); TQFrame* hline = new TQFrame(this, "hline");
@ -91,7 +91,7 @@ FlickrLogin::FlickrLogin(TQWidget* parent, const TQString& header,
vbox->addLayout(centerLayout); vbox->addLayout(centerLayout);
vbox->addLayout(btnLayout); vbox->addLayout(btnLayout);
resize( TQSize(300, 150).expandedTo(minimumSizeHint()) ); resize( TQSize(300, 150).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished ); clearWState( WState_Polished );
m_nameEdit->setText(_name); m_nameEdit->setText(_name);

@ -30,7 +30,7 @@
#include <tqfile.h> #include <tqfile.h>
#include <tqfileinfo.h> #include <tqfileinfo.h>
#include <textstream.h> #include <tqtextstream.h>
// KDE includes. // KDE includes.

@ -10,4 +10,4 @@ Somewhat immediate implementation needed:
For the lazy times: For the lazy times:
* Polish the html code used to render the thumbnails, better * Polish the html code used to render the thumbnails, better
fonts sizes and layout fonts sizes and tqlayout

@ -157,12 +157,12 @@ void Galleries::Load()
mMaxGalleryId = gallery_id; mMaxGalleryId = gallery_id;
// Load the gallery with this id. // Load the gallery with this id.
name = config.readEntry(TQString("Name%1").arg(gallery_id)); name = config.readEntry(TQString("Name%1").tqarg(gallery_id));
url = config.readEntry(TQString("URL%1").arg(gallery_id)); url = config.readEntry(TQString("URL%1").tqarg(gallery_id));
username = config.readEntry(TQString("Username%1").arg(gallery_id)); username = config.readEntry(TQString("Username%1").tqarg(gallery_id));
version = config.readNumEntry(TQString("Version%1").arg(gallery_id)); version = config.readNumEntry(TQString("Version%1").tqarg(gallery_id));
if (bln_use_wallet) if (bln_use_wallet)
mpWallet->readPassword(TQString("Password%1").arg(gallery_id), password); mpWallet->readPassword(TQString("Password%1").tqarg(gallery_id), password);
Gallery* p_gallery = new Gallery(name, url, username, password, version, gallery_id); Gallery* p_gallery = new Gallery(name, url, username, password, version, gallery_id);
mGalleries.append(p_gallery); mGalleries.append(p_gallery);
@ -217,12 +217,12 @@ void Galleries::Save()
unsigned int gallery_id = p_gallery->galleryId(); unsigned int gallery_id = p_gallery->galleryId();
gallery_ids.append(gallery_id); gallery_ids.append(gallery_id);
config.writeEntry(TQString("Name%1").arg(gallery_id), p_gallery->name()); config.writeEntry(TQString("Name%1").tqarg(gallery_id), p_gallery->name());
config.writeEntry(TQString("URL%1").arg(gallery_id), p_gallery->url()); config.writeEntry(TQString("URL%1").tqarg(gallery_id), p_gallery->url());
config.writeEntry(TQString("Username%1").arg(gallery_id), p_gallery->username()); config.writeEntry(TQString("Username%1").tqarg(gallery_id), p_gallery->username());
config.writeEntry(TQString("Version%1").arg(gallery_id), p_gallery->version()); config.writeEntry(TQString("Version%1").tqarg(gallery_id), p_gallery->version());
if (bln_use_wallet) if (bln_use_wallet)
mpWallet->writePassword(TQString("Password%1").arg(gallery_id), p_gallery->password()); mpWallet->writePassword(TQString("Password%1").tqarg(gallery_id), p_gallery->password());
} }
config.setGroup("GallerySync Settings"); config.setGroup("GallerySync Settings");

@ -52,7 +52,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout3</cstring> <cstring>tqlayout3</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -137,7 +137,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

@ -28,7 +28,7 @@
#include <tqprogressdialog.h> #include <tqprogressdialog.h>
#include <tqspinbox.h> #include <tqspinbox.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <layout.h> #include <tqlayout.h>
// Include files for KDE // Include files for KDE
@ -74,7 +74,7 @@ GalleryEdit::GalleryEdit(TQWidget* pParent,
tll->addItem(vbox); tll->addItem(vbox);
mpHeaderLabel = new TQLabel(page); mpHeaderLabel = new TQLabel(page);
mpHeaderLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, mpHeaderLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,
TQSizePolicy::Fixed)); TQSizePolicy::Fixed));
mpHeaderLabel->setText(title); mpHeaderLabel->setText(title);
vbox->addWidget(mpHeaderLabel); vbox->addWidget(mpHeaderLabel);
@ -124,7 +124,7 @@ GalleryEdit::GalleryEdit(TQWidget* pParent,
vbox->addLayout( centerLayout ); vbox->addLayout( centerLayout );
resize( TQSize(300, 150).expandedTo(minimumSizeHint()) ); resize( TQSize(300, 150).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished ); clearWState( WState_Polished );
mpNameEdit->setText(pGallery->name()); mpNameEdit->setText(pGallery->name());

@ -28,7 +28,7 @@
#include <tqprogressdialog.h> #include <tqprogressdialog.h>
#include <tqspinbox.h> #include <tqspinbox.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <layout.h> #include <tqlayout.h>
// Include files for KDE // Include files for KDE
@ -79,7 +79,7 @@ GalleryList::GalleryList(TQWidget *pParent, Galleries* pGalleries, bool blnShowO
hb->addWidget(label); hb->addWidget(label);
label->setPixmap(UserIcon("gallery")); label->setPixmap(UserIcon("gallery"));
label->setFrameStyle (TQFrame::Panel | TQFrame::Sunken); label->setFrameStyle (TQFrame::Panel | TQFrame::Sunken);
label->setAlignment(TQt::AlignTop); label->tqsetAlignment(TQt::AlignTop);
TQVBoxLayout *vb = new TQVBoxLayout(); TQVBoxLayout *vb = new TQVBoxLayout();
vb->setSpacing (KDialog::spacingHint()); vb->setSpacing (KDialog::spacingHint());
tll->addItem(vb); tll->addItem(vb);

@ -26,7 +26,7 @@
#include <tqfile.h> #include <tqfile.h>
#include <tqfileinfo.h> #include <tqfileinfo.h>
#include <textstream.h> #include <tqtextstream.h>
#include <cstring> #include <cstring>
#include <cstdio> #include <cstdio>
@ -76,7 +76,7 @@ void GalleryMPForm::finish()
bool GalleryMPForm::addPair(const TQString& name, const TQString& value) bool GalleryMPForm::addPair(const TQString& name, const TQString& value)
{ {
if (GalleryTalker::isGallery2()) if (GalleryTalker::isGallery2())
return addPairRaw(TQString("g2_form[%1]").arg(name), value); return addPairRaw(TQString("g2_form[%1]").tqarg(name), value);
return addPairRaw(name, value); return addPairRaw(name, value);
} }

@ -20,7 +20,7 @@
* ============================================================ */ * ============================================================ */
#include <tqcstring.h> #include <tqcstring.h>
#include <textstream.h> #include <tqtextstream.h>
#include <tqfile.h> #include <tqfile.h>
#include <tqimage.h> #include <tqimage.h>
#include <tqregexp.h> #include <tqregexp.h>

@ -32,7 +32,7 @@
#include <tqgroupbox.h> #include <tqgroupbox.h>
#include <tqspinbox.h> #include <tqspinbox.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <layout.h> #include <tqlayout.h>
#include <tqtooltip.h> #include <tqtooltip.h>
#include <tqsplitter.h> #include <tqsplitter.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
@ -87,11 +87,11 @@ GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl )
rightButtonGroupLayout->setMargin( 5 ); rightButtonGroupLayout->setMargin( 5 );
m_newAlbumBtn = new TQPushButton( rightButtonGroup, "m_newAlbumBtn" ); m_newAlbumBtn = new TQPushButton( rightButtonGroup, "m_newAlbumBtn" );
m_newAlbumBtn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); m_newAlbumBtn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
rightButtonGroupLayout->addWidget( m_newAlbumBtn, 0, TQt::AlignHCenter ); rightButtonGroupLayout->addWidget( m_newAlbumBtn, 0, TQt::AlignHCenter );
m_addPhotoBtn = new TQPushButton( rightButtonGroup, "m_addPhotoBtn" ); m_addPhotoBtn = new TQPushButton( rightButtonGroup, "m_addPhotoBtn" );
m_addPhotoBtn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); m_addPhotoBtn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
rightButtonGroupLayout->addWidget( m_addPhotoBtn, 0, TQt::AlignHCenter ); rightButtonGroupLayout->addWidget( m_addPhotoBtn, 0, TQt::AlignHCenter );
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@ -99,9 +99,9 @@ GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl )
TQGroupBox* optionsBox = new TQGroupBox(i18n("Override Default Options"), TQGroupBox* optionsBox = new TQGroupBox(i18n("Override Default Options"),
rightButtonGroup); rightButtonGroup);
optionsBox->setColumnLayout(0, Qt::Vertical); optionsBox->setColumnLayout(0, Qt::Vertical);
optionsBox->layout()->setSpacing(5); optionsBox->tqlayout()->setSpacing(5);
optionsBox->layout()->setMargin(5); optionsBox->tqlayout()->setMargin(5);
TQGridLayout* optionsBoxLayout = new TQGridLayout(optionsBox->layout()); TQGridLayout* optionsBoxLayout = new TQGridLayout(optionsBox->tqlayout());
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
m_captTitleCheckBox = new TQCheckBox(optionsBox); m_captTitleCheckBox = new TQCheckBox(optionsBox);
@ -118,7 +118,7 @@ GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl )
m_dimensionSpinBox = new TQSpinBox(0, 5000, 10, optionsBox); m_dimensionSpinBox = new TQSpinBox(0, 5000, 10, optionsBox);
m_dimensionSpinBox->setValue(600); m_dimensionSpinBox->setValue(600);
m_dimensionSpinBox->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); m_dimensionSpinBox->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
optionsBoxLayout->addWidget(m_dimensionSpinBox, 3, 1); optionsBoxLayout->addWidget(m_dimensionSpinBox, 3, 1);
TQLabel* resizeLabel = new TQLabel(i18n("Maximum dimension:"), optionsBox); 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(minimumSizeHint()) ); resize( TQSize(600, 400).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished ); clearWState( WState_Polished );
} }

@ -346,18 +346,18 @@ void GalleryWindow::slotPhotos( const TQValueList<GPhoto>& photoList)
TQString styleSheet = TQString styleSheet =
TQString( "body { margin: 8px; font-size: %1px; " TQString( "body { margin: 8px; font-size: %1px; "
" color: %2; background-color: %3;}" ) " color: %2; background-color: %3;}" )
.arg( pxSize ) .tqarg( pxSize )
.arg( colorGroup().text().name() ) .tqarg( tqcolorGroup().text().name() )
.arg( colorGroup().base().name() ); .tqarg( tqcolorGroup().base().name() );
styleSheet += TQString( "a { font-size: %1px; color: %2; " styleSheet += TQString( "a { font-size: %1px; color: %2; "
"text-decoration: none;}" ) "text-decoration: none;}" )
.arg( pxSize ) .tqarg( pxSize )
.arg( colorGroup().text().name() ); .tqarg( tqcolorGroup().text().name() );
styleSheet += TQString( "i { font-size: %1px; color: %2; " styleSheet += TQString( "i { font-size: %1px; color: %2; "
"text-decoration: none;}" ) "text-decoration: none;}" )
.arg( pxSize-2 ) .tqarg( pxSize-2 )
.arg( TQColor("steelblue").name() ); .tqarg( TQColor("steelblue").name() );
m_photoView->begin(); m_photoView->begin();
m_photoView->setUserStyleSheet( styleSheet ); m_photoView->setUserStyleSheet( styleSheet );
@ -378,13 +378,13 @@ void GalleryWindow::slotPhotos( const TQValueList<GPhoto>& photoList)
m_photoView->write( "<tr><td class='photo'>" m_photoView->write( "<tr><td class='photo'>"
+ TQString("<a href='%1'>") + TQString("<a href='%1'>")
.arg(imageurl.url()) .tqarg(imageurl.url())
+ TQString("<img border=1 src=\"%1\"><br>") + TQString("<img border=1 src=\"%1\"><br>")
.arg(thumburl.url()) .tqarg(thumburl.url())
+ photo.name + photo.name
+ ( photo.caption.isEmpty() ? TQString() : + ( photo.caption.isEmpty() ? TQString() :
TQString("<br><i>%1</i>") TQString("<br><i>%1</i>")
.arg(photo.caption) ) .tqarg(photo.caption) )
+ "</a></td></tr>" ); + "</a></td></tr>" );
} }
@ -529,7 +529,7 @@ void GalleryWindow::slotNewAlbum()
if (!clean) if (!clean)
{ {
KMessageBox::error( this, i18n("Sorry, these characters are not allowed in album name: %1") KMessageBox::error( this, i18n("Sorry, these characters are not allowed in album name: %1")
.arg("\\ / * ? \" \' & < > | . + # ( ) or spaces") ); .tqarg("\\ / * ? \" \' & < > | . + # ( ) or spaces") );
return; return;
} }
@ -601,7 +601,7 @@ void GalleryWindow::slotAddPhotoNext()
} }
m_progressDlg->setLabelText( i18n("Uploading file %1 ") m_progressDlg->setLabelText( i18n("Uploading file %1 ")
.arg( KURL(pathComments.first).filename() ) ); .tqarg( KURL(pathComments.first).filename() ) );
if (m_progressDlg->isHidden()) if (m_progressDlg->isHidden())
m_progressDlg->show(); m_progressDlg->show();

@ -32,7 +32,7 @@
#include <tqstringlist.h> #include <tqstringlist.h>
#include <tqfile.h> #include <tqfile.h>
#include <tqdom.h> #include <tqdom.h>
#include <textstream.h> #include <tqtextstream.h>
// KDE includes. // KDE includes.

@ -24,7 +24,7 @@
#include <tqtimer.h> #include <tqtimer.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <layout.h> #include <tqlayout.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <tqvalidator.h> #include <tqvalidator.h>
@ -85,7 +85,7 @@ public:
GPSEditDialog::GPSEditDialog(TQWidget* parent, const GPSDataContainer& gpsData, GPSEditDialog::GPSEditDialog(TQWidget* parent, const GPSDataContainer& gpsData,
const TQString& fileName, bool hasGPSInfo) const TQString& fileName, bool hasGPSInfo)
: KDialogBase(Plain, i18n("%1 - Edit Geographical Coordinates").arg(fileName), : KDialogBase(Plain, i18n("%1 - Edit Geographical Coordinates").tqarg(fileName),
Help|Ok|Cancel, Ok, Help|Ok|Cancel, Ok,
parent, 0, true, false) parent, 0, true, false)
{ {

@ -117,7 +117,7 @@ void GPSListViewItem::setGPSInfo(const GPSDataContainer& gpsData, bool dirty, bo
setText(6, status); setText(6, status);
} }
repaint(); tqrepaint();
} }
GPSDataContainer GPSListViewItem::GPSInfo() const GPSDataContainer GPSListViewItem::GPSInfo() const
@ -130,7 +130,7 @@ void GPSListViewItem::eraseGPSInfo()
d->erase = true; d->erase = true;
d->dirty = true; d->dirty = true;
setText(6, i18n("Deleted!")); setText(6, i18n("Deleted!"));
repaint(); tqrepaint();
} }
void GPSListViewItem::setDateTime(const TQDateTime& date) void GPSListViewItem::setDateTime(const TQDateTime& date)
@ -197,7 +197,7 @@ void GPSListViewItem::writeGPSInfoToFile()
void GPSListViewItem::setEnabled(bool e) void GPSListViewItem::setEnabled(bool e)
{ {
d->enabled = e; d->enabled = e;
repaint(); tqrepaint();
} }
bool GPSListViewItem::isEnabled() bool GPSListViewItem::isEnabled()
@ -210,7 +210,7 @@ bool GPSListViewItem::isDirty()
return d->dirty; return d->dirty;
} }
void GPSListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) void GPSListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
{ {
if (isEnabled()) if (isEnabled())
{ {
@ -219,7 +219,7 @@ void GPSListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column
TQColorGroup _cg( cg ); TQColorGroup _cg( cg );
TQColor c = _cg.text(); TQColor c = _cg.text();
_cg.setColor( TQColorGroup::Text, TQt::red ); _cg.setColor( TQColorGroup::Text, TQt::red );
KListViewItem::paintCell( p, _cg, column, width, alignment ); KListViewItem::paintCell( p, _cg, column, width, tqalignment );
_cg.setColor( TQColorGroup::Text, c ); _cg.setColor( TQColorGroup::Text, c );
} }
else if ( isDirty() && d->erase && column == 6) else if ( isDirty() && d->erase && column == 6)
@ -227,18 +227,18 @@ void GPSListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column
TQColorGroup _cg( cg ); TQColorGroup _cg( cg );
TQColor c = _cg.text(); TQColor c = _cg.text();
_cg.setColor( TQColorGroup::Text, TQt::red ); _cg.setColor( TQColorGroup::Text, TQt::red );
KListViewItem::paintCell( p, _cg, column, width, alignment ); KListViewItem::paintCell( p, _cg, column, width, tqalignment );
_cg.setColor( TQColorGroup::Text, c ); _cg.setColor( TQColorGroup::Text, c );
} }
else else
KListViewItem::paintCell(p, cg, column, width, alignment); KListViewItem::paintCell(p, cg, column, width, tqalignment);
} }
else else
{ {
TQColorGroup _cg( cg ); TQColorGroup _cg( cg );
TQColor c = _cg.text(); TQColor c = _cg.text();
_cg.setColor( TQColorGroup::Text, TQt::gray ); _cg.setColor( TQColorGroup::Text, TQt::gray );
KListViewItem::paintCell( p, _cg, column, width, alignment ); KListViewItem::paintCell( p, _cg, column, width, tqalignment );
_cg.setColor( TQColorGroup::Text, c ); _cg.setColor( TQColorGroup::Text, c );
} }
} }

@ -71,7 +71,7 @@ public:
protected: protected:
void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment);
private: private:

@ -126,7 +126,7 @@ void GPSMapWidget::khtmlMouseMoveEvent(khtml::MouseMoveEvent *e)
{ {
TQString status = jsStatusBarText(); TQString status = jsStatusBarText();
// If a new point to the map have been moved, the Status // If a new point to the map have been moved, the tqStatus
// string is like : "(lat:25.5894748, lon:47.6897455478, alt:211)" // string is like : "(lat:25.5894748, lon:47.6897455478, alt:211)"
if (status.startsWith(TQString("(lat:"))) if (status.startsWith(TQString("(lat:")))
extractGPSPositionfromStatusbar(status); extractGPSPositionfromStatusbar(status);
@ -138,12 +138,12 @@ void GPSMapWidget::khtmlMouseReleaseEvent(khtml::MouseReleaseEvent *e)
{ {
TQString status = jsStatusBarText(); TQString status = jsStatusBarText();
// If a new point to the map have been moved, the Status // If a new point to the map have been moved, the tqStatus
// string is like : "(lat:25.5894748, lon:47.6897455478, alt:211)" // string is like : "(lat:25.5894748, lon:47.6897455478, alt:211)"
if (status.startsWith(TQString("(lat:"))) if (status.startsWith(TQString("(lat:")))
extractGPSPositionfromStatusbar(status); extractGPSPositionfromStatusbar(status);
// If a new map zoom level have been selected, the Status // If a new map zoom level have been selected, the tqStatus
// string is like : "newZoomLevel:5" // string is like : "newZoomLevel:5"
if (status.startsWith(TQString("newZoomLevel:"))) if (status.startsWith(TQString("newZoomLevel:")))
{ {
@ -151,7 +151,7 @@ void GPSMapWidget::khtmlMouseReleaseEvent(khtml::MouseReleaseEvent *e)
d->zoomLevel = status; d->zoomLevel = status;
} }
// If a new map type have been selected, the Status // If a new map type have been selected, the tqStatus
// string is like : "newMapType:G_SATELLITE_TYPE" // string is like : "newMapType:G_SATELLITE_TYPE"
if (status.startsWith(TQString("newMapType:"))) if (status.startsWith(TQString("newMapType:")))
{ {

@ -24,7 +24,7 @@
// TQt includes. // TQt includes.
#include <tqcombobox.h> #include <tqcombobox.h>
#include <layout.h> #include <tqlayout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqvgroupbox.h> #include <tqvgroupbox.h>
#include <tqgrid.h> #include <tqgrid.h>
@ -138,14 +138,14 @@ GPSSyncDialog::GPSSyncDialog( KIPI::Interface* interface, TQWidget* parent)
d->listView->setResizeMode(TQListView::AllColumns); d->listView->setResizeMode(TQListView::AllColumns);
d->listView->setAllColumnsShowFocus(true); d->listView->setAllColumnsShowFocus(true);
d->listView->setSorting(-1); d->listView->setSorting(-1);
d->listView->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); d->listView->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
d->listView->setSelectionMode(TQListView::Extended); d->listView->setSelectionMode(TQListView::Extended);
d->listView->setMinimumWidth(450); d->listView->setMinimumWidth(450);
// --------------------------------------------------------------- // ---------------------------------------------------------------
TQGroupBox *settingsBox = new TQGroupBox(0, Qt::Vertical, i18n("Settings"), plainPage()); TQGroupBox *settingsBox = new TQGroupBox(0, Qt::Vertical, i18n("Settings"), plainPage());
TQGridLayout *settingsBoxLayout = new TQGridLayout(settingsBox->layout(), 8, 1, TQGridLayout *settingsBoxLayout = new TQGridLayout(settingsBox->tqlayout(), 8, 1,
KDialog::spacingHint()); KDialog::spacingHint());
TQPushButton *loadGPXButton = new TQPushButton(i18n("Load GPX File..."), settingsBox); TQPushButton *loadGPXButton = new TQPushButton(i18n("Load GPX File..."), settingsBox);
@ -299,7 +299,7 @@ void GPSSyncDialog::setImages( const KURL::List& images )
void GPSSyncDialog::slotLoadGPXFile() void GPSSyncDialog::slotLoadGPXFile()
{ {
KURL loadGPXFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), KURL loadGPXFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(),
i18n("%1|GPS Exchange Format").arg("*.gpx"), this, i18n("%1|GPS Exchange Format").tqarg("*.gpx"), this,
i18n("Select GPX File to Load") ); i18n("Select GPX File to Load") );
if( loadGPXFile.isEmpty() ) if( loadGPXFile.isEmpty() )
return; return;
@ -310,7 +310,7 @@ void GPSSyncDialog::slotLoadGPXFile()
if (!ret) if (!ret)
{ {
KMessageBox::error(this, i18n("Cannot parse %1 GPX file!") KMessageBox::error(this, i18n("Cannot parse %1 GPX file!")
.arg(loadGPXFile.fileName()), i18n("GPS Sync")); .tqarg(loadGPXFile.fileName()), i18n("GPS Sync"));
enableButton(User1, false); enableButton(User1, false);
return; return;
} }
@ -318,13 +318,13 @@ void GPSSyncDialog::slotLoadGPXFile()
if (d->gpxParser.numPoints() <= 0) if (d->gpxParser.numPoints() <= 0)
{ {
KMessageBox::sorry(this, i18n("The %1 GPX file do not have a date-time track to use!") KMessageBox::sorry(this, i18n("The %1 GPX file do not have a date-time track to use!")
.arg(loadGPXFile.fileName()), i18n("GPS Sync")); .tqarg(loadGPXFile.fileName()), i18n("GPS Sync"));
enableButton(User1, false); enableButton(User1, false);
return; return;
} }
d->gpxFileName->setText(loadGPXFile.fileName()); d->gpxFileName->setText(loadGPXFile.fileName());
d->gpxPointsLabel->setText(i18n("Points parsed: %1").arg(d->gpxParser.numPoints())); d->gpxPointsLabel->setText(i18n("Points parsed: %1").tqarg(d->gpxParser.numPoints()));
enableButton(User1, true); enableButton(User1, true);
slotUser1(); slotUser1();
} }
@ -373,7 +373,7 @@ bool GPSSyncDialog::promptUserClose()
if (KMessageBox::No == KMessageBox::warningYesNo(this, if (KMessageBox::No == KMessageBox::warningYesNo(this,
i18n("<p>%1\n" i18n("<p>%1\n"
"Do you really want to close this window without applying changes?</p>") "Do you really want to close this window without applying changes?</p>")
.arg(msg))) .tqarg(msg)))
return false; return false;
} }

@ -80,7 +80,7 @@ bool kmlExport::createDir(TQDir dir)
bool ok = createDir(parent); bool ok = createDir(parent);
if (!ok) if (!ok)
{ {
logError(i18n("Could not create '%1").arg(parent.path())); logError(i18n("Could not create '%1").tqarg(parent.path()));
return false; return false;
} }
return parent.mkdir(dir.dirName()); return parent.mkdir(dir.dirName());
@ -164,14 +164,14 @@ void kmlExport::generateImagesthumb(KIPI::Interface* interface, const KURL& imag
TQFile imageFile(path); TQFile imageFile(path);
if (!imageFile.open(IO_ReadOnly)) if (!imageFile.open(IO_ReadOnly))
{ {
logWarning(i18n("Could not read image '%1'").arg(path)); logWarning(i18n("Could not read image '%1'").tqarg(path));
return; return;
} }
TQString imageFormat = TQImageIO::imageFormat(TQT_TQIODEVICE(&imageFile)); TQString imageFormat = TQImageIO::imageFormat(TQT_TQIODEVICE(&imageFile));
if (imageFormat.isEmpty()) if (imageFormat.isEmpty())
{ {
logWarning(i18n("Format of image '%1' is unknown").arg(path)); logWarning(i18n("Format of image '%1' is unknown").tqarg(path));
return; return;
} }
imageFile.close(); imageFile.close();
@ -181,7 +181,7 @@ void kmlExport::generateImagesthumb(KIPI::Interface* interface, const KURL& imag
TQImage image; TQImage image;
if (!image.loadFromData(imageData) ) if (!image.loadFromData(imageData) )
{ {
logWarning(i18n("Error loading image '%1'").arg(path)); logWarning(i18n("Error loading image '%1'").tqarg(path));
return; return;
} }
@ -221,11 +221,11 @@ void kmlExport::generateImagesthumb(KIPI::Interface* interface, const KURL& imag
if (!image.save(destPath, imageFormat.ascii(), 85)) if (!image.save(destPath, imageFormat.ascii(), 85))
{ {
// if not able to save the image, it's pointless to create a placemark // if not able to save the image, it's pointless to create a placemark
logWarning(i18n("Could not save image '%1' to '%2'").arg(path).arg(destPath)); logWarning(i18n("Could not save image '%1' to '%2'").tqarg(path).tqarg(destPath));
} }
else else
{ {
//logInfo(i18n("Creation of picture '%1'").arg(fullFileName)); //logInfo(i18n("Creation of picture '%1'").tqarg(fullFileName));
KExiv2Iface::KExiv2 exiv2Iface; KExiv2Iface::KExiv2 exiv2Iface;
exiv2Iface.load(imageURL.path()); exiv2Iface.load(imageURL.path());
double alt, lat, lng; double alt, lat, lng;
@ -237,11 +237,11 @@ void kmlExport::generateImagesthumb(KIPI::Interface* interface, const KURL& imag
if (alt) if (alt)
{ {
addKmlTextElement(kmlGeometry, "coordinates", TQString("%1,%2,%3").arg(lng).arg(lat).arg(alt)); addKmlTextElement(kmlGeometry, "coordinates", TQString("%1,%2,%3").tqarg(lng).tqarg(lat).tqarg(alt));
} }
else else
{ {
addKmlTextElement(kmlGeometry, "coordinates", TQString("%1,%2").arg(lng).arg(lat)); addKmlTextElement(kmlGeometry, "coordinates", TQString("%1,%2").tqarg(lng).tqarg(lat));
} }
if (m_altitudeMode == 2 ) if (m_altitudeMode == 2 )
@ -301,18 +301,18 @@ void kmlExport::generateImagesthumb(KIPI::Interface* interface, const KURL& imag
my_description += "<br/>" + info.description() ; my_description += "<br/>" + info.description() ;
} }
addKmlTextElement(kmlPlacemark, "description", my_description); addKmlTextElement(kmlPlacemark, "description", my_description);
logInfo(i18n("Creation of placemark '%1'").arg(fullFileName)); logInfo(i18n("Creation of placemark '%1'").tqarg(fullFileName));
// Save icon // Save icon
TQString iconFileName = "thumb_" + baseFileName + '.' + imageFormat.lower(); TQString iconFileName = "thumb_" + baseFileName + '.' + imageFormat.lower();
TQString destPath = m_tempDestDir + m_imageDir + iconFileName; TQString destPath = m_tempDestDir + m_imageDir + iconFileName;
if (!icon.save(destPath, imageFormat.ascii(), 85)) if (!icon.save(destPath, imageFormat.ascii(), 85))
{ {
logWarning(i18n("Could not save icon for image '%1' to '%2'").arg(path).arg(destPath)); logWarning(i18n("Could not save icon for image '%1' to '%2'").tqarg(path).tqarg(destPath));
} }
else else
{ {
//logInfo(i18n("Creation of icon '%1'").arg(iconFileName)); //logInfo(i18n("Creation of icon '%1'").tqarg(iconFileName));
// style et icon // style et icon
TQDomElement kmlStyle = addKmlElement(kmlPlacemark, "Style"); TQDomElement kmlStyle = addKmlElement(kmlPlacemark, "Style");
TQDomElement kmlIconStyle = addKmlElement(kmlStyle, "IconStyle"); TQDomElement kmlIconStyle = addKmlElement(kmlStyle, "IconStyle");
@ -347,14 +347,14 @@ void kmlExport::addTrack(TQDomElement &kmlAlbum)
if (!ret) if (!ret)
{ {
logError(i18n("Cannot parse %1 GPX file!").arg(m_GPXFile)); logError(i18n("Cannot parse %1 GPX file!").tqarg(m_GPXFile));
return; return;
} }
if (m_gpxParser.numPoints() <= 0) if (m_gpxParser.numPoints() <= 0)
{ {
logError(i18n("The %1 GPX file do not have a date-time track to use!") logError(i18n("The %1 GPX file do not have a date-time track to use!")
.arg(m_GPXFile)); .tqarg(m_GPXFile));
return; return;
} }
@ -381,12 +381,12 @@ void kmlExport::addTrack(TQDomElement &kmlAlbum)
TQDomElement kmlLineStyle = addKmlElement(kmlLineTrackStyle, "LineStyle"); TQDomElement kmlLineStyle = addKmlElement(kmlLineTrackStyle, "LineStyle");
// the KML color is not #RRGGBB but AABBGGRR // the KML color is not #RRGGBB but AABBGGRR
TQString KMLColorValue = TQString("%1%2%3%4") TQString KMLColorValue = TQString("%1%2%3%4")
.arg((int)m_GPXOpacity*256/100, 2, 16) .tqarg((int)m_GPXOpacity*256/100, 2, 16)
.arg((&m_GPXColor)->blue(), 2, 16) .tqarg((&m_GPXColor)->blue(), 2, 16)
.arg((&m_GPXColor)->green(), 2, 16) .tqarg((&m_GPXColor)->green(), 2, 16)
.arg((&m_GPXColor)->red(), 2, 16); .tqarg((&m_GPXColor)->red(), 2, 16);
addKmlTextElement(kmlLineStyle, "color", KMLColorValue); addKmlTextElement(kmlLineStyle, "color", KMLColorValue);
addKmlTextElement(kmlLineStyle, "width", TQString("%1").arg(m_LineWidth) ); addKmlTextElement(kmlLineStyle, "width", TQString("%1").tqarg(m_LineWidth) );
m_gpxParser.CreateTrackLine(kmlAlbum, *kmlDocument, m_GPXAltitudeMode); m_gpxParser.CreateTrackLine(kmlAlbum, *kmlDocument, m_GPXAltitudeMode);
} }
@ -440,7 +440,7 @@ void kmlExport::generate()
} }
else else
{ {
logWarning(i18n("No position data for '%1'").arg(info.title())); logWarning(i18n("No position data for '%1'").tqarg(info.title()));
defectImage++; defectImage++;
} }
m_progressDialog->setProgress(pos, count); m_progressDialog->setProgress(pos, count);

@ -27,7 +27,7 @@
#include <tqcombobox.h> #include <tqcombobox.h>
#include <tqgroupbox.h> #include <tqgroupbox.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <layout.h> #include <tqlayout.h>
#include <tqlineedit.h> #include <tqlineedit.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <tqradiobutton.h> #include <tqradiobutton.h>
@ -68,20 +68,20 @@ KMLExportConfig::KMLExportConfig( TQWidget* parent, const char* name)
parent, 0, true, false) parent, 0, true, false)
{ {
if ( !name ) setName( "KMLExportConfig" ); if ( !name ) setName( "KMLExportConfig" );
setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0,
(TQSizePolicy::SizeType)0, 0, 0, sizePolicy().hasHeightForWidth() ) ); (TQSizePolicy::SizeType)0, 0, 0, sizePolicy().hasHeightForWidth() ) );
KMLExportConfigLayout = new TQGridLayout ( plainPage(), 1, 3, 0, spacingHint()); KMLExportConfigLayout = new TQGridLayout ( plainPage(), 1, 3, 0, spacingHint());
// -------------------------------------------------------------- // --------------------------------------------------------------
// Target preferences // Target preferences
TargetPreferenceGroupBox = new TQGroupBox(0, Qt::Vertical, i18n( "Target Preferences" ), plainPage()); TargetPreferenceGroupBox = new TQGroupBox(0, Qt::Vertical, i18n( "Target Preferences" ), plainPage());
TargetPreferenceGroupBoxLayout = new TQGridLayout( TargetPreferenceGroupBox->layout(), 6, 5, KDialog::spacingHint()); TargetPreferenceGroupBoxLayout = new TQGridLayout( TargetPreferenceGroupBox->tqlayout(), 6, 5, KDialog::spacingHint());
TargetPreferenceGroupBoxLayout->setAlignment( TQt::AlignTop ); TargetPreferenceGroupBoxLayout->tqsetAlignment( TQt::AlignTop );
// target type // target type
buttonGroupTargetType = new TQButtonGroup(0, Qt::Vertical, i18n( "Target Type" ), TargetPreferenceGroupBox, "buttonGroupTargetType" ); buttonGroupTargetType = new TQButtonGroup(0, Qt::Vertical, i18n( "Target Type" ), TargetPreferenceGroupBox, "buttonGroupTargetType" );
buttonGroupTargetTypeLayout = new TQGridLayout( buttonGroupTargetType->layout(), 2, 1, KDialog::spacingHint() ); buttonGroupTargetTypeLayout = new TQGridLayout( buttonGroupTargetType->tqlayout(), 2, 1, KDialog::spacingHint() );
buttonGroupTargetTypeLayout->setAlignment( TQt::AlignTop ); buttonGroupTargetTypeLayout->tqsetAlignment( TQt::AlignTop );
LocalTargetRadioButton_ = new TQRadioButton( i18n( "&Local or web target used by GoogleEarth" ), LocalTargetRadioButton_ = new TQRadioButton( i18n( "&Local or web target used by GoogleEarth" ),
buttonGroupTargetType, "LocalTargetRadioButton_" ); buttonGroupTargetType, "LocalTargetRadioButton_" );
@ -146,8 +146,8 @@ KMLExportConfig::KMLExportConfig( TQWidget* parent, const char* name)
// Sizes // Sizes
TQGroupBox *SizeGroupBox = new TQGroupBox(0, Qt::Vertical, i18n( "Sizes" ), plainPage() ); TQGroupBox *SizeGroupBox = new TQGroupBox(0, Qt::Vertical, i18n( "Sizes" ), plainPage() );
SizeGroupBox->setColumnLayout(0, Qt::Vertical ); SizeGroupBox->setColumnLayout(0, Qt::Vertical );
SizeGroupBoxLayout = new TQGridLayout( SizeGroupBox->layout(), 2, 3, KDialog::spacingHint() ); SizeGroupBoxLayout = new TQGridLayout( SizeGroupBox->tqlayout(), 2, 3, KDialog::spacingHint() );
SizeGroupBoxLayout->setAlignment( TQt::AlignTop ); SizeGroupBoxLayout->tqsetAlignment( TQt::AlignTop );
IconSizeLabel = new TQLabel( i18n( "Icon size" ), IconSizeLabel = new TQLabel( i18n( "Icon size" ),
SizeGroupBox, "IconSizeLabel" ); SizeGroupBox, "IconSizeLabel" );
@ -176,9 +176,9 @@ KMLExportConfig::KMLExportConfig( TQWidget* parent, const char* name)
// -------------------------------------------------------------- // --------------------------------------------------------------
// GPX Tracks // GPX Tracks
TQGroupBox *GPXTracksGroupBox = new TQGroupBox(0, Qt::Vertical, i18n( "GPX Tracks" ), plainPage()); TQGroupBox *GPXTracksGroupBox = new TQGroupBox(0, Qt::Vertical, i18n( "GPX Tracks" ), plainPage());
TQGridLayout *GPXTracksGroupBoxLayout = new TQGridLayout(GPXTracksGroupBox->layout(), 5, 4, TQGridLayout *GPXTracksGroupBoxLayout = new TQGridLayout(GPXTracksGroupBox->tqlayout(), 5, 4,
KDialog::spacingHint()); KDialog::spacingHint());
GPXTracksGroupBoxLayout->setAlignment( TQt::AlignTop ); GPXTracksGroupBoxLayout->tqsetAlignment( TQt::AlignTop );
// add a gpx track checkbox // add a gpx track checkbox
GPXTracksCheckBox_ = new TQCheckBox( i18n( "Draw GPX track" ), GPXTracksGroupBox, "GPXTracksCheckBox"); GPXTracksCheckBox_ = new TQCheckBox( i18n( "Draw GPX track" ), GPXTracksGroupBox, "GPXTracksCheckBox");
@ -190,7 +190,7 @@ KMLExportConfig::KMLExportConfig( TQWidget* parent, const char* name)
GPXTracksGroupBoxLayout->addMultiCellWidget( GPXFileLabel_, 1, 1, 0, 0); GPXTracksGroupBoxLayout->addMultiCellWidget( GPXFileLabel_, 1, 1, 0, 0);
GPXFileKURLRequester_ = new KURLRequester( GPXTracksGroupBox, "GPXFileKURLRequester" ); GPXFileKURLRequester_ = new KURLRequester( GPXTracksGroupBox, "GPXFileKURLRequester" );
GPXFileKURLRequester_->setFilter(i18n("%1|GPS Exchange Format").arg("*.gpx")); GPXFileKURLRequester_->setFilter(i18n("%1|GPS Exchange Format").tqarg("*.gpx"));
GPXFileKURLRequester_->setCaption(i18n("Select GPX File to Load")); GPXFileKURLRequester_->setCaption(i18n("Select GPX File to Load"));
GPXTracksGroupBoxLayout->addMultiCellWidget( GPXFileKURLRequester_, 1, 1, 1, 3); GPXTracksGroupBoxLayout->addMultiCellWidget( GPXFileKURLRequester_, 1, 1, 1, 3);

@ -49,7 +49,7 @@ TQString KMLGPSDataParser::lineString()
for (GPSDataMap::ConstIterator it = m_GPSDataMap.constBegin(); for (GPSDataMap::ConstIterator it = m_GPSDataMap.constBegin();
it != end; ++it ) it != end; ++it )
{ {
line += TQString("%1,%2,%3 ").arg(it.data().longitude()).arg(it.data().latitude()).arg(it.data().altitude()); line += TQString("%1,%2,%3 ").tqarg(it.data().longitude()).tqarg(it.data().latitude()).tqarg(it.data().altitude());
} }
return line; return line;
} }
@ -102,7 +102,7 @@ void KIPIGPSSyncPlugin::KMLGPSDataParser::CreateTrackPoints(TQDomElement &parent
it != end; ++it, i++) it != end; ++it, i++)
{ {
TQDomElement kmlPointPlacemark = addKmlElement(kmlPointsFolder, "Placemark"); TQDomElement kmlPointPlacemark = addKmlElement(kmlPointsFolder, "Placemark");
addKmlTextElement(kmlPointPlacemark, "name", TQString("%1 %2 ").arg(i18n("Point")).arg(i)); addKmlTextElement(kmlPointPlacemark, "name", TQString("%1 %2 ").tqarg(i18n("Point")).tqarg(i));
addKmlTextElement(kmlPointPlacemark, "styleUrl", "#track"); addKmlTextElement(kmlPointPlacemark, "styleUrl", "#track");
TQDomElement kmlTimeStamp = addKmlElement(kmlPointPlacemark, "TimeStamp"); TQDomElement kmlTimeStamp = addKmlElement(kmlPointPlacemark, "TimeStamp");
// GPS device are sync in time by satellite using GMT time. // GPS device are sync in time by satellite using GMT time.
@ -117,11 +117,11 @@ void KIPIGPSSyncPlugin::KMLGPSDataParser::CreateTrackPoints(TQDomElement &parent
if (it.data().latitude()) if (it.data().latitude())
{ {
addKmlTextElement(kmlGeometry, "coordinates", addKmlTextElement(kmlGeometry, "coordinates",
TQString("%1,%2,%3").arg(it.data().longitude()).arg(it.data().latitude()).arg(it.data().altitude())); TQString("%1,%2,%3").tqarg(it.data().longitude()).tqarg(it.data().latitude()).tqarg(it.data().altitude()));
} }
else else
{ {
addKmlTextElement(kmlGeometry, "coordinates", TQString("%1,%2").arg(it.data().longitude()).arg(it.data().latitude())); addKmlTextElement(kmlGeometry, "coordinates", TQString("%1,%2").tqarg(it.data().longitude()).tqarg(it.data().latitude()));
} }
if (altitudeMode == 2 ) if (altitudeMode == 2 )
{ {

@ -141,8 +141,8 @@ bool Plugin_GPSSync::checkBinaries(TQString &gpsBabelVersion)
"Please install gpsbabel as a package from your distributor " "Please install gpsbabel as a package from your distributor "
"or <a href=\"%1\">download the source</a>.</p>" "or <a href=\"%1\">download the source</a>.</p>"
"<p>Note: at least, gpsbabel version %2 is required by this plugin.</p></qt>") "<p>Note: at least, gpsbabel version %2 is required by this plugin.</p></qt>")
.arg("http://www.gpsbabel.org") .tqarg("http://www.gpsbabel.org")
.arg(gpsBabelBinary.minimalVersion()), .tqarg(gpsBabelBinary.minimalVersion()),
TQString(), TQString(),
TQString(), TQString(),
KMessageBox::Notify | KMessageBox::AllowLink); KMessageBox::Notify | KMessageBox::AllowLink);
@ -160,9 +160,9 @@ bool Plugin_GPSSync::checkBinaries(TQString &gpsBabelVersion)
"or <a href=\"%2\">download the source</a>.</p>" "or <a href=\"%2\">download the source</a>.</p>"
"<p>Note: at least, gpsbabel version %3 is required by this " "<p>Note: at least, gpsbabel version %3 is required by this "
"plugin</p></qt>") "plugin</p></qt>")
.arg(gpsBabelVersion) .tqarg(gpsBabelVersion)
.arg("http://www.gpsbabel.org") .tqarg("http://www.gpsbabel.org")
.arg(gpsBabelBinary.minimalVersion()), .tqarg(gpsBabelBinary.minimalVersion()),
TQString(), TQString(),
TQString(), TQString(),
KMessageBox::Notify | KMessageBox::AllowLink); KMessageBox::Notify | KMessageBox::AllowLink);

@ -172,7 +172,7 @@ struct Generator::Private {
bool init() { bool init() {
mTheme=Theme::findByInternalName(mInfo->theme()); mTheme=Theme::findByInternalName(mInfo->theme());
if (!mTheme) { if (!mTheme) {
logError( i18n("Could not find theme in '%1'").arg(mInfo->theme()) ); logError( i18n("Could not find theme in '%1'").tqarg(mInfo->theme()) );
return false; return false;
} }
return true; return true;
@ -200,11 +200,11 @@ struct Generator::Private {
bool writeDataToFile(const TQByteArray& data, const TQString& destPath) { bool writeDataToFile(const TQByteArray& data, const TQString& destPath) {
TQFile destFile(destPath); TQFile destFile(destPath);
if (!destFile.open(IO_WriteOnly)) { if (!destFile.open(IO_WriteOnly)) {
logWarning(i18n("Could not open file '%1' for writing").arg(destPath)); logWarning(i18n("Could not open file '%1' for writing").tqarg(destPath));
return false; return false;
} }
if (destFile.writeBlock(data) != (TQ_LONG)data.size()) { if (destFile.writeBlock(data) != (TQ_LONG)data.size()) {
logWarning(i18n("Could not save image to file '%1'").arg(destPath)); logWarning(i18n("Could not save image to file '%1'").tqarg(destPath));
return false; return false;
} }
return true; return true;
@ -233,13 +233,13 @@ struct Generator::Private {
TQString path=imageURL.path(); TQString path=imageURL.path();
TQFile imageFile(path); TQFile imageFile(path);
if (!imageFile.open(IO_ReadOnly)) { if (!imageFile.open(IO_ReadOnly)) {
logWarning(i18n("Could not read image '%1'").arg(path)); logWarning(i18n("Could not read image '%1'").tqarg(path));
return; return;
} }
TQString imageFormat = TQImageIO::imageFormat(TQT_TQIODEVICE(&imageFile)); TQString imageFormat = TQImageIO::imageFormat(TQT_TQIODEVICE(&imageFile));
if (imageFormat.isEmpty()) { if (imageFormat.isEmpty()) {
logWarning(i18n("Format of image '%1' is unknown").arg(path)); logWarning(i18n("Format of image '%1' is unknown").tqarg(path));
return; return;
} }
imageFile.close(); imageFile.close();
@ -248,7 +248,7 @@ struct Generator::Private {
TQByteArray imageData = imageFile.readAll(); TQByteArray imageData = imageFile.readAll();
TQImage originalImage; TQImage originalImage;
if (!originalImage.loadFromData(imageData) ) { if (!originalImage.loadFromData(imageData) ) {
logWarning(i18n("Error loading image '%1'").arg(path)); logWarning(i18n("Error loading image '%1'").tqarg(path));
return; return;
} }
@ -284,7 +284,7 @@ struct Generator::Private {
fullFileName = baseFileName + "." + mInfo->fullFormatString().lower(); fullFileName = baseFileName + "." + mInfo->fullFormatString().lower();
TQString destPath = destDir + "/" + fullFileName; TQString destPath = destDir + "/" + fullFileName;
if (!fullImage.save(destPath, mInfo->fullFormatString().ascii(), mInfo->fullQuality())) { if (!fullImage.save(destPath, mInfo->fullFormatString().ascii(), mInfo->fullQuality())) {
logWarning(i18n("Could not save image '%1' to '%2'").arg(path).arg(destPath)); logWarning(i18n("Could not save image '%1' to '%2'").tqarg(path).tqarg(destPath));
return; return;
} }
} }
@ -302,7 +302,7 @@ struct Generator::Private {
TQString thumbnailFileName = "thumb_" + baseFileName + "." + mInfo->thumbnailFormatString().lower(); TQString thumbnailFileName = "thumb_" + baseFileName + "." + mInfo->thumbnailFormatString().lower();
TQString destPath = destDir + "/" + thumbnailFileName; TQString destPath = destDir + "/" + thumbnailFileName;
if (!thumbnail.save(destPath, mInfo->thumbnailFormatString().ascii(), mInfo->thumbnailQuality())) { if (!thumbnail.save(destPath, mInfo->thumbnailFormatString().ascii(), mInfo->thumbnailQuality())) {
logWarning(i18n("Could not save thumbnail for image '%1' to '%2'").arg(path).arg(destPath)); logWarning(i18n("Could not save thumbnail for image '%1' to '%2'").tqarg(path).tqarg(destPath));
return; return;
} }
@ -337,7 +337,7 @@ struct Generator::Private {
TQValueList<KIPI::ImageCollection>::Iterator collectionEnd=mInfo->mCollectionList.end(); TQValueList<KIPI::ImageCollection>::Iterator collectionEnd=mInfo->mCollectionList.end();
for (; collectionIt!=collectionEnd; ++collectionIt) { for (; collectionIt!=collectionEnd; ++collectionIt) {
KIPI::ImageCollection collection=*collectionIt; KIPI::ImageCollection collection=*collectionIt;
logInfo( i18n("Generating files for \"%1\"").arg(collection.name()) ); logInfo( i18n("Generating files for \"%1\"").tqarg(collection.name()) );
TQString collectionFileName = webifyFileName(collection.name()); TQString collectionFileName = webifyFileName(collection.name());
TQString destDir = baseDestDir + "/" + collectionFileName; TQString destDir = baseDestDir + "/" + collectionFileName;
@ -406,13 +406,13 @@ struct Generator::Private {
CWrapper<xsltStylesheetPtr, xsltFreeStylesheet> xslt= xsltParseStylesheetFile( (const xmlChar*) xsltFileName.local8Bit().data() ); CWrapper<xsltStylesheetPtr, xsltFreeStylesheet> xslt= xsltParseStylesheetFile( (const xmlChar*) xsltFileName.local8Bit().data() );
if (!xslt) { if (!xslt) {
logError(i18n("Could not load XSL file '%1'").arg(xsltFileName)); logError(i18n("Could not load XSL file '%1'").tqarg(xsltFileName));
return false; return false;
} }
CWrapper<xmlDocPtr, xmlFreeDoc> xmlGallery=xmlParseFile( mXMLFileName.local8Bit().data() ); CWrapper<xmlDocPtr, xmlFreeDoc> xmlGallery=xmlParseFile( mXMLFileName.local8Bit().data() );
if (!xmlGallery) { if (!xmlGallery) {
logError(i18n("Could not load XML file '%1'").arg(mXMLFileName)); logError(i18n("Could not load XML file '%1'").tqarg(mXMLFileName));
return false; return false;
} }
@ -451,7 +451,7 @@ struct Generator::Private {
TQString destFileName=mInfo->destKURL().path() + "/index.html"; TQString destFileName=mInfo->destKURL().path() + "/index.html";
FILE* file=fopen(destFileName.local8Bit().data(), "w"); FILE* file=fopen(destFileName.local8Bit().data(), "w");
if (!file) { if (!file) {
logError(i18n("Could not open '%1' for writing").arg(destFileName)); logError(i18n("Could not open '%1' for writing").tqarg(destFileName));
return false; return false;
} }
xsltSaveResultToFile(file, xmlOutput, xslt); xsltSaveResultToFile(file, xmlOutput, xslt);
@ -469,7 +469,7 @@ struct Generator::Private {
TQString part = *it; TQString part = *it;
if (!dir.exists(part)) { if (!dir.exists(part)) {
if (!dir.mkdir(part)) { if (!dir.mkdir(part)) {
logError(i18n("Could not create folder '%1' in '%2'").arg(part).arg(dir.absPath())); logError(i18n("Could not create folder '%1' in '%2'").tqarg(part).tqarg(dir.absPath()));
return false; return false;
} }
} }

@ -45,7 +45,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>58</width> <width>58</width>
<height>20</height> <height>20</height>
@ -62,7 +62,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -79,7 +79,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>104</height> <height>104</height>
@ -109,7 +109,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -126,7 +126,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -244,7 +244,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -288,7 +288,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -305,7 +305,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>19</height> <height>19</height>
@ -332,7 +332,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -341,7 +341,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget" row="4" column="1" rowspan="1" colspan="2"> <widget class="TQLayoutWidget" row="4" column="1" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>layout13</cstring> <cstring>tqlayout13</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -401,7 +401,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

@ -49,8 +49,8 @@ void ListThemeParameter::init(const TQCString& internalName, const KConfigBase*
AbstractThemeParameter::init(internalName, configFile); AbstractThemeParameter::init(internalName, configFile);
for (int pos=0;; ++pos) { for (int pos=0;; ++pos) {
TQString valueKey = TQString("%1%2").arg(ITEM_VALUE_KEY).arg(pos); TQString valueKey = TQString("%1%2").tqarg(ITEM_VALUE_KEY).tqarg(pos);
TQString captionKey = TQString("%1%2").arg(ITEM_CAPTION_KEY).arg(pos); TQString captionKey = TQString("%1%2").tqarg(ITEM_CAPTION_KEY).tqarg(pos);
if (!configFile->hasKey(valueKey) || !configFile->hasKey(captionKey)) { if (!configFile->hasKey(valueKey) || !configFile->hasKey(captionKey)) {
break; break;
} }

@ -21,7 +21,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout1</cstring> <cstring>tqlayout1</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -63,7 +63,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>51</height> <height>51</height>

@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
// TQt // TQt
#include <tqfile.h> #include <tqfile.h>
#include <textstream.h> #include <tqtextstream.h>
// KDE // KDE
#include <kdebug.h> #include <kdebug.h>

@ -37,7 +37,7 @@
<property name="text"> <property name="text">
<string>In this page, you can change some theme parameters. Depending on the theme, different parameters are available.</string> <string>In this page, you can change some theme parameters. Depending on the theme, different parameters are available.</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -51,7 +51,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -79,7 +79,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>

@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
#include <tqdir.h> #include <tqdir.h>
#include <tqfileinfo.h> #include <tqfileinfo.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <layout.h> #include <tqlayout.h>
#include <tqobjectlist.h> #include <tqobjectlist.h>
#include <tqpainter.h> #include <tqpainter.h>
#include <tqspinbox.h> #include <tqspinbox.h>
@ -102,7 +102,7 @@ struct Wizard::Private {
void fillThemeParametersPage(Theme::Ptr theme) { void fillThemeParametersPage(Theme::Ptr theme) {
// Delete any previous widgets // Delete any previous widgets
TQFrame* content = mThemeParametersPage->content; TQFrame* content = mThemeParametersPage->content;
if (content->layout()) { if (content->tqlayout()) {
// Setting recursiveSearch to false is very important, if we don't // Setting recursiveSearch to false is very important, if we don't
// we will end up deleting subwidgets of our child widgets // we will end up deleting subwidgets of our child widgets
TQObjectList* list = content->queryList(TQWIDGET_OBJECT_NAME_STRING, 0 /*objName*/, TQObjectList* list = content->queryList(TQWIDGET_OBJECT_NAME_STRING, 0 /*objName*/,
@ -112,14 +112,14 @@ struct Wizard::Private {
delete it.current(); delete it.current();
} }
delete content->layout(); delete content->tqlayout();
} }
mThemeParameterWidgetFromName.clear(); mThemeParameterWidgetFromName.clear();
// Create layout. We need to recreate it everytime, to get rid of // Create tqlayout. We need to recreate it everytime, to get rid of
// spacers // spacers
TQGridLayout* layout = new TQGridLayout(content, 0, 3); TQGridLayout* tqlayout = new TQGridLayout(content, 0, 3);
layout->setSpacing(KDialog::spacingHint()); tqlayout->setSpacing(KDialog::spacingHint());
// Create widgets // Create widgets
Theme::ParameterList parameterList = theme->parameterList(); Theme::ParameterList parameterList = theme->parameterList();
@ -136,23 +136,23 @@ struct Wizard::Private {
themeParameter->defaultValue()); themeParameter->defaultValue());
TQString name = themeParameter->name(); TQString name = themeParameter->name();
name = i18n("'%1' is a label for a theme parameter", "%1:").arg(name); name = i18n("'%1' is a label for a theme parameter", "%1:").tqarg(name);
TQLabel* label = new TQLabel(name, content); TQLabel* label = new TQLabel(name, content);
TQWidget* widget = themeParameter->createWidget(content, value); TQWidget* widget = themeParameter->createWidget(content, value);
label->setBuddy(widget); label->setBuddy(widget);
int row = layout->numRows(); int row = tqlayout->numRows();
layout->addWidget(label, row, 0); tqlayout->addWidget(label, row, 0);
if (widget->sizePolicy().expanding() & TQSizePolicy::Horizontally) { if (widget->tqsizePolicy().expanding() & TQSizePolicy::Horizontally) {
// Widget wants full width // Widget wants full width
layout->addMultiCellWidget(widget, row, row, 1, 2); tqlayout->addMultiCellWidget(widget, row, row, 1, 2);
} else { } else {
// Widget doesn't like to be stretched, add a spacer next to it // Widget doesn't like to be stretched, add a spacer next to it
layout->addWidget(widget, row, 1); tqlayout->addWidget(widget, row, 1);
TQSpacerItem* spacer = new TQSpacerItem(1, 1, TQSizePolicy::Expanding, TQSizePolicy::Minimum); TQSpacerItem* spacer = new TQSpacerItem(1, 1, TQSizePolicy::Expanding, TQSizePolicy::Minimum);
layout->addItem(spacer, row, 2); tqlayout->addItem(spacer, row, 2);
} }
mThemeParameterWidgetFromName[internalName] = widget; mThemeParameterWidgetFromName[internalName] = widget;
@ -161,7 +161,7 @@ struct Wizard::Private {
// Add spacer at the end, so that widgets aren't spread on the whole // Add spacer at the end, so that widgets aren't spread on the whole
// parent height // parent height
TQSpacerItem* spacer = new TQSpacerItem(1, 1, TQSizePolicy::Minimum, TQSizePolicy::Expanding); TQSpacerItem* spacer = new TQSpacerItem(1, 1, TQSizePolicy::Minimum, TQSizePolicy::Expanding);
layout->addItem(spacer, layout->numRows(), 0); tqlayout->addItem(spacer, tqlayout->numRows(), 0);
} }
}; };
@ -242,12 +242,12 @@ void Wizard::slotThemeSelectionChanged() {
TQString url=theme->authorUrl(); TQString url=theme->authorUrl();
TQString author=theme->authorName(); TQString author=theme->authorName();
if (!url.isEmpty()) { if (!url.isEmpty()) {
author=TQString("<a href='%1'>%2</a>").arg(url).arg(author); author=TQString("<a href='%1'>%2</a>").tqarg(url).tqarg(author);
} }
TQString txt= TQString txt=
TQString("<b>%1</b><br><br>%2<br><br>").arg(theme->name(), theme->comment()) TQString("<b>%1</b><br><br>%2<br><br>").tqarg(theme->name(), theme->comment())
+ i18n("Author: %1").arg(author); + i18n("Author: %1").tqarg(author);
browser->setText(txt); browser->setText(txt);
setNextEnabled(d->mThemePage, true); setNextEnabled(d->mThemePage, true);

@ -91,9 +91,9 @@ ImageList::viewportPaintEvent( TQPaintEvent *e )
const uint x = (viewport()->width() - w - 30) / 2 ; const uint x = (viewport()->width() - w - 30) / 2 ;
const uint y = (viewport()->height() - h - 30) / 2 ; const uint y = (viewport()->height() - h - 30) / 2 ;
p.setBrush( colorGroup().background() ); p.setBrush( tqcolorGroup().background() );
p.drawRoundRect( x, y, w+30, h+30, (8*200)/w, (8*200)/h ); p.drawRoundRect( x, y, w+30, h+30, (8*200)/w, (8*200)/h );
t.draw( &p, x+15, y+15, TQRect(), colorGroup() ); t.draw( &p, x+15, y+15, TQRect(), tqcolorGroup() );
} }
} }

@ -24,7 +24,7 @@
#include <tqhgroupbox.h> #include <tqhgroupbox.h>
#include <tqimage.h> #include <tqimage.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <layout.h> #include <tqlayout.h>
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <tqvgroupbox.h> #include <tqvgroupbox.h>
@ -107,8 +107,8 @@ UploadDialog::UploadDialog(
m_ipodPreview = new TQLabel( buttons ); m_ipodPreview = new TQLabel( buttons );
m_ipodPreview->setFixedHeight( 80 ); m_ipodPreview->setFixedHeight( 80 );
m_ipodPreview->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); m_ipodPreview->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
m_ipodPreview->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); m_ipodPreview->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
buttonLayout->addWidget( m_createAlbumButton ); buttonLayout->addWidget( m_createAlbumButton );
buttonLayout->addWidget( m_removeAlbumButton ); buttonLayout->addWidget( m_removeAlbumButton );
@ -126,7 +126,7 @@ UploadDialog::UploadDialog(
m_uploadList->setMinimumHeight( 80 ); m_uploadList->setMinimumHeight( 80 );
urlLayout->addWidget( m_uploadList ); urlLayout->addWidget( m_uploadList );
m_uploadList->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding ); m_uploadList->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding );
TQVBoxLayout* uploadPaneLayout = new TQVBoxLayout( urlLayout ); TQVBoxLayout* uploadPaneLayout = new TQVBoxLayout( urlLayout );
m_addImagesButton = new TQPushButton ( i18n( "&Add..." ), urlBox ); m_addImagesButton = new TQPushButton ( i18n( "&Add..." ), urlBox );
@ -143,8 +143,8 @@ UploadDialog::UploadDialog(
m_imagePreview = new TQLabel( urlBox ); m_imagePreview = new TQLabel( urlBox );
m_imagePreview->setFixedHeight( 80 ); m_imagePreview->setFixedHeight( 80 );
m_imagePreview->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); m_imagePreview->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
m_imagePreview->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); m_imagePreview->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
TQWhatsThis::add( m_imagePreview, i18n( "The preview of the selected image in the list." ) ); TQWhatsThis::add( m_imagePreview, i18n( "The preview of the selected image in the list." ) );
TQLabel *hdd_icon = new TQLabel( urlBox ); TQLabel *hdd_icon = new TQLabel( urlBox );
@ -700,7 +700,7 @@ UploadDialog::openDevice()
debug() << "could not find iTunesDB on device mounted at " << m_mountPoint << endl; debug() << "could not find iTunesDB on device mounted at " << m_mountPoint << endl;
TQString msg = i18n( "An iPod photo database could not be found on device mounted at %1. " TQString msg = i18n( "An iPod photo database could not be found on device mounted at %1. "
"Should I try to initialize your iPod photo database?" ).arg( m_mountPoint ); "Should I try to initialize your iPod photo database?" ).tqarg( m_mountPoint );
if( KMessageBox::warningContinueCancel( this, msg, i18n( "Initialize iPod Photo Database?" ), if( KMessageBox::warningContinueCancel( this, msg, i18n( "Initialize iPod Photo Database?" ),
KGuiItem(i18n("&Initialize"), "new") ) == KMessageBox::Continue ) KGuiItem(i18n("&Initialize"), "new") ) == KMessageBox::Continue )

@ -18,19 +18,19 @@
#include "kpushbutton.h" #include "kpushbutton.h"
#include "tqlabel.h" #include "tqlabel.h"
#include "layout.h" #include "tqlayout.h"
using namespace IpodExport; using namespace IpodExport;
IpodHeader::IpodHeader( TQWidget *parent, const char *name, WFlags f ) IpodHeader::IpodHeader( TQWidget *parent, const char *name, WFlags f )
: TQFrame( parent, name, f ) : TQFrame( parent, name, f )
{ {
TQVBoxLayout *layout = new TQVBoxLayout( this, 10/*margin*/, 5/*spacing*/ ); TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 10/*margin*/, 5/*spacing*/ );
setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
m_messageLabel = new TQLabel( TQString(), this ); m_messageLabel = new TQLabel( TQString(), this );
m_messageLabel->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); m_messageLabel->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
TQHBoxLayout *buttonLayout = new TQHBoxLayout; TQHBoxLayout *buttonLayout = new TQHBoxLayout;
m_button = new KPushButton( this ); m_button = new KPushButton( this );
@ -40,8 +40,8 @@ IpodHeader::IpodHeader( TQWidget *parent, const char *name, WFlags f )
buttonLayout->addWidget( m_button ); buttonLayout->addWidget( m_button );
buttonLayout->addStretch( 1 ); buttonLayout->addStretch( 1 );
layout->addWidget( m_messageLabel ); tqlayout->addWidget( m_messageLabel );
layout->addLayout( buttonLayout ); tqlayout->addLayout( buttonLayout );
} }
void IpodHeader::setViewType( ViewType view ) void IpodHeader::setViewType( ViewType view )
@ -86,7 +86,7 @@ void IpodHeader::setIncompatibleIpod()
{ {
const TQString modelType = UploadDialog::instance()->ipodModel(); const TQString modelType = UploadDialog::instance()->ipodModel();
m_messageLabel->setText( i18n("<p align=\"center\"><b>Your iPod (%1) does not seem to support artwork.</b></p>" ).arg( modelType ) ); m_messageLabel->setText( i18n("<p align=\"center\"><b>Your iPod (%1) does not seem to support artwork.</b></p>" ).tqarg( modelType ) );
setPaletteBackgroundColor( TQColor(225,150,0) ); setPaletteBackgroundColor( TQColor(225,150,0) );
m_messageLabel->setPaletteBackgroundColor( TQColor(225,150,0) ); m_messageLabel->setPaletteBackgroundColor( TQColor(225,150,0) );
@ -109,12 +109,12 @@ void IpodHeader::setValidIpod()
if( !mountPoint.isEmpty() ) if( !mountPoint.isEmpty() )
{ {
m_messageLabel->setText( i18n("<p align=\"center\"><b>iPod %1 detected at: %2</b></p>" ) m_messageLabel->setText( i18n("<p align=\"center\"><b>iPod %1 detected at: %2</b></p>" )
.arg( modelType, mountPoint ) ); .tqarg( modelType, mountPoint ) );
} }
else else
{ {
m_messageLabel->setText( i18n("<p align=\"center\"><b>iPod %1 detected</b></p>" ) m_messageLabel->setText( i18n("<p align=\"center\"><b>iPod %1 detected</b></p>" )
.arg( modelType ) ); .tqarg( modelType ) );
} }
setPaletteBackgroundColor( TQColor(0,98,0) ); setPaletteBackgroundColor( TQColor(0,98,0) );
m_messageLabel->setPaletteBackgroundColor( TQColor(0,98,0) ); m_messageLabel->setPaletteBackgroundColor( TQColor(0,98,0) );

@ -258,7 +258,7 @@ bool ImageGrayScale::image2GrayScaleImageMagick(const TQString& src, const TQStr
} }
// Processing error ! // Processing error !
err = i18n("Cannot convert to gray scale: %1").arg(m_stdErr.replace('\n', ' ')); err = i18n("Cannot convert to gray scale: %1").tqarg(m_stdErr.replace('\n', ' '));
return false; return false;
} }

@ -213,7 +213,7 @@ bool ImageFlip::flipImageMagick(const TQString& src, const TQString& dest, FlipA
} }
// Processing error ! // Processing error !
err = i18n("Cannot flip: %1").arg(m_stdErr.replace('\n', ' ')); err = i18n("Cannot flip: %1").tqarg(m_stdErr.replace('\n', ' '));
return false; return false;
} }

@ -237,7 +237,7 @@ bool ImageRotate::rotateImageMagick(const TQString& src, const TQString& dest,
} }
// Processing error ! // Processing error !
err = i18n("Cannot rotate: %1").arg(m_stdErr.replace('\n', ' ')); err = i18n("Cannot rotate: %1").tqarg(m_stdErr.replace('\n', ' '));
return false; return false;
} }

@ -213,7 +213,7 @@ void Plugin_JPEGLossless::slotFlip()
} }
m_progressDlg = new KIPI::BatchProgressDialog(TQT_TQWIDGET(kapp->activeWindow()), m_progressDlg = new KIPI::BatchProgressDialog(TQT_TQWIDGET(kapp->activeWindow()),
i18n("Flip images %1").arg(title)); i18n("Flip images %1").tqarg(title));
connect(m_progressDlg, TQT_SIGNAL(cancelClicked()), connect(m_progressDlg, TQT_SIGNAL(cancelClicked()),
this, TQT_SLOT(slotCancel())); this, TQT_SLOT(slotCancel()));
@ -269,7 +269,7 @@ void Plugin_JPEGLossless::slotRotate()
} }
m_progressDlg = new KIPI::BatchProgressDialog(TQT_TQWIDGET(kapp->activeWindow()), m_progressDlg = new KIPI::BatchProgressDialog(TQT_TQWIDGET(kapp->activeWindow()),
i18n("Rotate images %1").arg(title)); i18n("Rotate images %1").tqarg(title));
connect(m_progressDlg, TQT_SIGNAL(cancelClicked()), connect(m_progressDlg, TQT_SIGNAL(cancelClicked()),
this, TQT_SLOT(slotCancel())); this, TQT_SLOT(slotCancel()));
@ -344,17 +344,17 @@ void Plugin_JPEGLossless::customEvent(TQCustomEvent *event)
{ {
case(KIPIJPEGLossLessPlugin::Rotate): case(KIPIJPEGLossLessPlugin::Rotate):
{ {
text = i18n("Rotating Image \"%1\"").arg(d->fileName.section('/', -1)); text = i18n("Rotating Image \"%1\"").tqarg(d->fileName.section('/', -1));
break; break;
} }
case(KIPIJPEGLossLessPlugin::Flip): case(KIPIJPEGLossLessPlugin::Flip):
{ {
text = i18n("Flipping Image \"%1\"").arg(d->fileName.section('/', -1)); text = i18n("Flipping Image \"%1\"").tqarg(d->fileName.section('/', -1));
break; break;
} }
case(KIPIJPEGLossLessPlugin::GrayScale): case(KIPIJPEGLossLessPlugin::GrayScale):
{ {
text = i18n("Converting to Black & White \"%1\"").arg(d->fileName.section('/', -1)); text = i18n("Converting to Black & White \"%1\"").tqarg(d->fileName.section('/', -1));
break; break;
} }
default: default:

@ -175,7 +175,7 @@ bool Utils::updateMetadataImageMagick(const TQString& src, TQString& err)
} }
// Processing error ! // Processing error !
err = i18n("Cannot update metadata: %1").arg(m_stdErr.replace('\n', ' ')); err = i18n("Cannot update metadata: %1").tqarg(m_stdErr.replace('\n', ' '));
return false; return false;
} }

@ -24,7 +24,7 @@
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqimage.h> #include <tqimage.h>
#include <tqpainter.h> #include <tqpainter.h>
#include <palette.h> #include <tqpalette.h>
// Local // Local
#include "gpfileiteminfo.h" #include "gpfileiteminfo.h"
#include "cameraiconview.h" #include "cameraiconview.h"
@ -90,10 +90,10 @@ void CameraIconItem::setPixmap(const TQImage& thumb) {
pixHeight_ = thumb.height(); pixHeight_ = thumb.height();
TQPainter painter; TQPainter painter;
painter.begin(pixmap()); painter.begin(pixmap());
painter.fillRect(0, 0, size, size, TQBrush(iconView()->colorGroup().base())); painter.fillRect(0, 0, size, size, TQBrush(iconView()->tqcolorGroup().base()));
painter.drawImage((size-thumb.width())/2, (size-thumb.height())/2, thumb); painter.drawImage((size-thumb.width())/2, (size-thumb.height())/2, thumb);
painter.end(); painter.end();
repaint(); tqrepaint();
} }
} // NameSpace KIPIKameraKlientPlugin } // NameSpace KIPIKameraKlientPlugin

@ -24,7 +24,7 @@
#include <tqpainter.h> #include <tqpainter.h>
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqrect.h> #include <tqrect.h>
#include <palette.h> #include <tqpalette.h>
#include <tqpoint.h> #include <tqpoint.h>
#include <tqpopupmenu.h> #include <tqpopupmenu.h>
#include <tqvaluevector.h> #include <tqvaluevector.h>
@ -73,9 +73,9 @@ void CameraIconView::setThumbnailSize() {
double scale = double(w-10) / double(image.width()); double scale = double(w-10) / double(image.width());
image = image.smoothScale(w-10, h-10, TQ_ScaleMin); image = image.smoothScale(w-10, h-10, TQ_ScaleMin);
TQPixmap pix(w, h); TQPixmap pix(w, h);
pix.fill(colorGroup().base()); pix.fill(tqcolorGroup().base());
TQPainter p(&pix); TQPainter p(&pix);
p.fillRect(0, 0, w, h, TQBrush(colorGroup().base())); p.fillRect(0, 0, w, h, TQBrush(tqcolorGroup().base()));
if(!image.isNull()) { if(!image.isNull()) {
p.drawImage((w-image.width())/2, (h-image.height())/2, image); p.drawImage((w-image.width())/2, (h-image.height())/2, image);
} }
@ -136,7 +136,7 @@ void CameraIconView::markDownloaded(CameraIconItem* iconItem) {
} }
GPFileItemInfo *fileInfo = const_cast<GPFileItemInfo*>(iconItem->fileInfo()); GPFileItemInfo *fileInfo = const_cast<GPFileItemInfo*>(iconItem->fileInfo());
fileInfo->downloaded = 1; fileInfo->downloaded = 1;
iconItem->repaint(); iconItem->tqrepaint();
} }
} // NameSpace KIPIKameraKlientPlugin } // NameSpace KIPIKameraKlientPlugin

@ -23,7 +23,7 @@
#include <tqdom.h> #include <tqdom.h>
#include <tqfile.h> #include <tqfile.h>
#include <tqstring.h> #include <tqstring.h>
#include <textstream.h> #include <tqtextstream.h>
// Local // Local
#include "cameralist.h" #include "cameralist.h"
#include "cameratype.h" #include "cameratype.h"

@ -21,7 +21,7 @@
#include <tqlistview.h> #include <tqlistview.h>
#include <tqradiobutton.h> #include <tqradiobutton.h>
#include <tqvbuttongroup.h> #include <tqvbuttongroup.h>
#include <layout.h> #include <tqlayout.h>
#include <tqstring.h> #include <tqstring.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include <tqlineedit.h> #include <tqlineedit.h>
@ -86,21 +86,21 @@ CameraSelection::CameraSelection(TQWidget* parent)
TQGroupBox* mainBox = new TQGroupBox(page); TQGroupBox* mainBox = new TQGroupBox(page);
mainBox->setTitle(i18n("Camera Configuration")); mainBox->setTitle(i18n("Camera Configuration"));
mainBox->setColumnLayout(0, Qt::Vertical ); mainBox->setColumnLayout(0, Qt::Vertical );
mainBox->layout()->setSpacing( 5 ); mainBox->tqlayout()->setSpacing( 5 );
mainBox->layout()->setMargin( 5 ); mainBox->tqlayout()->setMargin( 5 );
TQGridLayout* mainBoxLayout = new TQGridLayout(mainBox->layout()); TQGridLayout* mainBoxLayout = new TQGridLayout(mainBox->tqlayout());
mainBoxLayout->setAlignment(TQt::AlignTop); mainBoxLayout->tqsetAlignment(TQt::AlignTop);
listView_ = new TQListView( mainBox ); listView_ = new TQListView( mainBox );
listView_->addColumn( i18n("Cameras") ); listView_->addColumn( i18n("Cameras") );
listView_->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); listView_->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
mainBoxLayout->addMultiCellWidget(listView_, 0, 4, 0, 0); mainBoxLayout->addMultiCellWidget(listView_, 0, 4, 0, 0);
portButtonGroup_ = new TQVButtonGroup(mainBox); portButtonGroup_ = new TQVButtonGroup(mainBox);
portButtonGroup_->setTitle(i18n("Camera Port Type")); portButtonGroup_->setTitle(i18n("Camera Port Type"));
portButtonGroup_->setRadioButtonExclusive(true); portButtonGroup_->setRadioButtonExclusive(true);
portButtonGroup_->layout()->setSpacing(5); portButtonGroup_->tqlayout()->setSpacing(5);
portButtonGroup_->layout()->setMargin(5); portButtonGroup_->tqlayout()->setMargin(5);
usbButton_ = new TQRadioButton(portButtonGroup_); usbButton_ = new TQRadioButton(portButtonGroup_);
usbButton_->setText( i18n("USB")); usbButton_->setText( i18n("USB"));
@ -113,10 +113,10 @@ CameraSelection::CameraSelection(TQWidget* parent)
TQGroupBox* portPathBox = new TQGroupBox(mainBox); TQGroupBox* portPathBox = new TQGroupBox(mainBox);
portPathBox->setTitle( i18n("Camera Port Path")); portPathBox->setTitle( i18n("Camera Port Path"));
portPathBox->setColumnLayout(0, Qt::Vertical ); portPathBox->setColumnLayout(0, Qt::Vertical );
portPathBox->layout()->setSpacing( 5 ); portPathBox->tqlayout()->setSpacing( 5 );
portPathBox->layout()->setMargin( 5 ); portPathBox->tqlayout()->setMargin( 5 );
TQVBoxLayout* portPathBoxLayout = new TQVBoxLayout( portPathBox->layout() ); TQVBoxLayout* portPathBoxLayout = new TQVBoxLayout( portPathBox->tqlayout() );
portPathBoxLayout->setAlignment( TQt::AlignTop ); portPathBoxLayout->tqsetAlignment( TQt::AlignTop );
TQLabel* portPathLabel_ = new TQLabel( portPathBox); TQLabel* portPathLabel_ = new TQLabel( portPathBox);
portPathLabel_->setText( i18n("only for serial port\n" "cameras")); portPathLabel_->setText( i18n("only for serial port\n" "cameras"));

@ -37,7 +37,7 @@
#include <tqfileinfo.h> #include <tqfileinfo.h>
#include <tqimage.h> #include <tqimage.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <layout.h> #include <tqlayout.h>
#include <tqsplitter.h> #include <tqsplitter.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include <tqtooltip.h> #include <tqtooltip.h>
@ -170,7 +170,7 @@ CameraUI::CameraUI() : TQWidget()
mCameraBoxLayout->addWidget(mCameraConnectBtn); mCameraBoxLayout->addWidget(mCameraConnectBtn);
mCameraComboBox = new TQComboBox(this, "camera"); mCameraComboBox = new TQComboBox(this, "camera");
mCameraComboBox->setInsertionPolicy(TQComboBox::AtBottom); mCameraComboBox->setInsertionPolicy(TQComboBox::AtBottom);
mCameraComboBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); mCameraComboBox->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
mCameraBoxLayout->addWidget(mCameraComboBox); mCameraBoxLayout->addWidget(mCameraComboBox);
// create Download Directory Camera Box --------------------------------------------------- // create Download Directory Camera Box ---------------------------------------------------
@ -180,14 +180,14 @@ CameraUI::CameraUI() : TQWidget()
TQLabel* mDownloadDirectoryLabel = new TQLabel(i18n("Download to: "), this); TQLabel* mDownloadDirectoryLabel = new TQLabel(i18n("Download to: "), this);
mDownloadDirectoryBoxLayout->addWidget(mDownloadDirectoryLabel); mDownloadDirectoryBoxLayout->addWidget(mDownloadDirectoryLabel);
mDownloadDirectoryEdit = new TQLineEdit(this); mDownloadDirectoryEdit = new TQLineEdit(this);
mDownloadDirectoryEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); mDownloadDirectoryEdit->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
mDownloadDirectoryEdit->setReadOnly(true); mDownloadDirectoryEdit->setReadOnly(true);
mDownloadDirectoryBoxLayout->addWidget(mDownloadDirectoryEdit); mDownloadDirectoryBoxLayout->addWidget(mDownloadDirectoryEdit);
mChangeDownloadDirectoryBtn = new TQPushButton(i18n("&Change"), this); mChangeDownloadDirectoryBtn = new TQPushButton(i18n("&Change"), this);
mDownloadDirectoryBoxLayout->addWidget(mChangeDownloadDirectoryBtn); // ------------------------- mDownloadDirectoryBoxLayout->addWidget(mChangeDownloadDirectoryBtn); // -------------------------
mSplitter = new TQSplitter(this); mSplitter = new TQSplitter(this);
mLeftBoxLayout->addWidget(mSplitter); mLeftBoxLayout->addWidget(mSplitter);
mSplitter->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); mSplitter->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
mFolderView = new CameraFolderView(mSplitter); mFolderView = new CameraFolderView(mSplitter);
mIconView = new CameraIconView(mSplitter); mIconView = new CameraIconView(mSplitter);
mSplitter->setOpaqueResize(true); mSplitter->setOpaqueResize(true);
@ -199,7 +199,7 @@ CameraUI::CameraUI() : TQWidget()
controller_->start(); controller_->start();
cameraConnected_ = false; cameraConnected_ = false;
// create Status Bar ----------------------------------------------------------------------------- // create tqStatus Bar -----------------------------------------------------------------------------
mStatusBar = new KStatusBar(this); mStatusBar = new KStatusBar(this);
mLeftBoxLayout->addWidget(mStatusBar); mLeftBoxLayout->addWidget(mStatusBar);
@ -435,7 +435,7 @@ void CameraUI::slotCameraDownloadSelected() {
TQString dir = mDownloadDirectoryEdit->text(); TQString dir = mDownloadDirectoryEdit->text();
TQDir qdir(dir); TQDir qdir(dir);
if(!qdir.exists()) { if(!qdir.exists()) {
KMessageBox::error(this, i18n("'%1' directory does not exist.").arg(dir)); KMessageBox::error(this, i18n("'%1' directory does not exist.").tqarg(dir));
return; return;
} }
int count = 0; int count = 0;
@ -510,7 +510,7 @@ void CameraUI::slotCameraUpload() {
} }
TQString uploadName = info.fileName(); TQString uploadName = info.fileName();
while (container_->findItem(folderItem->folderPath(), uploadName)) { while (container_->findItem(folderItem->folderPath(), uploadName)) {
TQString msg(i18n("Camera Folder '%1' contains item '%2'\n Please, enter New Name").arg(folderItem->folderName()).arg(uploadName)); TQString msg(i18n("Camera Folder '%1' contains item '%2'\n Please, enter New Name").tqarg(folderItem->folderName()).tqarg(uploadName));
uploadName = KLineEditDlg::getText(msg,uploadName,&ok,this); uploadName = KLineEditDlg::getText(msg,uploadName,&ok,this);
if(!ok){ if(!ok){
return; return;

@ -27,10 +27,10 @@
#include <tqapplication.h> #include <tqapplication.h>
#include <tqhbox.h> #include <tqhbox.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <layout.h> #include <tqlayout.h>
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <textedit.h> #include <tqtextedit.h>
// KDE // KDE
#include <klocale.h> #include <klocale.h>
#include <kapplication.h> #include <kapplication.h>
@ -58,9 +58,9 @@ DMessageBox::DMessageBox() : TQWidget(0, 0, WShowModal | WStyle_DialogBorder| WD
0, true); 0, true);
TQLabel *pixLabel = new TQLabel(hbox); TQLabel *pixLabel = new TQLabel(hbox);
pixLabel->setPixmap(pix); pixLabel->setPixmap(pix);
pixLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); pixLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
msgBox_ = new TQLabel(hbox); msgBox_ = new TQLabel(hbox);
msgBox_->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); msgBox_->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
grid->addMultiCellWidget(hbox, 0, 0, 0, 2); grid->addMultiCellWidget(hbox, 0, 0, 0, 2);
// --------------------------------------------------- // ---------------------------------------------------
extraMsgBox_ = new TQTextEdit(this); extraMsgBox_ = new TQTextEdit(this);

@ -95,7 +95,7 @@ int GPCamera::setup() {
status = 0; status = 0;
} }
status = new GPStatus(); status = new GPtqStatus();
gp_abilities_list_new(&abilList); gp_abilities_list_new(&abilList);
gp_abilities_list_load(abilList, status->context); gp_abilities_list_load(abilList, status->context);
@ -160,7 +160,7 @@ int GPCamera::initialize() {
delete status; delete status;
status = 0; status = 0;
} }
status = new GPStatus(); status = new GPtqStatus();
// Try and initialize the camera to see if its connected // Try and initialize the camera to see if its connected
if (gp_camera_init(d->camera, status->context) != GP_OK) { if (gp_camera_init(d->camera, status->context) != GP_OK) {
gp_camera_unref(d->camera); gp_camera_unref(d->camera);
@ -209,7 +209,7 @@ int GPCamera::getSubFolders(const TQString& folder, TQValueList<TQString>& subFo
delete status; delete status;
status = 0; status = 0;
} }
status = new GPStatus(); status = new GPtqStatus();
if (gp_camera_folder_list_folders(d->camera, folder.latin1(), clist, status->context) != GP_OK) { if (gp_camera_folder_list_folders(d->camera, folder.latin1(), clist, status->context) != GP_OK) {
gp_list_unref(clist); gp_list_unref(clist);
delete status; delete status;
@ -257,7 +257,7 @@ int GPCamera::getItemsInfo(const TQString& folder, GPFileItemInfoList& infoList)
delete status; delete status;
status = 0; status = 0;
} }
status = new GPStatus; status = new GPtqStatus;
gp_list_new(&clist); gp_list_new(&clist);
if (gp_camera_folder_list_files(d->camera, folder.latin1(), clist, status->context) != GP_OK) { if (gp_camera_folder_list_files(d->camera, folder.latin1(), clist, status->context) != GP_OK) {
gp_list_unref(clist); gp_list_unref(clist);
@ -337,7 +337,7 @@ int GPCamera::getThumbnail(const TQString& folder, const TQString& imageName, TQ
delete status; delete status;
status = 0; status = 0;
} }
status = new GPStatus; status = new GPtqStatus;
if (gp_camera_file_get(d->camera, folder.latin1(), imageName.latin1(), GP_FILE_TYPE_PREVIEW, cfile, status->context) != GP_OK) { if (gp_camera_file_get(d->camera, folder.latin1(), imageName.latin1(), GP_FILE_TYPE_PREVIEW, cfile, status->context) != GP_OK) {
gp_file_unref(cfile); gp_file_unref(cfile);
delete status; delete status;
@ -359,7 +359,7 @@ int GPCamera::downloadItem(const TQString& folder, const TQString& itemName, con
delete status; delete status;
status = 0; status = 0;
} }
status = new GPStatus; status = new GPtqStatus;
if (gp_camera_file_get(d->camera, folder.latin1(), itemName.latin1(), GP_FILE_TYPE_NORMAL, cfile, status->context) != GP_OK) { if (gp_camera_file_get(d->camera, folder.latin1(), itemName.latin1(), GP_FILE_TYPE_NORMAL, cfile, status->context) != GP_OK) {
gp_file_unref(cfile); gp_file_unref(cfile);
delete status; delete status;
@ -381,7 +381,7 @@ int GPCamera::deleteItem(const TQString& folder, const TQString& itemName) {
delete status; delete status;
status = 0; status = 0;
} }
status = new GPStatus; status = new GPtqStatus;
if(gp_camera_file_delete(d->camera, folder.latin1(), itemName.latin1(), status->context) != GP_OK) { if(gp_camera_file_delete(d->camera, folder.latin1(), itemName.latin1(), status->context) != GP_OK) {
delete status; delete status;
status = 0; status = 0;
@ -412,7 +412,7 @@ int GPCamera::deleteAllItems(const TQString& folder) {
delete status; delete status;
status = 0; status = 0;
} }
status = new GPStatus; status = new GPtqStatus;
if (gp_camera_folder_delete_all(d->camera, folder.latin1(), status->context) != GP_OK) { if (gp_camera_folder_delete_all(d->camera, folder.latin1(), status->context) != GP_OK) {
delete status; delete status;
status = 0; status = 0;
@ -435,7 +435,7 @@ int GPCamera::uploadItem(const TQString& folder, const TQString& itemName, const
delete status; delete status;
status = 0; status = 0;
} }
status = new GPStatus; status = new GPtqStatus;
if (gp_camera_folder_put_file(d->camera, folder.latin1(), cfile, status->context) != GP_OK) { if (gp_camera_folder_put_file(d->camera, folder.latin1(), cfile, status->context) != GP_OK) {
gp_file_unref(cfile); gp_file_unref(cfile);
delete status; delete status;
@ -454,7 +454,7 @@ void GPCamera::cameraSummary(TQString& summary) {
delete status; delete status;
status = 0; status = 0;
} }
status = new GPStatus; status = new GPtqStatus;
gp_camera_get_summary(d->camera, &sum, status->context); gp_camera_get_summary(d->camera, &sum, status->context);
summary = TQString(sum.text); summary = TQString(sum.text);
delete status; delete status;
@ -467,7 +467,7 @@ void GPCamera::cameraManual(TQString& manual) {
delete status; delete status;
status = 0; status = 0;
} }
status = new GPStatus; status = new GPtqStatus;
gp_camera_get_manual(d->camera, &man, status->context); gp_camera_get_manual(d->camera, &man, status->context);
manual = TQString(man.text); manual = TQString(man.text);
delete status; delete status;
@ -480,7 +480,7 @@ void GPCamera::cameraAbout(TQString& about) {
delete status; delete status;
status = 0; status = 0;
} }
status = new GPStatus; status = new GPtqStatus;
gp_camera_get_about(d->camera, &abt, status->context); gp_camera_get_about(d->camera, &abt, status->context);
about = TQString(abt.text); about = TQString(abt.text);
delete status; delete status;

@ -34,7 +34,7 @@ namespace KIPIKameraKlientPlugin
{ {
class GPCameraPrivate; class GPCameraPrivate;
class GPStatus; class GPtqStatus;
class GPCamera { class GPCamera {
@ -84,7 +84,7 @@ public:
private: private:
int setup(); int setup();
GPCameraPrivate *d; GPCameraPrivate *d;
GPStatus *status; GPtqStatus *status;
}; };
} // NameSpace KIPIKameraKlientPlugin } // NameSpace KIPIKameraKlientPlugin

@ -254,7 +254,7 @@ void GPController::getSubFolders(const TQString& folder) {
} }
return; return;
} else { } else {
TQString msg(i18n("Failed to get subfolder names from '%1'\n").arg(folder)); TQString msg(i18n("Failed to get subfolder names from '%1'\n").tqarg(folder));
error(msg); error(msg);
return; return;
} }
@ -275,7 +275,7 @@ void GPController::getItemsInfo(const TQString& folder) {
if (result == GPCamera::GPSuccess) { if (result == GPCamera::GPSuccess) {
TQApplication::postEvent(parent_, new GPEventGetItemsInfo(folder, infoList)); TQApplication::postEvent(parent_, new GPEventGetItemsInfo(folder, infoList));
} else { } else {
TQString msg(i18n("Failed to get images information from '%1'\n").arg(folder)); TQString msg(i18n("Failed to get images information from '%1'\n").tqarg(folder));
error(msg); error(msg);
} }
} }
@ -298,7 +298,7 @@ void GPController::getThumbnail(const TQString& folder, const TQString& imageNam
scaleHighlightThumbnail(thumbnail); scaleHighlightThumbnail(thumbnail);
TQApplication::postEvent(parent_, new GPEventGetThumbnail(folder, imageName, thumbnail)); TQApplication::postEvent(parent_, new GPEventGetThumbnail(folder, imageName, thumbnail));
} else { } else {
kdWarning() << i18n("Failed to get preview for '%1/%2'").arg(folder).arg(imageName) << endl; kdWarning() << i18n("Failed to get preview for '%1/%2'").tqarg(folder).tqarg(imageName) << endl;
} }
} }
@ -307,7 +307,7 @@ void GPController::downloadItem(const TQString& folder, const TQString& itemName
int result = camera_->downloadItem(folder, itemName, saveFile); int result = camera_->downloadItem(folder, itemName, saveFile);
mutex_.unlock(); mutex_.unlock();
if (result != GPCamera::GPSuccess) { if (result != GPCamera::GPSuccess) {
TQString msg(i18n("Failed to download '%1' from '%2'").arg(itemName).arg(folder)); TQString msg(i18n("Failed to download '%1' from '%2'").tqarg(itemName).tqarg(folder));
error(msg); error(msg);
} else { } else {
TQApplication::postEvent(parent_, new GPEventDownloadItem(folder, itemName)); TQApplication::postEvent(parent_, new GPEventDownloadItem(folder, itemName));
@ -319,7 +319,7 @@ void GPController::openItem(const TQString& folder, const TQString& itemName, co
int result = camera_->downloadItem(folder, itemName, saveFile); int result = camera_->downloadItem(folder, itemName, saveFile);
mutex_.unlock(); mutex_.unlock();
if (result != GPCamera::GPSuccess) { if (result != GPCamera::GPSuccess) {
TQString msg(i18n("Failed to open '%1'").arg(itemName)); TQString msg(i18n("Failed to open '%1'").tqarg(itemName));
error(msg); error(msg);
} else { } else {
TQApplication::postEvent(parent_, new GPEventOpenItem(saveFile)); TQApplication::postEvent(parent_, new GPEventOpenItem(saveFile));
@ -331,7 +331,7 @@ void GPController::openItemWithService(const TQString& folder, const TQString& i
int result = camera_->downloadItem(folder, itemName, saveFile); int result = camera_->downloadItem(folder, itemName, saveFile);
mutex_.unlock(); mutex_.unlock();
if (result != GPCamera::GPSuccess) { if (result != GPCamera::GPSuccess) {
TQString msg(i18n("Failed to open '%1'").arg(itemName)); TQString msg(i18n("Failed to open '%1'").tqarg(itemName));
error(msg); error(msg);
} else { } else {
TQApplication::postEvent(parent_, new GPEventOpenItemWithService(saveFile, serviceName)); TQApplication::postEvent(parent_, new GPEventOpenItemWithService(saveFile, serviceName));
@ -343,7 +343,7 @@ void GPController::deleteItem(const TQString& folder, const TQString& itemName)
int result = camera_->deleteItem(folder, itemName); int result = camera_->deleteItem(folder, itemName);
mutex_.unlock(); mutex_.unlock();
if (result != GPCamera::GPSuccess) { if (result != GPCamera::GPSuccess) {
TQString msg(i18n("Failed to delete '%1'").arg(itemName)); TQString msg(i18n("Failed to delete '%1'").tqarg(itemName));
error(msg); error(msg);
} else { } else {
TQApplication::postEvent(parent_, new GPEventDeleteItem(folder, itemName)); TQApplication::postEvent(parent_, new GPEventDeleteItem(folder, itemName));
@ -355,7 +355,7 @@ void GPController::uploadItem(const TQString& folder, const TQString& uploadName
int result = camera_->uploadItem(folder, uploadName, localFile); int result = camera_->uploadItem(folder, uploadName, localFile);
mutex_.unlock(); mutex_.unlock();
if (result != GPCamera::GPSuccess) { if (result != GPCamera::GPSuccess) {
TQString msg(i18n("Failed to upload '%1'").arg(localFile)); TQString msg(i18n("Failed to upload '%1'").tqarg(localFile));
error(msg); error(msg);
} else { } else {
GPFileItemInfoList infoList; GPFileItemInfoList infoList;

@ -24,7 +24,7 @@
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqstring.h> #include <tqstring.h>
#include <layout.h> #include <tqlayout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <kiconloader.h> #include <kiconloader.h>
@ -53,7 +53,7 @@ GPFileItemInfoDlg::GPFileItemInfoDlg(const GPFileItemInfo& info,
TQLabel *thumbLabel = new TQLabel( page ); TQLabel *thumbLabel = new TQLabel( page );
thumbLabel->setFrameShape(TQFrame::Box); thumbLabel->setFrameShape(TQFrame::Box);
thumbLabel->setMargin(2); thumbLabel->setMargin(2);
thumbLabel->setPaletteBackgroundColor(colorGroup().base()); thumbLabel->setPaletteBackgroundColor(tqcolorGroup().base());
if (!pixmap) { if (!pixmap) {
if (info.mime.contains("image")) if (info.mime.contains("image"))
thumbLabel->setPixmap(DesktopIcon("image")); thumbLabel->setPixmap(DesktopIcon("image"));

@ -28,7 +28,7 @@ class GPMessages : public TQObject {
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
friend class GPStatus; friend class GPtqStatus;
public: public:

@ -26,10 +26,10 @@
namespace KIPIKameraKlientPlugin namespace KIPIKameraKlientPlugin
{ {
float GPStatus::target = 0.0; float GPtqStatus::target = 0.0;
bool GPStatus::cancel = false; bool GPtqStatus::cancel = false;
GPStatus::GPStatus() : TQObject() { GPtqStatus::GPtqStatus() : TQObject() {
context = gp_context_new(); context = gp_context_new();
cancel = false; cancel = false;
gp_context_set_cancel_func(context, cancel_func, 0); gp_context_set_cancel_func(context, cancel_func, 0);
@ -38,21 +38,21 @@ GPStatus::GPStatus() : TQObject() {
gp_context_set_progress_funcs(context, progress_start_func, progress_update_func, progress_stop_func, 0); gp_context_set_progress_funcs(context, progress_start_func, progress_update_func, progress_stop_func, 0);
} }
GPStatus::~GPStatus() { GPtqStatus::~GPtqStatus() {
if(context) { if(context) {
gp_context_unref(context); gp_context_unref(context);
} }
} }
void GPStatus::cancelOperation() { void GPtqStatus::cancelOperation() {
cancel = true; cancel = true;
} }
GPContextFeedback GPStatus::cancel_func(GPContext *, void *) { GPContextFeedback GPtqStatus::cancel_func(GPContext *, void *) {
return (cancel ? GP_CONTEXT_FEEDBACK_CANCEL : GP_CONTEXT_FEEDBACK_OK); return (cancel ? GP_CONTEXT_FEEDBACK_CANCEL : GP_CONTEXT_FEEDBACK_OK);
} }
void GPStatus::error_func(GPContext *, const char *format, va_list args, void *) { void GPtqStatus::error_func(GPContext *, const char *format, va_list args, void *) {
char buf[4096] = ""; char buf[4096] = "";
int nSize = vsnprintf( buf, 4096, format, args ); int nSize = vsnprintf( buf, 4096, format, args );
if(nSize > 4094) { if(nSize > 4094) {
@ -64,7 +64,7 @@ void GPStatus::error_func(GPContext *, const char *format, va_list args, void *)
GPMessages::gpMessagesWrapper()->emit errorMessage(error); GPMessages::gpMessagesWrapper()->emit errorMessage(error);
} }
void GPStatus::status_func (GPContext *, const char *format, va_list args, void *) { void GPtqStatus::status_func (GPContext *, const char *format, va_list args, void *) {
char buf[4096] = ""; char buf[4096] = "";
int nSize = vsnprintf( buf, 4096, format, args ); int nSize = vsnprintf( buf, 4096, format, args );
if(nSize > 4094) { if(nSize > 4094) {
@ -76,7 +76,7 @@ void GPStatus::status_func (GPContext *, const char *format, va_list args, void
GPMessages::gpMessagesWrapper()->emit statusChanged(status); GPMessages::gpMessagesWrapper()->emit statusChanged(status);
} }
unsigned int GPStatus::progress_start_func(GPContext *, float _target, const char *format, va_list args, void *) { unsigned int GPtqStatus::progress_start_func(GPContext *, float _target, const char *format, va_list args, void *) {
char buf[4096] = ""; char buf[4096] = "";
int nSize = vsnprintf( buf, 4096, format, args ); int nSize = vsnprintf( buf, 4096, format, args );
if(nSize > 4094) { if(nSize > 4094) {
@ -89,12 +89,12 @@ unsigned int GPStatus::progress_start_func(GPContext *, float _target, const cha
return GP_OK; return GP_OK;
} }
void GPStatus::progress_update_func(GPContext *, unsigned int, float current, void *) { void GPtqStatus::progress_update_func(GPContext *, unsigned int, float current, void *) {
int percentage = int(100.0 * current/target); int percentage = int(100.0 * current/target);
GPMessages::gpMessagesWrapper()->emit progressChanged(percentage); GPMessages::gpMessagesWrapper()->emit progressChanged(percentage);
} }
void GPStatus::progress_stop_func(GPContext *, unsigned int, void *) { void GPtqStatus::progress_stop_func(GPContext *, unsigned int, void *) {
GPMessages::gpMessagesWrapper()->emit progressChanged(0); GPMessages::gpMessagesWrapper()->emit progressChanged(0);
} }

@ -33,14 +33,14 @@ extern "C" {
namespace KIPIKameraKlientPlugin namespace KIPIKameraKlientPlugin
{ {
class GPStatus : public TQObject { class GPtqStatus : public TQObject {
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
friend class GPCamera; friend class GPCamera;
public: public:
GPStatus(); GPtqStatus();
~GPStatus(); ~GPtqStatus();
void cancelOperation(); void cancelOperation();
private: private:

@ -40,7 +40,7 @@ public:
virtual void setup(TQWidget* widget); virtual void setup(TQWidget* widget);
virtual KIPI::Category category(KAction*) const; virtual KIPI::Category category(KAction*) const;
TQString id() const { TQString id() const {
return TQString::fromLatin1("kameraklient"); return TQString::tqfromLatin1("kameraklient");
} }
KAction* mKameraKlientAction; KAction* mKameraKlientAction;

@ -20,7 +20,7 @@
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <tqfileinfo.h> #include <tqfileinfo.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <layout.h> #include <tqlayout.h>
// KDE // KDE
#include <klocale.h> #include <klocale.h>
#include <kbuttonbox.h> #include <kbuttonbox.h>
@ -34,7 +34,7 @@ namespace KIPIKameraKlientPlugin
SavefileDialog::SavefileDialog(const TQString& file, TQWidget *parent, const char* name, bool modal) : TQDialog(parent, name, modal) { SavefileDialog::SavefileDialog(const TQString& file, TQWidget *parent, const char* name, bool modal) : TQDialog(parent, name, modal) {
TQFileInfo fileInfo(file); TQFileInfo fileInfo(file);
setCaption(i18n("File Already Exists")); setCaption(i18n("File Already Exists"));
TQLabel *descLbl = new TQLabel(i18n("The file '%1' already exists!").arg(fileInfo.absFilePath()), this); TQLabel *descLbl = new TQLabel(i18n("The file '%1' already exists!").tqarg(fileInfo.absFilePath()), this);
renameEdit = new TQLineEdit(this); renameEdit = new TQLineEdit(this);
renameEdit->setText(fileInfo.fileName()); renameEdit->setText(fileInfo.fileName());
connect(renameEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slot_renameEnabled())); connect(renameEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slot_renameEnabled()));
@ -47,11 +47,11 @@ SavefileDialog::SavefileDialog(const TQString& file, TQWidget *parent, const cha
bbox->addButton(i18n("Overwrite All"), TQT_TQOBJECT(this), TQT_SLOT(slot_overwriteAll()), true); bbox->addButton(i18n("Overwrite All"), TQT_TQOBJECT(this), TQT_SLOT(slot_overwriteAll()), true);
TQPushButton *cancelBtn = bbox->addButton(i18n("&Cancel"), TQT_TQOBJECT(this), TQT_SLOT(reject()), true); TQPushButton *cancelBtn = bbox->addButton(i18n("&Cancel"), TQT_TQOBJECT(this), TQT_SLOT(reject()), true);
cancelBtn->setDefault(true); cancelBtn->setDefault(true);
bbox->layout(); bbox->tqlayout();
TQGridLayout *layout = new TQGridLayout(this, 0, 0, 15); TQGridLayout *tqlayout = new TQGridLayout(this, 0, 0, 15);
layout->addMultiCellWidget(descLbl, 0, 0, 0, 3); tqlayout->addMultiCellWidget(descLbl, 0, 0, 0, 3);
layout->addMultiCellWidget(renameEdit, 3, 3, 0, 3); tqlayout->addMultiCellWidget(renameEdit, 3, 3, 0, 3);
layout->addMultiCellWidget(bbox, 4, 4, 0, 3); tqlayout->addMultiCellWidget(bbox, 4, 4, 0, 3);
} }
SavefileDialog::~SavefileDialog() { SavefileDialog::~SavefileDialog() {

@ -23,7 +23,7 @@
#include <tqapplication.h> #include <tqapplication.h>
#include <tqgroupbox.h> #include <tqgroupbox.h>
#include <layout.h> #include <tqlayout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqlistview.h> #include <tqlistview.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
@ -90,11 +90,11 @@ SetupCamera::SetupCamera(TQWidget* parent, const char* name)
TQGroupBox* groupBox = new TQGroupBox(page, "groupBox"); TQGroupBox* groupBox = new TQGroupBox(page, "groupBox");
groupBox->setColumnLayout(0, Qt::Vertical); groupBox->setColumnLayout(0, Qt::Vertical);
groupBox->layout()->setSpacing(5); groupBox->tqlayout()->setSpacing(5);
groupBox->layout()->setMargin(5); groupBox->tqlayout()->setMargin(5);
TQGridLayout* groupBoxLayout = new TQGridLayout(groupBox->layout()); TQGridLayout* groupBoxLayout = new TQGridLayout(groupBox->tqlayout());
groupBoxLayout->setAlignment( TQt::AlignTop ); groupBoxLayout->tqsetAlignment( TQt::AlignTop );
listView_ = new TQListView( groupBox ); listView_ = new TQListView( groupBox );
listView_->addColumn(i18n("Model")); listView_->addColumn(i18n("Model"));
listView_->addColumn(i18n("Port")); listView_->addColumn(i18n("Port"));

@ -17,10 +17,10 @@
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqfont.h> #include <tqfont.h>
#include <tqfontmetrics.h> #include <tqfontmetrics.h>
#include <palette.h> #include <tqpalette.h>
#include <tqpainter.h> #include <tqpainter.h>
#include <tqevent.h> #include <tqevent.h>
#include <textedit.h> #include <tqtextedit.h>
// Local // Local
#include "thumbview.h" #include "thumbview.h"
#include "thumbitem.h" #include "thumbitem.h"
@ -52,7 +52,7 @@ ThumbItemLineEdit::ThumbItemLineEdit(const TQString& text, TQWidget* parent, Thu
setWrapColumnOrWidth(item->pixmapRect().width()); setWrapColumnOrWidth(item->pixmapRect().width());
resize(200, 200); resize(200, 200);
setText(text); setText(text);
setAlignment(TQt::AlignCenter); tqsetAlignment(TQt::AlignCenter);
resize(wrapColumnOrWidth() + 2, heightForWidth(wrapColumnOrWidth()) + 2); resize(wrapColumnOrWidth() + 2, heightForWidth(wrapColumnOrWidth()) + 2);
} }
@ -182,9 +182,9 @@ void ThumbItem::paintItem(TQPainter *, const TQColorGroup& cg) {
bitBlt(view->viewport(), r.x(), r.y(), &pix, 0, 0, r.width(), r.height()); bitBlt(view->viewport(), r.x(), r.y(), &pix, 0, 0, r.width(), r.height());
} }
void ThumbItem::repaint() { void ThumbItem::tqrepaint() {
TQRect r(view->contentsRectToViewport(d->rect)); TQRect r(view->contentsRectToViewport(d->rect));
view->viewport()->repaint(r); view->viewport()->tqrepaint(r);
} }
TQRect ThumbItem::rect() { TQRect ThumbItem::rect() {
@ -293,7 +293,7 @@ void ThumbItem::setPixmap(const TQPixmap& pixmap) {
view->updateItemContainer(this); view->updateItemContainer(this);
if(oR.intersects(TQRect(view->contentsX(), view->contentsY(), view->visibleWidth(), view->visibleHeight()))) { if(oR.intersects(TQRect(view->contentsX(), view->contentsY(), view->visibleWidth(), view->visibleHeight()))) {
view->viewport()->repaint(oR); view->viewport()->tqrepaint(oR);
} }
} }
@ -310,7 +310,7 @@ void ThumbItem::setText(const TQString& text) {
view->updateItemContainer(this); view->updateItemContainer(this);
if(oR.intersects(TQRect(view->contentsX(), view->contentsY(), view->visibleWidth(), view->visibleHeight()))) { if(oR.intersects(TQRect(view->contentsX(), view->contentsY(), view->visibleWidth(), view->visibleHeight()))) {
view->viewport()->repaint(oR); view->viewport()->tqrepaint(oR);
} }
} }
@ -360,7 +360,7 @@ void ThumbItem::renameItem() {
} }
void ThumbItem::cancelRenameItem() { void ThumbItem::cancelRenameItem() {
repaint(); tqrepaint();
bool resetFocus = view->viewport()->focusProxy() == renameBox; bool resetFocus = view->viewport()->focusProxy() == renameBox;
delete renameBox; delete renameBox;

@ -64,7 +64,7 @@ public:
virtual void setPixmap(const TQPixmap& pixmap); virtual void setPixmap(const TQPixmap& pixmap);
virtual void setText(const TQString& text); virtual void setText(const TQString& text);
void repaint(); void tqrepaint();
ThumbView* iconView(); ThumbView* iconView();

@ -237,7 +237,7 @@ void ThumbView::takeItem(ThumbItem *item) {
} }
if (!d->clearing) { if (!d->clearing) {
TQRect r(contentsRectToViewport(item->rect())); TQRect r(contentsRectToViewport(item->rect()));
viewport()->repaint(r); viewport()->tqrepaint(r);
} }
} }
@ -290,14 +290,14 @@ void ThumbView::viewportPaintEvent(TQPaintEvent *pe) {
for ( ; item; item = c->items.next()) { for ( ; item; item = c->items.next()) {
TQRect ir(contentsRectToViewport(item->rect())); TQRect ir(contentsRectToViewport(item->rect()));
if (r.intersects(ir)) { if (r.intersects(ir)) {
item->paintItem(&painter, colorGroup()); item->paintItem(&painter, tqcolorGroup());
paintRegion -= TQRegion(ir); paintRegion -= TQRegion(ir);
} }
} }
} }
} }
painter.setClipRegion(paintRegion); painter.setClipRegion(paintRegion);
painter.fillRect(r, colorGroup().base()); painter.fillRect(r, tqcolorGroup().base());
painter.end(); painter.end();
} }
@ -393,7 +393,7 @@ void ThumbView::drawRubber(TQPainter *p) {
TQRect r(d->rubber->normalize()); TQRect r(d->rubber->normalize());
r = contentsRectToViewport(r); r = contentsRectToViewport(r);
TQPoint pnt(r.x(), r.y()); TQPoint pnt(r.x(), r.y());
tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, TQRect( pnt.x(), pnt.y(), r.width(), r.height()), colorGroup(), TQStyle::Style_Default, TQStyleOption(colorGroup().base())); tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, TQRect( pnt.x(), pnt.y(), r.width(), r.height()), tqcolorGroup(), TQStyle::Style_Default, TQStyleOption(tqcolorGroup().base()));
} }
void ThumbView::contentsMousePressEvent(TQMouseEvent *e) { void ThumbView::contentsMousePressEvent(TQMouseEvent *e) {
@ -546,7 +546,7 @@ void ThumbView::contentsMouseMoveEvent(TQMouseEvent *e) {
if (changed) { if (changed) {
emit signalSelectionChanged(); emit signalSelectionChanged();
paintRegion.translate(-contentsX(), -contentsY()); paintRegion.translate(-contentsX(), -contentsY());
viewport()->repaint(paintRegion); viewport()->tqrepaint(paintRegion);
} }
ensureVisible(e->pos().x(), e->pos().y()); ensureVisible(e->pos().x(), e->pos().y());
*d->rubber = r; *d->rubber = r;
@ -945,7 +945,7 @@ void ThumbView::keyPressEvent(TQKeyEvent *e) {
return; return;
} }
if (handled) { if (handled) {
viewport()->repaint(); viewport()->tqrepaint();
emit signalSelectionChanged(); emit signalSelectionChanged();
} }
} }

@ -24,7 +24,7 @@
#include <tqlabel.h> #include <tqlabel.h>
#include <tqframe.h> #include <tqframe.h>
#include <layout.h> #include <tqlayout.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
@ -105,7 +105,7 @@ CommentEditDialog::CommentEditDialog(TQWidget* parent)
TQLabel *title = new TQLabel(i18n("<p>Enter the image caption hosted by <b>%1</b>. " TQLabel *title = new TQLabel(i18n("<p>Enter the image caption hosted by <b>%1</b>. "
"This field is not limited (excepted with IPTC). UTF-8 encoding " "This field is not limited (excepted with IPTC). UTF-8 encoding "
"will be used to save text.") "will be used to save text.")
.arg(KApplication::kApplication()->aboutData()->appName()), .tqarg(KApplication::kApplication()->aboutData()->appName()),
plainPage()); plainPage());
d->userCommentEdit = new KTextEdit(plainPage()); d->userCommentEdit = new KTextEdit(plainPage());

@ -24,7 +24,7 @@
#include <tqlabel.h> #include <tqlabel.h>
#include <tqframe.h> #include <tqframe.h>
#include <layout.h> #include <tqlayout.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
@ -101,7 +101,7 @@ CommentRemoveDialog::CommentRemoveDialog(TQWidget* parent)
TQVBoxLayout *vlay = new TQVBoxLayout(plainPage(), 0, KDialog::spacingHint()); TQVBoxLayout *vlay = new TQVBoxLayout(plainPage(), 0, KDialog::spacingHint());
d->removeHOSTCommentCheck = new TQCheckBox(i18n("Remove caption created by %1") d->removeHOSTCommentCheck = new TQCheckBox(i18n("Remove caption created by %1")
.arg(KApplication::kApplication()->aboutData()->appName()), .tqarg(KApplication::kApplication()->aboutData()->appName()),
plainPage()); plainPage());
d->removeJFIFCommentCheck = new TQCheckBox(i18n("Remove JFIF Comment section"), plainPage()); d->removeJFIFCommentCheck = new TQCheckBox(i18n("Remove JFIF Comment section"), plainPage());
d->removeEXIFCommentCheck = new TQCheckBox(i18n("Remove EXIF Comment"), plainPage()); d->removeEXIFCommentCheck = new TQCheckBox(i18n("Remove EXIF Comment"), plainPage());

@ -26,7 +26,7 @@
// QT includes. // QT includes.
#include <layout.h> #include <tqlayout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqcombobox.h> #include <tqcombobox.h>

@ -22,7 +22,7 @@
// QT includes. // QT includes.
#include <layout.h> #include <tqlayout.h>
#include <tqhgroupbox.h> #include <tqhgroupbox.h>
#include <tqgroupbox.h> #include <tqgroupbox.h>
#include <tqlabel.h> #include <tqlabel.h>
@ -151,7 +151,7 @@ EXIFCaption::EXIFCaption(TQWidget* parent)
"will be used to save the text.")); "will be used to save the text."));
d->syncHOSTCommentCheck = new TQCheckBox(i18n("Sync captions entered through %1") d->syncHOSTCommentCheck = new TQCheckBox(i18n("Sync captions entered through %1")
.arg(KApplication::kApplication()->aboutData()->appName()), .tqarg(KApplication::kApplication()->aboutData()->appName()),
parent); parent);
d->syncJFIFCommentCheck = new TQCheckBox(i18n("Sync JFIF Comment section"), parent); d->syncJFIFCommentCheck = new TQCheckBox(i18n("Sync JFIF Comment section"), parent);
d->syncIPTCCaptionCheck = new TQCheckBox(i18n("Sync IPTC caption (warning: limited to 2000 printable " d->syncIPTCCaptionCheck = new TQCheckBox(i18n("Sync IPTC caption (warning: limited to 2000 printable "

@ -22,7 +22,7 @@
// QT includes. // QT includes.
#include <layout.h> #include <tqlayout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqvalidator.h> #include <tqvalidator.h>
@ -104,9 +104,9 @@ EXIFDateTime::EXIFDateTime(TQWidget* parent)
d->dateCreatedSubSecCheck = new TQCheckBox(i18n("Creation sub-second"), parent); d->dateCreatedSubSecCheck = new TQCheckBox(i18n("Creation sub-second"), parent);
d->dateCreatedSel = new KDateTimeWidget(parent); d->dateCreatedSel = new KDateTimeWidget(parent);
d->dateCreatedSubSecEdit = new KIntSpinBox(0, 999, 1, 0, 10, parent); d->dateCreatedSubSecEdit = new KIntSpinBox(0, 999, 1, 0, 10, parent);
d->dateCreatedSel->setDateTime(TQDateTime::currentDateTime()); d->dateCreatedSel->setDateTime(TQDateTime::tqcurrentDateTime());
d->syncHOSTDateCheck = new TQCheckBox(i18n("Sync creation date entered through %1") d->syncHOSTDateCheck = new TQCheckBox(i18n("Sync creation date entered through %1")
.arg(KApplication::kApplication()->aboutData()->appName()), .tqarg(KApplication::kApplication()->aboutData()->appName()),
parent); parent);
d->syncIPTCDateCheck = new TQCheckBox(i18n("Sync IPTC creation date"), parent); d->syncIPTCDateCheck = new TQCheckBox(i18n("Sync IPTC creation date"), parent);
KSeparator *line = new KSeparator(Qt::Horizontal, parent); KSeparator *line = new KSeparator(Qt::Horizontal, parent);
@ -130,7 +130,7 @@ EXIFDateTime::EXIFDateTime(TQWidget* parent)
d->dateOriginalSubSecCheck = new TQCheckBox(i18n("Original sub-second"), parent); d->dateOriginalSubSecCheck = new TQCheckBox(i18n("Original sub-second"), parent);
d->dateOriginalSel = new KDateTimeWidget(parent); d->dateOriginalSel = new KDateTimeWidget(parent);
d->dateOriginalSubSecEdit = new KIntSpinBox(0, 999, 1, 0, 10, parent); d->dateOriginalSubSecEdit = new KIntSpinBox(0, 999, 1, 0, 10, parent);
d->dateOriginalSel->setDateTime(TQDateTime::currentDateTime()); d->dateOriginalSel->setDateTime(TQDateTime::tqcurrentDateTime());
grid->addMultiCellWidget(d->dateOriginalCheck, 5, 5, 0, 0); grid->addMultiCellWidget(d->dateOriginalCheck, 5, 5, 0, 0);
grid->addMultiCellWidget(d->dateOriginalSubSecCheck, 5, 5, 1, 2); grid->addMultiCellWidget(d->dateOriginalSubSecCheck, 5, 5, 1, 2);
grid->addMultiCellWidget(d->dateOriginalSel, 6, 6, 0, 0); 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->dateDigitalizedSubSecCheck = new TQCheckBox(i18n("Digitization sub-second"), parent);
d->dateDigitalizedSel = new KDateTimeWidget(parent); d->dateDigitalizedSel = new KDateTimeWidget(parent);
d->dateDigitalizedSubSecEdit = new KIntSpinBox(0, 999, 1, 0, 10, parent); d->dateDigitalizedSubSecEdit = new KIntSpinBox(0, 999, 1, 0, 10, parent);
d->dateDigitalizedSel->setDateTime(TQDateTime::currentDateTime()); d->dateDigitalizedSel->setDateTime(TQDateTime::tqcurrentDateTime());
grid->addMultiCellWidget(d->dateDigitalizedCheck, 7, 7, 0, 0); grid->addMultiCellWidget(d->dateDigitalizedCheck, 7, 7, 0, 0);
grid->addMultiCellWidget(d->dateDigitalizedSubSecCheck, 7, 7, 1, 2); grid->addMultiCellWidget(d->dateDigitalizedSubSecCheck, 7, 7, 1, 2);
grid->addMultiCellWidget(d->dateDigitalizedSel, 8, 8, 0, 0); grid->addMultiCellWidget(d->dateDigitalizedSel, 8, 8, 0, 0);
@ -269,7 +269,7 @@ void EXIFDateTime::readMetadata(TQByteArray& exifData)
TQDateTime datetime; TQDateTime datetime;
TQString datetimeStr, data; TQString datetimeStr, data;
d->dateCreatedSel->setDateTime(TQDateTime::currentDateTime()); d->dateCreatedSel->setDateTime(TQDateTime::tqcurrentDateTime());
d->dateCreatedCheck->setChecked(false); d->dateCreatedCheck->setChecked(false);
datetimeStr = exiv2Iface.getExifTagString("Exif.Image.DateTime", false); datetimeStr = exiv2Iface.getExifTagString("Exif.Image.DateTime", false);
if (!datetimeStr.isEmpty()) if (!datetimeStr.isEmpty())
@ -300,7 +300,7 @@ void EXIFDateTime::readMetadata(TQByteArray& exifData)
} }
d->dateCreatedSubSecEdit->setEnabled(d->dateCreatedSubSecCheck->isChecked()); d->dateCreatedSubSecEdit->setEnabled(d->dateCreatedSubSecCheck->isChecked());
d->dateOriginalSel->setDateTime(TQDateTime::currentDateTime()); d->dateOriginalSel->setDateTime(TQDateTime::tqcurrentDateTime());
d->dateOriginalCheck->setChecked(false); d->dateOriginalCheck->setChecked(false);
datetimeStr = exiv2Iface.getExifTagString("Exif.Photo.DateTimeOriginal", false); datetimeStr = exiv2Iface.getExifTagString("Exif.Photo.DateTimeOriginal", false);
if (!datetimeStr.isEmpty()) if (!datetimeStr.isEmpty())
@ -329,7 +329,7 @@ void EXIFDateTime::readMetadata(TQByteArray& exifData)
} }
d->dateOriginalSubSecEdit->setEnabled(d->dateOriginalSubSecCheck->isChecked()); d->dateOriginalSubSecEdit->setEnabled(d->dateOriginalSubSecCheck->isChecked());
d->dateDigitalizedSel->setDateTime(TQDateTime::currentDateTime()); d->dateDigitalizedSel->setDateTime(TQDateTime::tqcurrentDateTime());
d->dateDigitalizedCheck->setChecked(false); d->dateDigitalizedCheck->setChecked(false);
datetimeStr = exiv2Iface.getExifTagString("Exif.Photo.DateTimeDigitized", false); datetimeStr = exiv2Iface.getExifTagString("Exif.Photo.DateTimeDigitized", false);
if (!datetimeStr.isEmpty()) if (!datetimeStr.isEmpty())

@ -26,7 +26,7 @@
// QT includes. // QT includes.
#include <layout.h> #include <tqlayout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqcombobox.h> #include <tqcombobox.h>
@ -176,7 +176,7 @@ EXIFDevice::EXIFDevice(TQWidget* parent)
d->exposureTimeNumEdit = new KIntSpinBox(1, 100000, 1, 1, 10, parent); d->exposureTimeNumEdit = new KIntSpinBox(1, 100000, 1, 1, 10, parent);
d->exposureTimeDenEdit = new KIntSpinBox(1, 100000, 1, 1, 10, parent); d->exposureTimeDenEdit = new KIntSpinBox(1, 100000, 1, 1, 10, parent);
TQLabel *exposureLabel = new TQLabel("/", parent); TQLabel *exposureLabel = new TQLabel("/", parent);
exposureLabel->setAlignment (TQt::AlignRight|TQt::AlignVCenter); exposureLabel->tqsetAlignment (TQt::AlignRight|TQt::AlignVCenter);
grid->addMultiCellWidget(d->exposureTimeCheck, 5, 5, 0, 0); grid->addMultiCellWidget(d->exposureTimeCheck, 5, 5, 0, 0);
grid->addMultiCellWidget(d->exposureTimeNumEdit, 5, 5, 2, 2); grid->addMultiCellWidget(d->exposureTimeNumEdit, 5, 5, 2, 2);
grid->addMultiCellWidget(exposureLabel, 5, 5, 3, 3); grid->addMultiCellWidget(exposureLabel, 5, 5, 3, 3);

@ -24,7 +24,7 @@
#include <tqtimer.h> #include <tqtimer.h>
#include <tqframe.h> #include <tqframe.h>
#include <layout.h> #include <tqlayout.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
// KDE includes. // KDE includes.
@ -277,10 +277,10 @@ void EXIFEditDialog::slotItemChanged()
enableButton(Apply, !d->isReadOnly); enableButton(Apply, !d->isReadOnly);
setCaption(TQString("%1 (%2/%3) - %4") setCaption(TQString("%1 (%2/%3) - %4")
.arg((*d->currItem).filename()) .tqarg((*d->currItem).filename())
.arg(d->urls.findIndex(*(d->currItem))+1) .tqarg(d->urls.findIndex(*(d->currItem))+1)
.arg(d->urls.count()) .tqarg(d->urls.count())
.arg(i18n("Edit EXIF Metadata")) + .tqarg(i18n("Edit EXIF Metadata")) +
(d->isReadOnly ? TQString(" - ") + i18n("(read only)") : TQString())); (d->isReadOnly ? TQString(" - ") + i18n("(read only)") : TQString()));
enableButton(User1, *(d->currItem) != d->urls.last()); enableButton(User1, *(d->currItem) != d->urls.last());
enableButton(User2, *(d->currItem) != d->urls.first()); enableButton(User2, *(d->currItem) != d->urls.first());

@ -26,7 +26,7 @@
// QT includes. // QT includes.
#include <layout.h> #include <tqlayout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqcombobox.h> #include <tqcombobox.h>

@ -26,7 +26,7 @@
// QT includes. // QT includes.
#include <layout.h> #include <tqlayout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqcombobox.h> #include <tqcombobox.h>

@ -22,7 +22,7 @@
// QT includes. // QT includes.
#include <layout.h> #include <tqlayout.h>
#include <tqhgroupbox.h> #include <tqhgroupbox.h>
#include <tqgroupbox.h> #include <tqgroupbox.h>
#include <tqlabel.h> #include <tqlabel.h>
@ -103,7 +103,7 @@ IPTCCaption::IPTCCaption(TQWidget* parent)
d->captionEdit = new KTextEdit(parent); d->captionEdit = new KTextEdit(parent);
d->syncJFIFCommentCheck = new TQCheckBox(i18n("Sync JFIF Comment section"), parent); d->syncJFIFCommentCheck = new TQCheckBox(i18n("Sync JFIF Comment section"), parent);
d->syncHOSTCommentCheck = new TQCheckBox(i18n("Sync caption entered through %1") d->syncHOSTCommentCheck = new TQCheckBox(i18n("Sync caption entered through %1")
.arg(KApplication::kApplication()->aboutData()->appName()), .tqarg(KApplication::kApplication()->aboutData()->appName()),
parent); parent);
d->syncEXIFCommentCheck = new TQCheckBox(i18n("Sync EXIF Comment"), parent); d->syncEXIFCommentCheck = new TQCheckBox(i18n("Sync EXIF Comment"), parent);
KSeparator *line = new KSeparator(Qt::Horizontal, parent); KSeparator *line = new KSeparator(Qt::Horizontal, parent);

@ -22,7 +22,7 @@
// QT includes. // QT includes.
#include <layout.h> #include <tqlayout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqvalidator.h> #include <tqvalidator.h>
@ -84,7 +84,7 @@ IPTCCategories::IPTCCategories(TQWidget* parent)
{ {
d = new IPTCCategoriesPriv; d = new IPTCCategoriesPriv;
TQGridLayout *grid = new TQGridLayout(parent, 6, 1, 0, KDialog::spacingHint()); TQGridLayout *grid = new TQGridLayout(parent, 6, 1, 0, KDialog::spacingHint());
grid->setAlignment( TQt::AlignTop ); grid->tqsetAlignment( TQt::AlignTop );
// IPTC only accept printable Ascii char. // IPTC only accept printable Ascii char.
TQRegExp asciiRx("[\x20-\x7F]+$"); TQRegExp asciiRx("[\x20-\x7F]+$");

@ -22,7 +22,7 @@
// QT includes. // QT includes.
#include <layout.h> #include <tqlayout.h>
#include <tqhgroupbox.h> #include <tqhgroupbox.h>
#include <tqgroupbox.h> #include <tqgroupbox.h>
#include <tqlabel.h> #include <tqlabel.h>

@ -22,7 +22,7 @@
// QT includes. // QT includes.
#include <layout.h> #include <tqlayout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqdatetime.h> #include <tqdatetime.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
@ -114,11 +114,11 @@ IPTCDateTime::IPTCDateTime(TQWidget* parent)
d->dateCreatedSel = new KDateWidget(parent); d->dateCreatedSel = new KDateWidget(parent);
d->timeCreatedSel = new KTimeWidget(parent); d->timeCreatedSel = new KTimeWidget(parent);
d->syncHOSTDateCheck = new TQCheckBox(i18n("Sync creation date entered through %1") d->syncHOSTDateCheck = new TQCheckBox(i18n("Sync creation date entered through %1")
.arg(KApplication::kApplication()->aboutData()->appName()), .tqarg(KApplication::kApplication()->aboutData()->appName()),
parent); parent);
d->syncEXIFDateCheck = new TQCheckBox(i18n("Sync EXIF creation date"), parent); d->syncEXIFDateCheck = new TQCheckBox(i18n("Sync EXIF creation date"), parent);
KSeparator *line = new KSeparator(Qt::Horizontal, parent); KSeparator *line = new KSeparator(Qt::Horizontal, parent);
d->dateCreatedSel->setDate(TQDate::currentDate()); d->dateCreatedSel->setDate(TQDate::tqcurrentDate());
d->timeCreatedSel->setTime(TQTime::currentTime()); d->timeCreatedSel->setTime(TQTime::currentTime());
grid->addMultiCellWidget(d->dateCreatedCheck, 0, 0, 0, 0); grid->addMultiCellWidget(d->dateCreatedCheck, 0, 0, 0, 0);
grid->addMultiCellWidget(d->timeCreatedCheck, 0, 0, 1, 2); 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->timeReleasedCheck = new TQCheckBox(i18n("Release time"), parent);
d->dateReleasedSel = new KDateWidget(parent); d->dateReleasedSel = new KDateWidget(parent);
d->timeReleasedSel = new KTimeWidget(parent); d->timeReleasedSel = new KTimeWidget(parent);
d->dateReleasedSel->setDate(TQDate::currentDate()); d->dateReleasedSel->setDate(TQDate::tqcurrentDate());
d->timeReleasedSel->setTime(TQTime::currentTime()); d->timeReleasedSel->setTime(TQTime::currentTime());
grid->addMultiCellWidget(d->dateReleasedCheck, 5, 5, 0, 0); grid->addMultiCellWidget(d->dateReleasedCheck, 5, 5, 0, 0);
grid->addMultiCellWidget(d->timeReleasedCheck, 5, 5, 1, 2); 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->timeExpiredCheck = new TQCheckBox(i18n("Expiration time"), parent);
d->dateExpiredSel = new KDateWidget(parent); d->dateExpiredSel = new KDateWidget(parent);
d->timeExpiredSel = new KTimeWidget(parent); d->timeExpiredSel = new KTimeWidget(parent);
d->dateExpiredSel->setDate(TQDate::currentDate()); d->dateExpiredSel->setDate(TQDate::tqcurrentDate());
d->timeExpiredSel->setTime(TQTime::currentTime()); d->timeExpiredSel->setTime(TQTime::currentTime());
grid->addMultiCellWidget(d->dateExpiredCheck, 7, 7, 0, 0); grid->addMultiCellWidget(d->dateExpiredCheck, 7, 7, 0, 0);
grid->addMultiCellWidget(d->timeExpiredCheck, 7, 7, 1, 2); 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->timeDigitalizedCheck = new TQCheckBox(i18n("Digitization time"), parent);
d->dateDigitalizedSel = new KDateWidget(parent); d->dateDigitalizedSel = new KDateWidget(parent);
d->timeDigitalizedSel = new KTimeWidget(parent); d->timeDigitalizedSel = new KTimeWidget(parent);
d->dateDigitalizedSel->setDate(TQDate::currentDate()); d->dateDigitalizedSel->setDate(TQDate::tqcurrentDate());
d->timeDigitalizedSel->setTime(TQTime::currentTime()); d->timeDigitalizedSel->setTime(TQTime::currentTime());
grid->addMultiCellWidget(d->dateDigitalizedCheck, 9, 9, 0, 0); grid->addMultiCellWidget(d->dateDigitalizedCheck, 9, 9, 0, 0);
grid->addMultiCellWidget(d->timeDigitalizedCheck, 9, 9, 1, 2); grid->addMultiCellWidget(d->timeDigitalizedCheck, 9, 9, 1, 2);
@ -314,7 +314,7 @@ void IPTCDateTime::readMetadata(TQByteArray& iptcData)
dateStr = exiv2Iface.getIptcTagString("Iptc.Application2.DateCreated", false); dateStr = exiv2Iface.getIptcTagString("Iptc.Application2.DateCreated", false);
timeStr = exiv2Iface.getIptcTagString("Iptc.Application2.TimeCreated", false); timeStr = exiv2Iface.getIptcTagString("Iptc.Application2.TimeCreated", false);
d->dateCreatedSel->setDate(TQDate::currentDate()); d->dateCreatedSel->setDate(TQDate::tqcurrentDate());
d->dateCreatedCheck->setChecked(false); d->dateCreatedCheck->setChecked(false);
if (!dateStr.isEmpty()) if (!dateStr.isEmpty())
{ {
@ -345,7 +345,7 @@ void IPTCDateTime::readMetadata(TQByteArray& iptcData)
dateStr = exiv2Iface.getIptcTagString("Iptc.Application2.ReleaseDate", false); dateStr = exiv2Iface.getIptcTagString("Iptc.Application2.ReleaseDate", false);
timeStr = exiv2Iface.getIptcTagString("Iptc.Application2.ReleaseTime", false); timeStr = exiv2Iface.getIptcTagString("Iptc.Application2.ReleaseTime", false);
d->dateReleasedSel->setDate(TQDate::currentDate()); d->dateReleasedSel->setDate(TQDate::tqcurrentDate());
d->dateReleasedCheck->setChecked(false); d->dateReleasedCheck->setChecked(false);
if (!dateStr.isEmpty()) if (!dateStr.isEmpty())
{ {
@ -374,7 +374,7 @@ void IPTCDateTime::readMetadata(TQByteArray& iptcData)
dateStr = exiv2Iface.getIptcTagString("Iptc.Application2.ExpirationDate", false); dateStr = exiv2Iface.getIptcTagString("Iptc.Application2.ExpirationDate", false);
timeStr = exiv2Iface.getIptcTagString("Iptc.Application2.ExpirationTime", false); timeStr = exiv2Iface.getIptcTagString("Iptc.Application2.ExpirationTime", false);
d->dateExpiredSel->setDate(TQDate::currentDate()); d->dateExpiredSel->setDate(TQDate::tqcurrentDate());
d->dateExpiredCheck->setChecked(false); d->dateExpiredCheck->setChecked(false);
if (!dateStr.isEmpty()) if (!dateStr.isEmpty())
{ {
@ -403,7 +403,7 @@ void IPTCDateTime::readMetadata(TQByteArray& iptcData)
dateStr = exiv2Iface.getIptcTagString("Iptc.Application2.DigitizationDate", false); dateStr = exiv2Iface.getIptcTagString("Iptc.Application2.DigitizationDate", false);
timeStr = exiv2Iface.getIptcTagString("Iptc.Application2.DigitizationTime", false); timeStr = exiv2Iface.getIptcTagString("Iptc.Application2.DigitizationTime", false);
d->dateDigitalizedSel->setDate(TQDate::currentDate()); d->dateDigitalizedSel->setDate(TQDate::tqcurrentDate());
d->dateDigitalizedCheck->setChecked(false); d->dateDigitalizedCheck->setChecked(false);
if (!dateStr.isEmpty()) if (!dateStr.isEmpty())
{ {

@ -24,7 +24,7 @@
#include <tqtimer.h> #include <tqtimer.h>
#include <tqframe.h> #include <tqframe.h>
#include <layout.h> #include <tqlayout.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
// KDE includes. // KDE includes.
@ -120,7 +120,7 @@ public:
IPTCKeywords *keywordsPage; IPTCKeywords *keywordsPage;
IPTCCategories *categoriesPage; IPTCCategories *categoriesPage;
IPTCCredits *creditsPage; IPTCCredits *creditsPage;
IPTCStatus *statusPage; IPTCtqStatus *statusPage;
IPTCOrigin *originPage; IPTCOrigin *originPage;
KIPI::Interface *interface; 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"), d->page_status = addPage(i18n("Status"), i18n("Status Information"),
BarIcon("messagebox_info", KIcon::SizeMedium)); BarIcon("messagebox_info", KIcon::SizeMedium));
d->statusPage = new IPTCStatus(d->page_status); d->statusPage = new IPTCtqStatus(d->page_status);
d->page_origin = addPage(i18n("Origin"), i18n("Origin Information"), d->page_origin = addPage(i18n("Origin"), i18n("Origin Information"),
BarIcon("www", KIcon::SizeMedium)); BarIcon("www", KIcon::SizeMedium));
@ -303,10 +303,10 @@ void IPTCEditDialog::slotItemChanged()
enableButton(Apply, !d->isReadOnly); enableButton(Apply, !d->isReadOnly);
setCaption(TQString("%1 (%2/%3) - %4") setCaption(TQString("%1 (%2/%3) - %4")
.arg((*d->currItem).filename()) .tqarg((*d->currItem).filename())
.arg(d->urls.findIndex(*(d->currItem))+1) .tqarg(d->urls.findIndex(*(d->currItem))+1)
.arg(d->urls.count()) .tqarg(d->urls.count())
.arg(i18n("Edit IPTC Metadata")) + .tqarg(i18n("Edit IPTC Metadata")) +
(d->isReadOnly ? TQString(" - ") + i18n("(read only)") : TQString())); (d->isReadOnly ? TQString(" - ") + i18n("(read only)") : TQString()));
enableButton(User1, *(d->currItem) != d->urls.last()); enableButton(User1, *(d->currItem) != d->urls.last());
enableButton(User2, *(d->currItem) != d->urls.first()); enableButton(User2, *(d->currItem) != d->urls.first());

@ -22,7 +22,7 @@
// QT includes. // QT includes.
#include <layout.h> #include <tqlayout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqvalidator.h> #include <tqvalidator.h>
@ -80,7 +80,7 @@ IPTCKeywords::IPTCKeywords(TQWidget* parent)
{ {
d = new IPTCKeywordsPriv; d = new IPTCKeywordsPriv;
TQGridLayout *grid = new TQGridLayout(parent, 5, 2, 0, KDialog::spacingHint()); TQGridLayout *grid = new TQGridLayout(parent, 5, 2, 0, KDialog::spacingHint());
grid->setAlignment( TQt::AlignTop ); grid->tqsetAlignment( TQt::AlignTop );
// IPTC only accept printable Ascii char. // IPTC only accept printable Ascii char.
TQRegExp asciiRx("[\x20-\x7F]+$"); TQRegExp asciiRx("[\x20-\x7F]+$");

@ -22,7 +22,7 @@
// QT includes. // QT includes.
#include <layout.h> #include <tqlayout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqvalidator.h> #include <tqvalidator.h>
@ -417,7 +417,7 @@ IPTCOrigin::IPTCOrigin(TQWidget* parent)
for (IPTCOriginPriv::CountryCodeMap::Iterator it = d->countryCodeMap.begin(); for (IPTCOriginPriv::CountryCodeMap::Iterator it = d->countryCodeMap.begin();
it != d->countryCodeMap.end(); ++it ) it != d->countryCodeMap.end(); ++it )
d->countryCB->insertItem(TQString("%1 - %2").arg(it.key()).arg(it.data())); d->countryCB->insertItem(TQString("%1 - %2").tqarg(it.key()).tqarg(it.data()));
d->countryCB->listBox()->sort(); d->countryCB->listBox()->sort();

@ -22,7 +22,7 @@
// QT includes. // QT includes.
#include <layout.h> #include <tqlayout.h>
#include <tqcombobox.h> #include <tqcombobox.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
@ -88,7 +88,7 @@ public:
MetadataCheckBox *objectAttributeCheck; MetadataCheckBox *objectAttributeCheck;
}; };
IPTCStatus::IPTCStatus(TQWidget* parent) IPTCtqStatus::IPTCtqStatus(TQWidget* parent)
: TQWidget(parent) : TQWidget(parent)
{ {
d = new IPTCStatusPriv; d = new IPTCStatusPriv;
@ -294,12 +294,12 @@ IPTCStatus::IPTCStatus(TQWidget* parent)
this, TQT_SIGNAL(signalModified())); this, TQT_SIGNAL(signalModified()));
} }
IPTCStatus::~IPTCStatus() IPTCtqStatus::~IPTCtqStatus()
{ {
delete d; delete d;
} }
void IPTCStatus::readMetadata(TQByteArray& iptcData) void IPTCtqStatus::readMetadata(TQByteArray& iptcData)
{ {
blockSignals(true); blockSignals(true);
KExiv2Iface::KExiv2 exiv2Iface; KExiv2Iface::KExiv2 exiv2Iface;
@ -417,7 +417,7 @@ void IPTCStatus::readMetadata(TQByteArray& iptcData)
blockSignals(false); blockSignals(false);
} }
void IPTCStatus::applyMetadata(TQByteArray& iptcData) void IPTCtqStatus::applyMetadata(TQByteArray& iptcData)
{ {
KExiv2Iface::KExiv2 exiv2Iface; KExiv2Iface::KExiv2 exiv2Iface;
exiv2Iface.setIptc(iptcData); exiv2Iface.setIptc(iptcData);
@ -456,7 +456,7 @@ void IPTCStatus::applyMetadata(TQByteArray& iptcData)
{ {
TQString objectType; TQString objectType;
objectType.sprintf("%2d", d->objectTypeCB->currentItem()+1); objectType.sprintf("%2d", d->objectTypeCB->currentItem()+1);
objectType.append(TQString(":%1").arg(d->objectTypeDescEdit->text())); objectType.append(TQString(":%1").tqarg(d->objectTypeDescEdit->text()));
exiv2Iface.setIptcTagString("Iptc.Application2.ObjectType", objectType); exiv2Iface.setIptcTagString("Iptc.Application2.ObjectType", objectType);
} }
else if (d->objectTypeCheck->isValid()) else if (d->objectTypeCheck->isValid())
@ -466,7 +466,7 @@ void IPTCStatus::applyMetadata(TQByteArray& iptcData)
{ {
TQString objectAttribute; TQString objectAttribute;
objectAttribute.sprintf("%3d", d->objectAttributeCB->currentItem()+1); objectAttribute.sprintf("%3d", d->objectAttributeCB->currentItem()+1);
objectAttribute.append(TQString(":%1").arg(d->objectAttributeDescEdit->text())); objectAttribute.append(TQString(":%1").tqarg(d->objectAttributeDescEdit->text()));
exiv2Iface.setIptcTagString("Iptc.Application2.ObjectAttribute", objectAttribute); exiv2Iface.setIptcTagString("Iptc.Application2.ObjectAttribute", objectAttribute);
} }
else if (d->objectAttributeCheck->isValid()) else if (d->objectAttributeCheck->isValid())

@ -33,15 +33,15 @@ namespace KIPIMetadataEditPlugin
class IPTCStatusPriv; class IPTCStatusPriv;
class IPTCStatus : public TQWidget class IPTCtqStatus : public TQWidget
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
IPTCStatus(TQWidget* parent); IPTCtqStatus(TQWidget* parent);
~IPTCStatus(); ~IPTCtqStatus();
void applyMetadata(TQByteArray& iptcData); void applyMetadata(TQByteArray& iptcData);
void readMetadata(TQByteArray& iptcData); void readMetadata(TQByteArray& iptcData);

@ -22,7 +22,7 @@
// QT includes. // QT includes.
#include <layout.h> #include <tqlayout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqvalidator.h> #include <tqvalidator.h>
@ -80,7 +80,7 @@ IPTCSubjects::IPTCSubjects(TQWidget* parent)
{ {
d = new IPTCSubjectsPriv; d = new IPTCSubjectsPriv;
TQGridLayout *grid = new TQGridLayout(parent, 5, 2, 0, KDialog::spacingHint()); TQGridLayout *grid = new TQGridLayout(parent, 5, 2, 0, KDialog::spacingHint());
grid->setAlignment( TQt::AlignTop ); grid->tqsetAlignment( TQt::AlignTop );
// IPTC only accept printable Ascii char. // IPTC only accept printable Ascii char.
TQRegExp asciiRx("[\x20-\x7F]+$"); TQRegExp asciiRx("[\x20-\x7F]+$");

@ -238,7 +238,7 @@ void Plugin_MetadataEdit::slotImportExif()
if (!exiv2Iface.load(importEXIFFile.path())) if (!exiv2Iface.load(importEXIFFile.path()))
{ {
KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()),
i18n("Cannot load metadata from \"%1\"").arg(importEXIFFile.fileName()), i18n("Cannot load metadata from \"%1\"").tqarg(importEXIFFile.fileName()),
i18n("Import EXIF Metadata")); i18n("Import EXIF Metadata"));
return; return;
} }
@ -247,7 +247,7 @@ void Plugin_MetadataEdit::slotImportExif()
if (exifData.isEmpty()) if (exifData.isEmpty())
{ {
KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()),
i18n("\"%1\" do not have EXIF metadata").arg(importEXIFFile.fileName()), i18n("\"%1\" do not have EXIF metadata").tqarg(importEXIFFile.fileName()),
i18n("Import EXIF Metadata")); i18n("Import EXIF Metadata"));
return; return;
} }
@ -256,7 +256,7 @@ void Plugin_MetadataEdit::slotImportExif()
TQT_TQWIDGET(kapp->activeWindow()), TQT_TQWIDGET(kapp->activeWindow()),
i18n("EXIF metadata from current selected pictures will be permanently " i18n("EXIF metadata from current selected pictures will be permanently "
"replaced by the EXIF content of \"%1\".\n" "replaced by the EXIF content of \"%1\".\n"
"Do you want to continue ?").arg(importEXIFFile.fileName()), "Do you want to continue ?").tqarg(importEXIFFile.fileName()),
i18n("Import EXIF Metadata")) != KMessageBox::Yes) i18n("Import EXIF Metadata")) != KMessageBox::Yes)
return; return;
@ -384,7 +384,7 @@ void Plugin_MetadataEdit::slotImportIptc()
if (!exiv2Iface.load(importIPTCFile.path())) if (!exiv2Iface.load(importIPTCFile.path()))
{ {
KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()),
i18n("Cannot load metadata from \"%1\"").arg(importIPTCFile.fileName()), i18n("Cannot load metadata from \"%1\"").tqarg(importIPTCFile.fileName()),
i18n("Import IPTC Metadata")); i18n("Import IPTC Metadata"));
return; return;
} }
@ -393,7 +393,7 @@ void Plugin_MetadataEdit::slotImportIptc()
if (iptcData.isEmpty()) if (iptcData.isEmpty())
{ {
KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()),
i18n("\"%1\" do not have IPTC metadata").arg(importIPTCFile.fileName()), i18n("\"%1\" do not have IPTC metadata").tqarg(importIPTCFile.fileName()),
i18n("Import IPTC Metadata")); i18n("Import IPTC Metadata"));
return; return;
} }
@ -402,7 +402,7 @@ void Plugin_MetadataEdit::slotImportIptc()
TQT_TQWIDGET(kapp->activeWindow()), TQT_TQWIDGET(kapp->activeWindow()),
i18n("IPTC metadata from current selected pictures will be permanently " i18n("IPTC metadata from current selected pictures will be permanently "
"replaced by the IPTC content of \"%1\".\n" "replaced by the IPTC content of \"%1\".\n"
"Do you want to continue ?").arg(importIPTCFile.fileName()), "Do you want to continue ?").tqarg(importIPTCFile.fileName()),
i18n("Import IPTC Metadata")) != KMessageBox::Yes) i18n("Import IPTC Metadata")) != KMessageBox::Yes)
return; return;

@ -858,7 +858,7 @@ while test $CPT -lt $NBFRAMETOTAL;\
if [ $CPT = `echo $((($CPF*$NBFRAMEIMAGE)-$NBFRAMEIMAGE+1))` ]; then if [ $CPT = `echo $((($CPF*$NBFRAMEIMAGE)-$NBFRAMEIMAGE+1))` ]; then
# Conversion and resizing the curent image file with ImageMagick. # Conversion and resizing the curent image file with ImageMagick.
$MONTAGE_BIN -type TrueColor -quality 100 -geometry 768x576 -texture "$MASK" "${INPUT_IMAGE_FILES[`echo $(($CPF-1))`]}" "$TMPFILENAME.tmp.jpg" $MONTAGE_BIN -type TrueColor -quality 100 -tqgeometry 768x576 -texture "$MASK" "${INPUT_IMAGE_FILES[`echo $(($CPF-1))`]}" "$TMPFILENAME.tmp.jpg"
$CONVERT_BIN -type TrueColor -quality 100 "$TMPFILENAME.tmp.jpg" "$TMPFILENAME.tmp.pnm" $CONVERT_BIN -type TrueColor -quality 100 "$TMPFILENAME.tmp.jpg" "$TMPFILENAME.tmp.pnm"
# Next input image... # Next input image...
@ -870,7 +870,7 @@ while test $CPT -lt $NBFRAMETOTAL;\
if [ $[$CPT <= `echo $((($CPF*($NBFRAMEIMAGE+$NBFRAMETRANSITION)-$NBFRAMEIMAGE)))`] = 1 ]; then if [ $[$CPT <= `echo $((($CPF*($NBFRAMEIMAGE+$NBFRAMETRANSITION)-$NBFRAMEIMAGE)))`] = 1 ]; then
if [ $DISSOLVEVALUE = 99 ]; then if [ $DISSOLVEVALUE = 99 ]; then
$MONTAGE_BIN -type TrueColor -quality 100 -geometry 768x576 -texture "$MASK" "${INPUT_IMAGE_FILES[`echo $(($CPF-1))`]}" "$TMPFILENAME.tmp.jpg" $MONTAGE_BIN -type TrueColor -quality 100 -tqgeometry 768x576 -texture "$MASK" "${INPUT_IMAGE_FILES[`echo $(($CPF-1))`]}" "$TMPFILENAME.tmp.jpg"
$CONVERT_BIN -type TrueColor -quality 100 "$TMPFILENAME.tmp.jpg" "$TMPFILENAME.next_trans.tmp.pnm" $CONVERT_BIN -type TrueColor -quality 100 "$TMPFILENAME.tmp.jpg" "$TMPFILENAME.next_trans.tmp.pnm"
fi fi

@ -58,7 +58,7 @@ extern "C"
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqprocess.h> #include <tqprocess.h>
#include <tqdatetime.h> #include <tqdatetime.h>
#include <layout.h> #include <tqlayout.h>
#include <tqdragobject.h> #include <tqdragobject.h>
#include <tqmessagebox.h> #include <tqmessagebox.h>
@ -265,8 +265,8 @@ KImg2mpgData::KImg2mpgData(KIPI::Interface* interface, TQWidget *parent, const c
readSettings(); readSettings();
int maxW = TQMAX( m_VideoFormatComboBox->sizeHint().width(), int maxW = TQMAX( m_VideoFormatComboBox->tqsizeHint().width(),
m_ChromaComboBox->sizeHint().width() ); m_ChromaComboBox->tqsizeHint().width() );
m_ChromaComboBox->setMinimumWidth( maxW ); m_ChromaComboBox->setMinimumWidth( maxW );
m_VideoFormatComboBox->setMinimumWidth( maxW ); m_VideoFormatComboBox->setMinimumWidth( maxW );
@ -433,7 +433,7 @@ void KImg2mpgData::slotImagesFilesSelected( TQListBoxItem *item )
TQT_SLOT(slotFailedPreview(const KFileItem*))); TQT_SLOT(slotFailedPreview(const KFileItem*)));
int index = m_ImagesFilesListBox->index ( item ); int index = m_ImagesFilesListBox->index ( item );
m_label7->setText(i18n("Image no. %1").arg(index + 1)); m_label7->setText(i18n("Image no. %1").tqarg(index + 1));
} }
@ -578,7 +578,7 @@ void KImg2mpgData::slotEncode( void )
if (TQFile::exists(OutputFileName)) if (TQFile::exists(OutputFileName))
{ {
int Ret=KMessageBox::questionYesNo(this, i18n("The output MPEG file '%1' already exists.\n" int Ret=KMessageBox::questionYesNo(this, i18n("The output MPEG file '%1' already exists.\n"
"Do you want overwrite this file?").arg(OutputFileName)); "Do you want overwrite this file?").tqarg(OutputFileName));
if (Ret == KMessageBox::No) if (Ret == KMessageBox::No)
return; return;
} }
@ -688,7 +688,7 @@ void KImg2mpgData::slotEncode( void )
if (!TQFile::exists(FileName)) if (!TQFile::exists(FileName))
{ {
KMessageBox::error(this, KMessageBox::error(this,
i18n("Cannot access to file %1, please check the path is right.").arg(FileName)); i18n("Cannot access to file %1, please check the path is right.").tqarg(FileName));
m_Abort = true; m_Abort = true;
reset(); reset();
return; return;
@ -801,9 +801,9 @@ void KImg2mpgData::ShowNumberImages( int Number )
TotalDuration = TotalDuration.addMSecs((Number+1)*TransitionDuration); TotalDuration = TotalDuration.addMSecs((Number+1)*TransitionDuration);
if ( Number < 2) if ( Number < 2)
m_label6->setText(i18n("%1 image [%2]").arg(Number).arg(TotalDuration.toString())); m_label6->setText(i18n("%1 image [%2]").tqarg(Number).tqarg(TotalDuration.toString()));
else else
m_label6->setText(i18n("%1 images [%2]").arg(Number).arg(TotalDuration.toString())); m_label6->setText(i18n("%1 images [%2]").tqarg(Number).tqarg(TotalDuration.toString()));
} }
@ -840,7 +840,7 @@ void KImg2mpgData::readStderr(KProcess *, char *buffer, int buflen)
ImgNum = 1; ImgNum = 1;
m_frame->setText(i18n("Encoding image file [%1/%2]...") m_frame->setText(i18n("Encoding image file [%1/%2]...")
.arg(ImgNum).arg(m_ImagesFilesListBox->count())); .tqarg(ImgNum).tqarg(m_ImagesFilesListBox->count()));
if (ImgNum > 1) if (ImgNum > 1)
m_ImagesFilesListBox->setSelected(ImgNum-2, false); m_ImagesFilesListBox->setSelected(ImgNum-2, false);
@ -912,7 +912,7 @@ void KImg2mpgData::EncodeDone(KProcess*)
m_frame->setText(i18n("Encoding terminated...")); m_frame->setText(i18n("Encoding terminated..."));
int Ret=KMessageBox::warningYesNo(this, int Ret=KMessageBox::warningYesNo(this,
i18n("The encoding process has terminated...\n\n" i18n("The encoding process has terminated...\n\n"
"Encoding duration: %1").arg(Encoding), "Encoding duration: %1").tqarg(Encoding),
i18n("'images2mpg' Script Execution Terminated"), i18n("'images2mpg' Script Execution Terminated"),
i18n("&OK"), i18n("&OK"),
i18n("Show Process Messages")); i18n("Show Process Messages"));
@ -930,7 +930,7 @@ void KImg2mpgData::EncodeDone(KProcess*)
m_frame->setText(i18n("Encoding aborted...")); m_frame->setText(i18n("Encoding aborted..."));
int Ret=KMessageBox::warningYesNo(this, int Ret=KMessageBox::warningYesNo(this,
i18n("The encoding process has been aborted...\n\n" i18n("The encoding process has been aborted...\n\n"
"Encoding duration: %1").arg(Encoding), "Encoding duration: %1").tqarg(Encoding),
i18n("'images2mpg' Script Execution Aborted"), i18n("'images2mpg' Script Execution Aborted"),
i18n("&OK"), i18n("&OK"),
i18n("Show Process Messages")); i18n("Show Process Messages"));
@ -1130,7 +1130,7 @@ void KImg2mpgData::RemoveTmpFiles(void)
if (m_TmpFolderConfig.isEmpty() != true && tmpFolder.exists() == true) if (m_TmpFolderConfig.isEmpty() != true && tmpFolder.exists() == true)
if (DeleteDir(m_TmpFolderConfig) == false) if (DeleteDir(m_TmpFolderConfig) == false)
KMessageBox::error(this, i18n("Cannot remove temporary folder %1!").arg(m_TmpFolderConfig)); KMessageBox::error(this, i18n("Cannot remove temporary folder %1!").tqarg(m_TmpFolderConfig));
} }

@ -23,13 +23,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="tqmaximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>32767</height> <height>32767</height>
@ -53,7 +53,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout26</cstring> <cstring>tqlayout26</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -88,7 +88,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>5</height> <height>5</height>
@ -97,7 +97,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout16</cstring> <cstring>tqlayout16</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -105,7 +105,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout29</cstring> <cstring>tqlayout29</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -118,7 +118,7 @@
<property name="text"> <property name="text">
<string>Video Format</string> <string>Video Format</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignCenter</set> <set>AlignCenter</set>
</property> </property>
</widget> </widget>
@ -164,7 +164,7 @@ DVD is an experimental option.</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout30</cstring> <cstring>tqlayout30</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -185,7 +185,7 @@ DVD is an experimental option.</string>
<property name="text"> <property name="text">
<string>Video Type</string> <string>Video Type</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignCenter</set> <set>AlignCenter</set>
</property> </property>
</widget> </widget>
@ -225,7 +225,7 @@ NTSC is an American TV standard; PAL/SECAM is European.</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout31</cstring> <cstring>tqlayout31</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -246,7 +246,7 @@ NTSC is an American TV standard; PAL/SECAM is European.</string>
<property name="text"> <property name="text">
<string>Chroma Mode</string> <string>Chroma Mode</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignCenter</set> <set>AlignCenter</set>
</property> </property>
</widget> </widget>
@ -301,7 +301,7 @@ Change it if you have problems with the default value.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>5</height> <height>5</height>
@ -339,7 +339,7 @@ Change it if you have problems with the default value.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>5</height> <height>5</height>
@ -348,7 +348,7 @@ Change it if you have problems with the default value.</string>
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout25</cstring> <cstring>tqlayout25</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -356,7 +356,7 @@ Change it if you have problems with the default value.</string>
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout33</cstring> <cstring>tqlayout33</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -369,13 +369,13 @@ Change it if you have problems with the default value.</string>
<property name="text"> <property name="text">
<string>Image duration</string> <string>Image duration</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignVCenter</set> <set>AlignVCenter</set>
</property> </property>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout32</cstring> <cstring>tqlayout32</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -414,7 +414,7 @@ Change it if you have problems with the default value.</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout44</cstring> <cstring>tqlayout44</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -427,7 +427,7 @@ Change it if you have problems with the default value.</string>
<property name="text"> <property name="text">
<string>Transition speed</string> <string>Transition speed</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignVCenter</set> <set>AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -488,7 +488,7 @@ Change it if you have problems with the default value.</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout45</cstring> <cstring>tqlayout45</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -501,7 +501,7 @@ Change it if you have problems with the default value.</string>
<property name="text"> <property name="text">
<string>Background color</string> <string>Background color</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignVCenter</set> <set>AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -540,7 +540,7 @@ Black is a good value for this.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>5</height> <height>5</height>
@ -567,7 +567,7 @@ Black is a good value for this.</string>
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout15</cstring> <cstring>tqlayout15</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -622,7 +622,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -649,7 +649,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -674,7 +674,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -699,7 +699,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -724,7 +724,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -749,7 +749,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -758,7 +758,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout14</cstring> <cstring>tqlayout14</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -776,7 +776,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>128</width> <width>128</width>
<height>128</height> <height>128</height>
@ -788,7 +788,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<property name="scaledContents"> <property name="scaledContents">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignCenter</set> <set>AlignCenter</set>
</property> </property>
<property name="whatsThis" stdset="0"> <property name="whatsThis" stdset="0">
@ -820,7 +820,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout28</cstring> <cstring>tqlayout28</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -828,7 +828,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout27</cstring> <cstring>tqlayout27</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -846,13 +846,13 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="tqmaximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>32767</height> <height>32767</height>
@ -893,7 +893,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -912,7 +912,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize"> <property name="tqmaximumSize">
<size> <size>
<width>22</width> <width>22</width>
<height>22</height> <height>22</height>
@ -932,7 +932,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -953,13 +953,13 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="tqmaximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>32767</height> <height>32767</height>
@ -1001,7 +1001,7 @@ This audio file name will be multiplexed with the portfolio video.
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -1020,7 +1020,7 @@ This audio file name will be multiplexed with the portfolio video.
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize"> <property name="tqmaximumSize">
<size> <size>
<width>22</width> <width>22</width>
<height>22</height> <height>22</height>
@ -1040,7 +1040,7 @@ This audio file name will be multiplexed with the portfolio video.
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -1061,13 +1061,13 @@ This audio file name will be multiplexed with the portfolio video.
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>50</width> <width>50</width>
<height>25</height> <height>25</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="tqmaximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>30</height> <height>30</height>
@ -1098,13 +1098,13 @@ This audio file name will be multiplexed with the portfolio video.
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>27</height> <height>27</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="tqmaximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>30</height> <height>30</height>
@ -1126,7 +1126,7 @@ This audio file name will be multiplexed with the portfolio video.
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>20</height> <height>20</height>
@ -1135,7 +1135,7 @@ This audio file name will be multiplexed with the portfolio video.
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout21</cstring> <cstring>tqlayout21</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -1171,7 +1171,7 @@ The program uses the 'images2mpg' bash script.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>51</height> <height>51</height>
@ -1190,7 +1190,7 @@ The program uses the 'images2mpg' bash script.</string>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>62</width> <width>62</width>
<height>0</height> <height>0</height>
@ -1210,7 +1210,7 @@ The program uses the 'images2mpg' bash script.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>51</height> <height>51</height>

@ -27,8 +27,8 @@
// TQt includes // TQt includes
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <textview.h> #include <tqtextview.h>
#include <layout.h> #include <tqlayout.h>
// KDElib includes // KDElib includes

@ -23,7 +23,7 @@
// Include files for TQt // Include files for TQt
#include <tqvbox.h> #include <tqvbox.h>
#include <layout.h> #include <tqlayout.h>
#include <tqwidget.h> #include <tqwidget.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>

@ -30,7 +30,7 @@
#include <tqfile.h> #include <tqfile.h>
#include <tqfileinfo.h> #include <tqfileinfo.h>
#include <textstream.h> #include <tqtextstream.h>
// KDE includes. // KDE includes.
@ -76,7 +76,7 @@ void MPForm::finish()
bool MPForm::addPair(const TQString& name, const TQString& value, const TQString& contentType) bool MPForm::addPair(const TQString& name, const TQString& value, const TQString& contentType)
{ {
TQCString str; TQCString str;
TQString content_length = TQString("%1").arg(value.length()); TQString content_length = TQString("%1").tqarg(value.length());
str += "--"; str += "--";
str += m_boundary; str += m_boundary;
str += "\r\n"; str += "\r\n";
@ -131,7 +131,7 @@ bool MPForm::addFile(const TQString& name,const TQString& path)
TQByteArray imageData = imageFile.readAll(); TQByteArray imageData = imageFile.readAll();
TQCString str; TQCString str;
TQString file_size = TQString("%1").arg(imageFile.size()); TQString file_size = TQString("%1").tqarg(imageFile.size());
str += "--"; str += "--";
str += m_boundary; str += m_boundary;

@ -26,7 +26,7 @@
#include <tqframe.h> #include <tqframe.h>
#include <tqlineedit.h> #include <tqlineedit.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <layout.h> #include <tqlayout.h>
// KDE includes. // KDE includes.
@ -50,7 +50,7 @@ PicasawebLogin::PicasawebLogin(TQWidget* parent, const TQString& header,
TQVBoxLayout* vbox = new TQVBoxLayout( this, 5, 5, "vbox"); TQVBoxLayout* vbox = new TQVBoxLayout( this, 5, 5, "vbox");
m_headerLabel = new TQLabel(this); m_headerLabel = new TQLabel(this);
m_headerLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, m_headerLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,
TQSizePolicy::Fixed)); TQSizePolicy::Fixed));
m_headerLabel->setText(header); m_headerLabel->setText(header);
vbox->addWidget( m_headerLabel ); vbox->addWidget( m_headerLabel );
@ -96,7 +96,7 @@ PicasawebLogin::PicasawebLogin(TQWidget* parent, const TQString& header,
vbox->addLayout( btnLayout ); vbox->addLayout( btnLayout );
resize( TQSize(300, 150).expandedTo(minimumSizeHint()) ); resize( TQSize(300, 150).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished ); clearWState( WState_Polished );
m_nameEdit->setText(_name); m_nameEdit->setText(_name);

@ -31,7 +31,7 @@
// TQt includes. // TQt includes.
#include <tqcstring.h> #include <tqcstring.h>
#include <textstream.h> #include <tqtextstream.h>
#include <tqfile.h> #include <tqfile.h>
#include <tqfileinfo.h> #include <tqfileinfo.h>
#include <tqimage.h> #include <tqimage.h>
@ -320,8 +320,8 @@ void PicasawebTalker::addPhotoTag(const TQString& photoURI, const TQString& tag)
"<title>%1</title> " "<title>%1</title> "
"<category scheme='http://schemas.google.com/g/2005#kind' " "<category scheme='http://schemas.google.com/g/2005#kind' "
"term='http://schemas.google.com/photos/2007#tag'/> " "term='http://schemas.google.com/photos/2007#tag'/> "
"</entry>").arg(tag); "</entry>").tqarg(tag);
TQString postUrl = TQString("%1").arg(photoURI); TQString postUrl = TQString("%1").tqarg(photoURI);
TQByteArray buffer; TQByteArray buffer;
TQTextStream ts(buffer, IO_Append|IO_WriteOnly); TQTextStream ts(buffer, IO_Append|IO_WriteOnly);
ts.setEncoding(TQTextStream::UnicodeUTF8); ts.setEncoding(TQTextStream::UnicodeUTF8);
@ -330,7 +330,7 @@ void PicasawebTalker::addPhotoTag(const TQString& photoURI, const TQString& tag)
TQString auth_string = "GoogleLogin auth=" + m_token; TQString auth_string = "GoogleLogin auth=" + m_token;
KIO::TransferJob* job = KIO::http_post(postUrl, buffer, false); KIO::TransferJob* job = KIO::http_post(postUrl, buffer, false);
job->addMetaData("content-type", "Content-Type: application/atom+xml"); job->addMetaData("content-type", "Content-Type: application/atom+xml");
job->addMetaData("content-length", TQString("Content-Length: %1").arg(addTagXML.length())); job->addMetaData("content-length", TQString("Content-Length: %1").tqarg(addTagXML.length()));
job->addMetaData("customHTTPHeader", "Authorization: " + auth_string ); job->addMetaData("customHTTPHeader", "Authorization: " + auth_string );
//connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), //connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
@ -374,13 +374,13 @@ void PicasawebTalker::createAlbum(const TQString& albumTitle, const TQString& al
"</media:group> " "</media:group> "
"<category scheme='http://schemas.google.com/g/2005#kind' " "<category scheme='http://schemas.google.com/g/2005#kind' "
"term='http://schemas.google.com/photos/2007#album'></category> " "term='http://schemas.google.com/photos/2007#album'></category> "
"</entry> ").arg(albumTitle) "</entry> ").tqarg(albumTitle)
.arg(albumDesc) .tqarg(albumDesc)
.arg(location) .tqarg(location)
.arg(access) .tqarg(access)
.arg(isCommentsEnabled==true?"true":"false") .tqarg(isCommentsEnabled==true?"true":"false")
.arg(timestamp) .tqarg(timestamp)
.arg(media_keywords); .tqarg(media_keywords);
TQByteArray buffer; TQByteArray buffer;
TQTextStream ts(buffer, IO_Append|IO_WriteOnly); TQTextStream ts(buffer, IO_Append|IO_WriteOnly);
@ -392,7 +392,7 @@ void PicasawebTalker::createAlbum(const TQString& albumTitle, const TQString& al
TQString auth_string = "GoogleLogin auth=" + m_token; TQString auth_string = "GoogleLogin auth=" + m_token;
KIO::TransferJob* job = KIO::http_post(postUrl, buffer, false); KIO::TransferJob* job = KIO::http_post(postUrl, buffer, false);
job->addMetaData("content-type", "Content-Type: application/atom+xml"); job->addMetaData("content-type", "Content-Type: application/atom+xml");
job->addMetaData("content-length", TQString("Content-Length: %1").arg(newAlbumXML.length())); job->addMetaData("content-length", TQString("Content-Length: %1").tqarg(newAlbumXML.length()));
job->addMetaData("customHTTPHeader", "Authorization: " + auth_string ); job->addMetaData("customHTTPHeader", "Authorization: " + auth_string );
connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
@ -593,7 +593,7 @@ void PicasawebTalker::slotError(const TQString & error)
transError=i18n("Unknown error"); transError=i18n("Unknown error");
}; };
KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Error Occured: %1\n We can not proceed further").arg(transError)); KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Error Occured: %1\n We can not proceed further").tqarg(transError));
//kdDebug()<<"Not handling the error now will see it later"<<endl; //kdDebug()<<"Not handling the error now will see it later"<<endl;
} }
@ -904,7 +904,7 @@ void PicasawebTalker::parseResponseAddPhoto(const TQByteArray &data)
for ( TQStringList::Iterator it = tags.begin(); it != tags.end(); ++it ) for ( TQStringList::Iterator it = tags.begin(); it != tags.end(); ++it )
{ {
TQString photoURI= TQString("http://picasaweb.google.com/data/feed/api/user/" TQString photoURI= TQString("http://picasaweb.google.com/data/feed/api/user/"
"%1/albumid/%2/photoid/%3").arg(m_username).arg(album_id).arg(photo_id); "%1/albumid/%2/photoid/%3").tqarg(m_username).tqarg(album_id).tqarg(photo_id);
addPhotoTag( photoURI, *it); addPhotoTag( photoURI, *it);
} }
} }

@ -32,7 +32,7 @@
#include <tqgroupbox.h> #include <tqgroupbox.h>
#include <tqspinbox.h> #include <tqspinbox.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <layout.h> #include <tqlayout.h>
#include <tqtooltip.h> #include <tqtooltip.h>
#include <tqsplitter.h> #include <tqsplitter.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
@ -58,7 +58,7 @@ PicasawebWidget::PicasawebWidget(TQWidget* parent, const char* name, WFlags fl)
if ( !name ) if ( !name )
setName("PicasawebWidget"); setName("PicasawebWidget");
//resize( TQSize(600, 400).expandedTo(minimumSizeHint()) ); //resize( TQSize(600, 400).expandedTo(tqminimumSizeHint()) );
//clearWState( WState_Polished ); //clearWState( WState_Polished );
} }

@ -37,7 +37,7 @@
#include <tqradiobutton.h> #include <tqradiobutton.h>
#include <tqdatetimeedit.h> #include <tqdatetimeedit.h>
#include <tqdatetime.h> #include <tqdatetime.h>
#include <textedit.h> #include <tqtextedit.h>
// KDE includes. // KDE includes.
@ -374,7 +374,7 @@ void PicasawebWindow::slotAuthCancel()
void PicasawebWindow::slotCreateNewAlbum() void PicasawebWindow::slotCreateNewAlbum()
{ {
NewAlbumDialog *dlg = new NewAlbumDialog(TQT_TQWIDGET(kapp->activeWindow())); NewAlbumDialog *dlg = new NewAlbumDialog(TQT_TQWIDGET(kapp->activeWindow()));
dlg->m_dateAndTimeEdit->setDateTime(TQDateTime::currentDateTime()); dlg->m_dateAndTimeEdit->setDateTime(TQDateTime::tqcurrentDateTime());
TQString test; TQString test;
int t = dlg->exec(); int t = dlg->exec();
@ -541,7 +541,7 @@ void PicasawebWindow::slotAddPhotoNext()
return; return;
} }
m_progressDlg->setLabelText(i18n("Uploading file %1 ").arg( KURL(pathComments.first).filename())); m_progressDlg->setLabelText(i18n("Uploading file %1 ").tqarg( KURL(pathComments.first).filename()));
if (m_progressDlg->isHidden()) if (m_progressDlg->isHidden())
m_progressDlg->show(); m_progressDlg->show();
@ -558,7 +558,7 @@ void PicasawebWindow::slotAddPhotoFailed(const TQString& msg)
{ {
if ( KMessageBox::warningContinueCancel(this, if ( KMessageBox::warningContinueCancel(this,
i18n("Failed to upload photo into Picasaweb. %1\nDo you want to continue?") i18n("Failed to upload photo into Picasaweb. %1\nDo you want to continue?")
.arg( msg )) != KMessageBox::Continue) .tqarg( msg )) != KMessageBox::Continue)
{ {
m_uploadQueue.clear(); m_uploadQueue.clear();
m_progressDlg->reset(); m_progressDlg->reset();

@ -168,7 +168,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -193,7 +193,7 @@
<property name="text"> <property name="text">
<string>PicasaWeb Uploader</string> <string>PicasaWeb Uploader</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignCenter</set> <set>AlignCenter</set>
</property> </property>
</widget> </widget>

@ -118,7 +118,7 @@ void CropFrame::init(TPhoto *photo, int width, int height, bool autoRotate, bool
m_cropRegion = _photoToScreenRect(m_photo->cropRegion); m_cropRegion = _photoToScreenRect(m_photo->cropRegion);
if (paint) if (paint)
repaint(false); tqrepaint(false);
} }
TQRect CropFrame::_screenToPhotoRect(TQRect r) TQRect CropFrame::_screenToPhotoRect(TQRect r)
@ -263,7 +263,7 @@ void CropFrame::mouseMoveEvent(TQMouseEvent *e)
m_cropRegion.setRect(newX, newY, newW, newH); m_cropRegion.setRect(newX, newY, newW, newH);
m_photo->cropRegion = _screenToPhotoRect(m_cropRegion); m_photo->cropRegion = _screenToPhotoRect(m_cropRegion);
repaint(false); tqrepaint(false);
} }
} }
@ -295,14 +295,14 @@ void CropFrame::keyPressEvent(TQKeyEvent *e)
m_cropRegion.setRect(newX, newY, w, h); m_cropRegion.setRect(newX, newY, w, h);
m_photo->cropRegion = _screenToPhotoRect(m_cropRegion); m_photo->cropRegion = _screenToPhotoRect(m_cropRegion);
repaint(false); tqrepaint(false);
} }
void CropFrame::setColor(TQColor c) void CropFrame::setColor(TQColor c)
{ {
m_color = c; m_color = c;
repaint(false); tqrepaint(false);
} }
TQColor CropFrame::color() TQColor CropFrame::color()

@ -282,7 +282,7 @@ void FrmPrintWizard::updateCropFrame(TPhoto *photo, int photoIndex)
{ {
TPhotoSize *s = m_photoSizes.at(ListPhotoSizes->currentItem()); TPhotoSize *s = m_photoSizes.at(ListPhotoSizes->currentItem());
cropFrame->init(photo, getLayout(photoIndex)->width(), getLayout(photoIndex)->height(), s->autoRotate); cropFrame->init(photo, getLayout(photoIndex)->width(), getLayout(photoIndex)->height(), s->autoRotate);
LblCropPhoto->setText(i18n("Photo %1 of %2").arg( TQString::number(m_photos.at() + 1) ).arg( TQString::number(m_photos.count()) )); LblCropPhoto->setText(i18n("Photo %1 of %2").tqarg( TQString::number(m_photos.at() + 1) ).tqarg( TQString::number(m_photos.count()) ));
} }
void FrmPrintWizard::BtnCropPrev_clicked() void FrmPrintWizard::BtnCropPrev_clicked()
@ -399,7 +399,7 @@ double getMaxDPI(TQPtrList<TPhoto> photos, TQPtrList<TQRect> layouts, unsigned i
{ {
Q_ASSERT(layouts.count() > 1); Q_ASSERT(layouts.count() > 1);
TQRect *layout = layouts.at(1); TQRect *tqlayout = layouts.at(1);
double maxDPI = 0.0; double maxDPI = 0.0;
@ -407,12 +407,12 @@ double getMaxDPI(TQPtrList<TPhoto> photos, TQPtrList<TQRect> layouts, unsigned i
{ {
TPhoto *photo = photos.at(current); TPhoto *photo = photos.at(current);
double dpi = ((double)photo->cropRegion.width() + (double)photo->cropRegion.height()) / double dpi = ((double)photo->cropRegion.width() + (double)photo->cropRegion.height()) /
(((double)layout->width() / 1000.0) + ((double)layout->height() / 1000.0)); (((double)tqlayout->width() / 1000.0) + ((double)tqlayout->height() / 1000.0));
if (dpi > maxDPI) if (dpi > maxDPI)
maxDPI = dpi; maxDPI = dpi;
// iterate to the next position // iterate to the next position
layout = layouts.next(); tqlayout = layouts.next();
if (layout == 0) if (tqlayout == 0)
{ {
break; break;
} }
@ -426,7 +426,7 @@ TQRect * FrmPrintWizard::getLayout(int photoIndex)
// how many photos would actually be printed, including copies? // how many photos would actually be printed, including copies?
int photoCount = (photoIndex + 1); int photoCount = (photoIndex + 1);
// how many pages? Recall that the first layout item is the paper size // how many pages? Recall that the first tqlayout item is the paper size
int photosPerPage = s->layouts.count() - 1; int photosPerPage = s->layouts.count() - 1;
int remainder = photoCount % photosPerPage; int remainder = photoCount % photosPerPage;
@ -438,11 +438,11 @@ TQRect * FrmPrintWizard::getLayout(int photoIndex)
int FrmPrintWizard::getPageCount() int FrmPrintWizard::getPageCount()
{ {
// get the selected layout // get the selected tqlayout
TPhotoSize *s = m_photoSizes.at(ListPhotoSizes->currentItem()); TPhotoSize *s = m_photoSizes.at(ListPhotoSizes->currentItem());
int photoCount = m_photos.count(); int photoCount = m_photos.count();
// how many pages? Recall that the first layout item is the paper size // how many pages? Recall that the first tqlayout item is the paper size
int photosPerPage = s->layouts.count() - 1; int photosPerPage = s->layouts.count() - 1;
int remainder = photoCount % photosPerPage; int remainder = photoCount % photosPerPage;
int emptySlots = 0; int emptySlots = 0;
@ -541,7 +541,7 @@ TQString FrmPrintWizard::captionFormatter(TPhoto *photo, const TQString& format)
TQString resolution; TQString resolution;
TQSize imageSize = photo->exiv2Iface()->getImageDimensions(); TQSize imageSize = photo->exiv2Iface()->getImageDimensions();
if (imageSize.isValid()) { if (imageSize.isValid()) {
resolution = TQString( "%1x%2" ).arg( imageSize.width()).arg( imageSize.height()); resolution = TQString( "%1x%2" ).tqarg( imageSize.width()).tqarg( imageSize.height());
} }
str.replace("\\n", "\n"); str.replace("\\n", "\n");
@ -574,7 +574,7 @@ bool FrmPrintWizard::paintOnePage(TQPainter &p, TQPtrList<TPhoto> photos, TQPtrL
if (photos.count() == 0) return true; // no photos => last photo if (photos.count() == 0) return true; // no photos => last photo
TQRect *srcPage = layouts.at(0); TQRect *srcPage = layouts.at(0);
TQRect *layout = layouts.at(1); TQRect *tqlayout = layouts.at(1);
// scale the page size to best fit the painter // scale the page size to best fit the painter
// size the rectangle based on the minimum image dimension // size the rectangle based on the minimum image dimension
@ -654,10 +654,10 @@ bool FrmPrintWizard::paintOnePage(TQPainter &p, TQPtrList<TPhoto> photos, TQPtrL
else else
img = img.copy(photo->cropRegion); img = img.copy(photo->cropRegion);
int x1 = NINT((double)layout->left() * xRatio); int x1 = NINT((double)tqlayout->left() * xRatio);
int y1 = NINT((double)layout->top() * yRatio); int y1 = NINT((double)tqlayout->top() * yRatio);
int w = NINT((double)layout->width() * xRatio); int w = NINT((double)tqlayout->width() * xRatio);
int h = NINT((double)layout->height() * yRatio); int h = NINT((double)tqlayout->height() * yRatio);
p.drawImage( TQRect(x1 + left, y1 + top, w, h), img ); p.drawImage( TQRect(x1 + left, y1 + top, w, h), img );
@ -742,8 +742,8 @@ bool FrmPrintWizard::paintOnePage(TQPainter &p, TQPtrList<TPhoto> photos, TQPtrL
} // caption } // caption
// iterate to the next position // iterate to the next position
layout = layouts.next(); tqlayout = layouts.next();
if (layout == 0) if (tqlayout == 0)
{ {
current++; current++;
break; break;
@ -766,7 +766,7 @@ bool FrmPrintWizard::paintOnePage(TQImage &p, TQPtrList<TPhoto> photos, TQPtrLis
Q_ASSERT(layouts.count() > 1); Q_ASSERT(layouts.count() > 1);
TQRect *srcPage = layouts.at(0); TQRect *srcPage = layouts.at(0);
TQRect *layout = layouts.at(1); TQRect *tqlayout = layouts.at(1);
// scale the page size to best fit the painter // scale the page size to best fit the painter
// size the rectangle based on the minimum image dimension // size the rectangle based on the minimum image dimension
@ -821,10 +821,10 @@ bool FrmPrintWizard::paintOnePage(TQImage &p, TQPtrList<TPhoto> photos, TQPtrLis
img = img.copy(photo->cropRegion); img = img.copy(photo->cropRegion);
int x1 = NINT((double)layout->left() * xRatio); int x1 = NINT((double)tqlayout->left() * xRatio);
int y1 = NINT((double)layout->top() * yRatio); int y1 = NINT((double)tqlayout->top() * yRatio);
int w = NINT((double)layout->width() * xRatio); int w = NINT((double)tqlayout->width() * xRatio);
int h = NINT((double)layout->height() * yRatio); int h = NINT((double)tqlayout->height() * yRatio);
// We can use scaleFree because the crop frame should have the proper dimensions. // We can use scaleFree because the crop frame should have the proper dimensions.
img = img.smoothScale(w, h, TQ_ScaleFree); img = img.smoothScale(w, h, TQ_ScaleFree);
@ -929,8 +929,8 @@ bool FrmPrintWizard::paintOnePage(TQImage &p, TQPtrList<TPhoto> photos, TQPtrLis
} // caption } // caption
// iterate to the next position // iterate to the next position
layout = layouts.next(); tqlayout = layouts.next();
if (layout == 0) if (tqlayout == 0)
{ {
current++; current++;
break; break;
@ -944,11 +944,11 @@ bool FrmPrintWizard::paintOnePage(TQImage &p, TQPtrList<TPhoto> photos, TQPtrLis
// update the pages to be printed and preview first/last pages // update the pages to be printed and preview first/last pages
void FrmPrintWizard::previewPhotos() void FrmPrintWizard::previewPhotos()
{ {
// get the selected layout // get the selected tqlayout
TPhotoSize *s = m_photoSizes.at(ListPhotoSizes->currentItem()); TPhotoSize *s = m_photoSizes.at(ListPhotoSizes->currentItem());
int photoCount = m_photos.count(); int photoCount = m_photos.count();
// how many pages? Recall that the first layout item is the paper size // how many pages? Recall that the first tqlayout item is the paper size
int photosPerPage = s->layouts.count() - 1; int photosPerPage = s->layouts.count() - 1;
int remainder = photoCount % photosPerPage; int remainder = photoCount % photosPerPage;
int emptySlots = 0; int emptySlots = 0;
@ -997,7 +997,7 @@ void FrmPrintWizard::previewPhotos()
p.end(); p.end();
BmpFirstPagePreview->setPixmap(img); BmpFirstPagePreview->setPixmap(img);
LblPreview->setText(i18n("Page ") + TQString::number(m_currentPreviewPage + 1) + i18n(" of ") + TQString::number(getPageCount())); LblPreview->setText(i18n("Page ") + TQString::number(m_currentPreviewPage + 1) + i18n(" of ") + TQString::number(getPageCount()));
LblPreview->setText(i18n("Page %1 of %2").arg(m_currentPreviewPage + 1).arg(getPageCount())); LblPreview->setText(i18n("Page %1 of %2").tqarg(m_currentPreviewPage + 1).tqarg(getPageCount()));
manageBtnPreviewPage(); manageBtnPreviewPage();
manageBtnPrintOrder(); manageBtnPrintOrder();

@ -37,7 +37,7 @@
</attribute> </attribute>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout53</cstring> <cstring>tqlayout53</cstring>
</property> </property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
@ -53,7 +53,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout24</cstring> <cstring>tqlayout24</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -91,7 +91,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>300</height> <height>300</height>
@ -116,7 +116,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout52</cstring> <cstring>tqlayout52</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -132,7 +132,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>31</height> <height>31</height>
@ -156,7 +156,7 @@
Click the 'Next' button to begin.</string> Click the 'Next' button to begin.</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -170,7 +170,7 @@ Click the 'Next' button to begin.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>381</height> <height>381</height>
@ -195,7 +195,7 @@ Click the 'Next' button to begin.</string>
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>layout88</cstring> <cstring>tqlayout88</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -233,7 +233,7 @@ Click the 'Next' button to begin.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>471</height> <height>471</height>
@ -244,7 +244,7 @@ Click the 'Next' button to begin.</string>
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="1"> <widget class="TQLayoutWidget" row="0" column="1">
<property name="name"> <property name="name">
<cstring>layout87</cstring> <cstring>tqlayout87</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -271,7 +271,7 @@ Click the 'Next' button to begin.</string>
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout37</cstring> <cstring>tqlayout37</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -279,7 +279,7 @@ Click the 'Next' button to begin.</string>
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout36</cstring> <cstring>tqlayout36</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -343,7 +343,7 @@ Click the 'Next' button to begin.</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout36</cstring> <cstring>tqlayout36</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -359,7 +359,7 @@ Click the 'Next' button to begin.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>210</width> <width>210</width>
<height>20</height> <height>20</height>
@ -394,7 +394,7 @@ Click the 'Next' button to begin.</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout86</cstring> <cstring>tqlayout86</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -483,7 +483,7 @@ Click the 'Next' button to begin.</string>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>200</width> <width>200</width>
<height>110</height> <height>110</height>
@ -496,7 +496,7 @@ Click the 'Next' button to begin.</string>
%a aperture %l focal length %a aperture %l focal length
\n newline</string> \n newline</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -564,7 +564,7 @@ Click the 'Next' button to begin.</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout37</cstring> <cstring>tqlayout37</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -665,7 +665,7 @@ Click the 'Next' button to begin.</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout24</cstring> <cstring>tqlayout24</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -725,7 +725,7 @@ Click the 'Next' button to begin.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -752,7 +752,7 @@ Click the 'Next' button to begin.</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout23</cstring> <cstring>tqlayout23</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -768,7 +768,7 @@ Click the 'Next' button to begin.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>19</width> <width>19</width>
<height>26</height> <height>26</height>
@ -793,7 +793,7 @@ Click the 'Next' button to begin.</string>
<property name="text"> <property name="text">
<string>This wizard will output each page to this folder with the filename kipi_printwizard_1, kipi_printwizard_2, etc.</string> <string>This wizard will output each page to this folder with the filename kipi_printwizard_1, kipi_printwizard_2, etc.</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -801,7 +801,7 @@ Click the 'Next' button to begin.</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout23</cstring> <cstring>tqlayout23</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -817,7 +817,7 @@ Click the 'Next' button to begin.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>19</width> <width>19</width>
<height>26</height> <height>26</height>
@ -916,7 +916,7 @@ Click the 'Next' button to begin.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -941,7 +941,7 @@ Click the 'Next' button to begin.</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout113</cstring> <cstring>tqlayout113</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -949,7 +949,7 @@ Click the 'Next' button to begin.</string>
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout88</cstring> <cstring>tqlayout88</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -957,7 +957,7 @@ Click the 'Next' button to begin.</string>
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout86</cstring> <cstring>tqlayout86</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -988,7 +988,7 @@ Click the 'Next' button to begin.</string>
<property name="name"> <property name="name">
<cstring>ListPhotoSizes</cstring> <cstring>ListPhotoSizes</cstring>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>150</width> <width>150</width>
<height>200</height> <height>200</height>
@ -999,7 +999,7 @@ Click the 'Next' button to begin.</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout87</cstring> <cstring>tqlayout87</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -1026,7 +1026,7 @@ Click the 'Next' button to begin.</string>
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout90</cstring> <cstring>tqlayout90</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -1047,7 +1047,7 @@ Click the 'Next' button to begin.</string>
<property name="text"> <property name="text">
<string>Photos:</string> <string>Photos:</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -1063,7 +1063,7 @@ Click the 'Next' button to begin.</string>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>0</height> <height>0</height>
@ -1072,7 +1072,7 @@ Click the 'Next' button to begin.</string>
<property name="text"> <property name="text">
<string>&lt;p align="right"&gt;0&lt;/p&gt;</string> <string>&lt;p align="right"&gt;0&lt;/p&gt;</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>WordBreak|AlignVCenter|AlignLeft</set> <set>WordBreak|AlignVCenter|AlignLeft</set>
</property> </property>
</widget> </widget>
@ -1080,7 +1080,7 @@ Click the 'Next' button to begin.</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout91</cstring> <cstring>tqlayout91</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -1101,7 +1101,7 @@ Click the 'Next' button to begin.</string>
<property name="text"> <property name="text">
<string>Sheets:</string> <string>Sheets:</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -1117,7 +1117,7 @@ Click the 'Next' button to begin.</string>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>0</height> <height>0</height>
@ -1126,7 +1126,7 @@ Click the 'Next' button to begin.</string>
<property name="text"> <property name="text">
<string>&lt;p align="right"&gt;0&lt;/p&gt;</string> <string>&lt;p align="right"&gt;0&lt;/p&gt;</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>WordBreak|AlignVCenter|AlignLeft</set> <set>WordBreak|AlignVCenter|AlignLeft</set>
</property> </property>
</widget> </widget>
@ -1134,7 +1134,7 @@ Click the 'Next' button to begin.</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout92</cstring> <cstring>tqlayout92</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -1155,7 +1155,7 @@ Click the 'Next' button to begin.</string>
<property name="text"> <property name="text">
<string>Empty Q_SLOTS:</string> <string>Empty Q_SLOTS:</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>WordBreak|AlignVCenter|AlignRight</set> <set>WordBreak|AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -1171,7 +1171,7 @@ Click the 'Next' button to begin.</string>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>0</height> <height>0</height>
@ -1180,7 +1180,7 @@ Click the 'Next' button to begin.</string>
<property name="text"> <property name="text">
<string>&lt;p align="right"&gt;0&lt;/p&gt;</string> <string>&lt;p align="right"&gt;0&lt;/p&gt;</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>WordBreak|AlignVCenter|AlignLeft</set> <set>WordBreak|AlignVCenter|AlignLeft</set>
</property> </property>
</widget> </widget>
@ -1198,7 +1198,7 @@ Click the 'Next' button to begin.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>105</height> <height>105</height>
@ -1240,7 +1240,7 @@ Click the 'Next' button to begin.</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout112</cstring> <cstring>tqlayout112</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -1283,7 +1283,7 @@ Click the 'Next' button to begin.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>80</height> <height>80</height>
@ -1322,7 +1322,7 @@ Click the 'Next' button to begin.</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout75</cstring> <cstring>tqlayout75</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -1343,7 +1343,7 @@ Click the 'Next' button to begin.</string>
<property name="text"> <property name="text">
<string>Number of times to print selected photo:</string> <string>Number of times to print selected photo:</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -1370,7 +1370,7 @@ Click the 'Next' button to begin.</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout40</cstring> <cstring>tqlayout40</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -1405,7 +1405,7 @@ Click the 'Next' button to begin.</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout37</cstring> <cstring>tqlayout37</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -1421,7 +1421,7 @@ Click the 'Next' button to begin.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -1440,13 +1440,13 @@ Click the 'Next' button to begin.</string>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>260</width> <width>260</width>
<height>367</height> <height>367</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="tqmaximumSize">
<size> <size>
<width>260</width> <width>260</width>
<height>367</height> <height>367</height>
@ -1461,7 +1461,7 @@ Click the 'Next' button to begin.</string>
<property name="scaledContents"> <property name="scaledContents">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignVCenter</set> <set>AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -1475,7 +1475,7 @@ Click the 'Next' button to begin.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>21</height> <height>21</height>
@ -1486,7 +1486,7 @@ Click the 'Next' button to begin.</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout35</cstring> <cstring>tqlayout35</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -1504,7 +1504,7 @@ Click the 'Next' button to begin.</string>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize"> <property name="tqmaximumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>32767</height> <height>32767</height>
@ -1530,7 +1530,7 @@ Click the 'Next' button to begin.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>161</width> <width>161</width>
<height>21</height> <height>21</height>
@ -1549,7 +1549,7 @@ Click the 'Next' button to begin.</string>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize"> <property name="tqmaximumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>32767</height> <height>32767</height>
@ -1579,7 +1579,7 @@ Click the 'Next' button to begin.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -1603,7 +1603,7 @@ Click the 'Next' button to begin.</string>
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout110</cstring> <cstring>tqlayout110</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -1649,7 +1649,7 @@ Click the 'Next' button to begin.</string>
<property name="scaledContents"> <property name="scaledContents">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>WordBreak|AlignTop|AlignLeft</set> <set>WordBreak|AlignTop|AlignLeft</set>
</property> </property>
</widget> </widget>
@ -1673,7 +1673,7 @@ Click the 'Next' button to begin.</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout121</cstring> <cstring>tqlayout121</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -1689,7 +1689,7 @@ Click the 'Next' button to begin.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>41</width> <width>41</width>
<height>21</height> <height>21</height>
@ -1698,7 +1698,7 @@ Click the 'Next' button to begin.</string>
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout119</cstring> <cstring>tqlayout119</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -1708,7 +1708,7 @@ Click the 'Next' button to begin.</string>
<property name="name"> <property name="name">
<cstring>cropFrame</cstring> <cstring>cropFrame</cstring>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>200</width> <width>200</width>
<height>200</height> <height>200</height>
@ -1717,7 +1717,7 @@ Click the 'Next' button to begin.</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout118</cstring> <cstring>tqlayout118</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -1750,7 +1750,7 @@ Click the 'Next' button to begin.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>127</width> <width>127</width>
<height>16</height> <height>16</height>
@ -1801,7 +1801,7 @@ Click the 'Next' button to begin.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>127</width> <width>127</width>
<height>16</height> <height>16</height>
@ -1838,7 +1838,7 @@ Click the 'Next' button to begin.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>41</width> <width>41</width>
<height>21</height> <height>21</height>
@ -1858,7 +1858,7 @@ Click the 'Next' button to begin.</string>
</attribute> </attribute>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout62</cstring> <cstring>tqlayout62</cstring>
</property> </property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
@ -1874,7 +1874,7 @@ Click the 'Next' button to begin.</string>
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout61</cstring> <cstring>tqlayout61</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -1912,7 +1912,7 @@ Click the 'Next' button to begin.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>438</height> <height>438</height>
@ -1937,7 +1937,7 @@ Click the 'Next' button to begin.</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout60</cstring> <cstring>tqlayout60</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -1953,7 +1953,7 @@ Click the 'Next' button to begin.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>70</height> <height>70</height>
@ -1975,7 +1975,7 @@ Click the 'Next' button to begin.</string>
<property name="text"> <property name="text">
<string>Click the Next button to print.</string> <string>Click the Next button to print.</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignTop|AlignHCenter</set> <set>AlignTop|AlignHCenter</set>
</property> </property>
</widget> </widget>
@ -1989,7 +1989,7 @@ Click the 'Next' button to begin.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>361</height> <height>361</height>
@ -1998,7 +1998,7 @@ Click the 'Next' button to begin.</string>
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout35</cstring> <cstring>tqlayout35</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -2014,7 +2014,7 @@ Click the 'Next' button to begin.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>360</width> <width>360</width>
<height>20</height> <height>20</height>
@ -2060,7 +2060,7 @@ Click the 'Next' button to begin.</string>
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>layout55</cstring> <cstring>tqlayout55</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -2112,7 +2112,7 @@ Click the 'Next' button to begin.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>289</height> <height>289</height>
@ -2137,7 +2137,7 @@ Click the 'Next' button to begin.</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout54</cstring> <cstring>tqlayout54</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -2153,7 +2153,7 @@ Click the 'Next' button to begin.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>70</height> <height>70</height>
@ -2180,7 +2180,7 @@ Click the 'Next' button to begin.</string>
<property name="text"> <property name="text">
<string>Complete. Click Finish to exit the Print Wizard.</string> <string>Complete. Click Finish to exit the Print Wizard.</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignTop|AlignHCenter</set> <set>AlignTop|AlignHCenter</set>
</property> </property>
</widget> </widget>
@ -2194,7 +2194,7 @@ Click the 'Next' button to begin.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>41</width> <width>41</width>
<height>371</height> <height>371</height>

@ -172,33 +172,33 @@ void ActionThread::run()
identify = info.make + TQString("-") + info.model; identify = info.make + TQString("-") + info.model;
else else
{ {
identify = i18n("Make: %1\n").arg(info.make); identify = i18n("Make: %1\n").tqarg(info.make);
identify.append(i18n("Model: %1\n").arg(info.model)); identify.append(i18n("Model: %1\n").tqarg(info.model));
if (info.dateTime.isValid()) if (info.dateTime.isValid())
{ {
identify.append(i18n("Created: %1\n") identify.append(i18n("Created: %1\n")
.arg(KGlobal::locale()->formatDateTime(info.dateTime, true, true))); .tqarg(KGlobal::locale()->formatDateTime(info.dateTime, true, true)));
} }
if (info.aperture != -1.0) if (info.aperture != -1.0)
{ {
identify.append(i18n("Aperture: f/%1\n").arg(TQString::number(info.aperture))); identify.append(i18n("Aperture: f/%1\n").tqarg(TQString::number(info.aperture)));
} }
if (info.focalLength != -1.0) if (info.focalLength != -1.0)
{ {
identify.append(i18n("Focal: %1 mm\n").arg(info.focalLength)); identify.append(i18n("Focal: %1 mm\n").tqarg(info.focalLength));
} }
if (info.exposureTime != -1.0) if (info.exposureTime != -1.0)
{ {
identify.append(i18n("Exposure: 1/%1 s\n").arg(info.exposureTime)); identify.append(i18n("Exposure: 1/%1 s\n").tqarg(info.exposureTime));
} }
if (info.sensitivity != -1) if (info.sensitivity != -1)
{ {
identify.append(i18n("Sensitivity: %1 ISO").arg(info.sensitivity)); identify.append(i18n("Sensitivity: %1 ISO").tqarg(info.sensitivity));
} }
} }
} }

@ -38,7 +38,7 @@ extern "C"
#include <tqframe.h> #include <tqframe.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <layout.h> #include <tqlayout.h>
#include <tqtooltip.h> #include <tqtooltip.h>
#include <tqtimer.h> #include <tqtimer.h>
#include <tqfileinfo.h> #include <tqfileinfo.h>
@ -104,7 +104,7 @@ BatchDialog::BatchDialog(TQWidget* /*parent*/)
m_listView->setResizeMode(TQListView::AllColumns); m_listView->setResizeMode(TQListView::AllColumns);
m_listView->setAllColumnsShowFocus(true); m_listView->setAllColumnsShowFocus(true);
m_listView->setSorting(-1); m_listView->setSorting(-1);
m_listView->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_listView->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
m_listView->setSelectionMode(TQListView::Single); m_listView->setSelectionMode(TQListView::Single);
m_listView->setMinimumWidth(450); m_listView->setMinimumWidth(450);
@ -520,7 +520,7 @@ void BatchDialog::processed(const TQString& file, const TQString& tmpFile)
if (::stat(TQFile::encodeName(destFile), &statBuf) == 0) if (::stat(TQFile::encodeName(destFile), &statBuf) == 0)
{ {
KIO::RenameDlg dlg(this, i18n("Save Raw Image converted from '%1' as") KIO::RenameDlg dlg(this, i18n("Save Raw Image converted from '%1' as")
.arg(m_currentConvertItem->src), .tqarg(m_currentConvertItem->src),
tmpFile, destFile, tmpFile, destFile,
KIO::RenameDlg_Mode(KIO::M_SINGLE | KIO::M_OVERWRITE | KIO::M_SKIP)); KIO::RenameDlg_Mode(KIO::M_SINGLE | KIO::M_OVERWRITE | KIO::M_SKIP));
@ -548,7 +548,7 @@ void BatchDialog::processed(const TQString& file, const TQString& tmpFile)
{ {
if (::rename(TQFile::encodeName(tmpFile), TQFile::encodeName(destFile)) != 0) if (::rename(TQFile::encodeName(tmpFile), TQFile::encodeName(destFile)) != 0)
{ {
KMessageBox::error(this, i18n("Failed to save image %1").arg( destFile )); KMessageBox::error(this, i18n("Failed to save image %1").tqarg( destFile ));
m_currentConvertItem->viewItem->setPixmap(1, SmallIcon("cancel")); m_currentConvertItem->viewItem->setPixmap(1, SmallIcon("cancel"));
} }
else else

@ -80,7 +80,7 @@ public:
void setEnabled(bool d) void setEnabled(bool d)
{ {
m_enabled = d; m_enabled = d;
repaint(); tqrepaint();
} }
bool isEnabled(void) bool isEnabled(void)
@ -90,18 +90,18 @@ public:
protected: protected:
void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
{ {
if (m_enabled) if (m_enabled)
{ {
KListViewItem::paintCell(p, cg, column, width, alignment); KListViewItem::paintCell(p, cg, column, width, tqalignment);
} }
else else
{ {
TQColorGroup _cg( cg ); TQColorGroup _cg( cg );
TQColor c = _cg.text(); TQColor c = _cg.text();
_cg.setColor( TQColorGroup::Text, TQt::gray ); _cg.setColor( TQColorGroup::Text, TQt::gray );
KListViewItem::paintCell( p, _cg, column, width, alignment ); KListViewItem::paintCell( p, _cg, column, width, tqalignment );
_cg.setColor( TQColorGroup::Text, c ); _cg.setColor( TQColorGroup::Text, c );
} }
} }

@ -167,7 +167,7 @@ void Plugin_RawConverter::slotActivateSingle()
if (!isRAWFile(images.images()[0].path())) if (!isRAWFile(images.images()[0].path()))
{ {
KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()),
i18n("\"%1\" is not a Raw file.").arg(images.images()[0].fileName())); i18n("\"%1\" is not a Raw file.").tqarg(images.images()[0].fileName()));
return; return;
} }

@ -71,7 +71,7 @@ PreviewWidget::PreviewWidget(TQWidget *parent)
setLineWidth(1); setLineWidth(1);
setMinimumSize(TQSize(400, 300)); setMinimumSize(TQSize(400, 300));
setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
d->pix = new TQPixmap(400, 300); d->pix = new TQPixmap(400, 300);
d->pix->fill(TQt::black); d->pix->fill(TQt::black);

@ -184,7 +184,7 @@ bool RawDecodingIface::loadedFromDcraw(const TQString& filePath,
// -- Write image data into destination file ------------------------------- // -- Write image data into destination file -------------------------------
TQByteArray ICCColorProfile = getICCProfilFromFile(m_rawDecodingSettings.outputColorSpace); TQByteArray ICCColorProfile = getICCProfilFromFile(m_rawDecodingSettings.outputColorSpace);
TQString soft = TQString("Kipi-plugins v.%1").arg(kipiplugins_version); TQString soft = TQString("Kipi-plugins v.%1").tqarg(kipiplugins_version);
TQFileInfo fi(filePath); TQFileInfo fi(filePath);
destPath = fi.dirPath(true) + TQString("/") + ".kipi-rawconverter-tmp-" destPath = fi.dirPath(true) + TQString("/") + ".kipi-rawconverter-tmp-"
+ TQString::number(::time(0)); + TQString::number(::time(0));
@ -304,7 +304,7 @@ bool RawDecodingIface::loadedFromDcraw(const TQString& filePath,
TQString libpngver(PNG_HEADER_VERSION_STRING); TQString libpngver(PNG_HEADER_VERSION_STRING);
libpngver.replace('\n', ' '); libpngver.replace('\n', ' ');
soft.append(TQString(" (%1)").arg(libpngver)); soft.append(TQString(" (%1)").tqarg(libpngver));
png_text text; png_text text;
text.key = "Software"; text.key = "Software";
text.text = (char *)soft.ascii(); text.text = (char *)soft.ascii();
@ -384,7 +384,7 @@ bool RawDecodingIface::loadedFromDcraw(const TQString& filePath,
TQString libtiffver(TIFFLIB_VERSION_STR); TQString libtiffver(TIFFLIB_VERSION_STR);
libtiffver.replace('\n', ' '); libtiffver.replace('\n', ' ');
soft.append(TQString(" ( %1 )").arg(libtiffver)); soft.append(TQString(" ( %1 )").tqarg(libtiffver));
TIFFSetField(tif, TIFFTAG_SOFTWARE, (const char*)soft.ascii()); TIFFSetField(tif, TIFFTAG_SOFTWARE, (const char*)soft.ascii());
// Write ICC profil. // Write ICC profil.

@ -26,7 +26,7 @@
#include <tqvbuttongroup.h> #include <tqvbuttongroup.h>
#include <tqradiobutton.h> #include <tqradiobutton.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <layout.h> #include <tqlayout.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqstring.h> #include <tqstring.h>

@ -39,7 +39,7 @@ extern "C"
#include <tqtimer.h> #include <tqtimer.h>
#include <tqframe.h> #include <tqframe.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <layout.h> #include <tqlayout.h>
#include <tqtooltip.h> #include <tqtooltip.h>
#include <tqfileinfo.h> #include <tqfileinfo.h>
#include <tqevent.h> #include <tqevent.h>
@ -433,7 +433,7 @@ void SingleDialog::processed(const TQString&, const TQString& tmpFile)
struct stat statBuf; struct stat statBuf;
if (::stat(TQFile::encodeName(destFile), &statBuf) == 0) if (::stat(TQFile::encodeName(destFile), &statBuf) == 0)
{ {
KIO::RenameDlg dlg(this, i18n("Save Raw Image converted from '%1' as").arg(fi.fileName()), KIO::RenameDlg dlg(this, i18n("Save Raw Image converted from '%1' as").tqarg(fi.fileName()),
tmpFile, destFile, tmpFile, destFile,
KIO::RenameDlg_Mode(KIO::M_SINGLE | KIO::M_OVERWRITE | KIO::M_SKIP)); KIO::RenameDlg_Mode(KIO::M_SINGLE | KIO::M_OVERWRITE | KIO::M_SKIP));
@ -460,7 +460,7 @@ void SingleDialog::processed(const TQString&, const TQString& tmpFile)
{ {
if (::rename(TQFile::encodeName(tmpFile), TQFile::encodeName(destFile)) != 0) if (::rename(TQFile::encodeName(tmpFile), TQFile::encodeName(destFile)) != 0)
{ {
KMessageBox::error(this, i18n("Failed to save image %1").arg( destFile )); KMessageBox::error(this, i18n("Failed to save image %1").tqarg( destFile ));
} }
} }
} }

@ -23,7 +23,7 @@
// TQt includes // TQt includes
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <layout.h> #include <tqlayout.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include <tqstring.h> #include <tqstring.h>
#include <tqlabel.h> #include <tqlabel.h>

@ -174,14 +174,14 @@ void Plugin_SendImages::customEvent(TQCustomEvent *event)
case(KIPISendimagesPlugin::ResizeImages): case(KIPISendimagesPlugin::ResizeImages):
{ {
text = i18n("Resizing '%1' from Album '%2'...") text = i18n("Resizing '%1' from Album '%2'...")
.arg(d->fileName).arg(d->albumName); .tqarg(d->fileName).tqarg(d->albumName);
break; break;
} }
case(KIPISendimagesPlugin::Progress): case(KIPISendimagesPlugin::Progress):
{ {
text = i18n("Using '%1' from Album '%2' without resizing...") text = i18n("Using '%1' from Album '%2' without resizing...")
.arg(d->fileName).arg(d->albumName); .tqarg(d->fileName).tqarg(d->albumName);
break; break;
} }
@ -204,7 +204,7 @@ void Plugin_SendImages::customEvent(TQCustomEvent *event)
case(KIPISendimagesPlugin::ResizeImages): case(KIPISendimagesPlugin::ResizeImages):
{ {
text = i18n("Failed to resize '%1' from Album '%2'") text = i18n("Failed to resize '%1' from Album '%2'")
.arg(d->fileName).arg(d->albumName); .tqarg(d->fileName).tqarg(d->albumName);
break; break;
} }
@ -223,7 +223,7 @@ void Plugin_SendImages::customEvent(TQCustomEvent *event)
case(KIPISendimagesPlugin::ResizeImages): case(KIPISendimagesPlugin::ResizeImages):
{ {
text = i18n("Resizing '%1' from Album '%2' completed.") text = i18n("Resizing '%1' from Album '%2' completed.")
.arg(d->fileName).arg(d->albumName); .tqarg(d->fileName).tqarg(d->albumName);
break; break;
} }

@ -337,7 +337,7 @@ void SendImages::makeCommentsFile(void)
anyCommentsPresent = true; anyCommentsPresent = true;
ImageCommentsText += i18n("Caption for image \"%1\": %2\n") ImageCommentsText += i18n("Caption for image \"%1\": %2\n")
.arg(targetFile).arg(commentItem); .tqarg(targetFile).tqarg(commentItem);
//Tags from the database //Tags from the database
if (m_interface->hasFeature(KIPI::HostSupportsTags)) if (m_interface->hasFeature(KIPI::HostSupportsTags))
@ -345,7 +345,7 @@ void SendImages::makeCommentsFile(void)
TQMap <TQString, TQVariant> attribs=info.attributes(); TQMap <TQString, TQVariant> attribs=info.attributes();
if (attribs["tags"].asStringList().count() > 0) if (attribs["tags"].asStringList().count() > 0)
{ {
ImageCommentsText += i18n("Tags: %2\n").arg(attribs["tags"].asStringList().join(",")); ImageCommentsText += i18n("Tags: %2\n").tqarg(attribs["tags"].asStringList().join(","));
anyCommentsPresent = true; anyCommentsPresent = true;
} }
} }
@ -487,7 +487,7 @@ bool SendImages::invokeMailAgent(void)
KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()),
i18n("Cannot start '%1' program;\nplease " i18n("Cannot start '%1' program;\nplease "
"check your installation.") "check your installation.")
.arg(m_sendImagesDialog->m_mailAgentName->currentText())); .tqarg(m_sendImagesDialog->m_mailAgentName->currentText()));
else else
agentInvoked = true; agentInvoked = true;
} }
@ -516,7 +516,7 @@ bool SendImages::invokeMailAgent(void)
KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()),
i18n("Cannot start '%1' program;\nplease " i18n("Cannot start '%1' program;\nplease "
"check your installation.") "check your installation.")
.arg(m_sendImagesDialog->m_mailAgentName->currentText())); .tqarg(m_sendImagesDialog->m_mailAgentName->currentText()));
else else
agentInvoked = true; agentInvoked = true;
} }
@ -538,7 +538,7 @@ bool SendImages::invokeMailAgent(void)
KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()),
i18n("Cannot start '%1' program;\nplease " i18n("Cannot start '%1' program;\nplease "
"check your installation.") "check your installation.")
.arg(m_sendImagesDialog->m_mailAgentName->currentText())); .tqarg(m_sendImagesDialog->m_mailAgentName->currentText()));
else else
agentInvoked = true; agentInvoked = true;
} }
@ -564,7 +564,7 @@ bool SendImages::invokeMailAgent(void)
KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()),
i18n("Cannot start '%1' program;\nplease " i18n("Cannot start '%1' program;\nplease "
"check your installation.") "check your installation.")
.arg(m_sendImagesDialog->m_mailAgentName->currentText())); .tqarg(m_sendImagesDialog->m_mailAgentName->currentText()));
else else
agentInvoked = true; agentInvoked = true;
} }
@ -627,7 +627,7 @@ bool SendImages::invokeMailAgent(void)
KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()),
i18n("Cannot start '%1' program;\nplease " i18n("Cannot start '%1' program;\nplease "
"check your installation.") "check your installation.")
.arg(m_sendImagesDialog->m_mailAgentName->currentText())); .tqarg(m_sendImagesDialog->m_mailAgentName->currentText()));
else else
{ agentInvoked = true; { agentInvoked = true;
m_invokedBefore=true; m_invokedBefore=true;
@ -642,7 +642,7 @@ bool SendImages::invokeMailAgent(void)
void SendImages::removeTmpFiles(void) void SendImages::removeTmpFiles(void)
{ {
if (DeleteDir(m_tmp) == false) if (DeleteDir(m_tmp) == false)
KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Cannot remove temporary folder %1.").arg(m_tmp)); KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Cannot remove temporary folder %1.").tqarg(m_tmp));
} }
///Checks if directory is empty and invokes its deletion ///Checks if directory is empty and invokes its deletion
@ -884,7 +884,7 @@ void SendImages::slotMozillaExited(KProcess*)
KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()),
i18n("Cannot start '%1' program;\nplease " i18n("Cannot start '%1' program;\nplease "
"check your installation.") "check your installation.")
.arg(m_sendImagesDialog->m_mailAgentName->currentText())); .tqarg(m_sendImagesDialog->m_mailAgentName->currentText()));
} }
else else
{ {

@ -25,11 +25,11 @@
// TQt includes. // TQt includes.
#include <tqvbox.h> #include <tqvbox.h>
#include <layout.h> #include <tqlayout.h>
#include <tqdir.h> #include <tqdir.h>
#include <tqwidget.h> #include <tqwidget.h>
#include <tqfile.h> #include <tqfile.h>
#include <textstream.h> #include <tqtextstream.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqgroupbox.h> #include <tqgroupbox.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
@ -271,13 +271,13 @@ void SendImagesDialog::setupImagesList(void)
TQWhatsThis::add( m_addImagesButton, i18n("<p>Add images to the list.") ); TQWhatsThis::add( m_addImagesButton, i18n("<p>Add images to the list.") );
TQPushButton* m_remImagesButton = imagesListButtonBox->addButton ( i18n( "&Remove" )); TQPushButton* m_remImagesButton = imagesListButtonBox->addButton ( i18n( "&Remove" ));
TQWhatsThis::add( m_remImagesButton, i18n("<p>Remove selected images from the list.") ); TQWhatsThis::add( m_remImagesButton, i18n("<p>Remove selected images from the list.") );
imagesListButtonBox->layout(); imagesListButtonBox->tqlayout();
grid->addMultiCellWidget(imagesListButtonBox, 0, 1, 2, 2); grid->addMultiCellWidget(imagesListButtonBox, 0, 1, 2, 2);
m_imageLabel = new TQLabel( m_groupBoxImageList ); m_imageLabel = new TQLabel( m_groupBoxImageList );
m_imageLabel->setFixedHeight( 120 ); m_imageLabel->setFixedHeight( 120 );
m_imageLabel->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); m_imageLabel->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
m_imageLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); m_imageLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
TQWhatsThis::add( m_imageLabel, i18n( "<p>Preview of the currently selected image on the list." ) ); TQWhatsThis::add( m_imageLabel, i18n( "<p>Preview of the currently selected image on the list." ) );
grid->addMultiCellWidget(m_imageLabel, 2, 2, 2, 2); grid->addMultiCellWidget(m_imageLabel, 2, 2, 2, 2);
@ -287,19 +287,19 @@ void SendImagesDialog::setupImagesList(void)
TQGroupBox * groupBox2 = new TQGroupBox( i18n("Image Description"), page_setupImagesList ); TQGroupBox * groupBox2 = new TQGroupBox( i18n("Image Description"), page_setupImagesList );
groupBox2->setColumnLayout(0, Qt::Vertical ); groupBox2->setColumnLayout(0, Qt::Vertical );
groupBox2->layout()->setSpacing( 6 ); groupBox2->tqlayout()->setSpacing( 6 );
groupBox2->layout()->setMargin( 11 ); groupBox2->tqlayout()->setMargin( 11 );
TQWhatsThis::add( groupBox2, i18n("<p>The description of the currently selected image on the list.") ); TQWhatsThis::add( groupBox2, i18n("<p>The description of the currently selected image on the list.") );
TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->layout() ); TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() );
groupBox2Layout->setAlignment( TQt::AlignTop ); groupBox2Layout->tqsetAlignment( TQt::AlignTop );
m_ImageComments = new KSqueezedTextLabel( groupBox2 ); m_ImageComments = new KSqueezedTextLabel( groupBox2 );
m_ImageComments->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); m_ImageComments->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
groupBox2Layout->addWidget( m_ImageComments ); groupBox2Layout->addWidget( m_ImageComments );
m_ImageAlbum = new KSqueezedTextLabel( groupBox2 ); m_ImageAlbum = new KSqueezedTextLabel( groupBox2 );
m_ImageAlbum->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); m_ImageAlbum->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
groupBox2Layout->addWidget( m_ImageAlbum ); groupBox2Layout->addWidget( m_ImageAlbum );
vlay->addWidget( groupBox2 ); vlay->addWidget( groupBox2 );
@ -434,12 +434,12 @@ void SendImagesDialog::setupEmailOptions(void)
TQGroupBox * groupBox2 = new TQGroupBox( i18n("Image Properties"), page_setupEmailOptions ); TQGroupBox * groupBox2 = new TQGroupBox( i18n("Image Properties"), page_setupEmailOptions );
groupBox2->setColumnLayout(0, Qt::Vertical ); groupBox2->setColumnLayout(0, Qt::Vertical );
groupBox2->layout()->setSpacing( 6 ); groupBox2->tqlayout()->setSpacing( 6 );
groupBox2->layout()->setMargin( 11 ); groupBox2->tqlayout()->setMargin( 11 );
TQWhatsThis::add( groupBox2, i18n("<p>The properties of images to send.") ); TQWhatsThis::add( groupBox2, i18n("<p>The properties of images to send.") );
TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->layout() ); TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() );
groupBox2Layout->setAlignment( TQt::AlignTop ); groupBox2Layout->tqsetAlignment( TQt::AlignTop );
m_changeImagesProp = new TQCheckBox(i18n("Adjust image properties"), groupBox2); m_changeImagesProp = new TQCheckBox(i18n("Adjust image properties"), groupBox2);
TQWhatsThis::add( m_changeImagesProp, i18n("<p>If you enable this option, " TQWhatsThis::add( m_changeImagesProp, i18n("<p>If you enable this option, "
@ -469,12 +469,12 @@ void SendImagesDialog::setupEmailOptions(void)
"and if the target mailbox size is not limited.<p>" "and if the target mailbox size is not limited.<p>"
"<b>%5</b>: use this if you have no size or speed restrictions.<p>" "<b>%5</b>: use this if you have no size or speed restrictions.<p>"
"<b>%6</b>: use this only for printing purpose.<p>") "<b>%6</b>: use this only for printing purpose.<p>")
.arg(i18n("very small (320 pixels)")) .tqarg(i18n("very small (320 pixels)"))
.arg(i18n("small (640 pixels)")) .tqarg(i18n("small (640 pixels)"))
.arg(i18n("medium (800 pixels)")) .tqarg(i18n("medium (800 pixels)"))
.arg(i18n("big (1024 pixels)")) .tqarg(i18n("big (1024 pixels)"))
.arg(i18n("very big (1280 pixels)")) .tqarg(i18n("very big (1280 pixels)"))
.arg(i18n("huge - for printing (1600 pixels)")); .tqarg(i18n("huge - for printing (1600 pixels)"));
TQWhatsThis::add( m_imagesResize, whatsThis ); TQWhatsThis::add( m_imagesResize, whatsThis );
m_labelImageSize = new TQLabel( i18n("Sent image size:"), groupBox2); m_labelImageSize = new TQLabel( i18n("Sent image size:"), groupBox2);
@ -620,8 +620,8 @@ void SendImagesDialog::slotImageSelected( TQListBoxItem * item )
if ( !pitem ) return; if ( !pitem ) return;
m_ImageComments->setText( i18n("Caption: %1").arg(pitem->comments()) ); m_ImageComments->setText( i18n("Caption: %1").tqarg(pitem->comments()) );
m_ImageAlbum->setText( i18n("Album: %1").arg(pitem->album()) ); m_ImageAlbum->setText( i18n("Album: %1").tqarg(pitem->album()) );
m_imageLabel->clear(); m_imageLabel->clear();
if ( m_thumbJob ) if ( m_thumbJob )

@ -24,7 +24,7 @@
// QT include files // QT include files
#include <tqframe.h> #include <tqframe.h>
#include <layout.h> #include <tqlayout.h>
#include <tqvbox.h> #include <tqvbox.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>

@ -149,7 +149,7 @@ bool SimpleViewerExport::configure()
int ret = KMessageBox::warningYesNoCancel(TQT_TQWIDGET(kapp->activeWindow()), int ret = KMessageBox::warningYesNoCancel(TQT_TQWIDGET(kapp->activeWindow()),
i18n("Target folder %1 already exists.\n" i18n("Target folder %1 already exists.\n"
"Do you want to overwrite it (all data in this folder will be lost)") "Do you want to overwrite it (all data in this folder will be lost)")
.arg(m_configDlg->exportURL())); .tqarg(m_configDlg->exportURL()));
switch(ret) switch(ret)
{ {
@ -157,7 +157,7 @@ bool SimpleViewerExport::configure()
if(!KIO::NetAccess::del(m_configDlg->exportURL(), TQT_TQWIDGET(kapp->activeWindow()))) if(!KIO::NetAccess::del(m_configDlg->exportURL(), TQT_TQWIDGET(kapp->activeWindow())))
{ {
KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Could not delete %1\n" KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Could not delete %1\n"
"Please choose another export folder").arg(m_configDlg->exportURL())); "Please choose another export folder").tqarg(m_configDlg->exportURL()));
configured = false; configured = false;
} }
break; break;
@ -267,7 +267,7 @@ void SimpleViewerExport::slotProcess()
int ret = KMessageBox::warningYesNo(TQT_TQWIDGET(kapp->activeWindow()), int ret = KMessageBox::warningYesNo(TQT_TQWIDGET(kapp->activeWindow()),
i18n("Export was canceled.\n" i18n("Export was canceled.\n"
"Do you want to delete the yet created files in %1 ?") "Do you want to delete the yet created files in %1 ?")
.arg(m_configDlg->exportURL())); .tqarg(m_configDlg->exportURL()));
if(ret == KMessageBox::Yes) if(ret == KMessageBox::Yes)
{ {
KIO::NetAccess::del(m_configDlg->exportURL(), TQT_TQWIDGET(kapp->activeWindow())); KIO::NetAccess::del(m_configDlg->exportURL(), TQT_TQWIDGET(kapp->activeWindow()));
@ -288,7 +288,7 @@ bool SimpleViewerExport::createExportDirectories()
KURL root = m_configDlg->exportURL(); KURL root = m_configDlg->exportURL();
if(!KIO::NetAccess::mkdir(root, TQT_TQWIDGET(kapp->activeWindow()))) if(!KIO::NetAccess::mkdir(root, TQT_TQWIDGET(kapp->activeWindow())))
{ {
m_progressDlg->addedAction(i18n("Could not create folder '%1'").arg(root.url()), m_progressDlg->addedAction(i18n("Could not create folder '%1'").tqarg(root.url()),
KIPI::ErrorMessage); KIPI::ErrorMessage);
return(false); return(false);
} }
@ -297,7 +297,7 @@ bool SimpleViewerExport::createExportDirectories()
thumbsDir.addPath("/thumbs"); thumbsDir.addPath("/thumbs");
if(!KIO::NetAccess::mkdir(thumbsDir, TQT_TQWIDGET(kapp->activeWindow()))) if(!KIO::NetAccess::mkdir(thumbsDir, TQT_TQWIDGET(kapp->activeWindow())))
{ {
m_progressDlg->addedAction(i18n("Could not create folder '%1'").arg(thumbsDir.url()), m_progressDlg->addedAction(i18n("Could not create folder '%1'").tqarg(thumbsDir.url()),
KIPI::ErrorMessage); KIPI::ErrorMessage);
return(false); return(false);
} }
@ -306,7 +306,7 @@ bool SimpleViewerExport::createExportDirectories()
imagesDir.addPath("/images"); imagesDir.addPath("/images");
if(!KIO::NetAccess::mkdir(imagesDir, TQT_TQWIDGET(kapp->activeWindow()))) if(!KIO::NetAccess::mkdir(imagesDir, TQT_TQWIDGET(kapp->activeWindow())))
{ {
m_progressDlg->addedAction(i18n("Could not create folder '%1'").arg(imagesDir.url()), m_progressDlg->addedAction(i18n("Could not create folder '%1'").tqarg(imagesDir.url()),
KIPI::ErrorMessage); KIPI::ErrorMessage);
return(false); return(false);
} }
@ -336,24 +336,24 @@ bool SimpleViewerExport::exportImages()
file.open(IO_WriteOnly); file.open(IO_WriteOnly);
TQDomDocument xmlDoc; TQDomDocument xmlDoc;
xmlDoc.appendChild(xmlDoc.createProcessingInstruction( TQString::fromLatin1("xml"), xmlDoc.appendChild(xmlDoc.createProcessingInstruction( TQString::tqfromLatin1("xml"),
TQString::fromLatin1("version=\"1.0\" encoding=\"UTF-8\"") ) ); TQString::tqfromLatin1("version=\"1.0\" encoding=\"UTF-8\"") ) );
TQDomElement galleryElem = xmlDoc.createElement(TQString::fromLatin1("simpleviewerGallery")); TQDomElement galleryElem = xmlDoc.createElement(TQString::tqfromLatin1("simpleviewerGallery"));
xmlDoc.appendChild( galleryElem ); xmlDoc.appendChild( galleryElem );
galleryElem.setAttribute(TQString::fromLatin1("maxImageWidth"), m_configDlg->maxImageDimension()); galleryElem.setAttribute(TQString::tqfromLatin1("maxImageWidth"), m_configDlg->maxImageDimension());
galleryElem.setAttribute(TQString::fromLatin1("maxImageHeight"), m_configDlg->maxImageDimension()); galleryElem.setAttribute(TQString::tqfromLatin1("maxImageHeight"), m_configDlg->maxImageDimension());
galleryElem.setAttribute(TQString::fromLatin1("textColor"), TQString(m_configDlg->textColor().name()).replace("#", "0x")); galleryElem.setAttribute(TQString::tqfromLatin1("textColor"), TQString(m_configDlg->textColor().name()).replace("#", "0x"));
galleryElem.setAttribute(TQString::fromLatin1("frameColor"), TQString(m_configDlg->frameColor().name()).replace("#", "0x")); galleryElem.setAttribute(TQString::tqfromLatin1("frameColor"), TQString(m_configDlg->frameColor().name()).replace("#", "0x"));
galleryElem.setAttribute(TQString::fromLatin1("bgColor"), TQString(m_configDlg->backgroundColor().name()).replace("#", "0x")); galleryElem.setAttribute(TQString::tqfromLatin1("bgColor"), TQString(m_configDlg->backgroundColor().name()).replace("#", "0x"));
galleryElem.setAttribute(TQString::fromLatin1("frameWidth"), m_configDlg->frameWidth()); galleryElem.setAttribute(TQString::tqfromLatin1("frameWidth"), m_configDlg->frameWidth());
galleryElem.setAttribute(TQString::fromLatin1("stagePadding"), m_configDlg->stagePadding()); galleryElem.setAttribute(TQString::tqfromLatin1("stagePadding"), m_configDlg->stagePadding());
galleryElem.setAttribute(TQString::fromLatin1("thumbnailColumns"), m_configDlg->thumbnailColumns()); galleryElem.setAttribute(TQString::tqfromLatin1("thumbnailColumns"), m_configDlg->thumbnailColumns());
galleryElem.setAttribute(TQString::fromLatin1("thumbnailRows"), m_configDlg->thumbnailRows()); galleryElem.setAttribute(TQString::tqfromLatin1("thumbnailRows"), m_configDlg->thumbnailRows());
galleryElem.setAttribute(TQString::fromLatin1("navPosition"), m_configDlg->navPosition()); galleryElem.setAttribute(TQString::tqfromLatin1("navPosition"), m_configDlg->navPosition());
galleryElem.setAttribute(TQString::fromLatin1("navDirection"), m_configDlg->navDirection()); galleryElem.setAttribute(TQString::tqfromLatin1("navDirection"), m_configDlg->navDirection());
galleryElem.setAttribute(TQString::fromLatin1("title"), m_configDlg->title()); galleryElem.setAttribute(TQString::tqfromLatin1("title"), m_configDlg->title());
galleryElem.setAttribute(TQString::fromLatin1("imagePath"), TQString()); galleryElem.setAttribute(TQString::tqfromLatin1("imagePath"), TQString());
galleryElem.setAttribute(TQString::fromLatin1("thumbPath"), TQString()); galleryElem.setAttribute(TQString::tqfromLatin1("thumbPath"), TQString());
KExiv2Iface::KExiv2 meta; KExiv2Iface::KExiv2 meta;
TQImage image; TQImage image;
@ -377,7 +377,7 @@ bool SimpleViewerExport::exportImages()
KURL url = *it; KURL url = *it;
TQFileInfo fileInfo(url.path()); TQFileInfo fileInfo(url.path());
m_progressDlg->addedAction(i18n("Processing %1").arg(url.filename()), KIPI::StartingMessage); m_progressDlg->addedAction(i18n("Processing %1").tqarg(url.filename()), KIPI::StartingMessage);
// Check if RAW file. // Check if RAW file.
#if KDCRAW_VERSION < 0x000106 #if KDCRAW_VERSION < 0x000106
@ -392,27 +392,27 @@ bool SimpleViewerExport::exportImages()
if(image.isNull()) if(image.isNull())
{ {
m_progressDlg->addedAction(i18n("Could not open image '%1'").arg(url.filename()), m_progressDlg->addedAction(i18n("Could not open image '%1'").tqarg(url.filename()),
KIPI::WarningMessage); KIPI::WarningMessage);
continue; continue;
} }
if(!createThumbnail(image, thumbnail)) if(!createThumbnail(image, thumbnail))
{ {
m_progressDlg->addedAction(i18n("Could not create thumbnail from '%1'").arg(url.filename()), m_progressDlg->addedAction(i18n("Could not create thumbnail from '%1'").tqarg(url.filename()),
KIPI::WarningMessage); KIPI::WarningMessage);
continue; continue;
} }
if(resizeImages && !resizeImage(image, maxSize, image)) if(resizeImages && !resizeImage(image, maxSize, image))
{ {
m_progressDlg->addedAction(i18n("Could not resize image '%1'").arg(url.filename()), m_progressDlg->addedAction(i18n("Could not resize image '%1'").tqarg(url.filename()),
KIPI::WarningMessage); KIPI::WarningMessage);
continue; continue;
} }
meta.load(url.path()); meta.load(url.path());
newName = TQString("%1.%2").arg(tmp.sprintf("%03i", index)).arg(TQString("jpg")); newName = TQString("%1.%2").tqarg(tmp.sprintf("%03i", index)).tqarg(TQString("jpg"));
KURL thumbnailPath(thumbsDir); KURL thumbnailPath(thumbsDir);
thumbnailPath.addPath(newName); thumbnailPath.addPath(newName);
@ -510,15 +510,15 @@ void SimpleViewerExport::cfgAddImage(TQDomDocument &xmlDoc, TQDomElement &galler
comment = TQString(); comment = TQString();
} }
TQDomElement img = xmlDoc.createElement(TQString::fromLatin1("image")); TQDomElement img = xmlDoc.createElement(TQString::tqfromLatin1("image"));
galleryElem.appendChild(img); galleryElem.appendChild(img);
TQDomElement name = xmlDoc.createElement(TQString::fromLatin1("name")); TQDomElement name = xmlDoc.createElement(TQString::tqfromLatin1("name"));
img.appendChild(name); img.appendChild(name);
TQDomText nametxt = xmlDoc.createTextNode(newName); TQDomText nametxt = xmlDoc.createTextNode(newName);
name.appendChild(nametxt); name.appendChild(nametxt);
TQDomElement caption = xmlDoc.createElement(TQString::fromLatin1("caption")); TQDomElement caption = xmlDoc.createElement(TQString::tqfromLatin1("caption"));
img.appendChild(caption); img.appendChild(caption);
TQDomText captiontxt = xmlDoc.createTextNode(comment); TQDomText captiontxt = xmlDoc.createTextNode(comment);
caption.appendChild(captiontxt); caption.appendChild(captiontxt);

@ -25,9 +25,9 @@
#include <tqframe.h> #include <tqframe.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <layout.h> #include <tqlayout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <layout.h> #include <tqlayout.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <tqhgroupbox.h> #include <tqhgroupbox.h>
@ -171,9 +171,9 @@ void SVEDialog::selectionPage()
m_selectionPage = addPage(i18n("Selection"), i18n("Album Selection"), m_selectionPage = addPage(i18n("Selection"), i18n("Album Selection"),
BarIcon("folder_image", KIcon::SizeMedium)); BarIcon("folder_image", KIcon::SizeMedium));
TQVBoxLayout *layout = new TQVBoxLayout( m_selectionPage, 0, spacingHint() ); TQVBoxLayout *tqlayout = new TQVBoxLayout( m_selectionPage, 0, spacingHint() );
m_imageCollectionSelector = new KIPI::ImageCollectionSelector( m_selectionPage, m_interface ); m_imageCollectionSelector = new KIPI::ImageCollectionSelector( m_selectionPage, m_interface );
layout->addWidget(m_imageCollectionSelector); tqlayout->addWidget(m_imageCollectionSelector);
} }
void SVEDialog::lookPage() void SVEDialog::lookPage()

@ -40,7 +40,7 @@
#include <tqcursor.h> #include <tqcursor.h>
#include <tqfont.h> #include <tqfont.h>
#include <tqwmatrix.h> #include <tqwmatrix.h>
#include <textcodec.h> #include <tqtextcodec.h>
// KDE includes. // KDE includes.

@ -29,7 +29,7 @@
#include <tqlabel.h> #include <tqlabel.h>
#include <tqradiobutton.h> #include <tqradiobutton.h>
#include <tqspinbox.h> #include <tqspinbox.h>
#include <layout.h> #include <tqlayout.h>
#include <tqmap.h> #include <tqmap.h>
#include <tqframe.h> #include <tqframe.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
@ -615,7 +615,7 @@ void SlideShowConfig::slotImagesFilesSelected( TQListBoxItem *item )
TQT_SLOT(slotFailedPreview(const KFileItem*))); TQT_SLOT(slotFailedPreview(const KFileItem*)));
int index = m_ImagesFilesListBox->index ( item ); int index = m_ImagesFilesListBox->index ( item );
m_label7->setText(i18n("Image no. %1").arg(index + 1)); m_label7->setText(i18n("Image no. %1").tqarg(index + 1));
} }
void SlideShowConfig::slotAddDropItems(KURL::List filesUrl) void SlideShowConfig::slotAddDropItems(KURL::List filesUrl)
@ -735,9 +735,9 @@ void SlideShowConfig::ShowNumberImages( int Number )
TotalDuration = TotalDuration.addMSecs((Number-1)*TransitionDuration); TotalDuration = TotalDuration.addMSecs((Number-1)*TransitionDuration);
if ( Number < 2) if ( Number < 2)
m_label6->setText(i18n("%1 image [%2]").arg(Number).arg(TotalDuration.toString())); m_label6->setText(i18n("%1 image [%2]").tqarg(Number).tqarg(TotalDuration.toString()));
else else
m_label6->setText(i18n("%1 images [%2]").arg(Number).arg(TotalDuration.toString())); m_label6->setText(i18n("%1 images [%2]").tqarg(Number).tqarg(TotalDuration.toString()));
} }
void SlideShowConfig::slotGotPreview(const KFileItem*, const TQPixmap &pixmap) void SlideShowConfig::slotGotPreview(const KFileItem*, const TQPixmap &pixmap)
@ -766,7 +766,7 @@ void SlideShowConfig::slotStartClicked()
if (!TQFile::exists(pitem->path())) if (!TQFile::exists(pitem->path()))
{ {
KMessageBox::error(this, KMessageBox::error(this,
i18n("Cannot access to file %1, please check the path is right.").arg(pitem->path())); i18n("Cannot access to file %1, please check the path is right.").tqarg(pitem->path()));
return; return;
} }
m_urlList->append(pitem->path()); // Input images files. m_urlList->append(pitem->path()); // Input images files.

@ -23,13 +23,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="tqmaximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>32767</height> <height>32767</height>
@ -163,7 +163,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout15</cstring> <cstring>tqlayout15</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -210,7 +210,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout14</cstring> <cstring>tqlayout14</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -226,7 +226,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>5</height> <height>5</height>
@ -245,7 +245,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -273,7 +273,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -301,7 +301,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -329,7 +329,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -355,7 +355,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>5</height> <height>5</height>
@ -366,7 +366,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout14</cstring> <cstring>tqlayout14</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -384,7 +384,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>128</width> <width>128</width>
<height>128</height> <height>128</height>
@ -396,7 +396,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<property name="scaledContents"> <property name="scaledContents">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignCenter</set> <set>AlignCenter</set>
</property> </property>
<property name="whatsThis" stdset="0"> <property name="whatsThis" stdset="0">
@ -428,7 +428,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout50</cstring> <cstring>tqlayout50</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -436,7 +436,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout47</cstring> <cstring>tqlayout47</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -473,7 +473,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>238</width> <width>238</width>
<height>33</height> <height>33</height>
@ -499,7 +499,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>2</height> <height>2</height>
@ -535,7 +535,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout14</cstring> <cstring>tqlayout14</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -619,7 +619,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>16</height> <height>16</height>
@ -664,7 +664,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize"> <property name="tqmaximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>32767</height> <height>32767</height>
@ -689,7 +689,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize"> <property name="tqmaximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>32767</height> <height>32767</height>
@ -704,7 +704,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout48</cstring> <cstring>tqlayout48</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -722,7 +722,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize"> <property name="tqmaximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>30</height> <height>30</height>
@ -744,7 +744,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize"> <property name="tqmaximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>32767</height> <height>32767</height>
@ -767,7 +767,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout49</cstring> <cstring>tqlayout49</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -785,7 +785,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize"> <property name="tqmaximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>30</height> <height>30</height>
@ -807,13 +807,13 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="tqmaximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>32767</height> <height>32767</height>
@ -841,7 +841,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>2</height> <height>2</height>
@ -862,7 +862,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>5</height> <height>5</height>
@ -897,7 +897,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout57</cstring> <cstring>tqlayout57</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -916,7 +916,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout52</cstring> <cstring>tqlayout52</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -940,7 +940,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>15</width> <width>15</width>
<height>21</height> <height>21</height>
@ -966,7 +966,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout51</cstring> <cstring>tqlayout51</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -990,7 +990,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>15</width> <width>15</width>
<height>21</height> <height>21</height>
@ -1025,7 +1025,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>81</width> <width>81</width>
<height>31</height> <height>31</height>
@ -1034,7 +1034,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout55</cstring> <cstring>tqlayout55</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -1058,7 +1058,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>15</width> <width>15</width>
<height>21</height> <height>21</height>
@ -1096,7 +1096,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>5</height> <height>5</height>
@ -1238,7 +1238,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout15</cstring> <cstring>tqlayout15</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -1262,7 +1262,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>21</height> <height>21</height>
@ -1314,7 +1314,7 @@ Ken Burns effect doesn't use this cache mechanism.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>41</width> <width>41</width>
<height>90</height> <height>90</height>
@ -1326,7 +1326,7 @@ Ken Burns effect doesn't use this cache mechanism.</string>
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout3</cstring> <cstring>tqlayout3</cstring>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy>
@ -1350,7 +1350,7 @@ Ken Burns effect doesn't use this cache mechanism.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>20</height> <height>20</height>

@ -24,7 +24,7 @@
// TQt includes. // TQt includes.
#include <tqtoolbutton.h> #include <tqtoolbutton.h>
#include <layout.h> #include <tqlayout.h>
#include <tqpixmap.h> #include <tqpixmap.h>
// KDE includes. // KDE includes.
@ -63,7 +63,7 @@ ToolBar::ToolBar(TQWidget* parent)
lay->addWidget(m_stopBtn); lay->addWidget(m_stopBtn);
adjustSize(); adjustSize();
setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
m_canHide = true; m_canHide = true;

@ -10,4 +10,4 @@ Somewhat immediate implementation needed:
For the lazy times: For the lazy times:
* Polish the html code used to render the thumbnails, better * Polish the html code used to render the thumbnails, better
fonts sizes and layout fonts sizes and tqlayout

@ -52,7 +52,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout3</cstring> <cstring>tqlayout3</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -137,7 +137,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

@ -28,7 +28,7 @@
#include <tqprogressdialog.h> #include <tqprogressdialog.h>
#include <tqspinbox.h> #include <tqspinbox.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <layout.h> #include <tqlayout.h>
// Include files for KDE // Include files for KDE
@ -74,7 +74,7 @@ GalleryEdit::GalleryEdit(TQWidget* pParent,
tll->addItem(vbox); tll->addItem(vbox);
mpHeaderLabel = new TQLabel(page); mpHeaderLabel = new TQLabel(page);
mpHeaderLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, mpHeaderLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,
TQSizePolicy::Fixed)); TQSizePolicy::Fixed));
mpHeaderLabel->setText(title); mpHeaderLabel->setText(title);
vbox->addWidget(mpHeaderLabel); vbox->addWidget(mpHeaderLabel);
@ -124,7 +124,7 @@ GalleryEdit::GalleryEdit(TQWidget* pParent,
vbox->addLayout( centerLayout ); vbox->addLayout( centerLayout );
resize( TQSize(300, 150).expandedTo(minimumSizeHint()) ); resize( TQSize(300, 150).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished ); clearWState( WState_Polished );
mpNameEdit->setText(pGallery->name()); mpNameEdit->setText(pGallery->name());

@ -32,7 +32,7 @@
#include <tqgroupbox.h> #include <tqgroupbox.h>
#include <tqspinbox.h> #include <tqspinbox.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <layout.h> #include <tqlayout.h>
#include <tqtooltip.h> #include <tqtooltip.h>
#include <tqsplitter.h> #include <tqsplitter.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
@ -87,11 +87,11 @@ GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl )
rightButtonGroupLayout->setMargin( 5 ); rightButtonGroupLayout->setMargin( 5 );
m_newAlbumBtn = new TQPushButton( rightButtonGroup, "m_newAlbumBtn" ); m_newAlbumBtn = new TQPushButton( rightButtonGroup, "m_newAlbumBtn" );
m_newAlbumBtn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); m_newAlbumBtn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
rightButtonGroupLayout->addWidget( m_newAlbumBtn, 0, TQt::AlignHCenter ); rightButtonGroupLayout->addWidget( m_newAlbumBtn, 0, TQt::AlignHCenter );
m_addPhotoBtn = new TQPushButton( rightButtonGroup, "m_addPhotoBtn" ); m_addPhotoBtn = new TQPushButton( rightButtonGroup, "m_addPhotoBtn" );
m_addPhotoBtn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); m_addPhotoBtn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
rightButtonGroupLayout->addWidget( m_addPhotoBtn, 0, TQt::AlignHCenter ); rightButtonGroupLayout->addWidget( m_addPhotoBtn, 0, TQt::AlignHCenter );
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@ -99,9 +99,9 @@ GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl )
TQGroupBox* optionsBox = new TQGroupBox(i18n("Override Default Options"), TQGroupBox* optionsBox = new TQGroupBox(i18n("Override Default Options"),
rightButtonGroup); rightButtonGroup);
optionsBox->setColumnLayout(0, Qt::Vertical); optionsBox->setColumnLayout(0, Qt::Vertical);
optionsBox->layout()->setSpacing(5); optionsBox->tqlayout()->setSpacing(5);
optionsBox->layout()->setMargin(5); optionsBox->tqlayout()->setMargin(5);
TQGridLayout* optionsBoxLayout = new TQGridLayout(optionsBox->layout()); TQGridLayout* optionsBoxLayout = new TQGridLayout(optionsBox->tqlayout());
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@ -111,7 +111,7 @@ GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl )
m_dimensionSpinBox = new TQSpinBox(0, 5000, 10, optionsBox); m_dimensionSpinBox = new TQSpinBox(0, 5000, 10, optionsBox);
m_dimensionSpinBox->setValue(600); m_dimensionSpinBox->setValue(600);
m_dimensionSpinBox->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); m_dimensionSpinBox->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
optionsBoxLayout->addWidget(m_dimensionSpinBox, 1, 1); optionsBoxLayout->addWidget(m_dimensionSpinBox, 1, 1);
TQLabel* resizeLabel = new TQLabel(i18n("Maximum dimension:"), optionsBox); 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(minimumSizeHint()) ); resize( TQSize(600, 400).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished ); clearWState( WState_Polished );
} }

@ -331,18 +331,18 @@ void GalleryWindow::slotPhotos( const TQValueList<GPhoto>& photoList)
TQString styleSheet = TQString styleSheet =
TQString( "body { margin: 8px; font-size: %1px; " TQString( "body { margin: 8px; font-size: %1px; "
" color: %2; background-color: %3;}" ) " color: %2; background-color: %3;}" )
.arg( pxSize ) .tqarg( pxSize )
.arg( colorGroup().text().name() ) .tqarg( tqcolorGroup().text().name() )
.arg( colorGroup().base().name() ); .tqarg( tqcolorGroup().base().name() );
styleSheet += TQString( "a { font-size: %1px; color: %2; " styleSheet += TQString( "a { font-size: %1px; color: %2; "
"text-decoration: none;}" ) "text-decoration: none;}" )
.arg( pxSize ) .tqarg( pxSize )
.arg( colorGroup().text().name() ); .tqarg( tqcolorGroup().text().name() );
styleSheet += TQString( "i { font-size: %1px; color: %2; " styleSheet += TQString( "i { font-size: %1px; color: %2; "
"text-decoration: none;}" ) "text-decoration: none;}" )
.arg( pxSize-2 ) .tqarg( pxSize-2 )
.arg( TQColor("steelblue").name() ); .tqarg( TQColor("steelblue").name() );
m_photoView->begin(); m_photoView->begin();
m_photoView->setUserStyleSheet( styleSheet ); m_photoView->setUserStyleSheet( styleSheet );
@ -363,13 +363,13 @@ void GalleryWindow::slotPhotos( const TQValueList<GPhoto>& photoList)
m_photoView->write( "<tr><td class='photo'>" m_photoView->write( "<tr><td class='photo'>"
+ TQString("<a href='%1'>") + TQString("<a href='%1'>")
.arg(imageurl.url()) .tqarg(imageurl.url())
+ TQString("<img border=1 src=\"%1\"><br>") + TQString("<img border=1 src=\"%1\"><br>")
.arg(thumburl.url()) .tqarg(thumburl.url())
+ photo.name + photo.name
+ ( photo.caption.isEmpty() ? TQString() : + ( photo.caption.isEmpty() ? TQString() :
TQString("<br><i>%1</i>") TQString("<br><i>%1</i>")
.arg(photo.caption) ) .tqarg(photo.caption) )
+ "</a></td></tr>" ); + "</a></td></tr>" );
} }
@ -514,7 +514,7 @@ void GalleryWindow::slotNewAlbum()
if (!clean) if (!clean)
{ {
KMessageBox::error( this, i18n("Sorry, these characters are not allowed in album name: %1") KMessageBox::error( this, i18n("Sorry, these characters are not allowed in album name: %1")
.arg("\\ / * ? \" \' & < > | . + # ( ) or spaces") ); .tqarg("\\ / * ? \" \' & < > | . + # ( ) or spaces") );
return; return;
} }
@ -584,7 +584,7 @@ void GalleryWindow::slotAddPhotoNext()
} }
m_progressDlg->setLabelText( i18n("Uploading file %1 ") m_progressDlg->setLabelText( i18n("Uploading file %1 ")
.arg( KURL(pathComments.first).filename() ) ); .tqarg( KURL(pathComments.first).filename() ) );
if (m_progressDlg->isHidden()) if (m_progressDlg->isHidden())
m_progressDlg->show(); m_progressDlg->show();

@ -96,8 +96,8 @@ Sinks::Sinks()
if (sink_id > mMaxSinkId) if (sink_id > mMaxSinkId)
mMaxSinkId = sink_id; mMaxSinkId = sink_id;
type = config.readEntry(TQString("Type%1").arg(sink_id)); type = config.readEntry(TQString("Type%1").tqarg(sink_id));
name = config.readEntry(TQString("Name%1").arg(sink_id)); name = config.readEntry(TQString("Name%1").tqarg(sink_id));
Sink* p_sink = SinkFactory::Create(type, sink_id, name, &config, p_wallet); Sink* p_sink = SinkFactory::Create(type, sink_id, name, &config, p_wallet);
if (p_sink) if (p_sink)
mSinks.append(p_sink); mSinks.append(p_sink);

@ -25,7 +25,7 @@
#include <tqfile.h> #include <tqfile.h>
#include <tqfileinfo.h> #include <tqfileinfo.h>
#include <textstream.h> #include <tqtextstream.h>
//#include <cstring> //#include <cstring>
//#include <cstdio> //#include <cstdio>
@ -58,7 +58,7 @@ GalleryForm::~GalleryForm()
void GalleryForm::addPair(const TQString& name, const TQString& value) void GalleryForm::addPair(const TQString& name, const TQString& value)
{ {
if (Gallery2 == mVersion) if (Gallery2 == mVersion)
return addPairRaw(TQString("g2_form[%1]").arg(name), value); return addPairRaw(TQString("g2_form[%1]").tqarg(name), value);
return addPairRaw(name, value); return addPairRaw(name, value);
} }

@ -19,7 +19,7 @@
* ============================================================ */ * ============================================================ */
#include <tqcstring.h> #include <tqcstring.h>
#include <textstream.h> #include <tqtextstream.h>
#include <tqfile.h> #include <tqfile.h>
#include <tqimage.h> #include <tqimage.h>
#include <tqregexp.h> #include <tqregexp.h>
@ -51,11 +51,11 @@ GallerySink::GallerySink(unsigned int sinkId, TQString name, KConfig* pConfig, K
mpJob(0), mpJob(0),
m_loggedIn(false) m_loggedIn(false)
{ {
TQString tmp = pConfig->readEntry(TQString("URL%1").arg(sinkId)); TQString tmp = pConfig->readEntry(TQString("URL%1").tqarg(sinkId));
mURL = KURL(tmp); mURL = KURL(tmp);
mUsername = pConfig->readEntry(TQString("Username%1").arg(sinkId)); mUsername = pConfig->readEntry(TQString("Username%1").tqarg(sinkId));
if (pWallet) if (pWallet)
pWallet->readPassword(TQString("Password%1").arg(sinkId), mPassword); pWallet->readPassword(TQString("Password%1").tqarg(sinkId), mPassword);
} }
GallerySink::~GallerySink() GallerySink::~GallerySink()
@ -72,12 +72,12 @@ const KIPI2::CollectionList* GallerySink::getCollections()
void GallerySink::Save(KConfig* pConfig, KWallet::Wallet* pWallet) void GallerySink::Save(KConfig* pConfig, KWallet::Wallet* pWallet)
{ {
pConfig->writeEntry(TQString("Name%1").arg(mSinkId), mName); pConfig->writeEntry(TQString("Name%1").tqarg(mSinkId), mName);
pConfig->writeEntry(TQString("Type%1").arg(mSinkId), Type()); pConfig->writeEntry(TQString("Type%1").tqarg(mSinkId), Type());
pConfig->writeEntry(TQString("URL%1").arg(mSinkId), TQString(mURL.url())); pConfig->writeEntry(TQString("URL%1").tqarg(mSinkId), TQString(mURL.url()));
pConfig->writeEntry(TQString("Username%1").arg(mSinkId), mUsername); pConfig->writeEntry(TQString("Username%1").tqarg(mSinkId), mUsername);
if (pWallet) if (pWallet)
pWallet->writePassword(TQString("Password%1").arg(mSinkId), mPassword); pWallet->writePassword(TQString("Password%1").tqarg(mSinkId), mPassword);
} }

@ -32,7 +32,7 @@ extern "C"
// TQt includes. // TQt includes.
#include <tqtooltip.h> #include <tqtooltip.h>
#include <layout.h> #include <tqlayout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqvbuttongroup.h> #include <tqvbuttongroup.h>
#include <tqvgroupbox.h> #include <tqvgroupbox.h>
@ -252,7 +252,7 @@ TimeAdjustDialog::TimeAdjustDialog(KIPI::Interface* interface, TQWidget* parent)
d->infoLabel = new TQLabel(d->exampleBox); d->infoLabel = new TQLabel(d->exampleBox);
d->exampleAdj = new TQLabel(d->exampleBox); d->exampleAdj = new TQLabel(d->exampleBox);
d->exampleAdj->setAlignment(TQt::AlignCenter); d->exampleAdj->tqsetAlignment(TQt::AlignCenter);
vlay->addStretch(); vlay->addStretch();
@ -301,7 +301,7 @@ void TimeAdjustDialog::slotHelp()
void TimeAdjustDialog::slotResetDateToCurrent() void TimeAdjustDialog::slotResetDateToCurrent()
{ {
d->dateCreatedSel->setDateTime(TQDateTime::currentDateTime()); d->dateCreatedSel->setDateTime(TQDateTime::tqcurrentDateTime());
} }
void TimeAdjustDialog::closeEvent(TQCloseEvent *e) void TimeAdjustDialog::closeEvent(TQCloseEvent *e)
@ -328,7 +328,7 @@ void TimeAdjustDialog::readSettings()
if (adjType == 2) d->exif->setChecked(true); if (adjType == 2) d->exif->setChecked(true);
if (adjType == 3) d->custom->setChecked(true); if (adjType == 3) d->custom->setChecked(true);
TQDateTime current = TQDateTime::currentDateTime(); TQDateTime current = TQDateTime::tqcurrentDateTime();
d->dateCreatedSel->setDateTime(config.readDateTimeEntry("Custom Date", &current)); d->dateCreatedSel->setDateTime(config.readDateTimeEntry("Custom Date", &current));
d->syncEXIFDateCheck->setChecked(config.readBoolEntry("Sync EXIF Date", true)); d->syncEXIFDateCheck->setChecked(config.readBoolEntry("Sync EXIF Date", true));
@ -403,7 +403,7 @@ void TimeAdjustDialog::slotUpdateExample()
TQString newDate = date.toString(Qt::LocalDate); TQString newDate = date.toString(Qt::LocalDate);
d->exampleAdj->setText(i18n("<b>%1</b><br>would, for example, " d->exampleAdj->setText(i18n("<b>%1</b><br>would, for example, "
"change into<br><b>%2</b>") "change into<br><b>%2</b>")
.arg(oldDate).arg(newDate)); .tqarg(oldDate).tqarg(newDate));
} }
void TimeAdjustDialog::slotAdjustmentTypeChanged() void TimeAdjustDialog::slotAdjustmentTypeChanged()

@ -212,9 +212,9 @@ void Plugin_WallPaper::slotSetScaleAndCrop()
///////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////
void Plugin_WallPaper::setWallpaper(int layout) void Plugin_WallPaper::setWallpaper(int tqlayout)
{ {
if (layout>SCALE_AND_CROP || layout < CENTER) if (tqlayout>SCALE_AND_CROP || tqlayout < CENTER)
return; return;
KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( parent() ); KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( parent() );
@ -254,7 +254,7 @@ void Plugin_WallPaper::setWallpaper(int layout)
} }
TQString cmd = TQString("dcop kdesktop KBackgroundIface setWallpaper '%1' %2") TQString cmd = TQString("dcop kdesktop KBackgroundIface setWallpaper '%1' %2")
.arg(path).arg(layout); .tqarg(path).tqarg(tqlayout);
KRun::runCommand(cmd); KRun::runCommand(cmd);
} }

@ -76,7 +76,7 @@
}; };
KActionMenu *m_action_Background; KActionMenu *m_action_Background;
void setWallpaper( int layout ); void setWallpaper( int tqlayout );
}; };
#endif // PLUGIN_IMAGES2DESKTOP_H #endif // PLUGIN_IMAGES2DESKTOP_H

Loading…
Cancel
Save