From c604a648677271bb3db22cdf06f4897a5e652594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Thu, 31 Aug 2017 07:51:43 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@539 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- utils/system_daemon/daemon.cpp | 2 +- utils/system_daemon/file_manager.cpp | 2 +- utils/system_daemon/main.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/system_daemon/daemon.cpp b/utils/system_daemon/daemon.cpp index 9aa99b9b..1e1df9a5 100644 --- a/utils/system_daemon/daemon.cpp +++ b/utils/system_daemon/daemon.cpp @@ -259,7 +259,7 @@ void Daemon::TileFileProgress::tileEvent(PIScreenTile * t, TileEvent e) { -Daemon::Daemon(): PIPeer(pisd_prefix + PISystemInfo::instance()->hostname + "_" + PIString(randomi() % 100)) { +Daemon::Daemon(): PIPeer(pisd_prefix + PISystemInfo::instance()->hostname + "_" + PIString::fromNumber(randomi() % 100)) { // setName("Daemon"); dtimer.setName("__S__Daemon_timer"); mode = rmNone; diff --git a/utils/system_daemon/file_manager.cpp b/utils/system_daemon/file_manager.cpp index 26b6f082..2ac09574 100644 --- a/utils/system_daemon/file_manager.cpp +++ b/utils/system_daemon/file_manager.cpp @@ -246,7 +246,7 @@ FileManager::FileManager() { panels[i] = new TileDir(); panels[i]->fm = this; panels[i]->key_func = (void*)tileKey_s; - panels[i]->setName("file panel " + PIString(i)); + panels[i]->setName("file panel " + PIString::fromNumber(i)); panels[i]->label_path = plabel; CONNECTU(panels[i], actionRequest, this, actionRequest) panel->addTile(plabel); diff --git a/utils/system_daemon/main.cpp b/utils/system_daemon/main.cpp index f4eb71fb..61a12ef6 100755 --- a/utils/system_daemon/main.cpp +++ b/utils/system_daemon/main.cpp @@ -221,13 +221,13 @@ public: line += ns.expandLeftTo(5, ' ') + " %, u "; ns = PIString::fromNumber(sys_mon.statistic().cpu_load_user, 'f', 2); line += ns.expandLeftTo(5, ' ') + " %"; - tile->content << TileList::Row("PID: " + PIString(sys_mon.statistic().ID), CellFormat()); + tile->content << TileList::Row("PID: " + PIString::fromNumber(sys_mon.statistic().ID), CellFormat()); tile->content << TileList::Row(line, CellFormat()); tile->content << TileList::Row("Threads:", CellFormat()); piForeachC (PISystemMonitor::ThreadStats & t, ts) maxlen = piMaxi(maxlen, t.name.length()); piForeachC (PISystemMonitor::ThreadStats & t, ts) { - line = PIString(++num).expandLeftTo(2, ' ') + ": "; + line = PIString::fromNumber(++num).expandLeftTo(2, ' ') + ": "; line += PIString(t.name).expandRightTo(maxlen, ' ') + ": k "; PIString ns = PIString::fromNumber(t.cpu_load_kernel, 'f', 2); line += ns.expandLeftTo(5, ' ') + " %, u ";