diff options
Diffstat (limited to 'ksquirrel/imageedit')
-rw-r--r-- | ksquirrel/imageedit/sq_converter.cpp | 16 | ||||
-rw-r--r-- | ksquirrel/imageedit/sq_converter.h | 2 | ||||
-rw-r--r-- | ksquirrel/imageedit/sq_imageeditoptions.ui.h | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/ksquirrel/imageedit/sq_converter.cpp b/ksquirrel/imageedit/sq_converter.cpp index c14d060..bcd7b70 100644 --- a/ksquirrel/imageedit/sq_converter.cpp +++ b/ksquirrel/imageedit/sq_converter.cpp @@ -89,10 +89,10 @@ void SQ_Converter::slotStartEdit() startEditPrivate(); } -TQString SQ_Converter::adjustFileName(const TQString &globalprefix, const TQString &name1, int tqreplace, TQString putto, bool paged, int page) +TQString SQ_Converter::adjustFileName(const TQString &globalprefix, const TQString &name1, int replace, TQString putto, bool paged, int page) { TQFileInfo ff(name1); - TQString name = ff.dirPath() + '/' + (tqreplace == 0 ? globalprefix : (tqreplace == 2 ? TQString() : globalprefix)) + ff.fileName(); + TQString name = ff.dirPath() + '/' + (replace == 0 ? globalprefix : (replace == 2 ? TQString() : globalprefix)) + ff.fileName(); ff = TQFileInfo(name); TQString result, inner, filter = lw->filter; @@ -113,7 +113,7 @@ TQString SQ_Converter::adjustFileName(const TQString &globalprefix, const TQStri suffix = (SQ_LibraryHandler::instance()->knownExtension(TQString::tqfromLatin1("*.") + ext)) ? TQString(lw->codec->extension(32)) : ext; - if(tqreplace == 0 || tqreplace == 2) + if(replace == 0 || replace == 2) result = (!paged) ? (prefix + inner + suffix) : (prefix + spage + inner + suffix); else { @@ -143,7 +143,7 @@ void SQ_Converter::decodingCycle() RGBA *scan; int errors, gerrors = 0, current; TQString putto; - int tqreplace = imageopt.where_to_put; + int replace = imageopt.where_to_put; bool brk; SQ_Config::instance()->setGroup("Edit tools"); @@ -229,9 +229,9 @@ void SQ_Converter::decodingCycle() if(i == SQE_NOTOK || brk) { if(current == 1) - name = adjustFileName(prefix, *it, tqreplace, putto); + name = adjustFileName(prefix, *it, replace, putto); else - name = adjustFileName(prefix, *it, tqreplace, putto, true, current); + name = adjustFileName(prefix, *it, replace, putto, true, current); lastFrame = last; @@ -242,7 +242,7 @@ void SQ_Converter::decodingCycle() i = SQE_OK; - if(tqreplace == 2) + if(replace == 2) { emit convertText(i18n("Removing") + KStringHandler::rsqueeze(ff.fileName()) + TQString("... "), false); @@ -262,7 +262,7 @@ void SQ_Converter::decodingCycle() if(current) { - name = adjustFileName(prefix, *it, tqreplace, putto, true, current); + name = adjustFileName(prefix, *it, replace, putto, true, current); lastFrame = false; diff --git a/ksquirrel/imageedit/sq_converter.h b/ksquirrel/imageedit/sq_converter.h index f0a8de1..8a7d1ec 100644 --- a/ksquirrel/imageedit/sq_converter.h +++ b/ksquirrel/imageedit/sq_converter.h @@ -77,7 +77,7 @@ class SQ_Converter : public TQObject /* * Determine file name. In this file SQ_Converter will save new image. */ - TQString adjustFileName(const TQString &globalprefix, const TQString &name, int tqreplace, + TQString adjustFileName(const TQString &globalprefix, const TQString &name, int replace, TQString putto, bool paged = false, int page = 0); void determineNextScan(const fmt_image &im, RGBA *scan, int y); diff --git a/ksquirrel/imageedit/sq_imageeditoptions.ui.h b/ksquirrel/imageedit/sq_imageeditoptions.ui.h index cb39e41..a00aafd 100644 --- a/ksquirrel/imageedit/sq_imageeditoptions.ui.h +++ b/ksquirrel/imageedit/sq_imageeditoptions.ui.h @@ -17,7 +17,7 @@ int SQ_ImageEditOptions::exec(SQ_ImageOptions *o) { kurl->setURL(o->putto); - TQButton *b = buttonGroup1->tqfind(o->where_to_put); + TQButton *b = buttonGroup1->find(o->where_to_put); if(b) b->animateClick(); |