Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

Using QString::left instead of QString::mid(0, )

Browse Source
This commit is contained in:
nowrep 2012-07-01 18:11:43 +02:00
parent 066600ff10
commit a37b29b275
6 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lib/adblock/adblockrule.cpp
View File

@ -94,8 +94,9 @@ QString toSecondLevelDomain(const QUrl &url)
#endif
}
AdBlockRule::AdBlockRule(const QString &filter)
: m_enabled(true)
AdBlockRule::AdBlockRule(const QString &filter, AdBlockSubscription* subscription)
: m_subscription(subscription)
, m_enabled(true)
, m_cssRule(false)
, m_exception(false)
, m_internalDisabled(false)
@ -116,6 +117,16 @@ AdBlockRule::AdBlockRule(const QString &filter)
setFilter(filter);
}
AdBlockSubscription* AdBlockRule::subscription() const
{
return m_subscription;
}
void AdBlockRule::setSubscription(AdBlockSubscription* subscription)
{
m_subscription = subscription;
}
QString AdBlockRule::filter() const
{
return m_filter;
@ -333,7 +344,7 @@ void AdBlockRule::parseFilter()
// Domain restricted rule
if (!parsedLine.startsWith("##")) {
QString domains = parsedLine.mid(0, pos);
QString domains = parsedLine.left(pos);
parseDomains(domains, ',');
}

8
src/lib/adblock/adblockrule.h
View File

@ -55,10 +55,15 @@
class QNetworkRequest;
class QUrl;
class AdBlockSubscription;
class AdBlockRule
{
public:
AdBlockRule(const QString &filter = QString());
AdBlockRule(const QString &filter = QString(), AdBlockSubscription* subscription = 0);
AdBlockSubscription* subscription() const;
void setSubscription(AdBlockSubscription* subscription);
QString filter() const;
void setFilter(const QString &filter);
@ -87,6 +92,7 @@ private:
void parseFilter();
void parseDomains(const QString &domains, const QChar &separator);
AdBlockSubscription* m_subscription;
QString m_filter;
bool m_enabled;

2
src/lib/adblock/adblocksubscription.cpp
View File

@ -117,7 +117,7 @@ void AdBlockSubscription::loadSubscription()
while (!textStream.atEnd()) {
const QString &line = textStream.readLine();
m_rules.append(AdBlockRule(line));
m_rules.append(AdBlockRule(line, this));
}
populateCache();

2
src/lib/bookmarksimport/htmlimporter.cpp
View File

@ -82,7 +82,7 @@ QList<BookmarksModel::Bookmark> HtmlImporter::exportBookmarks()
bookmarks.replace("<H3", "<h3");
bookmarks.replace("</H3", "</h3");
bookmarks = bookmarks.mid(0, bookmarks.lastIndexOf("</dl><p>"));
bookmarks = bookmarks.left(bookmarks.lastIndexOf("</dl><p>"));
int start = bookmarks.indexOf("<dl><p>");
QStringList folders("Html Import");

2
src/lib/navigation/locationbar.cpp
View File

@ -106,7 +106,7 @@ QUrl LocationBar::createUrl()
//Check for Search Engine shortcut
int firstSpacePos = text().indexOf(" ");
if (firstSpacePos != -1) {
QString shortcut = text().mid(0, firstSpacePos);
QString shortcut = text().left(firstSpacePos);
QString searchedString = QUrl::toPercentEncoding(text().mid(firstSpacePos).trimmed());
SearchEngine en = mApp->searchEnginesManager()->engineForShortcut(shortcut);

4
src/lib/tools/globalfunctions.cpp
View File

@ -192,7 +192,7 @@ QString qz_ensureUniqueFilename(const QString &pathToFile)
tmpFileName.append("(" + QString::number(i) + ")");
}
else {
tmpFileName = tmpFileName.mid(0, index) + "(" + QString::number(i) + ")" + tmpFileName.mid(index);
tmpFileName = tmpFileName.left(index) + "(" + QString::number(i) + ")" + tmpFileName.mid(index);
}
i++;
}
@ -248,7 +248,7 @@ QString qz_alignTextToWidth(const QString &string, const QString &text, const QF
}
if (elidedLine.size() != part.size()) {
elidedLine = elidedLine.mid(0, elidedLine.size() - 3);
elidedLine = elidedLine.left(elidedLine.size() - 3);
}
if (!returnString.isEmpty()) {