From ec1fddcd0d6663ad273af85357f04abbc5689468 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:00 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit c2637a0da6d9a1c8626ca39f8451ab3b7cda487a. --- kuickshow/src/aboutwidget.cpp | 10 +++++----- kuickshow/src/defaultswidget.cpp | 12 ++++++------ kuickshow/src/filecache.cpp | 2 +- kuickshow/src/filewidget.cpp | 4 ++-- kuickshow/src/filewidget.h | 2 +- kuickshow/src/generalwidget.cpp | 20 ++++++++++---------- kuickshow/src/imagewindow.cpp | 20 ++++++++++---------- kuickshow/src/imlibwidget.cpp | 6 +++--- kuickshow/src/kuickfile.cpp | 10 +++++----- kuickshow/src/kuickfile.h | 4 ++-- kuickshow/src/kuickshow.cpp | 12 ++++++------ kuickshow/src/mainwidget.cpp | 2 +- kuickshow/src/printing.cpp | 40 +++++++++++++++++++-------------------- kuickshow/src/slideshowwidget.cpp | 16 ++++++++-------- 14 files changed, 80 insertions(+), 80 deletions(-) (limited to 'kuickshow') diff --git a/kuickshow/src/aboutwidget.cpp b/kuickshow/src/aboutwidget.cpp index dc43578f..d5d3a841 100644 --- a/kuickshow/src/aboutwidget.cpp +++ b/kuickshow/src/aboutwidget.cpp @@ -41,7 +41,7 @@ AboutWidget::AboutWidget( TQWidget *parent, const char *name ) TQGroupBox *gBox = new TQGroupBox( 1,Qt::Horizontal, this); gBox->setGeometry( 10, 10, width()-20, height()-20 ); - gBox->setAlignment( AlignHCenter ); + gBox->tqsetAlignment( AlignHCenter ); gBox->installEventFilter( this ); gBox->setPalette( TQPalette( TQColor( white ) ) ); @@ -57,14 +57,14 @@ AboutWidget::AboutWidget( TQWidget *parent, const char *name ) TQLabel *authors = new TQLabel("Kuickshow " KUICKSHOWVERSION " was brought to you by", gBox); - authors->setAlignment( AlignCenter ); + authors->tqsetAlignment( AlignCenter ); m_homepage = new KURLWidget("Carsten Pfeiffer", gBox); m_homepage->setURL( "http://devel-home.kde.org/~pfeiffer/kuickshow/" ); - m_homepage->setAlignment( AlignCenter ); + m_homepage->tqsetAlignment( AlignCenter ); TQLabel *copy = new TQLabel("(C) 1998-2006", gBox); - copy->setAlignment( AlignCenter ); + copy->tqsetAlignment( AlignCenter ); ImlibWidget *im = new ImlibWidget( 0L, gBox, "KuickShow Logo" ); if ( im->loadImage( file ) ) @@ -84,7 +84,7 @@ bool AboutWidget::eventFilter( TQObject *o, TQEvent *e ) { if ( e->type() == TQEvent::MouseButtonPress ) { TQMouseEvent *ev = TQT_TQMOUSEEVENT( e ); - if ( !m_homepage->geometry().contains( ev->pos() ) ) { + if ( !m_homepage->tqgeometry().contains( ev->pos() ) ) { deleteLater(); return true; } diff --git a/kuickshow/src/defaultswidget.cpp b/kuickshow/src/defaultswidget.cpp index 55d752f5..c0bef522 100644 --- a/kuickshow/src/defaultswidget.cpp +++ b/kuickshow/src/defaultswidget.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include @@ -92,7 +92,7 @@ DefaultsWidget::DefaultsWidget( TQWidget *parent, const char *name) // -- gbPreview = new TQGroupBox( i18n("Preview"), this ); - gbPreview->setAlignment( AlignCenter ); + gbPreview->tqsetAlignment( AlignCenter ); lbImOrig = new TQLabel( i18n("Original"), gbPreview ); imOrig = new ImlibWidget( 0L, gbPreview, "original image" ); @@ -105,13 +105,13 @@ DefaultsWidget::DefaultsWidget( TQWidget *parent, const char *name) //////////////// - // layout management + // tqlayout management TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 0, - KDialog::spacingHint(), "main layout" ); + KDialog::spacingHint(), "main tqlayout" ); - TQVBoxLayout *gbScaleLayout = new TQVBoxLayout( gbScale->layout(), + TQVBoxLayout *gbScaleLayout = new TQVBoxLayout( gbScale->tqlayout(), KDialog::spacingHint()); - TQVBoxLayout *gbGeometryLayout = new TQVBoxLayout(gbGeometry->layout(), + TQVBoxLayout *gbGeometryLayout = new TQVBoxLayout(gbGeometry->tqlayout(), KDialog::spacingHint()); TQGridLayout *gbPreviewLayout = new TQGridLayout(gbPreview, 2, 3, 0, KDialog::spacingHint()); diff --git a/kuickshow/src/filecache.cpp b/kuickshow/src/filecache.cpp index 2fb4f6df..d68bc897 100644 --- a/kuickshow/src/filecache.cpp +++ b/kuickshow/src/filecache.cpp @@ -68,7 +68,7 @@ TQString FileCache::tempDir() KTempDir * FileCache::createTempDir() { - TQString tmpName = TQString::fromLatin1( KGlobal::instance()->instanceName() ); + TQString tmpName = TQString::tqfromLatin1( KGlobal::instance()->instanceName() ); tmpName.append( TQString::number( getpid() ) ); TQString dirName = locateLocal( "tmp", tmpName ); KTempDir *dir = new KTempDir( dirName ); diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp index 2662df41..403269bf 100644 --- a/kuickshow/src/filewidget.cpp +++ b/kuickshow/src/filewidget.cpp @@ -196,7 +196,7 @@ bool FileWidget::eventFilter( TQObject *o, TQEvent *e ) } const TQString& text = k->text(); - if ( !text.isEmpty() && text.unicode()->isPrint() ) { + if ( !text.isEmpty() && text.tqunicode()->isPrint() ) { k->accept(); if ( !m_fileFinder ) { @@ -448,7 +448,7 @@ void FileWidget::slotFinishedLoading() emit finished(); } -TQSize FileWidget::sizeHint() const +TQSize FileWidget::tqsizeHint() const { return TQSize( 300, 300 ); } diff --git a/kuickshow/src/filewidget.h b/kuickshow/src/filewidget.h index 82996644..64f11605 100644 --- a/kuickshow/src/filewidget.h +++ b/kuickshow/src/filewidget.h @@ -71,7 +71,7 @@ protected: virtual bool eventFilter( TQObject *o, TQEvent * ); virtual void resizeEvent( TQResizeEvent * ); virtual void activatedMenu( const KFileItem *, const TQPoint& ); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; private slots: void slotReturnPressed( const TQString& text ); diff --git a/kuickshow/src/generalwidget.cpp b/kuickshow/src/generalwidget.cpp index d26ef387..bde353d6 100644 --- a/kuickshow/src/generalwidget.cpp +++ b/kuickshow/src/generalwidget.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include @@ -36,8 +36,8 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQVBoxLayout *layout = new TQVBoxLayout( this ); - layout->setSpacing( KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + tqlayout->setSpacing( KDialog::spacingHint() ); TQPixmap pixmap = UserIcon( "logo" ); KURLLabel *logo = new KURLLabel( this ); @@ -50,7 +50,7 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name ) connect( logo, TQT_SIGNAL( leftClickedURL( const TQString & ) ), TQT_SLOT( slotURLClicked( const TQString & ) ) ); - layout->addWidget( logo, 0, AlignRight ); + tqlayout->addWidget( logo, 0, AlignRight ); cbFullscreen = new TQCheckBox( i18n("Fullscreen mode"), this, "boscreen" ); @@ -70,17 +70,17 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name ) gridLayout->addWidget( l1, 1, 0 ); gridLayout->addWidget( editFilter, 1, 1 ); - layout->addWidget( cbFullscreen ); - layout->addWidget( cbPreload ); - layout->addWidget( cbLastdir ); - layout->addLayout( gridLayout ); + tqlayout->addWidget( cbFullscreen ); + tqlayout->addWidget( cbPreload ); + tqlayout->addWidget( cbLastdir ); + tqlayout->addLayout( gridLayout ); //////////////////////////////////////////////////////////////////////// TQVGroupBox *gbox2 = new TQVGroupBox( i18n("Quality/Speed"), this, "qualitybox" ); - layout->addWidget( gbox2 ); - layout->addStretch(); + tqlayout->addWidget( gbox2 ); + tqlayout->addStretch(); cbSmoothScale = new TQCheckBox( i18n("Smooth scaling"), gbox2, "smoothscale" ); cbFastRender = new TQCheckBox( i18n("Fast rendering"), gbox2, "fastrender" ); diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp index 12aa9118..f56c7b30 100644 --- a/kuickshow/src/imagewindow.cpp +++ b/kuickshow/src/imagewindow.cpp @@ -310,8 +310,8 @@ void ImageWindow::updateGeometry( int imWidth, int imHeight ) TQString caption = i18n( "Filename (Imagewidth x Imageheight)", "%3 (%1 x %2)" ); - caption = caption.arg( m_kuim->originalWidth() ). - arg( m_kuim->originalHeight() ).arg( m_kuim->url().prettyURL() ); + caption = caption.tqarg( m_kuim->originalWidth() ). + tqarg( m_kuim->originalHeight() ).tqarg( m_kuim->url().prettyURL() ); setCaption( kapp->makeStdCaption( caption ) ); } @@ -403,7 +403,7 @@ void ImageWindow::scrollImage( int x, int y, bool restrict ) // XUnmapWindow(); // XSetWindowBackgroundPixmap() // resize window to fit image size, center image -// XClearWindow(); // repaint +// XClearWindow(); // tqrepaint // XMapWindow(), XSync(); // bool ImageWindow::showNextImage( const KURL& url ) @@ -412,7 +412,7 @@ bool ImageWindow::showNextImage( const KURL& url ) switch ( file->waitForDownload( this ) ) { case KuickFile::ERROR: { - TQString tmp = i18n("Unable to download the image from %1.").arg(url.prettyURL()); + TQString tmp = i18n("Unable to download the image from %1.").tqarg(url.prettyURL()); emit sigImageError( file, tmp ); return false; } @@ -430,7 +430,7 @@ bool ImageWindow::showNextImage( KuickFile *file ) if ( !loadImage( file ) ) { TQString tmp = i18n("Unable to load the image %1.\n" "Perhaps the file format is unsupported or " - "your Imlib is not installed properly.").arg(file->url().prettyURL()); + "your Imlib is not installed properly.").tqarg(file->url().prettyURL()); emit sigImageError( file, tmp ); return false; } @@ -1128,7 +1128,7 @@ int ImageWindow::desktopWidth( bool totalScreen ) const { if ( myIsFullscreen || totalScreen ) { - return KGlobalSettings::desktopGeometry(topLevelWidget()).width(); + return KGlobalSettings::desktopGeometry(tqtopLevelWidget()).width(); } else return Kuick::workArea().width(); } @@ -1137,7 +1137,7 @@ int ImageWindow::desktopWidth( bool totalScreen ) const int ImageWindow::desktopHeight( bool totalScreen ) const { if ( myIsFullscreen || totalScreen ) { - return KGlobalSettings::desktopGeometry(topLevelWidget()).height(); + return KGlobalSettings::desktopGeometry(tqtopLevelWidget()).height(); } else { return Kuick::workArea().height(); } @@ -1146,7 +1146,7 @@ int ImageWindow::desktopHeight( bool totalScreen ) const TQSize ImageWindow::maxImageSize() const { if ( myIsFullscreen ) { - return KGlobalSettings::desktopGeometry(topLevelWidget()).size(); + return KGlobalSettings::desktopGeometry(tqtopLevelWidget()).size(); } else { return Kuick::workArea().size() - Kuick::frameSize( winId() ); @@ -1193,7 +1193,7 @@ bool ImageWindow::canZoomTo( int newWidth, int newHeight ) if ( !ImlibWidget::canZoomTo( newWidth, newHeight ) ) return false; - TQSize desktopSize = KGlobalSettings::desktopGeometry(topLevelWidget()).size(); + TQSize desktopSize = KGlobalSettings::desktopGeometry(tqtopLevelWidget()).size(); int desktopArea = desktopSize.width() * desktopSize.height(); int imageArea = newWidth * newHeight; @@ -1203,7 +1203,7 @@ bool ImageWindow::canZoomTo( int newWidth, int newHeight ) return KMessageBox::warningContinueCancel( this, i18n("You are about to view a very large image (%1 x %2 pixels), which can be very resource-consuming and even make your computer hang.\nDo you want to continue?") - .arg( newWidth ).arg( newHeight ), + .tqarg( newWidth ).tqarg( newHeight ), TQString(), KStdGuiItem::cont(), "ImageWindow_confirm_very_large_window" diff --git a/kuickshow/src/imlibwidget.cpp b/kuickshow/src/imlibwidget.cpp index a3356d17..f42e6c14 100644 --- a/kuickshow/src/imlibwidget.cpp +++ b/kuickshow/src/imlibwidget.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include @@ -475,7 +475,7 @@ void ImlibWidget::setBackgroundColor( const TQColor& color ) { myBackgroundColor = color; setPalette( TQPalette( myBackgroundColor )); - repaint( false); // FIXME - false? necessary at all? + tqrepaint( false); // FIXME - false? necessary at all? } const TQColor& ImlibWidget::backgroundColor() const @@ -515,7 +515,7 @@ void ImlibWidget::setBusyCursor() void ImlibWidget::restoreCursor() { - if ( cursor().shape() == KCursor::waitCursor().shape() ) // only if nobody changed the cursor in the meantime! + if ( cursor().shape() == KCursor::waitCursor().tqshape() ) // only if nobody changed the cursor in the meantime! setCursor( m_oldCursor ); } diff --git a/kuickshow/src/kuickfile.cpp b/kuickshow/src/kuickfile.cpp index 247e56a8..4e0aa573 100644 --- a/kuickshow/src/kuickfile.cpp +++ b/kuickshow/src/kuickfile.cpp @@ -94,7 +94,7 @@ bool KuickFile::download() return m_job != 0L; } -KuickFile::DownloadStatus KuickFile::waitForDownload( TQWidget *parent ) +KuickFile::DownloadtqStatus KuickFile::waitForDownload( TQWidget *parent ) { if ( isAvailable() ) return OK; @@ -106,8 +106,8 @@ KuickFile::DownloadStatus KuickFile::waitForDownload( TQWidget *parent ) KProgressDialog *dialog = new KProgressDialog( parent ); dialog->setModal( true ); - dialog->setCaption( i18n("Downloading %1...").arg( m_url.fileName() ) ); - dialog->setLabel( i18n("Please wait while downloading\n%1").arg( m_url.prettyURL() )); + dialog->setCaption( i18n("Downloading %1...").tqarg( m_url.fileName() ) ); + dialog->setLabel( i18n("Please wait while downloading\n%1").tqarg( m_url.prettyURL() )); dialog->setAllowCancel( true ); dialog->setAutoClose( true ); @@ -152,7 +152,7 @@ void KuickFile::slotResult( KIO::Job *job ) TQString canceledFile = static_cast(job)->destURL().path(); TQFile::remove( canceledFile ); - m_progress->topLevelWidget()->hide(); + m_progress->tqtopLevelWidget()->hide(); } else { m_localFile = static_cast(job)->destURL().path(); @@ -162,7 +162,7 @@ void KuickFile::slotResult( KIO::Job *job ) m_progress->setProgress( 100 ); #define BUGGY_VERSION KDE_MAKE_VERSION(3,5,2) if ( KDE::version() <= BUGGY_VERSION ) { - m_progress->topLevelWidget()->hide(); // ### workaround broken KProgressDialog + m_progress->tqtopLevelWidget()->hide(); // ### workaround broken KProgressDialog } } } diff --git a/kuickshow/src/kuickfile.h b/kuickshow/src/kuickfile.h index 49ee3894..af92355f 100644 --- a/kuickshow/src/kuickfile.h +++ b/kuickshow/src/kuickfile.h @@ -27,7 +27,7 @@ class KuickFile : public TQObject TQ_OBJECT public: - enum DownloadStatus + enum DownloadtqStatus { OK = 1, CANCELED, @@ -72,7 +72,7 @@ public: * immediately. * @return true when the download has finished or false when the user aborted the dialog */ - KuickFile::DownloadStatus waitForDownload( TQWidget *parent ); + KuickFile::DownloadtqStatus waitForDownload( TQWidget *parent ); // bool needsDownload(); diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp index d566adfb..fc086313 100644 --- a/kuickshow/src/kuickshow.cpp +++ b/kuickshow/src/kuickshow.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include @@ -133,7 +133,7 @@ KuickShow::KuickShow( const char *name ) if ( KMessageBox::warningYesNo( this, i18n("Do you really want to display this 1 image at the same time? This might be quite resource intensive and could overload your computer.
If you choose %1, only the first image will be shown.", - "Do you really want to display these %n images at the same time? This might be quite resource intensive and could overload your computer.
If you choose %1, only the first image will be shown.", numArgs).arg(KStdGuiItem::no().plainText()), + "Do you really want to display these %n images at the same time? This might be quite resource intensive and could overload your computer.
If you choose %1, only the first image will be shown.", numArgs).tqarg(KStdGuiItem::no().plainText()), i18n("Display Multiple Images?")) != KMessageBox::Yes ) { @@ -253,7 +253,7 @@ void KuickShow::initGUI( const KURL& startDir ) coll, "kuick_print" ); print->setText( i18n("Print Image...") ); - KAction *configure = new KAction( i18n("Configure %1...").arg( KGlobal::instance()->aboutData()->programName() ), "configure", + KAction *configure = new KAction( i18n("Configure %1...").tqarg( KGlobal::instance()->aboutData()->programName() ), "configure", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( configuration() ), coll, "kuick_configure" ); @@ -552,7 +552,7 @@ bool KuickShow::showImage( const KFileItem *fi, this, TQT_SLOT (slotTrashCurrentImage (ImageWindow *))); if ( s_viewers.count() == 1 && moveToTopLeft ) { // we have to move to 0x0 before showing _and_ - // after showing, otherwise we get some bogus geometry() + // after showing, otherwise we get some bogus tqgeometry() m_viewer->move( Kuick::workArea().topLeft() ); } @@ -641,7 +641,7 @@ void KuickShow::performDeleteCurrentImage(TQWidget *parent) if (KMessageBox::warningContinueCancel( parent, - i18n("Do you really want to delete\n '%1'?").arg(item->url().pathOrURL()), + i18n("Do you really want to delete\n '%1'?").tqarg(item->url().pathOrURL()), i18n("Delete File"), KStdGuiItem::del(), "Kuick_delete_current_image") @@ -666,7 +666,7 @@ void KuickShow::performTrashCurrentImage(TQWidget *parent) if (KMessageBox::warningContinueCancel( parent, - i18n("Do you really want to trash\n '%1'?").arg(item->url().pathOrURL()), + i18n("Do you really want to trash\n '%1'?").tqarg(item->url().pathOrURL()), i18n("Trash File"), KGuiItem(i18n("to trash", "&Trash"),"edittrash"), "Kuick_trash_current_image") diff --git a/kuickshow/src/mainwidget.cpp b/kuickshow/src/mainwidget.cpp index 47b3d837..d94d332e 100644 --- a/kuickshow/src/mainwidget.cpp +++ b/kuickshow/src/mainwidget.cpp @@ -35,7 +35,7 @@ MainWidget::~MainWidget() } -// for now, no layout managers +// for now, no tqlayout managers void MainWidget::resizeEvent( TQResizeEvent * ) { box->resize( width(), height() ); diff --git a/kuickshow/src/printing.cpp b/kuickshow/src/printing.cpp index 2983f60b..2c78a925 100644 --- a/kuickshow/src/printing.cpp +++ b/kuickshow/src/printing.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -52,7 +52,7 @@ bool Printing::printImage( ImageWindow& imageWin, TQWidget *parent ) KPrinter::addDialogPage( new KuickPrintDialogPage( parent, "kuick page")); - if ( printer.setup( parent, i18n("Print %1").arg(printer.docName().section('/', -1)) ) ) + if ( printer.setup( parent, i18n("Print %1").tqarg(printer.docName().section('/', -1)) ) ) { KTempFile tmpFile( TQString(), ".png" ); if ( tmpFile.status() == 0 ) @@ -109,7 +109,7 @@ bool Printing::printImageWithTQt( const TQString& filename, KPrinter& printer, bool shrinkToFit = (printer.option( "app-kuickshow-shrinkToFit" ) != f); TQSize imagesize = image.size(); if ( shrinkToFit && (image.width() > w || image.height() > h) ) { - imagesize.scale( w, h, TQSize::ScaleMin ); + imagesize.tqscale( w, h, TQSize::ScaleMin ); } @@ -117,28 +117,28 @@ bool Printing::printImageWithTQt( const TQString& filename, KPrinter& printer, // align image // bool ok = false; - int alignment = printer.option("app-kuickshow-alignment").toInt( &ok ); + int tqalignment = printer.option("app-kuickshow-tqalignment").toInt( &ok ); if ( !ok ) - alignment = TQt::AlignCenter; // default + tqalignment = TQt::AlignCenter; // default int x = 0; int y = 0; // ### need a GUI for this in KuickPrintDialogPage! - // x - alignment - if ( alignment & TQt::AlignHCenter ) + // x - tqalignment + if ( tqalignment & TQt::AlignHCenter ) x = (w - imagesize.width())/2; - else if ( alignment & TQt::AlignLeft ) + else if ( tqalignment & TQt::AlignLeft ) x = 0; - else if ( alignment & TQt::AlignRight ) + else if ( tqalignment & TQt::AlignRight ) x = w - imagesize.width(); - // y - alignment - if ( alignment & TQt::AlignVCenter ) + // y - tqalignment + if ( tqalignment & TQt::AlignVCenter ) y = (h - imagesize.height())/2; - else if ( alignment & TQt::AlignTop ) + else if ( tqalignment & TQt::AlignTop ) y = 0; - else if ( alignment & TQt::AlignBottom ) + else if ( tqalignment & TQt::AlignBottom ) y = h - imagesize.height(); // @@ -199,21 +199,21 @@ KuickPrintDialogPage::KuickPrintDialogPage( TQWidget *parent, const char *name ) { setTitle( i18n("Image Settings") ); - TQVBoxLayout *layout = new TQVBoxLayout( this ); - layout->setMargin( KDialog::marginHint() ); - layout->setSpacing( KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + tqlayout->setMargin( KDialog::marginHint() ); + tqlayout->setSpacing( KDialog::spacingHint() ); m_addFileName = new TQCheckBox( i18n("Print fi&lename below image"), this); m_addFileName->setChecked( true ); - layout->addWidget( m_addFileName ); + tqlayout->addWidget( m_addFileName ); m_blackwhite = new TQCheckBox ( i18n("Print image in &black and white"), this); m_blackwhite->setChecked( false ); - layout->addWidget (m_blackwhite ); + tqlayout->addWidget (m_blackwhite ); TQVButtonGroup *group = new TQVButtonGroup( i18n("Scaling"), this ); group->setRadioButtonExclusive( true ); - layout->addWidget( group ); + tqlayout->addWidget( group ); // m_shrinkToFit = new TQRadioButton( i18n("Shrink image to &fit, if necessary"), group ); m_shrinkToFit = new TQCheckBox( i18n("Shrink image to &fit, if necessary"), group ); m_shrinkToFit->setChecked( true ); @@ -258,7 +258,7 @@ void KuickPrintDialogPage::getOptions( TQMap& opts, TQString t = "true"; TQString f = "false"; -// ### opts["app-kuickshow-alignment"] = ; +// ### opts["app-kuickshow-tqalignment"] = ; opts["app-kuickshow-printFilename"] = m_addFileName->isChecked() ? t : f; opts["app-kuickshow-blackwhite"] = m_blackwhite->isChecked() ? t : f; opts["app-kuickshow-shrinkToFit"] = m_shrinkToFit->isChecked() ? t : f; diff --git a/kuickshow/src/slideshowwidget.cpp b/kuickshow/src/slideshowwidget.cpp index 8bac8718..ed2bedc6 100644 --- a/kuickshow/src/slideshowwidget.cpp +++ b/kuickshow/src/slideshowwidget.cpp @@ -17,7 +17,7 @@ */ #include -#include +#include #include #include @@ -31,8 +31,8 @@ SlideShowWidget::SlideShowWidget( TQWidget *parent, const char *name ) { // setTitle( i18n("Slideshow") ); - TQVBoxLayout *layout = new TQVBoxLayout( this ); - layout->setSpacing( KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + tqlayout->setSpacing( KDialog::spacingHint() ); m_fullScreen = new TQCheckBox( i18n("Switch to &full-screen"), this ); m_startWithCurrent = new TQCheckBox( i18n("S&tart with current image"), this); @@ -48,11 +48,11 @@ SlideShowWidget::SlideShowWidget( TQWidget *parent, const char *name ) m_cycles->setSpecialValueText( i18n("infinite") ); m_cycles->setRange( 0, 500 ); - layout->addWidget( m_fullScreen ); - layout->addWidget( m_startWithCurrent ); - layout->addWidget( m_delayTime ); - layout->addWidget( m_cycles ); - layout->addStretch( 1 ); + tqlayout->addWidget( m_fullScreen ); + tqlayout->addWidget( m_startWithCurrent ); + tqlayout->addWidget( m_delayTime ); + tqlayout->addWidget( m_cycles ); + tqlayout->addStretch( 1 ); loadSettings( *kdata ); } -- cgit v1.2.3