diff options
57 files changed, 229 insertions, 229 deletions
diff --git a/src/app/bookmarkdialogbase.ui b/src/app/bookmarkdialogbase.ui index 08ccea2..d4db944 100644 --- a/src/app/bookmarkdialogbase.ui +++ b/src/app/bookmarkdialogbase.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>400</width> <height>0</height> @@ -88,7 +88,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>383</width> <height>16</height> diff --git a/src/app/bookmarkviewcontroller.cpp b/src/app/bookmarkviewcontroller.cpp index d09156a..b40f70e 100644 --- a/src/app/bookmarkviewcontroller.cpp +++ b/src/app/bookmarkviewcontroller.cpp @@ -98,7 +98,7 @@ public: if ( !item) return; if (item->mBookmark.isGroup()) return; - TQRect rect=mListView->itemRect(item); + TQRect rect=mListView->tqitemRect(item); tip(rect, item->mBookmark.url().prettyURL()); }; @@ -392,11 +392,11 @@ void BookmarkViewController::deleteCurrentBookmark() { TQString title; if (bookmark.isGroup()) { msg=i18n("Are you sure you want to delete the bookmark folder <b>%1</b>?<br>This will delete the folder and all the bookmarks in it.") - .arg(bookmark.text()); + .tqarg(bookmark.text()); title=i18n("Delete Bookmark &Folder"); } else { msg=i18n("Are you sure you want to delete the bookmark <b>%1</b>?") - .arg(bookmark.text()); + .tqarg(bookmark.text()); title=i18n("Delete &Bookmark"); } diff --git a/src/app/configdialog.cpp b/src/app/configdialog.cpp index 66b11e8..0fb33df 100644 --- a/src/app/configdialog.cpp +++ b/src/app/configdialog.cpp @@ -22,13 +22,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // TQt #include <tqbuttongroup.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlineedit.h> #include <tqmap.h> #include <tqradiobutton.h> #include <tqspinbox.h> -#include <stylesheet.h> -#include <textedit.h> +#include <tqstylesheet.h> +#include <tqtextedit.h> // KDE #include <kcolorbutton.h> @@ -93,9 +93,9 @@ template<class T> void addConfigPage(KDialogBase* dialog, T* content, const TQString& header, const TQString& name, const char* iconName) { TQFrame* page=dialog->addPage(name, header, BarIcon(iconName, 32)); content->reparent(page, TQPoint(0,0)); - TQVBoxLayout* layout=new TQVBoxLayout(page, 0, KDialog::spacingHint()); - layout->addWidget(content); - layout->addStretch(); + TQVBoxLayout* tqlayout=new TQVBoxLayout(page, 0, KDialog::spacingHint()); + tqlayout->addWidget(content); + tqlayout->addStretch(); } template<class T> @@ -247,7 +247,7 @@ void ConfigDialog::calculateCacheSize() { KURL url; url.setPath(ThumbnailLoadJob::thumbnailBaseDir()); unsigned long size=KDirSize::dirSize(url); - KMessageBox::information( this,i18n("Cache size is %1").arg(KIO::convertSize(size)) ); + KMessageBox::information( this,i18n("Cache size is %1").tqarg(KIO::convertSize(size)) ); } @@ -281,7 +281,7 @@ void ConfigDialog::emptyCache() { int response=KMessageBox::warningContinueCancel(this, "<qt>" + i18n("Are you sure you want to empty the thumbnail cache?" - " This will delete the folder <b>%1</b>.").arg(TQStyleSheet::escape(dir)) + "</qt>", + " This will delete the folder <b>%1</b>.").tqarg(TQStyleSheet::escape(dir)) + "</qt>", TQString(), KStdGuiItem::del()); @@ -289,7 +289,7 @@ void ConfigDialog::emptyCache() { KURL url; url.setPath(dir); - if (KIO::NetAccess::del(url, topLevelWidget()) ) { + if (KIO::NetAccess::del(url, tqtopLevelWidget()) ) { KMessageBox::information( this,i18n("Cache emptied.") ); } } diff --git a/src/app/configfileoperationspage.ui b/src/app/configfileoperationspage.ui index 451a030..78ac6d3 100644 --- a/src/app/configfileoperationspage.ui +++ b/src/app/configfileoperationspage.ui @@ -93,7 +93,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>16</height> diff --git a/src/app/configfullscreenpage.ui b/src/app/configfullscreenpage.ui index 855869f..e7da709 100644 --- a/src/app/configfullscreenpage.ui +++ b/src/app/configfullscreenpage.ui @@ -43,7 +43,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>16</height> @@ -131,7 +131,7 @@ You can use the following keywords to format the On Screen Display: <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>18</height> diff --git a/src/app/configimagelistpage.ui b/src/app/configimagelistpage.ui index 01cfe95..6670dbd 100644 --- a/src/app/configimagelistpage.ui +++ b/src/app/configimagelistpage.ui @@ -40,7 +40,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>16</height> @@ -131,7 +131,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -150,7 +150,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <grid> <property name="name"> @@ -166,7 +166,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -217,7 +217,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>16</height> @@ -258,7 +258,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> diff --git a/src/app/configimageviewpage.ui b/src/app/configimageviewpage.ui index 963f13d..a99b945 100644 --- a/src/app/configimageviewpage.ui +++ b/src/app/configimageviewpage.ui @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>181</width> <height>21</height> @@ -73,7 +73,7 @@ </widget> <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="6"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -217,7 +217,7 @@ <string>Using this option, Gwenview will display the image as fast as possible, and smooth it after a short delay. Use this option if your computer is not very fast.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> <property name="buddy" stdset="0"> @@ -238,7 +238,7 @@ Use this option if your computer is not very fast.</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>16</height> diff --git a/src/app/configmiscpage.ui b/src/app/configmiscpage.ui index 7e5874e..9b69c2d 100644 --- a/src/app/configmiscpage.ui +++ b/src/app/configmiscpage.ui @@ -92,7 +92,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>24</height> @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>24</height> @@ -137,7 +137,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <grid> <property name="name"> @@ -153,7 +153,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>11</width> <height>20</height> @@ -191,7 +191,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>41</height> diff --git a/src/app/configslideshowpage.ui b/src/app/configslideshowpage.ui index ccf0c15..62ab807 100644 --- a/src/app/configslideshowpage.ui +++ b/src/app/configslideshowpage.ui @@ -88,7 +88,7 @@ When this option is enabled, the slideshow will stop on the last image of the fo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>180</width> <height>20</height> diff --git a/src/app/kipiinterface.cpp b/src/app/kipiinterface.cpp index f95fe54..9a35ef3 100644 --- a/src/app/kipiinterface.cpp +++ b/src/app/kipiinterface.cpp @@ -163,7 +163,7 @@ KIPI::ImageCollection KIPIInterface::currentSelection() { LOG(""); KURL::List list=d->mFileView->selectedImageURLs(); KURL url=d->mFileView->dirURL(); - return KIPI::ImageCollection(new ImageCollection(url, i18n("%1 (Selected Images)").arg(url.fileName()), list)); + return KIPI::ImageCollection(new ImageCollection(url, i18n("%1 (Selected Images)").tqarg(url.fileName()), list)); } @@ -189,12 +189,12 @@ int KIPIInterface::features() const { * here, it is however necessary to discard caches if the plugin preserves timestamp */ bool KIPIInterface::addImage(const KURL& url, TQString&) { - Cache::instance()->invalidate( url ); + Cache::instance()->tqinvalidate( url ); return true; } void KIPIInterface::delImage(const KURL& url) { - Cache::instance()->invalidate( url ); + Cache::instance()->tqinvalidate( url ); } // TODO currently KDirWatch doesn't have watching of files in a directory @@ -203,7 +203,7 @@ void KIPIInterface::refreshImages( const KURL::List& urls ) { for( KURL::List::ConstIterator it = urls.begin(); it != urls.end(); ++it ) { - Cache::instance()->invalidate( *it ); + Cache::instance()->tqinvalidate( *it ); } d->mFileView->refreshItems( urls ); } diff --git a/src/app/main.cpp b/src/app/main.cpp index 989bffd..bef08ae 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -117,7 +117,7 @@ KDE_EXPORT int kdemain (int argc, char *argv[]) { aboutData.addCredit("Marco Gazzetta", I18N_NOOP("Fixed crash when trying to generate a thumbnail for a broken JPEG file (v0.16.0)"), "[email protected]"); aboutData.addCredit("GeniusR13", I18N_NOOP("Fixed compilation on KDE 3.0 (v0.16.1)"), "[email protected]"); aboutData.addCredit("Ian Koenig", I18N_NOOP("First RPM spec file"), "[email protected]"); - aboutData.addCredit("Meni Livne", I18N_NOOP("Toolbar layout patch for RTL languages (v0.16.0)"), "[email protected]"); + aboutData.addCredit("Meni Livne", I18N_NOOP("Toolbar tqlayout patch for RTL languages (v0.16.0)"), "[email protected]"); aboutData.addCredit("Angelo Naselli", I18N_NOOP("Printing support (v1.0.0)"), "[email protected]"); aboutData.addCredit("Jos van den Oever", I18N_NOOP("File info view (v1.0.0)\nPatch to toggle auto-zoom on click (v1.0.0)"), "[email protected]"); aboutData.addCredit("Jeroen Peters", I18N_NOOP("Configurable mouse wheel behavior (v1.1.1)"), "[email protected]"); diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp index 70b42d7..1464a09 100644 --- a/src/app/mainwindow.cpp +++ b/src/app/mainwindow.cpp @@ -199,8 +199,8 @@ bool MainWindow::queryClose() { KConfig* config=KGlobal::config(); - // Don't store dock layout if only the image dock is visible. This avoid - // saving layout when in "fullscreen" or "image only" mode. + // Don't store dock tqlayout if only the image dock is visible. This avoid + // saving tqlayout when in "fullscreen" or "image only" mode. if (mFileViewController->isVisible() || mDirViewController->widget()->isVisible()) { mDockArea->writeDockConfig(config,CONFIG_DOCK_GROUP); } @@ -806,7 +806,7 @@ void MainWindow::updateStatusInfo() { int pos = mFileViewController->shownFilePosition(); uint count = mFileViewController->fileCount(); if (count > 0) { - tokens << i18n("%1/%2").arg(pos+1).arg(count); + tokens << i18n("%1/%2").tqarg(pos+1).tqarg(count); } else { tokens << i18n("No images"); } @@ -816,7 +816,7 @@ void MainWindow::updateStatusInfo() { TQSize size = mDocument->image().size(); if (!size.isEmpty()) { - tokens << i18n("%1 x %2 pixels").arg(size.width()).arg(size.height()); + tokens << i18n("%1 x %2 pixels").tqarg(size.width()).tqarg(size.height()); } mSBDetailLabel->setText(tokens.join(" - ")); @@ -867,11 +867,11 @@ void MainWindow::createWidgets() { mDockArea->manager()->setSplitterOpaqueResize(true); mViewModeWidget=new TQWidget(mCentralStack); - TQVBoxLayout* layout=new TQVBoxLayout(mViewModeWidget); - layout->setAutoAdd(true); + TQVBoxLayout* tqlayout=new TQVBoxLayout(mViewModeWidget); + tqlayout->setAutoAdd(true); mCentralStack->addWidget(mViewModeWidget); - // Status bar + // tqStatus bar mSBDetailLabel=new TQLabel("", statusBar()); mSBHintLabel=new TruncatedTextLabel(statusBar()); @@ -923,7 +923,7 @@ void MainWindow::createWidgets() { setGeometry(20,20,720,520); // Default dock config - // (The "magic numbers" were found by adjusting the layout from within the + // (The "magic numbers" were found by adjusting the tqlayout from within the // app and looking at the result in the configuration file) mFolderDock->manualDock(mFileDock, KDockWidget::DockLeft, 4000); mImageDock->manualDock(mFolderDock, KDockWidget::DockBottom, 3734); @@ -1094,9 +1094,9 @@ void MainWindow::createObjectInteractions() { void MainWindow::createHideShowAction(KDockWidget* dock) { TQString caption; if (dock->mayBeHide()) { - caption=i18n("Hide %1").arg(dock->caption()); + caption=i18n("Hide %1").tqarg(dock->caption()); } else { - caption=i18n("Show %1").arg(dock->caption()); + caption=i18n("Show %1").tqarg(dock->caption()); } KAction* action=new KAction(caption, 0, TQT_TQOBJECT(dock), TQT_SLOT(changeHideShowState()), (TQObject*)0 ); @@ -1216,7 +1216,7 @@ void MainWindow::createLocationToolBar() { // Do not let the combobox get wider than available space, as this would // hide the toolbuttons after it - mURLEdit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); + mURLEdit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); // Avoid stealing focus mURLEdit->setFocusPolicy(TQ_ClickFocus); diff --git a/src/app/metaedit.cpp b/src/app/metaedit.cpp index ff31891..3fa9e19 100644 --- a/src/app/metaedit.cpp +++ b/src/app/metaedit.cpp @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ // TQt #include <tqlabel.h> -#include <textedit.h> +#include <tqtextedit.h> #include <tqfileinfo.h> // KDE @@ -132,7 +132,7 @@ void MetaEdit::setComment(const TQString& comment) { void MetaEdit::setMessage(const TQString& msg) { mCommentEdit->setTextFormat(TQTextEdit::RichText); mCommentEdit->setReadOnly(true); - mCommentEdit->setText(TQString("<i>%1</i>").arg(msg)); + mCommentEdit->setText(TQString("<i>%1</i>").tqarg(msg)); } } // namespace diff --git a/src/app/truncatedtextlabel.h b/src/app/truncatedtextlabel.h index 2351890..8e126ed 100644 --- a/src/app/truncatedtextlabel.h +++ b/src/app/truncatedtextlabel.h @@ -39,14 +39,14 @@ public: TruncatedTextLabel(TQWidget* parent) : TQLabel(parent) {} - TQSize minimumSizeHint() const { - TQSize size=TQLabel::minimumSizeHint(); + TQSize tqminimumSizeHint() const { + TQSize size=TQLabel::tqminimumSizeHint(); size.setWidth(-1); return size; } - TQSize sizeHint() const { - return TQSize(contentsRect().width(), TQLabel::sizeHint().height()); + TQSize tqsizeHint() const { + return TQSize(contentsRect().width(), TQLabel::tqsizeHint().height()); } void setText(const TQString& text) { diff --git a/src/app/vtabwidget.cpp b/src/app/vtabwidget.cpp index 40a1a0a..66e9b9e 100644 --- a/src/app/vtabwidget.cpp +++ b/src/app/vtabwidget.cpp @@ -47,9 +47,9 @@ VTabWidget::VTabWidget(TQWidget* parent) d->mTabBar->setPosition(KMultiTabBar::Left); d->mTabBar->setStyle(KMultiTabBar::KDEV3ICON); d->mStack=new TQWidgetStack(this); - TQHBoxLayout* layout=new TQHBoxLayout(this); - layout->add(d->mTabBar); - layout->add(d->mStack); + TQHBoxLayout* tqlayout=new TQHBoxLayout(this); + tqlayout->add(d->mTabBar); + tqlayout->add(d->mStack); } diff --git a/src/gvcore/cache.cpp b/src/gvcore/cache.cpp index 8f4bfb3..448d8f6 100644 --- a/src/gvcore/cache.cpp +++ b/src/gvcore/cache.cpp @@ -179,7 +179,7 @@ void Cache::addThumbnail( const KURL& url, const TQPixmap& thumbnail, TQSize ima checkMaxSize(); } -void Cache::invalidate( const KURL& url ) { +void Cache::tqinvalidate( const KURL& url ) { d->mImages.remove( url ); } diff --git a/src/gvcore/cache.h b/src/gvcore/cache.h index 68591a5..199bc46 100644 --- a/src/gvcore/cache.h +++ b/src/gvcore/cache.h @@ -52,7 +52,7 @@ public: void getFrames( const KURL& url, ImageFrames* frames, TQCString* format ) const; TQPixmap thumbnail( const KURL& url, TQSize& imagesize ) const; void setPriorityURL( const KURL& url, bool set ); - void invalidate( const KURL& url ); + void tqinvalidate( const KURL& url ); void checkThumbnailSize( int size ); void readConfig(KConfig*,const TQString& group); void updateAge(); diff --git a/src/gvcore/captionformatter.cpp b/src/gvcore/captionformatter.cpp index 4b0a593..74514f3 100644 --- a/src/gvcore/captionformatter.cpp +++ b/src/gvcore/captionformatter.cpp @@ -35,7 +35,7 @@ TQString CaptionFormatter::format(const TQString& format) { TQString resolution; if (mImageSize.isValid()) { - resolution = TQString( "%1x%2" ).arg( mImageSize.width()).arg( mImageSize.height()); + resolution = TQString( "%1x%2" ).tqarg( mImageSize.width()).tqarg( mImageSize.height()); } TQString str=format; diff --git a/src/gvcore/clicklineedit.cpp b/src/gvcore/clicklineedit.cpp index dfbe3bb..58c09ac 100644 --- a/src/gvcore/clicklineedit.cpp +++ b/src/gvcore/clicklineedit.cpp @@ -40,14 +40,14 @@ ClickLineEdit::ClickLineEdit(TQWidget *parent, const char* name ) : void ClickLineEdit::setClickMessage( const TQString &msg ) { mClickMessage = msg; - repaint(); + tqrepaint(); } void ClickLineEdit::setText( const TQString &txt ) { mDrawClickMsg = txt.isEmpty(); - repaint(); + tqrepaint(); KLineEdit::setText( txt ); } @@ -86,7 +86,7 @@ void ClickLineEdit::focusInEvent( TQFocusEvent *ev ) { if ( mDrawClickMsg == true ) { mDrawClickMsg = false; - repaint(); + tqrepaint(); } TQLineEdit::focusInEvent( ev ); } @@ -96,7 +96,7 @@ void ClickLineEdit::focusOutEvent( TQFocusEvent *ev ) { if ( text().isEmpty() ) { mDrawClickMsg = true; - repaint(); + tqrepaint(); } TQLineEdit::focusOutEvent( ev ); } diff --git a/src/gvcore/cursortracker.cpp b/src/gvcore/cursortracker.cpp index 3569dc8..00f1736 100644 --- a/src/gvcore/cursortracker.cpp +++ b/src/gvcore/cursortracker.cpp @@ -79,7 +79,7 @@ TipTracker::TipTracker(const TQString& txt, TQWidget* reference) setPalette(TQToolTip::palette()); setFrameStyle(TQFrame::Plain | TQFrame::Box); setLineWidth(1); - setAlignment(AlignAuto | AlignTop); + tqsetAlignment(AlignAuto | AlignTop); } diff --git a/src/gvcore/deletedialog.cpp b/src/gvcore/deletedialog.cpp index 2e3cfbb..3d6308b 100644 --- a/src/gvcore/deletedialog.cpp +++ b/src/gvcore/deletedialog.cpp @@ -26,7 +26,7 @@ #include <tqstringlist.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqtimer.h> #include <tqvbox.h> @@ -113,9 +113,9 @@ bool DeleteDialog::shouldDelete() const { } -TQSize DeleteDialog::sizeHint() const { +TQSize DeleteDialog::tqsizeHint() const { m_widget->adjustSize(); - TQSize hint = m_widget->minimumSize(); + TQSize hint = m_widget->tqminimumSize(); hint = calculateSize(hint.width(), hint.height()); // For some reason calculateSize does not return a correct height. As I'm diff --git a/src/gvcore/deletedialog.h b/src/gvcore/deletedialog.h index 1bdc5ab..6825368 100644 --- a/src/gvcore/deletedialog.h +++ b/src/gvcore/deletedialog.h @@ -36,7 +36,7 @@ public: void setURLList(const KURL::List &files); bool shouldDelete() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected slots: virtual void accept(); diff --git a/src/gvcore/deletedialogbase.ui b/src/gvcore/deletedialogbase.ui index 7a8ffd4..4725920 100644 --- a/src/gvcore/deletedialogbase.ui +++ b/src/gvcore/deletedialogbase.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -47,7 +47,7 @@ <property name="name"> <cstring>ddDeleteText</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>60</height> @@ -56,7 +56,7 @@ <property name="text"> <string>Deletion method placeholder, not in GUI</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -80,7 +80,7 @@ <property name="text"> <string>Placeholder for number of files, not in GUI</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/src/gvcore/document.cpp b/src/gvcore/document.cpp index b81a229..caa93f5 100644 --- a/src/gvcore/document.cpp +++ b/src/gvcore/document.cpp @@ -343,7 +343,7 @@ void Document::slotLoaded() { // //--------------------------------------------------------------------- void Document::reload() { - Cache::instance()->invalidate( url()); + Cache::instance()->tqinvalidate( url()); load(); emit reloaded(url()); } @@ -378,7 +378,7 @@ void Document::doPaint(KPrinter *printer, TQPainter *painter) { TQString t = "true"; TQString f = "false"; - int alignment = (printer->option("app-gwenview-position").isEmpty() ? + int tqalignment = (printer->option("app-gwenview-position").isEmpty() ? TQt::AlignCenter : printer->option("app-gwenview-position").toInt()); // Compute filename offset @@ -407,7 +407,7 @@ void Document::doPaint(KPrinter *printer, TQPainter *painter) { if (scaling==GV_FITTOPAGE /* Fit to page */) { bool enlargeToFit = printer->option( "app-gwenview-enlargeToFit" ) != f; if ((image.width() > pdWidth || image.height() > pdHeight) || enlargeToFit) { - size.scale( pdWidth, pdHeight, TQSize::ScaleMin ); + size.tqscale( pdWidth, pdHeight, TQSize::ScaleMin ); } } else { if (scaling==GV_SCALE /* Scale To */) { @@ -452,24 +452,24 @@ void Document::doPaint(KPrinter *printer, TQPainter *painter) { printer->abort(); return; } else if (resp == KMessageBox::No) { // Shrink - size.scale(pdWidth, pdHeight, TQSize::ScaleMin); + size.tqscale(pdWidth, pdHeight, TQSize::ScaleMin); } } } // Compute x and y - if ( alignment & TQt::AlignHCenter ) + if ( tqalignment & TQt::AlignHCenter ) x = (pdWidth - size.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 = pdWidth - size.width(); - if ( alignment & TQt::AlignVCenter ) + if ( tqalignment & TQt::AlignVCenter ) y = (pdHeight - size.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 = pdHeight - size.height(); // Draw, the image will be scaled to fit the given area if necessary @@ -532,7 +532,7 @@ void Document::saveBeforeClosing() { if (!d->mModified) return; TQString msg=i18n("<qt>The image <b>%1</b> has been modified, do you want to save the changes?</qt>") - .arg(url().prettyURL()); + .tqarg(url().prettyURL()); int result=KMessageBox::questionYesNo(dialogParentWidget(), msg, TQString(), KStdGuiItem::save(), KStdGuiItem::discard(), CONFIG_SAVE_AUTOMATICALLY); @@ -605,7 +605,7 @@ TQString Document::saveInternal(const KURL& url, const TQCString& format) { LOG("Save failed: " << msg); return TQString("<qt><b>%1</b><br/>") - .arg(i18n("Could not save the image to %1.").arg(url.prettyURL())) + .tqarg(i18n("Could not save the image to %1.").tqarg(url.prettyURL())) + msg + "</qt>"; } diff --git a/src/gvcore/documentloadedimpl.cpp b/src/gvcore/documentloadedimpl.cpp index 31baec0..aacea94 100644 --- a/src/gvcore/documentloadedimpl.cpp +++ b/src/gvcore/documentloadedimpl.cpp @@ -134,7 +134,7 @@ TQString DocumentLoadedImpl::save(const KURL& _url, const TQCString& format) con if (!parent.isWritable()) { return i18n("The %1 folder is read-only.") - .arg(parent.filePath()); + .tqarg(parent.filePath()); } } } @@ -152,7 +152,7 @@ TQString DocumentLoadedImpl::save(const KURL& _url, const TQCString& format) con if (tmp.status()!=0) { TQString reason( strerror(tmp.status()) ); return i18n("Could not create a temporary file.\nReason: %1.") - .arg(reason); + .tqarg(reason); } TQFile* file=tmp.file(); msg=localSave(file, format); @@ -162,7 +162,7 @@ TQString DocumentLoadedImpl::save(const KURL& _url, const TQCString& format) con if (tmp.status()!=0) { TQString reason( strerror(tmp.status()) ); return i18n("Saving image to a temporary file failed.\nReason: %1.") - .arg(reason); + .tqarg(reason); } TQString tmpName=tmp.name(); @@ -172,11 +172,11 @@ TQString DocumentLoadedImpl::save(const KURL& _url, const TQCString& format) con // Move the tmp file to the final dest if (url.isLocalFile()) { if( ::rename( TQFile::encodeName(tmpName), TQFile::encodeName( url.path())) < 0 ) { - return i18n("Could not write to %1.").arg(url.path()); + return i18n("Could not write to %1.").tqarg(url.path()); } } else { if (!KIO::NetAccess::upload(tmp.name(), url, KApplication::kApplication()->mainWidget() )) { - return i18n("Could not upload the file to %1.").arg(url.prettyURL()); + return i18n("Could not upload the file to %1.").tqarg(url.prettyURL()); } } diff --git a/src/gvcore/documentloadingimpl.cpp b/src/gvcore/documentloadingimpl.cpp index 02020ad..072229e 100644 --- a/src/gvcore/documentloadingimpl.cpp +++ b/src/gvcore/documentloadingimpl.cpp @@ -99,7 +99,7 @@ void DocumentLoadingImpl::init() { emitImageRectUpdated(); } else { setImage(image); - TQMemArray< TQRect > rects = TQRegion(d->mLoader->loadedRegion()).rects(); + TQMemArray< TQRect > rects = TQRegion(d->mLoader->loadedRegion()).tqrects(); for( unsigned int i = 0; i < rects.count(); ++i ) { emit rectUpdated(rects[i]); } diff --git a/src/gvcore/dragpixmapgenerator.h b/src/gvcore/dragpixmapgenerator.h index 308c391..efbbd93 100644 --- a/src/gvcore/dragpixmapgenerator.h +++ b/src/gvcore/dragpixmapgenerator.h @@ -128,7 +128,7 @@ public: if (listCropped) { // If list has been cropped, leave space for item count text height += fm.height(); - bottomText = i18n("%1 items").arg(mItemList.count()); + bottomText = i18n("%1 items").tqarg(mItemList.count()); width = TQMAX(width, fm.width("... " + bottomText)); } diff --git a/src/gvcore/externaltooldialog.cpp b/src/gvcore/externaltooldialog.cpp index a71351b..e579b99 100644 --- a/src/gvcore/externaltooldialog.cpp +++ b/src/gvcore/externaltooldialog.cpp @@ -144,7 +144,7 @@ struct ExternalToolDialogPrivate { for (; item; item=item->nextSibling()) { if (item==mSelectedItem) continue; if (name==item->text(0)) { - KMessageBox::sorry(mContent, i18n("There is already a tool named \"%1\"").arg(name)); + KMessageBox::sorry(mContent, i18n("There is already a tool named \"%1\"").tqarg(name)); return false; } } diff --git a/src/gvcore/externaltooldialogbase.ui b/src/gvcore/externaltooldialogbase.ui index e35f222..00d2954 100644 --- a/src/gvcore/externaltooldialogbase.ui +++ b/src/gvcore/externaltooldialogbase.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>720</width> <height>0</height> @@ -49,7 +49,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>487</width> <height>16</height> @@ -153,7 +153,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <grid> <property name="name"> @@ -304,7 +304,7 @@ You can use keywords in the Command field: <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>140</height> diff --git a/src/gvcore/externaltoolmanager.cpp b/src/gvcore/externaltoolmanager.cpp index 3a43d26..4fd4e03 100644 --- a/src/gvcore/externaltoolmanager.cpp +++ b/src/gvcore/externaltoolmanager.cpp @@ -222,7 +222,7 @@ TQDict<KDesktopFile>& ExternalToolManager::desktopFiles() const { void ExternalToolManager::hideDesktopFile(KDesktopFile* desktopFile) { TQFileInfo fi(desktopFile->fileName()); - TQString name=TQString("%1.desktop").arg( fi.baseName(true) ); + TQString name=TQString("%1.desktop").tqarg( fi.baseName(true) ); d->mDesktopFiles.take(name); if (desktopFile->isReadOnly()) { @@ -240,7 +240,7 @@ KDesktopFile* ExternalToolManager::editSystemDesktopFile(const KDesktopFile* des TQFileInfo fi(desktopFile->fileName()); TQString name=fi.baseName(true); - d->mDesktopFiles.remove(TQString("%1.desktop").arg(name)); + d->mDesktopFiles.remove(TQString("%1.desktop").tqarg(name)); return createUserDesktopFile(name); } @@ -250,7 +250,7 @@ KDesktopFile* ExternalToolManager::createUserDesktopFile(const TQString& name) { Q_ASSERT(!name.isEmpty()); KDesktopFile* desktopFile=new KDesktopFile( d->mUserToolDir + "/" + name + ".desktop", false); - d->mDesktopFiles.insert(TQString("%1.desktop").arg(name), desktopFile); + d->mDesktopFiles.insert(TQString("%1.desktop").tqarg(name), desktopFile); return desktopFile; } diff --git a/src/gvcore/filedetailview.cpp b/src/gvcore/filedetailview.cpp index a7d9f64..f061c13 100644 --- a/src/gvcore/filedetailview.cpp +++ b/src/gvcore/filedetailview.cpp @@ -125,8 +125,8 @@ FileDetailView::FileDetailView(TQWidget *parent, const char *name) setDropHighlighter(false); int size = IconSize(KIcon::Small); - mShownItemUnselectedPixmap = createShownItemPixmap(size, colorGroup().highlight()); - mShownItemSelectedPixmap = createShownItemPixmap(size, colorGroup().highlightedText()); + mShownItemUnselectedPixmap = createShownItemPixmap(size, tqcolorGroup().highlight()); + mShownItemSelectedPixmap = createShownItemPixmap(size, tqcolorGroup().highlightedText()); } @@ -525,8 +525,8 @@ void FileDetailView::setShownFileItem(KFileItem* fileItem) FileDetailViewItem* newShownItem=viewItem(fileItem); FileViewBase::setShownFileItem(fileItem); - if (oldShownItem) oldShownItem->repaint(); - if (newShownItem) newShownItem->repaint(); + if (oldShownItem) oldShownItem->tqrepaint(); + if (newShownItem) newShownItem->tqrepaint(); } diff --git a/src/gvcore/filedetailviewitem.h b/src/gvcore/filedetailviewitem.h index a0ad5df..1104bce 100644 --- a/src/gvcore/filedetailviewitem.h +++ b/src/gvcore/filedetailviewitem.h @@ -71,7 +71,7 @@ public: TQRect rect() const { - TQRect r = listView()->itemRect(this); + TQRect r = listView()->tqitemRect(this); return TQRect( listView()->viewportToContents( r.topLeft() ), TQSize( r.width(), r.height() ) ); } diff --git a/src/gvcore/fileopobject.cpp b/src/gvcore/fileopobject.cpp index 5d9a820..e72d192 100644 --- a/src/gvcore/fileopobject.cpp +++ b/src/gvcore/fileopobject.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // TQt #include <tqfile.h> -#include <stylesheet.h> +#include <tqstylesheet.h> #include <tqwidget.h> // KDE @@ -89,7 +89,7 @@ void FileOpObject::slotResult(KIO::Job* job) { void FileOpObject::polishJob(KIO::Job* job) { - job->setWindow(mParent->topLevelWidget()); + job->setWindow(mParent->tqtopLevelWidget()); connect( job, TQT_SIGNAL( result(KIO::Job*) ), this, TQT_SLOT( slotResult(KIO::Job*) ) ); } @@ -259,7 +259,7 @@ void FileOpTrashObject::operator()() { } else { TQString filename=TQStyleSheet::escape(mURLList.first().filename()); response=KMessageBox::warningContinueCancel(mParent, - i18n("<p>Do you really want to move <b>%1</b> to the trash?</p>").arg(filename),i18n("Trash used as a verb", "Trash File"),KGuiItem(i18n("Trash used as a verb", "&Trash"),"edittrash")); + i18n("<p>Do you really want to move <b>%1</b> to the trash?</p>").tqarg(filename),i18n("Trash used as a verb", "Trash File"),KGuiItem(i18n("Trash used as a verb", "&Trash"),"edittrash")); } if (response!=KMessageBox::Continue) return; } @@ -287,7 +287,7 @@ void FileOpRealDeleteObject::operator()() { } else { TQString filename=TQStyleSheet::escape(mURLList.first().filename()); response=KMessageBox::warningContinueCancel(mParent, - i18n("<p>Do you really want to delete <b>%1</b>?</p>").arg(filename), + i18n("<p>Do you really want to delete <b>%1</b>?</p>").tqarg(filename), i18n("Delete File"), KStdGuiItem::del() ); @@ -309,7 +309,7 @@ void FileOpRenameObject::operator()() { TQString filename = srcURL.filename(); InputDialog dlg(mParent); dlg.setCaption(i18n("Renaming File")); - dlg.setLabel(i18n("<p>Rename file <b>%1</b> to:</p>").arg(TQStyleSheet::escape(filename))); + dlg.setLabel(i18n("<p>Rename file <b>%1</b> to:</p>").tqarg(TQStyleSheet::escape(filename))); dlg.setButtonOK( KGuiItem(i18n("&Rename"), "edit") ); dlg.lineEdit()->setText(filename); diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp index cc338ca..51445be 100644 --- a/src/gvcore/filethumbnailview.cpp +++ b/src/gvcore/filethumbnailview.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // TQt #include <tqframe.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpainter.h> #include <tqpen.h> #include <tqpixmap.h> @@ -77,8 +77,8 @@ public: ProgressWidget(FileThumbnailView* view, int count) : TQFrame(view) { - TQHBoxLayout* layout=new TQHBoxLayout(this, 3, 3); - layout->setAutoAdd(true); + TQHBoxLayout* tqlayout=new TQHBoxLayout(this, 3, 3); + tqlayout->setAutoAdd(true); setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised ); mStop=new TQPushButton(this); @@ -93,7 +93,7 @@ public: void polish() { TQFrame::polish(); - setMinimumWidth(layout()->minimumSize().width()); + setMinimumWidth(tqlayout()->tqminimumSize().width()); //setFixedHeight( mProgressBar->height() ); setFixedHeight( mStop->height() ); } @@ -142,7 +142,7 @@ struct FileThumbnailView::Private { mWaitThumbnail.fill(view->paletteBackgroundColor()); TQPainter painter(&mWaitThumbnail); - painter.setPen(view->colorGroup().button()); + painter.setPen(view->tqcolorGroup().button()); painter.drawRect(0,0,mThumbnailSize,mThumbnailSize); painter.drawPixmap( (mThumbnailSize-mWaitPixmap.width())/2, @@ -285,7 +285,7 @@ void FileThumbnailView::setThumbnailPixmap(const KFileItem* fileItem, const TQPi if (size.isValid()) { iconItem->setImageSize(size); } - iconItem->repaint(); + iconItem->tqrepaint(); // Notify progress if (d->mProgressWidget) { diff --git a/src/gvcore/filethumbnailviewitem.cpp b/src/gvcore/filethumbnailviewitem.cpp index cd607b7..65da494 100644 --- a/src/gvcore/filethumbnailviewitem.cpp +++ b/src/gvcore/filethumbnailviewitem.cpp @@ -271,16 +271,16 @@ void FileThumbnailViewItem::calcRect(const TQString&) { textH+=(*it)->height(); } - TQRect itemRect(x(), y(), view->gridX(), 0); + TQRect tqitemRect(x(), y(), view->gridX(), 0); TQRect itemPixmapRect(PADDING, PADDING, thumbnailSize, thumbnailSize); TQRect itemTextRect(0, 0, textW, textH); if (isRight) { - itemRect.setHeight( TQMAX(thumbnailSize + PADDING*2, textH) ); + tqitemRect.setHeight( TQMAX(thumbnailSize + PADDING*2, textH) ); itemTextRect.moveLeft(thumbnailSize + PADDING * 2 ); - itemTextRect.moveTop((itemRect.height() - textH)/2); + itemTextRect.moveTop((tqitemRect.height() - textH)/2); } else { - itemPixmapRect.moveLeft( (itemRect.width() - itemPixmapRect.width()) / 2 ); - itemRect.setHeight(thumbnailSize + PADDING*3 + textH); + itemPixmapRect.moveLeft( (tqitemRect.width() - itemPixmapRect.width()) / 2 ); + tqitemRect.setHeight(thumbnailSize + PADDING*3 + textH); itemTextRect.moveLeft(PADDING); itemTextRect.moveTop(thumbnailSize + PADDING * 2); } @@ -292,8 +292,8 @@ void FileThumbnailViewItem::calcRect(const TQString&) { if ( itemTextRect != textRect() ) { setTextRect( itemTextRect ); } - if ( itemRect != rect() ) { - setItemRect( itemRect ); + if ( tqitemRect != rect() ) { + setItemRect( tqitemRect ); } } diff --git a/src/gvcore/filethumbnailviewitem.h b/src/gvcore/filethumbnailviewitem.h index d3a1063..b242355 100644 --- a/src/gvcore/filethumbnailviewitem.h +++ b/src/gvcore/filethumbnailviewitem.h @@ -52,7 +52,7 @@ public: void updateLines(); protected: - void paintItem(TQPainter* painter, const TQColorGroup& colorGroup); + void paintItem(TQPainter* painter, const TQColorGroup& tqcolorGroup); void calcRect( const TQString& text_=TQString() ); void paintFocus(TQPainter*, const TQColorGroup&) {} bool acceptDrop(const TQMimeSource*) const; diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp index 7222c27..bdacf01 100644 --- a/src/gvcore/fileviewcontroller.cpp +++ b/src/gvcore/fileviewcontroller.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <tqcheckbox.h> #include <tqdatetimeedit.h> #include <tqhbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpopupmenu.h> #include <tqpushbutton.h> #include <tqtooltip.h> @@ -191,7 +191,7 @@ public: void initFilterBar() { mFilterBar=new FilterBar(that); - mFilterBar->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + mFilterBar->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); mFilterBar->hide(); TQIconSet resetIS=BarIcon("locationbar_erase"); @@ -256,7 +256,7 @@ FileViewController::FileViewController(TQWidget* parent,KActionCollection* actio : TQWidget(parent) , mMode(FILE_LIST) , mPrefetch( NULL ) -, mChangeDirStatus(CHANGE_DIR_STATUS_NONE) +, mChangeDirtqStatus(CHANGE_DIR_STATUS_NONE) , mBrowsing(false) , mSelecting(false) { @@ -268,10 +268,10 @@ FileViewController::FileViewController(TQWidget* parent,KActionCollection* actio d->initFilterCombo(); d->mStack=new TQWidgetStack(this); - TQVBoxLayout *layout=new TQVBoxLayout(this); - layout->addWidget(d->mToolBar); - layout->addWidget(d->mFilterBar); - layout->addWidget(d->mStack); + TQVBoxLayout *tqlayout=new TQVBoxLayout(this); + tqlayout->addWidget(d->mToolBar); + tqlayout->addWidget(d->mFilterBar); + tqlayout->addWidget(d->mStack); // Actions mSelectFirst=new KAction(i18n("&First"), @@ -338,7 +338,7 @@ FileViewController::FileViewController(TQWidget* parent,KActionCollection* actio // Dir lister mDirLister=new DirLister; - mDirLister->setMainWindow(topLevelWidget()); + mDirLister->setMainWindow(tqtopLevelWidget()); connect(mDirLister,TQT_SIGNAL(clear()), TQT_TQOBJECT(this),TQT_SLOT(dirListerClear()) ); @@ -575,13 +575,13 @@ void FileViewController::slotSelectNext() { } void FileViewController::slotSelectPreviousDir() { - mChangeDirStatus = CHANGE_DIR_STATUS_PREV; + mChangeDirtqStatus = CHANGE_DIR_STATUS_PREV; mDirLister->clearError(); mDirLister->openURL(mDirURL.upURL()); } void FileViewController::slotSelectNextDir() { - mChangeDirStatus = CHANGE_DIR_STATUS_NEXT; + mChangeDirtqStatus = CHANGE_DIR_STATUS_NEXT; mDirLister->clearError(); mDirLister->openURL(mDirURL.upURL()); } @@ -747,7 +747,7 @@ void FileViewController::updateViewMode() { void FileViewController::updateThumbnailSize(int size) { size*=SLIDER_RESOLUTION; - d->mSliderTracker->setText(i18n("Thumbnail size: %1x%2").arg(size).arg(size)); + d->mSliderTracker->setText(i18n("Thumbnail size: %1x%2").tqarg(size).tqarg(size)); FileViewConfig::setThumbnailSize(size); mFileThumbnailView->setThumbnailSize(size); Cache::instance()->checkThumbnailSize(size); @@ -1102,12 +1102,12 @@ void FileViewController::delayedDirListerCompleted() { mFileThumbnailView->sort(mFileThumbnailView->sortDirection()); } - if (mChangeDirStatus != CHANGE_DIR_STATUS_NONE) { + if (mChangeDirtqStatus != CHANGE_DIR_STATUS_NONE) { KFileItem *item; TQString fileName = mDirURL.filename(); for (item=currentFileView()->firstFileItem(); item; item=currentFileView()->nextItem(item) ) { if (item->name() == fileName) { - if (mChangeDirStatus == CHANGE_DIR_STATUS_NEXT) { + if (mChangeDirtqStatus == CHANGE_DIR_STATUS_NEXT) { do { item=currentFileView()->nextItem(item); } while (item && !Archive::fileItemIsDirOrArchive(item)); @@ -1119,7 +1119,7 @@ void FileViewController::delayedDirListerCompleted() { break; }; } - mChangeDirStatus = CHANGE_DIR_STATUS_NONE; + mChangeDirtqStatus = CHANGE_DIR_STATUS_NONE; if (!item) { mDirLister->openURL(mDirURL); } else { diff --git a/src/gvcore/fileviewcontroller.h b/src/gvcore/fileviewcontroller.h index 8339659..de0de53 100644 --- a/src/gvcore/fileviewcontroller.h +++ b/src/gvcore/fileviewcontroller.h @@ -227,7 +227,7 @@ private: CHANGE_DIR_STATUS_NONE, CHANGE_DIR_STATUS_PREV, CHANGE_DIR_STATUS_NEXT - } mChangeDirStatus; + } mChangeDirtqStatus; bool mBrowsing; bool mSelecting; diff --git a/src/gvcore/filterbar.ui b/src/gvcore/filterbar.ui index 2c9f11c..b407ce1 100644 --- a/src/gvcore/filterbar.ui +++ b/src/gvcore/filterbar.ui @@ -64,7 +64,7 @@ <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>16</height> @@ -125,7 +125,7 @@ equal to this date</string> <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>16</height> @@ -185,7 +185,7 @@ equal to this date</string> <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>16</height> @@ -210,7 +210,7 @@ equal to this date</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>16</height> diff --git a/src/gvcore/fullscreenbar.cpp b/src/gvcore/fullscreenbar.cpp index d288429..311b98d 100644 --- a/src/gvcore/fullscreenbar.cpp +++ b/src/gvcore/fullscreenbar.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // TQt #include <tqbitmap.h> #include <tqevent.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpainter.h> #include <tqtimer.h> @@ -83,8 +83,8 @@ FullScreenBar::FullScreenBar(TQWidget* parent) setIconSize(FULLSCREEN_ICON_SIZE); setMovingEnabled(false); - TQColor bg=colorGroup().highlight(); - TQColor fg=colorGroup().highlightedText(); + TQColor bg=tqcolorGroup().highlight(); + TQColor fg=tqcolorGroup().highlightedText(); TQPalette pal(palette()); pal.setColor(TQColorGroup::Background, bg); pal.setColor(TQColorGroup::Foreground, fg); @@ -123,7 +123,7 @@ void FullScreenBar::showEvent(TQShowEvent* event) { if (!d->mFirstShow) return; d->mFirstShow=false; move(0, -height()); - layout()->setResizeMode(TQLayout::Fixed); + tqlayout()->setResizeMode(TQLayout::Fixed); } diff --git a/src/gvcore/imageloader.cpp b/src/gvcore/imageloader.cpp index 699d088..06a9011 100644 --- a/src/gvcore/imageloader.cpp +++ b/src/gvcore/imageloader.cpp @@ -113,7 +113,7 @@ public: int getch() { if (mThread->testCancel()) { LOG("cancel detected"); - seStatus(IO_ReadError); + setqStatus(IO_ReadError); return -1; } return TQBuffer::getch(); diff --git a/src/gvcore/imagesavedialog.cpp b/src/gvcore/imagesavedialog.cpp index 17101e2..7831830 100644 --- a/src/gvcore/imagesavedialog.cpp +++ b/src/gvcore/imagesavedialog.cpp @@ -70,7 +70,7 @@ ImageSaveDialog::ImageSaveDialog(KURL& url, const TQCString& imageFormat, TQWidg if (!patterns.contains(pattern)) patterns.append(pattern); } if (patterns.isEmpty()) { - patterns.append( TQString("*.%1").arg(format.lower()) ); + patterns.append( TQString("*.%1").tqarg(format.lower()) ); } TQString patternString=patterns.join(" "); diff --git a/src/gvcore/imageview.cpp b/src/gvcore/imageview.cpp index cbfc459..a6c5b9f 100644 --- a/src/gvcore/imageview.cpp +++ b/src/gvcore/imageview.cpp @@ -113,7 +113,7 @@ as approximate as possible). However when converting from widget to image and ba this can result in the final rectangle being smaller than the original. The widgetToImageBounding() function converts from widget to image coordinates in a way which makes sure the reverse conversion will be at least as large -as the original geometry. +as the original tqgeometry. There are no conversion functions for only width/height, as their conversion depends on the position (because of the rounding etc.). For similar reasons @@ -257,7 +257,7 @@ struct ImageView::Private { const double zoomValues[] = { 0.5, 1, 2 }; int nbValues=sizeof(zoomValues) / sizeof(double); for (int pos=0; pos<nbValues; ++pos) { - TQString txt=TQString("%1%").arg( int(zoomValues[pos]*100) ); + TQString txt=TQString("%1%").tqarg( int(zoomValues[pos]*100) ); mZoomCombo->insertItem(txt); } } @@ -423,7 +423,7 @@ ImageView::~ImageView() { void ImageView::slotLoaded() { if (d->mDocument->isNull()) { resizeContents(0,0); - viewport()->repaint(false); + viewport()->tqrepaint(false); return; } @@ -488,7 +488,7 @@ KToggleAction* ImageView::zoomToFit() const { void ImageView::updateFromSettings() { - // Reset, so that next repaint doesn't possibly take longer because of + // Reset, so that next tqrepaint doesn't possibly take longer because of // smoothing ImageViewConfig::setMaxRepaintSize(DEFAULT_MAX_REPAINT_SIZE); ImageViewConfig::setMaxScaleRepaintSize(DEFAULT_MAX_REPAINT_SIZE); @@ -625,7 +625,7 @@ void ImageView::drawContents(TQPainter* painter,int clipx,int clipy,int clipw,in TQRect widgetRect = TQRect(0, 0, visibleWidth(), visibleHeight()); TQRegion region = TQRegion(widgetRect) - imageRect; - TQMemArray<TQRect> rects = region.rects(); + TQMemArray<TQRect> rects = region.tqrects(); for(unsigned int pos = 0; pos < rects.count(); ++pos ) { painter->eraseRect(rects[pos]); } @@ -701,7 +701,7 @@ void ImageView::limitPaintSize( PendingPaint& paint ) { // don't paint more than max_size pixels at a time int maxHeight = ( maxSize + paint.rect.width() - 1 ) / paint.rect.width(); // round up maxHeight = TQMAX( maxHeight, 5 ); // at least 5 lines together - // can't repaint whole paint at once, adjust height and schedule the rest + // can't tqrepaint whole paint at once, adjust height and schedule the rest if( maxHeight < paint.rect.height()) { TQRect remaining = paint.rect; remaining.setTop( remaining.top() + maxHeight ); @@ -781,12 +781,12 @@ void ImageView::slotBusyLevelChanged( BusyLevel level ) { // How to do painting: // When something needs to be erased: TQPainter on viewport and eraseRect() // When whole picture needs to be repainted: fullRepaint() -// When a part of the picture needs to be updated: viewport()->repaint(area,false) +// When a part of the picture needs to be updated: viewport()->tqrepaint(area,false) // All other paints will be changed to progressive painting. void ImageView::fullRepaint() { if( !viewport()->isUpdatesEnabled()) return; cancelPending(); - viewport()->repaint(false); + viewport()->tqrepaint(false); } void ImageView::cancelPending() { @@ -832,7 +832,7 @@ void ImageView::performPaint( TQPainter* painter, int clipx, int clipy, int clip int extraPixels = ImageUtils::extraScalePixels( smoothAlgo, zoom()); TQRect imageRect = d->widgetToImageBounding( TQRect(clipx,clipy,clipw,cliph), extraPixels ); imageRect = imageRect.intersect( TQRect( 0, 0, d->mDocument->width(), d->mDocument->height())); - TQMemArray< TQRect > rects = TQRegion(d->mValidImageArea.intersect( imageRect )).rects(); + TQMemArray< TQRect > rects = TQRegion(d->mValidImageArea.intersect( imageRect )).tqrects(); for( unsigned int i = 1; i < rects.count(); ++i ) { addPendingPaint( secondPass, d->imageToWidget( rects[ i ] )); } @@ -1024,7 +1024,7 @@ bool ImageView::eventFilter(TQObject* obj, TQEvent* event) { return true; // Getting/loosing focus causes repaints, but repainting here is expensive, - // and there's no need to repaint on focus changes, as the focus is not + // and there's no need to tqrepaint on focus changes, as the focus is not // indicated. case TQEvent::FocusIn: case TQEvent::FocusOut: @@ -1313,7 +1313,7 @@ void ImageView::slotImageSizeUpdated() { void ImageView::slotImageRectUpdated(const TQRect& imageRect) { d->mValidImageArea += imageRect; - viewport()->repaint( d->imageToWidget( imageRect ), false ); + viewport()->tqrepaint( d->imageToWidget( imageRect ), false ); } @@ -1339,7 +1339,7 @@ double ImageView::computeZoomToFit() const { return 1.0; } TQSize size=d->mDocument->image().size(); - size.scale(width(),height(),TQSize::ScaleMin); + size.tqscale(width(),height(),TQSize::ScaleMin); double zoom=double(size.width())/d->mDocument->width(); if (zoom>1.0 && !ImageViewConfig::enlargeSmallImages()) return 1.0; @@ -1350,7 +1350,7 @@ double ImageView::computeZoomToWidth() const { if (d->mDocument->isNull()) { return 1.0; } - int sw = verticalScrollBar()->sizeHint().width(); // geometry is not valid before first show() + int sw = verticalScrollBar()->tqsizeHint().width(); // tqgeometry is not valid before first show() int w = width(); int dw = d->mDocument->width(); switch( vScrollBarMode()) { @@ -1370,7 +1370,7 @@ double ImageView::computeZoomToHeight() const { if (d->mDocument->isNull()) { return 1.0; } - int sh = horizontalScrollBar()->sizeHint().height(); + int sh = horizontalScrollBar()->tqsizeHint().height(); int h = height(); int dh = d->mDocument->height(); switch( vScrollBarMode()) { @@ -1425,11 +1425,11 @@ void ImageView::updateImageOffset() { int zpixHeight=int(d->mDocument->height() * d->mZoom); if (zpixWidth>viewWidth && hScrollBarMode()!=AlwaysOff) { - // use sizeHint() - geometry is not valid before first show() - viewHeight-=horizontalScrollBar()->sizeHint().height(); + // use tqsizeHint() - tqgeometry is not valid before first show() + viewHeight-=horizontalScrollBar()->tqsizeHint().height(); } if (zpixHeight>viewHeight && vScrollBarMode()!=AlwaysOff) { - viewWidth-=verticalScrollBar()->sizeHint().width(); + viewWidth-=verticalScrollBar()->tqsizeHint().width(); } d->mXOffset=TQMAX(0,(viewWidth-zpixWidth)/2); @@ -1457,7 +1457,7 @@ void ImageView::updateZoomActions() { if (d->mZoomMode==ZOOM_FREE) { d->mZoomIn->setEnabled(d->mZoom<MAX_ZOOM); d->mZoomOut->setEnabled(d->mZoom>1/MAX_ZOOM); - TQString zoomText=TQString("%1%").arg(int(d->mZoom*100)); + TQString zoomText=TQString("%1%").tqarg(int(d->mZoom*100)); d->mZoomCombo->setCurrentText(zoomText); } else { d->mZoomIn->setEnabled(true); diff --git a/src/gvcore/imageviewconfig.kcfg b/src/gvcore/imageviewconfig.kcfg index d93051a..6424202 100644 --- a/src/gvcore/imageviewconfig.kcfg +++ b/src/gvcore/imageviewconfig.kcfg @@ -2,7 +2,7 @@ <!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd"> <kcfg> <include>tqapplication.h</include> - <include>palette.h</include> + <include>tqpalette.h</include> <kcfgfile name="gwenviewrc"/> <group name="pixmap widget"> <entry name="smoothAlgorithm" key="smooth scale" type="Enum"> @@ -18,7 +18,7 @@ <default>false</default> </entry> <entry name="backgroundColor" key="background color" type="Color"> - <default code="true">TQApplication::palette().active().dark()</default> + <default code="true">TQApplication::tqpalette().active().dark()</default> </entry> <entry name="enlargeSmallImages" key="enlarge small images" type="Bool"> <default>false</default> diff --git a/src/gvcore/imageviewcontroller.cpp b/src/gvcore/imageviewcontroller.cpp index 8293b44..f24a2e8 100644 --- a/src/gvcore/imageviewcontroller.cpp +++ b/src/gvcore/imageviewcontroller.cpp @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // TQt #include <tqcursor.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpopupmenu.h> #include <tqvbox.h> #include <tqwidgetstack.h> @@ -275,12 +275,12 @@ ImageViewController::ImageViewController(TQWidget* parent, Document* document, K d->mContainer=new TQWidget(parent); d->mContainer->setMinimumWidth(1); // Make sure we can resize the toolbar smaller than its minimum size - TQVBoxLayout* layout=new TQVBoxLayout(d->mContainer); + TQVBoxLayout* tqlayout=new TQVBoxLayout(d->mContainer); d->mToolBar=new KToolBar(d->mContainer, "", true); - layout->add(d->mToolBar); + tqlayout->add(d->mToolBar); d->mStack=new TQWidgetStack(d->mContainer); - layout->add(d->mStack); + tqlayout->add(d->mStack); d->mImageView=new ImageView(d->mStack, document, actionCollection); d->mStack->addWidget(d->mImageView); diff --git a/src/gvcore/imageviewtools.cpp b/src/gvcore/imageviewtools.cpp index da9044a..699868a 100644 --- a/src/gvcore/imageviewtools.cpp +++ b/src/gvcore/imageviewtools.cpp @@ -36,7 +36,7 @@ namespace Gwenview { // Helper function static TQCursor loadCursor(const TQString& name) { TQString path; - path=locate("data", TQString("gwenview/cursors/%1.png").arg(name)); + path=locate("data", TQString("gwenview/cursors/%1.png").tqarg(name)); return TQCursor(TQPixmap(path)); } diff --git a/src/gvcore/printdialog.cpp b/src/gvcore/printdialog.cpp index 1f07979..98524af 100644 --- a/src/gvcore/printdialog.cpp +++ b/src/gvcore/printdialog.cpp @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ // TQt #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpainter.h> #include <tqradiobutton.h> #include <tqvbuttongroup.h> @@ -82,8 +82,8 @@ PrintDialogPage::PrintDialogPage( Document* document, TQWidget *parent, const ch mContent = new PrintDialogPageBase(this); setTitle( mContent->caption() ); - TQVBoxLayout *layout = new TQVBoxLayout( this ); - layout->addWidget( mContent ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + tqlayout->addWidget( mContent ); connect(mContent->mWidth, TQT_SIGNAL( valueChanged( double )), TQT_SLOT( slotWidthChanged( double ))); connect(mContent->mHeight, TQT_SIGNAL( valueChanged( double )), TQT_SLOT( slotHeightChanged( double ))); @@ -169,57 +169,57 @@ void PrintDialogPage::setScaleHeight( double value ) { } int PrintDialogPage::getPosition(const TQString& align) { - int alignment; + int tqalignment; if (align == i18n("Central-Left")) { - alignment = TQt::AlignLeft | TQt::AlignVCenter; + tqalignment = TQt::AlignLeft | TQt::AlignVCenter; } else if (align == i18n("Central-Right")) { - alignment = TQt::AlignRight | TQt::AlignVCenter; + tqalignment = TQt::AlignRight | TQt::AlignVCenter; } else if (align == i18n("Top-Left")) { - alignment = TQt::AlignTop | TQt::AlignLeft; + tqalignment = TQt::AlignTop | TQt::AlignLeft; } else if (align == i18n("Top-Right")) { - alignment = TQt::AlignTop | TQt::AlignRight; + tqalignment = TQt::AlignTop | TQt::AlignRight; } else if (align == i18n("Bottom-Left")) { - alignment = TQt::AlignBottom | TQt::AlignLeft; + tqalignment = TQt::AlignBottom | TQt::AlignLeft; } else if (align == i18n("Bottom-Right")) { - alignment = TQt::AlignBottom | TQt::AlignRight; + tqalignment = TQt::AlignBottom | TQt::AlignRight; } else if (align == i18n("Top-Central")) { - alignment = TQt::AlignTop | TQt::AlignHCenter; + tqalignment = TQt::AlignTop | TQt::AlignHCenter; } else if (align == i18n("Bottom-Central")) { - alignment = TQt::AlignBottom | TQt::AlignHCenter; + tqalignment = TQt::AlignBottom | TQt::AlignHCenter; } else { // Central - alignment = TQt::AlignCenter; // TQt::AlignHCenter || TQt::AlignVCenter + tqalignment = TQt::AlignCenter; // TQt::AlignHCenter || TQt::AlignVCenter } - return alignment; + return tqalignment; } TQString PrintDialogPage::setPosition(int align) { - TQString alignment; + TQString tqalignment; if (align == (TQt::AlignLeft | TQt::AlignVCenter)) { - alignment = i18n("Central-Left"); + tqalignment = i18n("Central-Left"); } else if (align == (TQt::AlignRight | TQt::AlignVCenter)) { - alignment = i18n("Central-Right"); + tqalignment = i18n("Central-Right"); } else if (align == (TQt::AlignTop | TQt::AlignLeft)) { - alignment = i18n("Top-Left"); + tqalignment = i18n("Top-Left"); } else if (align == (TQt::AlignTop | TQt::AlignRight)) { - alignment = i18n("Top-Right"); + tqalignment = i18n("Top-Right"); } else if (align == (TQt::AlignBottom | TQt::AlignLeft)) { - alignment = i18n("Bottom-Left"); + tqalignment = i18n("Bottom-Left"); } else if (align == (TQt::AlignBottom | TQt::AlignRight)) { - alignment = i18n("Bottom-Right"); + tqalignment = i18n("Bottom-Right"); } else if (align == (TQt::AlignTop | TQt::AlignHCenter)) { - alignment = i18n("Top-Central"); + tqalignment = i18n("Top-Central"); } else if (align == (TQt::AlignBottom | TQt::AlignHCenter)) { - alignment = i18n("Bottom-Central"); + tqalignment = i18n("Bottom-Central"); } else { // Central: TQt::AlignCenter or (TQt::AlignHCenter || TQt::AlignVCenter) - alignment = i18n("Central"); + tqalignment = i18n("Central"); } - return alignment; + return tqalignment; } // SLOTS diff --git a/src/gvcore/printdialogpagebase.ui b/src/gvcore/printdialogpagebase.ui index 6ae7696..6d92eda 100644 --- a/src/gvcore/printdialogpagebase.ui +++ b/src/gvcore/printdialogpagebase.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -98,7 +98,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>101</width> <height>21</height> @@ -170,7 +170,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -186,7 +186,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -214,7 +214,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>240</width> <height>21</height> @@ -236,7 +236,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -252,7 +252,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -351,7 +351,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> diff --git a/src/gvcore/qxcfi.cpp b/src/gvcore/qxcfi.cpp index 27ad0b9..9fb146a 100644 --- a/src/gvcore/qxcfi.cpp +++ b/src/gvcore/qxcfi.cpp @@ -486,7 +486,7 @@ void XCFImageFormat::readXCF ( TQImageIO* image_io ) } image_io->setImage( xcf_image.image ); - image_io->seStatus( 0 ); + image_io->setqStatus( 0 ); } /*! diff --git a/src/gvcore/thumbnaildetailsdialogbase.ui b/src/gvcore/thumbnaildetailsdialogbase.ui index ae03c98..1dd6646 100644 --- a/src/gvcore/thumbnaildetailsdialogbase.ui +++ b/src/gvcore/thumbnaildetailsdialogbase.ui @@ -29,7 +29,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <grid> <property name="name"> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -96,7 +96,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>21</height> diff --git a/src/gvcore/xpm.cpp b/src/gvcore/xpm.cpp index b56ba59..cc2cabc 100644 --- a/src/gvcore/xpm.cpp +++ b/src/gvcore/xpm.cpp @@ -74,7 +74,7 @@ static TQString fbname( const TQString &fileName ) // get file basename (sort of s = s.mid( i ); if ( (i = s.findRev('\\')) >= 0 ) s = s.mid( i ); - TQRegExp r( TQString::fromLatin1("[a-zA-Z][a-zA-Z0-9_]*") ); + TQRegExp r( TQString::tqfromLatin1("[a-zA-Z][a-zA-Z0-9_]*") ); int p = r.search( s ); if ( p == -1 ) s.truncate( 0 ); @@ -82,7 +82,7 @@ static TQString fbname( const TQString &fileName ) // get file basename (sort of s = s.mid( p, r.matchedLength() ); } if ( s.isEmpty() ) - s = TQString::fromLatin1( "dummy" ); + s = TQString::tqfromLatin1( "dummy" ); return s; } @@ -161,10 +161,10 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc int i, cpp, ncols, w, h, index = 0; if ( iio ) { - iio->seStatus( 1 ); + iio->setqStatus( 1 ); d = iio ? iio->ioDevice() : 0; d->readLine( buf.data(), buf.size() ); // "/* XPM */" - TQRegExp r( TQString::fromLatin1("/\\*.XPM.\\*/") ); + TQRegExp r( TQString::tqfromLatin1("/\\*.XPM.\\*/") ); if ( buf.find(r) == -1 ) return; // bad magic } else if ( !source ) { @@ -291,7 +291,7 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc } if ( iio ) { iio->setImage( image ); - iio->seStatus( 0 ); // image ok + iio->setqStatus( 0 ); // image ok } } @@ -340,7 +340,7 @@ static const char* xpm_color_name( int cpp, int index ) static void write_xpm_image( TQImageIO * iio ) { if ( iio ) - iio->seStatus( 1 ); + iio->setqStatus( 1 ); else return; @@ -424,7 +424,7 @@ static void write_xpm_image( TQImageIO * iio ) } s << "};" << endl; - iio->seStatus( 0 ); + iio->setqStatus( 0 ); } // TQt code end --------------------------- diff --git a/src/gvdirpart/gvdirpart.cpp b/src/gvdirpart/gvdirpart.cpp index 3f321e5..4745bfe 100644 --- a/src/gvdirpart/gvdirpart.cpp +++ b/src/gvdirpart/gvdirpart.cpp @@ -173,7 +173,7 @@ bool GVDirPart::openURL(const KURL& url) { void GVDirPart::loaded(const KURL& url) { TQString caption = url.filename(); if( !mDocument->image().isNull()) - caption += TQString(" %1 x %2").arg(mDocument->width()).arg(mDocument->height()); + caption += TQString(" %1 x %2").tqarg(mDocument->width()).tqarg(mDocument->height()); emit setWindowCaption(caption); emit completed(); } diff --git a/src/gvimagepart/gvimagepart.cpp b/src/gvimagepart/gvimagepart.cpp index 95c67e3..95712b5 100644 --- a/src/gvimagepart/gvimagepart.cpp +++ b/src/gvimagepart/gvimagepart.cpp @@ -194,7 +194,7 @@ void GVImagePart::slotLoading() { } void GVImagePart::slotLoaded(const KURL& url) { - TQString caption = url.filename() + TQString(" - %1x%2").arg(mDocument->width()).arg(mDocument->height()); + TQString caption = url.filename() + TQString(" - %1x%2").tqarg(mDocument->width()).tqarg(mDocument->height()); emit setWindowCaption(caption); emit completed(); emit setStatusBarText(i18n("Done.")); @@ -363,7 +363,7 @@ void GVImagePart::saveOriginalAs() { if (!file.open(IO_WriteOnly)) { KMessageBox::error( widget(), - i18n("Could not open '%1' for writing.").arg(path)); + i18n("Could not open '%1' for writing.").tqarg(path)); return; } storeData(widget(), &file, data); diff --git a/src/imageutils/jpegcontent.cpp b/src/imageutils/jpegcontent.cpp index c007267..5bcb7ef 100644 --- a/src/imageutils/jpegcontent.cpp +++ b/src/imageutils/jpegcontent.cpp @@ -120,7 +120,7 @@ struct inmem_dest_mgr : public jpeg_destination_mgr { void inmem_init_destination(j_compress_ptr cinfo) { inmem_dest_mgr* dest=(inmem_dest_mgr*)(cinfo->dest); if (dest->mOutput->size()==0) { - bool result=dest->mOutput->resize(INMEM_DST_DELTA); + bool result=dest->mOutput->tqresize(INMEM_DST_DELTA); Q_ASSERT(result); } dest->free_in_buffer=dest->mOutput->size(); @@ -129,7 +129,7 @@ void inmem_init_destination(j_compress_ptr cinfo) { int inmem_empty_output_buffer(j_compress_ptr cinfo) { inmem_dest_mgr* dest=(inmem_dest_mgr*)(cinfo->dest); - bool result=dest->mOutput->resize(dest->mOutput->size() + INMEM_DST_DELTA); + bool result=dest->mOutput->tqresize(dest->mOutput->size() + INMEM_DST_DELTA); Q_ASSERT(result); dest->next_output_byte=(JOCTET*)( dest->mOutput->data() + dest->mOutput->size() - INMEM_DST_DELTA ); dest->free_in_buffer=INMEM_DST_DELTA; @@ -141,7 +141,7 @@ void inmem_term_destination(j_compress_ptr cinfo) { inmem_dest_mgr* dest=(inmem_dest_mgr*)(cinfo->dest); int finalSize=dest->next_output_byte - (JOCTET*)(dest->mOutput->data()); Q_ASSERT(finalSize>=0); - dest->mOutput->resize(finalSize); + dest->mOutput->tqresize(finalSize); } diff --git a/src/imageutils/scale.cpp b/src/imageutils/scale.cpp index 733dc1a..c8a70a7 100644 --- a/src/imageutils/scale.cpp +++ b/src/imageutils/scale.cpp @@ -1929,7 +1929,7 @@ TQImage scale(const TQImage& image, int width, int height, if( image.isNull()) return image.copy(); TQSize newSize( image.size() ); - newSize.scale( TQSize( width, height ), (TQSize::ScaleMode)mode ); // ### remove cast in TQt 4.0 + newSize.tqscale( TQSize( width, height ), (TQSize::ScaleMode)mode ); // ### remove cast in TQt 4.0 newSize = newSize.expandedTo( TQSize( 1, 1 )); // make sure it doesn't become null if ( newSize == image.size() ) return image.copy(); diff --git a/src/spec/gwenview-mdk.spec b/src/spec/gwenview-mdk.spec index c524954..e2ad754 100644 --- a/src/spec/gwenview-mdk.spec +++ b/src/spec/gwenview-mdk.spec @@ -272,7 +272,7 @@ rm -rf $RPM_BUILD_ROOT o Update the EXIF thumbnail when rotating a JPEG file. o In the folder view, folders now open with a single click (By Daniel Thaler). o Reworked coordinate conversions in order to avoid subtle paint errors. - o Remember computed optimal repaint sizes in the config file, + o Remember computed optimal tqrepaint sizes in the config file, so they are available immediately after next start. o Remember shown URL after session restore. * Sat Oct 16 2004 Angelo Naselli <[email protected]> 1.1.5-0.3mdk @@ -317,7 +317,7 @@ rm -rf $RPM_BUILD_ROOT - Avoid data loss if the JPEG images are saved while being rotated by JPEGTran. - The back button in Konqueror now works correctly with gvimagepart. - - The default layout is more user-friendly. + - The default tqlayout is more user-friendly. - Non-trivial URLs (e.g. http query URL) are correctly handled. - You can now drop images on the image view. diff --git a/src/tsthread/tsthread.cpp b/src/tsthread/tsthread.cpp index c845cce..6363f2e 100644 --- a/src/tsthread/tsthread.cpp +++ b/src/tsthread/tsthread.cpp @@ -175,7 +175,7 @@ void TSThread::customEvent( TQCustomEvent* ev ) } bool deleted = false; deleted_flag = &deleted; // this is like TQGuardedPtr for self, but faster - int signal_id = e->object->metaObject()->findSignal( normalizeSignalSlot( e->signal ).data() + 1, true ); + int signal_id = e->object->tqmetaObject()->findSignal( normalizeSignalSlot( e->signal ).data() + 1, true ); if( signal_id >= 0 ) e->object->qt_emit( signal_id, e->args ); else |