summaryrefslogtreecommitdiffstats
path: root/src/basket.cpp
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2020-04-07 02:21:44 +0200
committerSlávek Banko <slavek.banko@axis.cz>2020-04-10 12:47:05 +0200
commitb51e232350d31b65a8cd055693c7869f0a896193 (patch)
treea92cf4251003376d27c8621bc5116dd980faf381 /src/basket.cpp
parent360e269df56279904ac6f2913e8f0c3f786aa8fb (diff)
downloadbasket-b51e232350d31b65a8cd055693c7869f0a896193.tar.gz
basket-b51e232350d31b65a8cd055693c7869f0a896193.zip
Added controlled conversions to char* instead of automatic ascii conversions.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit ef3976a6cb843f51333ea43172306a9c8f4954ef)
Diffstat (limited to 'src/basket.cpp')
-rw-r--r--src/basket.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/basket.cpp b/src/basket.cpp
index aa51f8c..a4edb31 100644
--- a/src/basket.cpp
+++ b/src/basket.cpp
@@ -346,7 +346,7 @@ void debugZone(int zone)
s = "Emblem0+" + TQString::number(zone - Note::Emblem0);
break;
}
- std::cout << s << std::endl;
+ std::cout << s.local8Bit() << std::endl;
}
#define FOR_EACH_NOTE(noteVar) \
@@ -1357,7 +1357,7 @@ Basket::Basket(TQWidget *parent, const TQString &folderName)
m_finishLoadOnFirstShow(false), m_relayoutOnNextShow(false)
{
TQString sAction = "local_basket_activate_" + folderName;
- m_action = new TDEAction("FAKE TEXT", "FAKE ICON", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(activatedShortcut()), Global::bnpView->actionCollection(), sAction);
+ m_action = new TDEAction("FAKE TEXT", "FAKE ICON", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(activatedShortcut()), Global::bnpView->actionCollection(), sAction.utf8());
m_action->setShortcutConfigurable(false); // We do it in the basket properties dialog (and keep it in sync with the global one)
if (!m_folderName.endsWith("/"))
@@ -3954,7 +3954,7 @@ void debugSel(NoteSelection* sel, int n = 0)
for (NoteSelection *node = sel; node; node = node->next) {
for (int i = 0; i < n; i++)
std::cout << "-";
- std::cout << (node->firstChild ? "Group" : node->note->content()->toText("")) << std::endl;
+ std::cout << (node->firstChild ? "Group" : node->note->content()->toText("").local8Bit()) << std::endl;
if (node->firstChild)
debugSel(node->firstChild, n+1);
}