1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
--- kcollectd-0.9.orig/kcollectd/kcollectd.cc
+++ kcollectd-0.9/kcollectd/kcollectd.cc
@@ -73,7 +73,7 @@
gui->show();
}
}
- catch(basic_filesystem_error<path> &e) {
+ catch(const std::exception &e) {
KMessageBox::error(0, i18n("Failed to read collectd-structure at \'%1\'\n"
"Terminating.", QString(RRD_BASEDIR)));
exit(1);
--- kcollectd-0.9.orig/kcollectd/gui.cc
+++ kcollectd-0.9/kcollectd/gui.cc
@@ -127,21 +127,21 @@
const directory_iterator end_itr;
for (directory_iterator host(rrdpath); host != end_itr; ++host ) {
if (is_directory(*host)) {
- QTreeWidgetItem *hostitem = mkItem(listview, host->leaf());
+ QTreeWidgetItem *hostitem = mkItem(listview, host->path().filename().string());
hostitem->setFlags(hostitem->flags() & ~Qt::ItemIsSelectable);
for (directory_iterator sensor(*host); sensor != end_itr; ++sensor ) {
if (is_directory(*sensor)) {
- QTreeWidgetItem *sensoritem = mkItem(hostitem, sensor->leaf());
+ QTreeWidgetItem *sensoritem = mkItem(hostitem, sensor->path().filename().string());
sensoritem->setFlags(sensoritem->flags() & ~Qt::ItemIsSelectable);
for (directory_iterator rrd(*sensor); rrd != end_itr; ++rrd ) {
if (is_regular(*rrd) && extension(*rrd) == ".rrd") {
QTreeWidgetItem *rrditem = mkItem(sensoritem, basename(*rrd));
rrditem->setFlags(rrditem->flags() & ~Qt::ItemIsSelectable);
std::ostringstream info;
- info << host->leaf() << delimiter
- << sensor->leaf() << delimiter
+ info << host->path().filename().string() << delimiter
+ << sensor->path().filename().string() << delimiter
<< basename(*rrd);
- get_datasources(rrd->string(), info.str(), rrditem);
+ get_datasources(rrd->path().string(), info.str(), rrditem);
}
}
}
--- kcollectd-0.9.orig/doc/en/index.docbook
+++ kcollectd-0.9/doc/en/index.docbook
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY kcollectd "<application>kcollectd 0.8</application>">
<!ENTITY kappname "&kcollectd;">
<!ENTITY package "kcollectd">
--- kcollectd-0.9.orig/po/de.po
+++ kcollectd-0.9/po/de.po
@@ -10,6 +10,7 @@
"PO-Revision-Date: 2009-06-16 20:41+0200\n"
"Last-Translator: M G Berberich <berberic@fmi.uni-passau.de>\n"
"Language-Team: German <kde-i18n-de@kde.org>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
|
