Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/nmapsi/files: nmapsi-0.2_alpha3-gcc45.patch
Date: Thu, 06 May 2010 10:14:33
Message-Id: 20100506101430.DDA962950A@corvid.gentoo.org
1 ssuominen 10/05/06 10:14:30
2
3 Added: nmapsi-0.2_alpha3-gcc45.patch
4 Log:
5 Fix building with GCC 4.5+ wrt #318483 by Kacper Kowalik.
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 net-analyzer/nmapsi/files/nmapsi-0.2_alpha3-gcc45.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nmapsi/files/nmapsi-0.2_alpha3-gcc45.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nmapsi/files/nmapsi-0.2_alpha3-gcc45.patch?rev=1.1&content-type=text/plain
13
14 Index: nmapsi-0.2_alpha3-gcc45.patch
15 ===================================================================
16 diff -ur nmapsi4-0.2-alpha3.orig/lib/history/loghistory.cpp nmapsi4-0.2-alpha3/lib/history/loghistory.cpp
17 --- nmapsi4-0.2-alpha3.orig/lib/history/loghistory.cpp 2010-01-14 18:37:42.000000000 +0200
18 +++ nmapsi4-0.2-alpha3/lib/history/loghistory.cpp 2010-05-06 13:13:18.000000000 +0300
19 @@ -105,7 +105,7 @@
20 qDeleteAll(ItemListHistory);
21 ItemListHistory.clear();
22 logTree->clear();
23 - logTree->setIconSize(QSize::QSize(32, 32));
24 + logTree->setIconSize(QSize(32, 32));
25
26 QFile *tmpFile = new QFile();
27 short index = 0;
28 @@ -166,7 +166,7 @@
29 qDeleteAll(ItemListHistory);
30 ItemListHistory.clear();
31 logTree->clear();
32 - logTree->setIconSize(QSize::QSize(22, 22));
33 + logTree->setIconSize(QSize(22, 22));
34
35 if (!urlList.isEmpty() && urlList.first().compare("NULL") && urlListTime.first().compare("NULL")) {
36 #ifndef HISTORY_NO_DEBUG
37 diff -ur nmapsi4-0.2-alpha3.orig/nmapsi4/core/digSupport/digSupport.cpp nmapsi4-0.2-alpha3/nmapsi4/core/digSupport/digSupport.cpp
38 --- nmapsi4-0.2-alpha3.orig/nmapsi4/core/digSupport/digSupport.cpp 2010-01-14 18:37:43.000000000 +0200
39 +++ nmapsi4-0.2-alpha3/nmapsi4/core/digSupport/digSupport.cpp 2010-05-06 13:13:18.000000000 +0300
40 @@ -88,7 +88,7 @@
41 QTextStream stream1(&buff1);
42 QString line;
43
44 - Wview->setIconSize(QSize::QSize(32, 32));
45 + Wview->setIconSize(QSize(32, 32));
46 QTreeWidgetItem *rootLook = new QTreeWidgetItem(Wview);
47 itemList.push_front(rootLook);
48
49 @@ -107,7 +107,7 @@
50 #endif
51 itemLook = new QTreeWidgetItem(rootLook);
52 itemList.push_front(itemLook);
53 - itemLook->setSizeHint(0, QSize::QSize(22, 22));
54 + itemLook->setSizeHint(0, QSize(22, 22));
55 itemLook->setIcon(0, QIcon(QString::fromUtf8(":/images/images/view-web-browser-dom-tree.png")));
56 itemLook->setText(0,line);
57 if(!resultFlag) {
58 diff -ur nmapsi4-0.2-alpha3.orig/nmapsi4/core/hostCheck.cpp nmapsi4-0.2-alpha3/nmapsi4/core/hostCheck.cpp
59 --- nmapsi4-0.2-alpha3.orig/nmapsi4/core/hostCheck.cpp 2010-01-14 18:37:43.000000000 +0200
60 +++ nmapsi4-0.2-alpha3/nmapsi4/core/hostCheck.cpp 2010-05-06 13:13:18.000000000 +0300
61 @@ -30,7 +30,7 @@
62 this->delMonitorHost(scanMonitor,hostname);
63 return;
64 }
65 - treeLookup->setIconSize(QSize::QSize(32, 32));
66 + treeLookup->setIconSize(QSize(32, 32));
67 treeLookup->header()->setResizeMode(0, QHeaderView::Interactive);
68
69 rootLook = new QTreeWidgetItem(treeLookup);
70 diff -ur nmapsi4-0.2-alpha3.orig/nmapsi4/core/nmapParser.cpp nmapsi4-0.2-alpha3/nmapsi4/core/nmapParser.cpp
71 --- nmapsi4-0.2-alpha3.orig/nmapsi4/core/nmapParser.cpp 2010-01-14 18:37:43.000000000 +0200
72 +++ nmapsi4-0.2-alpha3/nmapsi4/core/nmapParser.cpp 2010-05-06 13:13:18.000000000 +0300
73 @@ -187,17 +187,17 @@
74 *out << nmap_command << endl << endl;
75 }
76
77 - listWscan->setIconSize(QSize::QSize(32, 32));
78 + listWscan->setIconSize(QSize(32, 32));
79 listWscan->header()->setResizeMode(0, QHeaderView::Interactive);
80 - listScanError->setIconSize(QSize::QSize(32, 32));
81 + listScanError->setIconSize(QSize(32, 32));
82 listScanError->header()->setResizeMode(0, QHeaderView::Interactive);
83 - listScan->setIconSize(QSize::QSize(32, 32));
84 + listScan->setIconSize(QSize(32, 32));
85 listScan->header()->setResizeMode(0, QHeaderView::Interactive);
86 - treeWinfo->setIconSize(QSize::QSize(32, 32));
87 + treeWinfo->setIconSize(QSize(32, 32));
88 treeWinfo->header()->setResizeMode(0, QHeaderView::Interactive);
89 - treeTraceroot->setIconSize(QSize::QSize(32, 32));
90 + treeTraceroot->setIconSize(QSize(32, 32));
91 treeTraceroot->header()->setResizeMode(0, QHeaderView::Interactive);
92 - treeNSS->setIconSize(QSize::QSize(32, 32));
93 + treeNSS->setIconSize(QSize(32, 32));
94 treeNSS->header()->setResizeMode(0, QHeaderView::Interactive);
95
96 int tmpBox = toolBox->currentIndex();
97 @@ -270,16 +270,16 @@
98 || b2_line.contains("unfiltered")) {
99
100 if (b2_line.contains("filtered") || b2_line.contains("unfiltered")) {
101 - item2->setSizeHint(0, QSize::QSize(22, 22));
102 + item2->setSizeHint(0, QSize(22, 22));
103 item2->setIcon(0, QIcon(QString::fromUtf8(":/images/images/flag_yellow.png")));
104 filtered_port++;
105 } else {
106 - item2->setSizeHint(0, QSize::QSize(22, 22));
107 + item2->setSizeHint(0, QSize(22, 22));
108 item2->setIcon(0, QIcon(QString::fromUtf8(":/images/images/flag_green.png")));
109 open_port++;
110 }
111 } else {
112 - item2->setSizeHint(0, QSize::QSize(22, 22));
113 + item2->setSizeHint(0, QSize(22, 22));
114 item2->setIcon(0, QIcon(QString::fromUtf8(":/images/images/flag_red.png")));
115 close_port++;
116 }
117 @@ -392,7 +392,7 @@
118 itemList.push_front(infoItemObj); // reference to address
119
120 if (!b3_line.isEmpty()) {
121 - infoItemObj->setSizeHint(0, QSize::QSize(22, 22));
122 + infoItemObj->setSizeHint(0, QSize(22, 22));
123 infoItemObj->setIcon(0, QIcon(QString::fromUtf8(":/images/images/messagebox_info.png")));
124 infoItemObj->setText(0, b3_line);
125 infoItemObj->setToolTip(0, b3_line); // field information
126 @@ -451,7 +451,7 @@
127 }
128 // ------------------------------------------------------------------------
129
130 - infoTracerootObj->setSizeHint(0, QSize::QSize(22, 22));
131 + infoTracerootObj->setSizeHint(0, QSize(22, 22));
132 infoTracerootObj->setIcon(0, QIcon(QString::fromUtf8(":/images/images/traceroute.png")));
133 if ((PFile) && (!verboseLog)) *out << infoTracerootObj->text(0) << endl;
134 }
135 @@ -475,7 +475,7 @@
136 infoNSSObj = new QTreeWidgetItem(infoNSS);
137 itemList.push_front(infoNSSObj);
138
139 - infoNSSObj->setSizeHint(0, QSize::QSize(22, 22));
140 + infoNSSObj->setSizeHint(0, QSize(22, 22));
141 infoNSSObj->setIcon(0, QIcon(QString::fromUtf8(":/images/images/traceroute.png")));
142 infoNSSObj->setText(0, bNSS_line);
143 infoNSSObj->setToolTip(0, bNSS_line); // field information
144 diff -ur nmapsi4-0.2-alpha3.orig/nmapsi4/core/resizeNmapsi4.cpp nmapsi4-0.2-alpha3/nmapsi4/core/resizeNmapsi4.cpp
145 --- nmapsi4-0.2-alpha3.orig/nmapsi4/core/resizeNmapsi4.cpp 2010-01-14 18:37:43.000000000 +0200
146 +++ nmapsi4-0.2-alpha3/nmapsi4/core/resizeNmapsi4.cpp 2010-05-06 13:13:18.000000000 +0300
147 @@ -96,7 +96,7 @@
148
149 void nmapClass::optionListCreate() {
150
151 - optionsListScan->setIconSize(QSize::QSize(52, 52));
152 + optionsListScan->setIconSize(QSize(52, 52));
153
154 scanW = new QListWidgetItem(optionsListScan);
155 scanW->setIcon(QIcon(QString::fromUtf8(":/images/images/viewmag.png")));
156 diff -ur nmapsi4-0.2-alpha3.orig/nmapsi4/core/scanMonitor.cpp nmapsi4-0.2-alpha3/nmapsi4/core/scanMonitor.cpp
157 --- nmapsi4-0.2-alpha3.orig/nmapsi4/core/scanMonitor.cpp 2010-01-14 18:37:43.000000000 +0200
158 +++ nmapsi4-0.2-alpha3/nmapsi4/core/scanMonitor.cpp 2010-05-06 13:13:18.000000000 +0300
159 @@ -20,7 +20,7 @@
160 #include "../mainwin.h"
161
162 void nmapClass::addMonitorHost(QTreeWidget* monitor, const QString host) {
163 - scanMonitor->setIconSize(QSize::QSize(32, 32));
164 + scanMonitor->setIconSize(QSize(32, 32));
165 scanMonitor->header()->setResizeMode(0, QHeaderView::Interactive);
166 tabWidget->setTabIcon(2,QIcon(QString::fromUtf8(":/images/images/reload.png")));
167 QTreeWidgetItem *hostThread = new QTreeWidgetItem(monitor);
168 diff -ur nmapsi4-0.2-alpha3.orig/nmapsi4/preference/listExtension.cpp nmapsi4-0.2-alpha3/nmapsi4/preference/listExtension.cpp
169 --- nmapsi4-0.2-alpha3.orig/nmapsi4/preference/listExtension.cpp 2010-01-14 18:37:43.000000000 +0200
170 +++ nmapsi4-0.2-alpha3/nmapsi4/preference/listExtension.cpp 2010-05-06 13:13:18.000000000 +0300
171 @@ -26,7 +26,7 @@
172 vulnExt = extension.value("vulnFlag", "false").toBool();
173 extList->clear(); // clear listWidget for reload use
174
175 - extList->setIconSize(QSize::QSize(48, 48));
176 + extList->setIconSize(QSize(48, 48));
177 QIcon imgA = QIcon(QString::fromUtf8(":/images/nmapsi4/preference/images/preferences-pluginA.png"));
178 QIcon imgD = QIcon(QString::fromUtf8(":/images/nmapsi4/preference/images/preferences-pluginD.png"));
179
180 diff -ur nmapsi4-0.2-alpha3.orig/nmapsi4/preference/profilemain.cpp nmapsi4-0.2-alpha3/nmapsi4/preference/profilemain.cpp
181 --- nmapsi4-0.2-alpha3.orig/nmapsi4/preference/profilemain.cpp 2010-01-14 18:37:43.000000000 +0200
182 +++ nmapsi4-0.2-alpha3/nmapsi4/preference/profilemain.cpp 2010-05-06 13:13:18.000000000 +0300
183 @@ -90,7 +90,7 @@
184
185 // Create listview items
186 // TODO insert history item and window setup
187 - listViewOptions->setIconSize(QSize::QSize(52, 52));
188 + listViewOptions->setIconSize(QSize(52, 52));
189
190 profileItem = new QListWidgetItem(listViewOptions);
191 profileItem->setIcon(QIcon(QString::fromUtf8(":/images/images/preferences-system-windows.png")));
192 diff -ur nmapsi4-0.2-alpha3.orig/nmapsi4-logr/mainwin.cpp nmapsi4-0.2-alpha3/nmapsi4-logr/mainwin.cpp
193 --- nmapsi4-0.2-alpha3.orig/nmapsi4-logr/mainwin.cpp 2010-01-14 18:37:43.000000000 +0200
194 +++ nmapsi4-0.2-alpha3/nmapsi4-logr/mainwin.cpp 2010-05-06 13:13:18.000000000 +0300
195 @@ -99,7 +99,7 @@
196 QTextStream buffer(logF);
197 QString tmpLine;
198
199 - treeLogView->setIconSize(QSize::QSize(32, 32));
200 + treeLogView->setIconSize(QSize(32, 32));
201
202 while (!buffer.atEnd()) {
203 tmpLine = buffer.readLine();
Report Message
Find on MARC Find on Google Groups