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
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
|
#!/usr/bin/perl -w
# David Faure <faure@kde.org>
# KUrl -> QUrl
# Usage: convert-kurl.pl *.h *.cpp
# VERY IMPORTANT: add add_definitions(-DQT_NO_URL_CAST_FROM_STRING) to your CMakeLists.txt, to catch
# passing a path to a QUrl via an implicit constructor (and port to QUrl(url) or QUrl::fromLocalFile(path)).
# See https://community.kde.org/Frameworks/Porting_Notes#URL for more advice
use strict;
use File::Basename;
use lib dirname($0);
use functionUtilkde;
my %urls = (); # shared between all files
foreach my $file (@ARGV) {
# I don't use functionUtilkde::substInFile because it touches all files, even those which were not modified.
my $modified;
my %varname = ();
open(my $FILE, "<", $file) or warn "We can't open file $file:$!\n";
my @l = map {
my $orig = $_;
s/#include <kurl.h>/#include <QUrl>/;
s/#include <KUrl>/#include <QUrl>/;
s/class KUrl\;/class QUrl\;/;
s/KUrl\(\)\;/QUrl()\;/;
s/KUrl::toPercentEncoding\b/QUrl::toPercentEncoding/;
s/KUrl::fromPercentEncoding\b/QUrl::fromPercentEncoding/;
s,KUrl::fromPath\b,QUrl::fromLocalFile,;
if (/\s*KUrl::List\s+(\w+);/) {
my $var = $1;
$varname{$1} = 1;
}
if (/(\s*)(\w+)\.populateMimeData\s*\(\s*(\w+)\s*\);/) {
my $var = $2;
if (defined $varname{$var}) {
my $urls = $3;
my $indent = $1;
$_ = $indent . "$urls->setUrls($var);\n";
}
}
if (/KUrl::List::fromMimeData\s*\(\s*(\w+)\s*\)/) {
my $var = $1;
s/KUrl::List::fromMimeData\s*\(\s*$var\s*\)/$var\-\>urls()/;
}
if (/KUrl::List::canDecode\s*\(\s*(\w+)\s*\)/) {
my $var = $1;
s/KUrl::List::canDecode\s*\(\s*$var\s*\)/$var\-\>hasUrls()/;
}
# Detect variables being declared as KUrl
if (/const KUrl\s*&\s*(\w+)/ || /^\s*KUrl\s+(\w+)\s*[=\;]/ || /^\s*KUrl\s+(\w+)\s*\(/) {
$urls{$1} = 1;
print STDERR "found KUrl var: $1\n";
s/const KUrl\s*&\s*/const QUrl &/;
s/KUrl (\w+)\;/QUrl $1\;/;
s/KUrl (\w+)\s*=/QUrl $1 =/;
}
# Detect variables being declared as QUrl (for copying into KUrls, below)
if (/const QUrl\s*&\s*(\w+)/ || /^\s*QUrl\s+(\w+)\s*(?:=|;)/ || /^\s*QUrl\s+(\w+)\s*\(/) {
#print STDERR "found QUrl var: $1\n";
$urls{$1} = 2;
}
# Do not port KUrl(QString) automatically, that's impossible (need to find out if the string is a path or a URL...)
# Except when it's clear :)
if (my ($var, $value) = /KUrl (\w+)\s*\(\s*(\"[^\"]*\")\s*\)/) {
if ($value =~ /:\//) { # full URL -> clear
s/KUrl $var/QUrl $var/;
}
}
if (my ($value) = /KUrl\s*\(\s*(\"[^\"]*\")\s*\)/) { # anonymous var
if ($value =~ /:\//) { # full URL -> clear
s/KUrl\s*\(\s*\Q$value\E\s*\)/QUrl($value)/;
}
}
if (my ($var, $value) = /KUrl (\w+)\s*\(\s*(\w+)\s*\)/) {
if (defined $urls{$value}) { # copy of another URL -> clear
s/KUrl $var/QUrl $var/;
}
}
if (/(\w+)\.pass\(\)/ && defined $urls{$1}) {
my $url = $1;
s/$url\.pass\(\)/$url\.password()/g;
}
if (/(\w+)\.setPass\b/ && defined $urls{$1}) {
my $url = $1;
s/$url\.setPass\b/$url\.setPassword/g;
}
if (/(\w+)\.protocol\(\)/ && defined $urls{$1}) {
my $url = $1;
s/$url\.protocol\(\)/$url\.scheme()/g;
}
if (/(\w+)\.setProtocol\(/ && defined $urls{$1}) {
my $url = $1;
s/$url\.setProtocol\(/$url\.setScheme(/g;
}
if (/(\w+)\.user\(\)/ && defined $urls{$1}) {
my $url = $1;
s/$url\.user\(\)/$url\.userName()/g;
}
if (/(\w+)\.setUser\b/ && defined $urls{$1}) {
my $url = $1;
s/$url\.setUser\b/$url\.setUserName/g;
}
if (/(\w+)\.setRef\b/ && defined $urls{$1}) {
my $url = $1;
s/$url\.setRef\b/$url\.setFragment/g;
}
if (/(\w+)\.htmlRef\(\)/ && defined $urls{$1}) {
my $url = $1;
s/$url\.htmlRef\(\)/$url\.fragment(QUrl::FullyDecoded)/g;
}
if (/(\w+)\.hasHTMLRef\(\)/ && defined $urls{$1}) {
my $url = $1;
s/$url\.hasHTMLRef\(\)/$url\.hasFragment()/g;
}
if (/(\w+)\.hasRef\(\)/ && defined $urls{$1}) {
my $url = $1;
s/$url\.hasRef\(\)/$url\.hasFragment()/g;
}
# url.adjustPath(KUrl::RemoveTrailingSlash) => url = url.adjusted(QUrl::StripTrailingSlash);
if (/(\w*).adjustPath\(\s*KUrl::RemoveTrailingSlash\s*\)/) {
my $urlvar = $1;
s/$urlvar\.adjustPath\(\s*KUrl::RemoveTrailingSlash\s*\)/$urlvar = $urlvar\.adjusted(QUrl::StripTrailingSlash)/;
}
# url.directory()
if (/(\w+)\.directory\(\)/ && defined $urls{$1}) {
my $url = $1;
s/$url\.directory\(\)/$url\.adjusted(QUrl::RemoveFilename|QUrl::StripTrailingSlash).path()/g;
}
# url.url(KUrl::RemoveTrailingSlash)
if (/\.url\([KQ]Url::RemoveTrailingSlash\)/) {
s/\.url\([KQ]Url::RemoveTrailingSlash\)/\.adjusted(QUrl::StripTrailingSlash).toString()/g;
}
# url.path(KUrl::RemoveTrailingSlash)
if (/\.path\(KUrl::RemoveTrailingSlash\)/) {
s/\.path\(KUrl::RemoveTrailingSlash\)/\.adjusted(QUrl::StripTrailingSlash).path()/g;
}
# url.toLocalFile(KUrl::RemoveTrailingSlash)
if (/\.toLocalFile\(KUrl::RemoveTrailingSlash\)/) {
s/\.toLocalFile\(KUrl::RemoveTrailingSlash\)/\.adjusted(QUrl::StripTrailingSlash).toLocalFile()/g;
}
# url.adjustPath(KUrl::RemoveTrailingSlash)
if (/(\w+)\.adjustPath\(KUrl::RemoveTrailingSlash\)/ && defined $urls{$1}) {
my $url = $1;
s/$url\.adjustPath\(KUrl::RemoveTrailingSlash\)/$url = $url\.adjusted(QUrl::StripTrailingSlash)/g;
}
#url.setFileName(...)
my $regexpRange = qr/
^(\s*) # (1) Indentation, possibly "Classname *" (the ? means non-greedy)
(\w+) # (2) variable name
\.setFileName\s*\((.*)\) # (3) argument
(.*)$ # (4) afterreg
/x; # /x Enables extended whitespace mode
if (my ($indent, $url, $arg, $afterreg) = $_ =~ $regexpRange) {
if (defined $urls{$url}) {
$_ = $indent . "$url = $url.adjusted(QUrl::RemoveFilename);\n";
$_ .= $indent . "$url.setPath($url.path() + $arg);\n";
}
}
#u.queryItem(QLatin1String("x-allow-unencrypted"))
#=> QUrlQuery(url).queryItemValue
if (/(\w+)\.queryItem\b/ && defined $urls{$1}) {
my $url = $1;
s/$url\.queryItem\b/QUrlQuery($url).queryItemValue/;
}
# url.addPath(path)
my $regexpAddPath = qr/
^(\s*) # (1) Indentation
(\w+)\.addPath # (2) url
${functionUtilkde::paren_begin}3${functionUtilkde::paren_end} # (3) path
/x; # /x Enables extended whitespace mode
if (my ($indent, $url, $path) = $_ =~ $regexpAddPath ) {
if (defined $urls{$url}) {
$_ = $indent . "$url = $url" . ".adjusted(QUrl::StripTrailingSlash);\n" . $indent . "$url.setPath($url.path() + '\/' + $path);\n";
#s/$url\.addPath\(\s*$path\s*\)\;/$url = $url\.adjusted(QUrl::StripTrailingSlash)\;\n$indent$url.setPath($url.path() + '\/' + $path)\;/;
}
}
if ( /(\w+)\.prettyUrl\(\)/ && defined $urls{$1}) {
my $url = $1;
s/$url\.prettyUrl\b/$url\.toDisplayString/;
}
s/KUrl::List\b/QList<QUrl>/g;
s,\bKUrl\b,QUrl,g;
$modified ||= $orig ne $_;
$_;
} <$FILE>;
if ($modified) {
open (my $OUT, ">", $file);
print $OUT @l;
close ($OUT);
}
}
functionUtilkde::diffFile( "@ARGV" );
|
