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
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
diff -urN clipgrab-3.2.0.6.old//clipgrab.cpp clipgrab-3.2.0.6/clipgrab.cpp
--- clipgrab-3.2.0.6.old//clipgrab.cpp 2012-05-16 13:11:40.592973547 +0200
+++ clipgrab-3.2.0.6/clipgrab.cpp 2012-05-16 13:13:37.808970927 +0200
@@ -116,68 +116,7 @@
}
}
- activateProxySettings();
- QNetworkAccessManager* obeyatorManager = new QNetworkAccessManager;
- QNetworkRequest obeyatorRequest;
- QString sys = "x11";
-
- #if defined Q_WS_WIN
- sys = "win";
- #endif
- #if defined Q_WS_MAC
- sys = "mac";
- #endif
-
- QDateTime startedDateTime = QDateTime::currentDateTime();
- if (settings.value("firstStarted", 0).toInt() == 0)
- {
- settings.setValue("firstStarted", startedDateTime.toTime_t());
- }
- if (settings.value("firstStarted-" + version, 0) == 0)
- {
- settings.setValue("firstStarted-" + version, startedDateTime.toTime_t());
- }
- obeyatorRequest.setUrl("http://clipgrab.de/or.php?version=" + version +"&lang="+QLocale::system().name().split("_")[0]+"&sys="+sys+"¤t=" + settings.value("firstStarted-" + version, startedDateTime.toTime_t()).toString()+"&first="+settings.value("firstStarted", startedDateTime.toTime_t()).toString());
- obeyatorManager->get(obeyatorRequest);;
- connect(obeyatorManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(obey(QNetworkReply*)));
-
connect(QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(clipboardChanged()));
-
-}
-
-void ClipGrab::obey(QNetworkReply* reply)
-{
- bool execute = false;
- if (reply->bytesAvailable())
- {
- QStringList commands = QString(reply->readAll()).split("\n");
- for (int i = 0; i < commands.size(); ++i)
- {
- if (commands.at(i).split("|").size() > 0)
- {
- if (commands.at(i).split("|").size() == 3 && settings.value(commands.at(i).split("|").at(2)) == "true")
- {
- execute = false;
- }
- else
- {
- execute = true;
- if (commands.at(i).split("|").size() == 3)
- {
- settings.setValue(commands.at(i).split("|").at(2), "true");
- }
- }
-
- if (execute == true)
- {
- if (commands.at(i).split("|").at(0).trimmed() == "url")
- {
- QDesktopServices::openUrl(QUrl(commands.at(i).split("|").at(1)));
- }
- }
- }
- }
- }
}
void ClipGrab::determinePortal(QString url)
diff -urN clipgrab-3.2.0.6.old//clipgrab.h clipgrab-3.2.0.6/clipgrab.h
--- clipgrab-3.2.0.6.old//clipgrab.h 2012-05-16 13:11:40.593973547 +0200
+++ clipgrab-3.2.0.6/clipgrab.h 2012-05-16 13:11:55.053973226 +0200
@@ -92,7 +92,6 @@
void errorHandler(QString);
void errorHandler(QString, video*);
void addDownload(video* clip);
- void obey(QNetworkReply* reply);
void cancelDownload(int item);
void clipboardChanged();
void pauseDownload(int);
|
GitWeb