diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2026-02-21 11:03:45 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2026-02-22 20:26:55 +0900 |
| commit | 16d42ec4616a84b046cd71f805a009b792a93ec9 (patch) | |
| tree | 1522d1dd06ecd32e6c61d142b88d4b4814b83950 /src/modules/options | |
| parent | a09cecfffd5151adfc50e343c821ed8ebdd1ab87 (diff) | |
| download | kvirc-16d42ec4616a84b046cd71f805a009b792a93ec9.tar.gz kvirc-16d42ec4616a84b046cd71f805a009b792a93ec9.zip | |
Fix conversion of TQString to const char* (modules)
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src/modules/options')
| -rw-r--r-- | src/modules/options/libkvioptions.cpp | 2 | ||||
| -rw-r--r-- | src/modules/options/optw_messages.cpp | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp index bdca2099..8607a684 100644 --- a/src/modules/options/libkvioptions.cpp +++ b/src/modules/options/libkvioptions.cpp @@ -193,7 +193,7 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c) KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("option",KVS_PT_STRING,0,szOption) KVSM_PARAMETERS_END(c) - KviOptionsWidgetInstanceEntry * e = g_pOptionsInstanceManager->findInstanceEntry(szOption); + KviOptionsWidgetInstanceEntry * e = g_pOptionsInstanceManager->findInstanceEntry(szOption.utf8().data()); if(!e) { c->warning(__tr2qs_ctx("No such options page class name %Q","options"),&szOption); diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp index 9eabcce6..77f853b2 100644 --- a/src/modules/options/optw_messages.cpp +++ b/src/modules/options/optw_messages.cpp @@ -47,6 +47,8 @@ #include "kvi_config.h" #include "kvi_filedialog.h" +#include <tuple> + //#warning "Info tips" #ifdef COMPILE_PSEUDO_TRANSPARENCY @@ -292,7 +294,7 @@ void KviMessageListViewItem::paintCell(TQPainter * p,const TQColorGroup &,int,in // skip the msgtype prefix TQString txt = (g_msgtypeOptionsTable[m_iOptId].name + 7); txt += " ("; - txt += __tr2qs_no_xgettext(TQString::fromUtf8(m_pMsgType->type())); + txt += __tr2qs_no_xgettext(m_pMsgType->type()); txt += ")"; p->drawText(24,listView()->itemMargin(),w - 24,height() - (listView()->itemMargin() * 2),TQt::AlignLeft | TQt::AlignVCenter,txt); if(isSelected()) @@ -614,8 +616,7 @@ void KviMessageColorsOptionsWidget::load() //tqDebug("SYMLINKING %s to %s",szGlobal.ptr(),szLocal.ptr()); //tqDebug("SYMLINK RETURNS %d (%d)",::symlink(szGlobal.ptr(),szLocal.ptr())); //tqDebug("ERRNO (%d)",errno); - // "int _ = " used to silence warning from compiler about unchecked returned values - int _ = symlink(szGlobal,szLocal); + std::ignore = symlink(szGlobal.utf8().data(),szLocal.utf8().data()); // FIXME: Do it also on windows... #endif |