From 591ce28f0128f324165b19f6ff653d158711614b Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 16 Feb 2025 11:30:46 +0900 Subject: [PATCH] Fix bad code, this was highlighted when building with cmake and ninja Signed-off-by: Michele Calgaro --- pics/imageedit/resize_toolbutton_e.png | Bin 416 -> 0 bytes src/imageedit/sq_converter.cpp | 2 +- src/ksquirrel-libs-configurator/klc.cpp | 115 ------------------ src/ksquirrel-libs-configurator/main.cpp | 2 +- src/ksquirrel.cpp | 8 +- src/ksquirrelpart/ksquirrelpart.cpp | 26 ++-- .../sq_codecsettingsskeleton.ui.h | 4 +- src/ksquirrelpart/sq_glwidget_stuff.cpp | 8 +- src/ksquirrelpart/sq_libraryhandler.cpp | 24 ++-- src/main.cpp | 12 +- src/sidebar/sq_storagefile.cpp | 7 +- src/sq_codecsettingsskeleton.ui.h | 4 +- src/sq_dirthumbs.cpp | 2 +- src/sq_glwidget_stuff.cpp | 8 +- src/sq_libraryhandler.cpp | 24 ++-- src/sq_widgetstack.cpp | 2 +- 16 files changed, 65 insertions(+), 183 deletions(-) delete mode 100644 pics/imageedit/resize_toolbutton_e.png delete mode 100644 src/ksquirrel-libs-configurator/klc.cpp diff --git a/pics/imageedit/resize_toolbutton_e.png b/pics/imageedit/resize_toolbutton_e.png deleted file mode 100644 index 14099f4310a52ade0aabafb6240604e279c50cb6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 416 zcmV;R0bl-!P)#dr#X%SGBmOzhds~YY z@iwt%?DL#^bKiR%=YOB93dEIiA#@W>c#xF>sE3H~mJOCAS@#g5i-rwO&|CD-u{A4N z!wdR2WAmxP8?u&5MV2$v$14UnXLAp2>|!TN&7{f`QnaM#8vm&|}dUilJ^4D9X^4RK`>EL4sSjC(v|j1jwse+VZA<`^Dv$L^5AC>7?F zhQdw`4}Yu?7(tb00u!%zm~eJCxc*hqHCh>LruV@1C>82BWDc;OWji_N*;qb^#}vjo zf<+Vjj!$?$LWS+O&c~ET8QI|(9_tPZTz-Q;6?-WOZr)&N{@*7e(A}HP``v;70000< KMNUMnLSTX~^P?RA diff --git a/src/imageedit/sq_converter.cpp b/src/imageedit/sq_converter.cpp index 74522af..ebe8e72 100644 --- a/src/imageedit/sq_converter.cpp +++ b/src/imageedit/sq_converter.cpp @@ -111,7 +111,7 @@ TQString SQ_Converter::adjustFileName(const TQString &globalprefix, const TQStri prefix.truncate(name2.length() - ext.length()); suffix = (SQ_LibraryHandler::instance()->knownExtension(TQString::fromLatin1("*.") + ext)) - ? TQString(lw->codec->extension(32)) : ext; + ? TQString(lw->codec->extension(32).c_str()) : ext; if(replace == 0 || replace == 2) result = (!paged) ? (prefix + inner + suffix) : (prefix + spage + inner + suffix); diff --git a/src/ksquirrel-libs-configurator/klc.cpp b/src/ksquirrel-libs-configurator/klc.cpp deleted file mode 100644 index 4f9a3ef..0000000 --- a/src/ksquirrel-libs-configurator/klc.cpp +++ /dev/null @@ -1,115 +0,0 @@ -#include -#include -/**************************************************************************** -** Form implementation generated from reading ui file './klc.ui' -** -** Created: Птн Дек 7 20:18:10 2007 -** by: The User Interface Compiler ($Id: tqt/main.cpp 3.3.7 edited Aug 31 2005 $) -** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ - -#include "klc.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "./klc.ui.h" - -/* - * Constructs a KLC as a child of 'parent', with the - * name 'name' and widget flags set to 'f'. - */ -KLC::KLC( TQWidget* parent, const char* name, WFlags fl ) - : TQWidget( parent, name, fl ) -{ - if ( !name ) - setName( "KLC" ); - KLCLayout = new TQGridLayout( this, 1, 1, 11, 6, "KLCLayout"); - - layout1 = new TQHBoxLayout( 0, 0, 6, "layout1"); - spacer1 = new TQSpacerItem( 371, 26, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - layout1->addItem( spacer1 ); - - pushApply = new TQPushButton( this, "pushApply" ); - layout1->addWidget( pushApply ); - - pushClose = new TQPushButton( this, "pushClose" ); - layout1->addWidget( pushClose ); - - KLCLayout->addMultiCellLayout( layout1, 2, 2, 0, 1 ); - - listDisabled = new TQListView( this, "listDisabled" ); - listDisabled->addColumn( tr2i18n( "..." ) ); - listDisabled->setEnabled( FALSE ); - listDisabled->setAllColumnsShowFocus( TRUE ); - listDisabled->setResizeMode( TQListView::AllColumns ); - - KLCLayout->addWidget( listDisabled, 1, 1 ); - - textLabel1_2 = new TQLabel( this, "textLabel1_2" ); - - KLCLayout->addWidget( textLabel1_2, 0, 1 ); - - textLabel1 = new TQLabel( this, "textLabel1" ); - - KLCLayout->addWidget( textLabel1, 0, 0 ); - - listEnabled = new TQListView( this, "listEnabled" ); - listEnabled->addColumn( tr2i18n( "..." ) ); - listEnabled->setEnabled( FALSE ); - listEnabled->setAllColumnsShowFocus( TRUE ); - listEnabled->setResizeMode( TQListView::AllColumns ); - - KLCLayout->addWidget( listEnabled, 1, 0 ); - languageChange(); - resize( TQSize(586, 425).expandedTo(minimumSizeHint()) ); - clearWState( WState_Polished ); - - // signals and slots connections - connect( pushApply, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotApply() ) ); - connect( pushClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( close() ) ); - - // tab order - setTabOrder( listEnabled, listDisabled ); - setTabOrder( listDisabled, pushApply ); - setTabOrder( pushApply, pushClose ); - init(); -} - -/* - * Destroys the object and frees any allocated resources - */ -KLC::~KLC() -{ - destroy(); - // no need to delete child widgets, TQt does it all for us -} - -/* - * Sets the strings of the subwidgets using the current - * language. - */ -void KLC::languageChange() -{ - setCaption( tr2i18n( "Codec manager" ) ); - pushApply->setText( tr2i18n( "Apply" ) ); - pushClose->setText( tr2i18n( "Close" ) ); - listDisabled->header()->setLabel( 0, tr2i18n( "..." ) ); - textLabel1_2->setText( tr2i18n( "Select codecs to enable:" ) ); - textLabel1->setText( tr2i18n( "Select codecs to disable:" ) ); - listEnabled->header()->setLabel( 0, tr2i18n( "..." ) ); -} - -#include "klc.moc" diff --git a/src/ksquirrel-libs-configurator/main.cpp b/src/ksquirrel-libs-configurator/main.cpp index 4bfc26c..d1549ca 100644 --- a/src/ksquirrel-libs-configurator/main.cpp +++ b/src/ksquirrel-libs-configurator/main.cpp @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) I18N_NOOP("ksquirrel-libs-configurator"), TDEAboutData::License_GPL, "(c) 2007 Baryshev Dmitry", - TQString(), + 0, "http://ksquirrel.sourceforge.net", "ksquirrel.iv@gmail.com"); diff --git a/src/ksquirrel.cpp b/src/ksquirrel.cpp index 92aa892..8f2a149 100644 --- a/src/ksquirrel.cpp +++ b/src/ksquirrel.cpp @@ -514,7 +514,7 @@ void KSquirrel::createWidgets(int createFirst) m_urlbox = tdeconf->readBoolEntry("has_url", false); // main TQVBox - mainPage = new TQVBox(this, TQString::fromLatin1("SQ_BROWSER_VBOX")); + mainPage = new TQVBox(this, "SQ_BROWSER_VBOX"); mainPage->resize(size()); SQ_SplashScreen::advance(); @@ -526,7 +526,7 @@ void KSquirrel::createWidgets(int createFirst) tools = new TDEToolBar(mainPage); // location toolbar - pTLocation = new TDEToolBar(mainPage, TQString::fromLatin1("Location toolbar")); + pTLocation = new TDEToolBar(mainPage, "Location toolbar"); pTLocation->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); // main splitter @@ -1748,7 +1748,7 @@ void KSquirrel::control(const TQString &command) { int id = it.data(); - TDEAction *a = SQ_GLWidget::window()->actionCollection()->action(TQString::fromLatin1("action_%1").arg(id)); + TDEAction *a = SQ_GLWidget::window()->actionCollection()->action(TQString("action_%1").arg(id).local8Bit()); if(a) a->activate(); } @@ -1759,7 +1759,7 @@ void KSquirrel::control(const TQString &command) for(TQMap::iterator it = messages.begin();it != messages.end();++it) { - std::cerr << it.key() << std::endl; + std::cerr << it.key().local8Bit() << std::endl; } std::cerr << "******************************" << std::endl; diff --git a/src/ksquirrelpart/ksquirrelpart.cpp b/src/ksquirrelpart/ksquirrelpart.cpp index 8483ed7..b2cc809 100644 --- a/src/ksquirrelpart/ksquirrelpart.cpp +++ b/src/ksquirrelpart/ksquirrelpart.cpp @@ -80,46 +80,46 @@ KSquirrelPart::KSquirrelPart(TQWidget *parentWidget, const char *, TDEAction *a; - a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Plus)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Plus).local8Bit()); new TDEAction(i18n("Zoom +"), "zoom-in", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart zoom in"); - a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Minus)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Minus).local8Bit()); new TDEAction(i18n("Zoom -"), "zoom-out", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart zoom out"); - a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_P)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_P).local8Bit()); new TDEAction(i18n("Properties"), "image-x-generic", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart properties"); - a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_R)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_R).local8Bit()); new TDEAction(i18n("Normalize"), "rebuild", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart normalize"); // colorize & filters - a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_D)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_D).local8Bit()); new TDEAction(i18n("Color balance..."), "colorize", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart colorbalance"); - a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_U)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_U).local8Bit()); new TDEAction(i18n("Apply filter..."), "effect", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart filter"); // rotate - a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Left+CTRL)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Left+CTRL).local8Bit()); new TDEAction(i18n("Rotate left"), "object-rotate-left", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart rotateleft"); - a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Right+CTRL)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Right+CTRL).local8Bit()); new TDEAction(i18n("Rotate right"), "object-rotate-right", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart rotateright"); // copy/move - a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F5)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F5).local8Bit()); new TDEAction(i18n("Copy to..."), "edit-copy", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart copyto"); - a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F7)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F7).local8Bit()); new TDEAction(i18n("Move to..."), "edit-cut", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart moveto"); - a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F6)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F6).local8Bit()); new TDEAction(i18n("Copy to last folder"), "", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart copy"); - a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F8)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F8).local8Bit()); new TDEAction(i18n("Move to last folder"), "", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart move"); - a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_S)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_S).local8Bit()); new TDEAction(i18n("Save As..."), "document-save-as", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart saveas"); sa = new TDESelectAction(i18n("Zoom"), 0, actionCollection(), "ksquirrelpart zoom"); diff --git a/src/ksquirrelpart/sq_codecsettingsskeleton.ui.h b/src/ksquirrelpart/sq_codecsettingsskeleton.ui.h index d976149..2cbbf93 100644 --- a/src/ksquirrelpart/sq_codecsettingsskeleton.ui.h +++ b/src/ksquirrelpart/sq_codecsettingsskeleton.ui.h @@ -94,7 +94,7 @@ void SQ_CodecSettingsSkeleton::recursivelyReadWrite(fmt_settings &settings, bool if(u && t != settings.end()) { if(r) - u->setURL((*t).second.sVal); + u->setURL((*t).second.sVal.c_str()); else { KURL url = u->url(); // get rid of "file://" if present @@ -134,7 +134,7 @@ void SQ_CodecSettingsSkeleton::recursivelyReadWrite(fmt_settings &settings, bool if(c && t != settings.end()) { if(r) - c->setColor(TQColor(TQString((*t).second.sVal))); + c->setColor(TQColor(TQString((*t).second.sVal.c_str()))); else (*t).second.sVal = TQString(c->color().name()).ascii(); } diff --git a/src/ksquirrelpart/sq_glwidget_stuff.cpp b/src/ksquirrelpart/sq_glwidget_stuff.cpp index 25c1706..954e2a7 100644 --- a/src/ksquirrelpart/sq_glwidget_stuff.cpp +++ b/src/ksquirrelpart/sq_glwidget_stuff.cpp @@ -229,7 +229,7 @@ void SQ_GLWidget::slotProperties() { for(std::vector::iterator it = tab->finfo.meta.begin();it != tab->finfo.meta.end();++it) { - meta.append(TQPair((*it).group, (*it).data)); + meta.append(TQPair((*it).group.c_str(), (*it).data.c_str())); } } @@ -238,8 +238,8 @@ void SQ_GLWidget::slotProperties() list << tab->quickImageInfo << TQString::fromLatin1("%1x%2").arg(tab->finfo.image[tab->current].w).arg(tab->finfo.image[tab->current].h) << TQString::fromLatin1("%1").arg(tab->finfo.image[tab->current].bpp) - << tab->finfo.image[tab->current].colorspace - << tab->finfo.image[tab->current].compression + << tab->finfo.image[tab->current].colorspace.c_str() + << tab->finfo.image[tab->current].compression.c_str() << sz << TQString::fromLatin1("%1").arg((double)real_size / tab->fmt_size, 0, 'f', 2) << ((tab->finfo.image[tab->current].interlaced) ? i18n("yes") : i18n("no")) @@ -871,7 +871,7 @@ void SQ_GLWidget::initAccelsAndMenu() menu->insertItem(i18n("Image"), menuImage); #define SQ_ADD_KACTION(b) \ - (new TDEAction(TQString(), b, this, TQ_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").arg(b))) + (new TDEAction(TQString(), b, this, TQ_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").arg(b).local8Bit())) id_saveas = menuFile->insertItem(SQ_IconLoader::instance()->loadIcon("document-save-as", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Save As...") + "\tS", SQ_ADD_KACTION(TQt::Key_S), TQ_SLOT(activate())); diff --git a/src/ksquirrelpart/sq_libraryhandler.cpp b/src/ksquirrelpart/sq_libraryhandler.cpp index 3b6cf2c..56165b9 100644 --- a/src/ksquirrelpart/sq_libraryhandler.cpp +++ b/src/ksquirrelpart/sq_libraryhandler.cpp @@ -257,8 +257,8 @@ void SQ_LibraryHandler::add(TQStringList &foundLibraries) libtmp.lib->load(); // resolve create() and destroy() functions - libtmp.codec_create = (fmt_codec_base*(*)())(libtmp.lib)->resolve(TQString::fromLatin1("codec_create")); - libtmp.codec_destroy = (void (*)(fmt_codec_base*))(libtmp.lib)->resolve(TQString::fromLatin1("codec_destroy")); + libtmp.codec_create = (fmt_codec_base*(*)())(libtmp.lib)->resolve(TQString::fromLatin1("codec_create").local8Bit()); + libtmp.codec_destroy = (void (*)(fmt_codec_base*))(libtmp.lib)->resolve(TQString::fromLatin1("codec_destroy").local8Bit()); // couldn't resolve - corrupted library ? if(!libtmp.codec_create || !libtmp.codec_destroy) @@ -274,19 +274,19 @@ void SQ_LibraryHandler::add(TQStringList &foundLibraries) // read options codeK->options(&o); - TQString q = o.name; + TQString q = o.name.c_str(); // Yet unknown library ? if(!alreadyInMap(q)) { libtmp.mime = TQPixmap(reinterpret_cast(o.pixmap)); - libtmp.mimetype = o.mimetype; + libtmp.mimetype = o.mimetype.c_str(); libtmp.mime_multi = libtmp.mimetype.find(';') != -1; libtmp.quickinfo = q; - libtmp.filter = o.filter; - libtmp.version = o.version; - libtmp.regexp_str = o.mime; - libtmp.config = o.config; + libtmp.filter = o.filter.c_str(); + libtmp.version = o.version.c_str(); + libtmp.regexp_str = o.mime.c_str(); + libtmp.config = o.config.c_str(); libtmp.regexp.setPattern(libtmp.regexp_str); libtmp.regexp.setCaseSensitive(true); libtmp.writestatic = o.writestatic; @@ -366,10 +366,10 @@ void SQ_LibraryHandler::dump() const for(const_iterator it = begin();it != itEnd;++it) { std::cerr << std::setw(30) - << KStringHandler::csqueeze(TQFileInfo((*it).libpath).fileName(), 30) + << KStringHandler::csqueeze(TQFileInfo((*it).libpath).fileName(), 30).local8Bit() << std::setw(0) << " [" - << KStringHandler::rsqueeze((*it).quickinfo, 45) + << KStringHandler::rsqueeze((*it).quickinfo, 45).local8Bit() << "]" << endl; } @@ -430,7 +430,7 @@ void SQ_LibraryHandler::writeSettings(SQ_LIBRARY *lib) for(fmt_settings::iterator it = lib->settings.begin();it != itEnd;++it) { - k = (*it).first; + k = TQString::fromLocal8Bit((*it).first.c_str()); if((*it).second.type == settings_value::v_bool) // boolean { @@ -450,7 +450,7 @@ void SQ_LibraryHandler::writeSettings(SQ_LIBRARY *lib) else // string { k.prepend("s"); - tdeconf->writeEntry(k, (*it).second.sVal); + tdeconf->writeEntry(k, (*it).second.sVal.c_str()); } } } diff --git a/src/main.cpp b/src/main.cpp index ba65acf..b87b928 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -68,18 +68,18 @@ int main(int argc, char *argv[]) I18N_NOOP("KSquirrel - image viewer for TDE"), TDEAboutData::License_GPL, "(c) 2003-2007 Baryshev Dmitry", - TQString(), + 0, "http://ksquirrel.sourceforge.net", "ksquirrel.iv@gmail.com"); // setup 'About' dialog - aboutData.addAuthor("Dmitry Baryshev aka Krasu", "Author", "ksquirrel.iv@gmail.com", TQString()); - aboutData.addCredit("Andrey Rahmatullin aka wrar", I18N_NOOP("Bug reports, patches"), "wrar@altlinux.ru", TQString()); - aboutData.addCredit("SeaJey", I18N_NOOP("Testing"), "seajey.serg@gmail.com", TQString()); - aboutData.addCredit("JaguarWan", I18N_NOOP("Bug reports"), "jaguarwan@gmail.com", TQString()); + aboutData.addAuthor("Dmitry Baryshev aka Krasu", "Author", "ksquirrel.iv@gmail.com"); + aboutData.addCredit("Andrey Rahmatullin aka wrar", I18N_NOOP("Bug reports, patches"), "wrar@altlinux.ru"); + aboutData.addCredit("SeaJey", I18N_NOOP("Testing"), "seajey.serg@gmail.com"); + aboutData.addCredit("JaguarWan", I18N_NOOP("Bug reports"), "jaguarwan@gmail.com"); aboutData.addCredit("NightGoblin", I18N_NOOP("Translation help"), 0, "http://nightgoblin.info"); aboutData.addCredit(I18N_NOOP("TiamaT"), I18N_NOOP("Initial artwork for edit tools"), "plasticfantasy@tut.by", "http://www.livejournal.com/users/tiamatik/"); - aboutData.addCredit(I18N_NOOP("Fera"), I18N_NOOP("Great artwork for edit tools"), "morrigan171@mail.ru", TQString()); + aboutData.addCredit(I18N_NOOP("Fera"), I18N_NOOP("Great artwork for edit tools"), "morrigan171@mail.ru"); aboutData.addCredit(I18N_NOOP("OpenGL forum at"), 0, 0, "http://opengl.org"); aboutData.addCredit(I18N_NOOP("GameDev forum at"), 0, 0, "http://gamedev.ru"); diff --git a/src/sidebar/sq_storagefile.cpp b/src/sidebar/sq_storagefile.cpp index cb26937..cf41122 100644 --- a/src/sidebar/sq_storagefile.cpp +++ b/src/sidebar/sq_storagefile.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include -#include +#include #include #include @@ -38,7 +38,7 @@ void SQ_StorageFile::writeStorageFileAsString(const TQString &path, const KURL & if(file.open(IO_WriteOnly)) { - TQString k = content.utf8(); + TQCString k = content.local8Bit(); file.writeBlock(k, k.length()); file.close(); } @@ -64,12 +64,9 @@ TQString SQ_StorageFile::readStorageFileAsString(const TQString &path) if(file.open(IO_ReadOnly)) { TQByteArray ba = file.readAll(); - if(file.status() == IO_Ok) { - TQString k; str.append(ba); - str = TQString::fromUtf8(str); } } diff --git a/src/sq_codecsettingsskeleton.ui.h b/src/sq_codecsettingsskeleton.ui.h index d976149..2cbbf93 100644 --- a/src/sq_codecsettingsskeleton.ui.h +++ b/src/sq_codecsettingsskeleton.ui.h @@ -94,7 +94,7 @@ void SQ_CodecSettingsSkeleton::recursivelyReadWrite(fmt_settings &settings, bool if(u && t != settings.end()) { if(r) - u->setURL((*t).second.sVal); + u->setURL((*t).second.sVal.c_str()); else { KURL url = u->url(); // get rid of "file://" if present @@ -134,7 +134,7 @@ void SQ_CodecSettingsSkeleton::recursivelyReadWrite(fmt_settings &settings, bool if(c && t != settings.end()) { if(r) - c->setColor(TQColor(TQString((*t).second.sVal))); + c->setColor(TQColor(TQString((*t).second.sVal.c_str()))); else (*t).second.sVal = TQString(c->color().name()).ascii(); } diff --git a/src/sq_dirthumbs.cpp b/src/sq_dirthumbs.cpp index 03e73bc..76e289d 100644 --- a/src/sq_dirthumbs.cpp +++ b/src/sq_dirthumbs.cpp @@ -71,7 +71,7 @@ void SQ_DirThumbs::saveThumbnail(const KURL &url, SQ_Thumbnail &thumb) TQString SQ_DirThumbs::absPath(const KURL &relurl) { - KMD5 md5(TQString(TQFile::encodeName(relurl.prettyURL()))); + KMD5 md5(TQString(TQFile::encodeName(relurl.prettyURL())).local8Bit()); TQString ext = TQString::fromLatin1(".%1").arg(sqdirThumbFormat); diff --git a/src/sq_glwidget_stuff.cpp b/src/sq_glwidget_stuff.cpp index 25c1706..954e2a7 100644 --- a/src/sq_glwidget_stuff.cpp +++ b/src/sq_glwidget_stuff.cpp @@ -229,7 +229,7 @@ void SQ_GLWidget::slotProperties() { for(std::vector::iterator it = tab->finfo.meta.begin();it != tab->finfo.meta.end();++it) { - meta.append(TQPair((*it).group, (*it).data)); + meta.append(TQPair((*it).group.c_str(), (*it).data.c_str())); } } @@ -238,8 +238,8 @@ void SQ_GLWidget::slotProperties() list << tab->quickImageInfo << TQString::fromLatin1("%1x%2").arg(tab->finfo.image[tab->current].w).arg(tab->finfo.image[tab->current].h) << TQString::fromLatin1("%1").arg(tab->finfo.image[tab->current].bpp) - << tab->finfo.image[tab->current].colorspace - << tab->finfo.image[tab->current].compression + << tab->finfo.image[tab->current].colorspace.c_str() + << tab->finfo.image[tab->current].compression.c_str() << sz << TQString::fromLatin1("%1").arg((double)real_size / tab->fmt_size, 0, 'f', 2) << ((tab->finfo.image[tab->current].interlaced) ? i18n("yes") : i18n("no")) @@ -871,7 +871,7 @@ void SQ_GLWidget::initAccelsAndMenu() menu->insertItem(i18n("Image"), menuImage); #define SQ_ADD_KACTION(b) \ - (new TDEAction(TQString(), b, this, TQ_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").arg(b))) + (new TDEAction(TQString(), b, this, TQ_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").arg(b).local8Bit())) id_saveas = menuFile->insertItem(SQ_IconLoader::instance()->loadIcon("document-save-as", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Save As...") + "\tS", SQ_ADD_KACTION(TQt::Key_S), TQ_SLOT(activate())); diff --git a/src/sq_libraryhandler.cpp b/src/sq_libraryhandler.cpp index 3b6cf2c..56165b9 100644 --- a/src/sq_libraryhandler.cpp +++ b/src/sq_libraryhandler.cpp @@ -257,8 +257,8 @@ void SQ_LibraryHandler::add(TQStringList &foundLibraries) libtmp.lib->load(); // resolve create() and destroy() functions - libtmp.codec_create = (fmt_codec_base*(*)())(libtmp.lib)->resolve(TQString::fromLatin1("codec_create")); - libtmp.codec_destroy = (void (*)(fmt_codec_base*))(libtmp.lib)->resolve(TQString::fromLatin1("codec_destroy")); + libtmp.codec_create = (fmt_codec_base*(*)())(libtmp.lib)->resolve(TQString::fromLatin1("codec_create").local8Bit()); + libtmp.codec_destroy = (void (*)(fmt_codec_base*))(libtmp.lib)->resolve(TQString::fromLatin1("codec_destroy").local8Bit()); // couldn't resolve - corrupted library ? if(!libtmp.codec_create || !libtmp.codec_destroy) @@ -274,19 +274,19 @@ void SQ_LibraryHandler::add(TQStringList &foundLibraries) // read options codeK->options(&o); - TQString q = o.name; + TQString q = o.name.c_str(); // Yet unknown library ? if(!alreadyInMap(q)) { libtmp.mime = TQPixmap(reinterpret_cast(o.pixmap)); - libtmp.mimetype = o.mimetype; + libtmp.mimetype = o.mimetype.c_str(); libtmp.mime_multi = libtmp.mimetype.find(';') != -1; libtmp.quickinfo = q; - libtmp.filter = o.filter; - libtmp.version = o.version; - libtmp.regexp_str = o.mime; - libtmp.config = o.config; + libtmp.filter = o.filter.c_str(); + libtmp.version = o.version.c_str(); + libtmp.regexp_str = o.mime.c_str(); + libtmp.config = o.config.c_str(); libtmp.regexp.setPattern(libtmp.regexp_str); libtmp.regexp.setCaseSensitive(true); libtmp.writestatic = o.writestatic; @@ -366,10 +366,10 @@ void SQ_LibraryHandler::dump() const for(const_iterator it = begin();it != itEnd;++it) { std::cerr << std::setw(30) - << KStringHandler::csqueeze(TQFileInfo((*it).libpath).fileName(), 30) + << KStringHandler::csqueeze(TQFileInfo((*it).libpath).fileName(), 30).local8Bit() << std::setw(0) << " [" - << KStringHandler::rsqueeze((*it).quickinfo, 45) + << KStringHandler::rsqueeze((*it).quickinfo, 45).local8Bit() << "]" << endl; } @@ -430,7 +430,7 @@ void SQ_LibraryHandler::writeSettings(SQ_LIBRARY *lib) for(fmt_settings::iterator it = lib->settings.begin();it != itEnd;++it) { - k = (*it).first; + k = TQString::fromLocal8Bit((*it).first.c_str()); if((*it).second.type == settings_value::v_bool) // boolean { @@ -450,7 +450,7 @@ void SQ_LibraryHandler::writeSettings(SQ_LIBRARY *lib) else // string { k.prepend("s"); - tdeconf->writeEntry(k, (*it).second.sVal); + tdeconf->writeEntry(k, (*it).second.sVal.c_str()); } } } diff --git a/src/sq_widgetstack.cpp b/src/sq_widgetstack.cpp index 8aeeaba..e931c0b 100644 --- a/src/sq_widgetstack.cpp +++ b/src/sq_widgetstack.cpp @@ -753,7 +753,7 @@ void SQ_WidgetStack::slotSelectAll() TDEAction* SQ_WidgetStack::action(const TQString &name) { - return dirop->actionCollection()->action(name); + return dirop->actionCollection()->action(name.local8Bit()); } bool SQ_WidgetStack::updateRunning() const