summaryrefslogtreecommitdiff
path: root/src/printutils.cc
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2011-10-31 22:56:35 (GMT)
committerMarius Kintel <marius@kintel.net>2011-10-31 22:56:35 (GMT)
commitcb56f700b1b0f4ae589da62a5fd1d4e368deb604 (patch)
tree62fe4e42ca983c3b2b8c97fdd377861c112b27cc /src/printutils.cc
parent759446d6c3b8f10a95c6d4bf74f9b95a5821565b (diff)
de-Qt'ified printutils
Diffstat (limited to 'src/printutils.cc')
-rw-r--r--src/printutils.cc35
1 files changed, 18 insertions, 17 deletions
diff --git a/src/printutils.cc b/src/printutils.cc
index a315ab3..ec41765 100644
--- a/src/printutils.cc
+++ b/src/printutils.cc
@@ -2,7 +2,7 @@
#include <stdio.h>
#include <QDate>
-QList<QString> print_messages_stack;
+std::list<std::string> print_messages_stack;
OutputHandlerFunc *outputhandler = NULL;
void *outputhandler_data = NULL;
@@ -14,37 +14,38 @@ void set_output_handler(OutputHandlerFunc *newhandler, void *userdata)
void print_messages_push()
{
- print_messages_stack.append(QString());
+ print_messages_stack.push_back(std::string());
}
void print_messages_pop()
{
- QString msg = print_messages_stack.takeLast();
- if (print_messages_stack.size() > 0 && !msg.isNull()) {
- if (!print_messages_stack.last().isEmpty())
- print_messages_stack.last() += "\n";
- print_messages_stack.last() += msg;
+ std::string msg = print_messages_stack.back();
+ print_messages_stack.pop_back();
+ if (print_messages_stack.size() > 0 && !msg.empty()) {
+ if (!print_messages_stack.back().empty()) {
+ print_messages_stack.back() += "\n";
+ }
+ print_messages_stack.back() += msg;
}
}
-void PRINT(const QString &msg)
+void PRINT(const std::string &msg)
{
- if (msg.isNull())
- return;
+ if (msg.empty()) return;
if (print_messages_stack.size() > 0) {
- if (!print_messages_stack.last().isEmpty())
- print_messages_stack.last() += "\n";
- print_messages_stack.last() += msg;
+ if (!print_messages_stack.back().empty()) {
+ print_messages_stack.back() += "\n";
+ }
+ print_messages_stack.back() += msg;
}
PRINT_NOCACHE(msg);
}
-void PRINT_NOCACHE(const QString &msg)
+void PRINT_NOCACHE(const std::string &msg)
{
- if (msg.isNull())
- return;
+ if (msg.empty()) return;
if (!outputhandler) {
- fprintf(stderr, "%s\n", msg.toUtf8().data());
+ fprintf(stderr, "%s\n", msg.c_str());
} else {
outputhandler(msg, outputhandler_data);
}
contact: Jan Huwald // Impressum