Commit 1cb58b04 authored by Yuri Chornoivan's avatar Yuri Chornoivan
Browse files

Fix minor EBN issues

parent 9bb1953d
...@@ -26,7 +26,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS ...@@ -26,7 +26,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
find_package(DolphinVcs) find_package(DolphinVcs)
set_package_properties(DolphinVcs PROPERTIES set_package_properties(DolphinVcs PROPERTIES
DESCRIPTION "the Dolphin version control plugin library" DESCRIPTION "the Dolphin version control plugin library"
URL "http://dolphin.kde.org/" URL "https://kde.org/applications/system/org.kde.dolphin"
TYPE REQUIRED TYPE REQUIRED
PURPOSE "Provides the version control plugin interface." PURPOSE "Provides the version control plugin interface."
) )
......
...@@ -198,7 +198,7 @@ bool FileViewBazaarPlugin::beginRetrieval(const QString& directory) ...@@ -198,7 +198,7 @@ bool FileViewBazaarPlugin::beginRetrieval(const QString& directory)
const int length = filePath.length() - pos - 1; const int length = filePath.length() - pos - 1;
//conflicts annoyingly have a human readable text before the filename //conflicts annoyingly have a human readable text before the filename
//TODO cover other conflict types //TODO cover other conflict types
if (filePath.startsWith("C Text conflict")) { if (filePath.startsWith(QLatin1String("C Text conflict"))) {
filePath = filePath.mid(17, length); filePath = filePath.mid(17, length);
} }
filePath = baseDir + '/' + filePath.mid(pos, length); filePath = baseDir + '/' + filePath.mid(pos, length);
...@@ -462,7 +462,7 @@ void FileViewBazaarPlugin::execBazaarCommand(const QString& command, ...@@ -462,7 +462,7 @@ void FileViewBazaarPlugin::execBazaarCommand(const QString& command,
char buffer[512]; char buffer[512];
while (process.readLine(buffer, sizeof(buffer)) > 0) { while (process.readLine(buffer, sizeof(buffer)) > 0) {
QString output = QString(buffer).trimmed(); QString output = QString(buffer).trimmed();
if (output.startsWith("qbzr")) { if (output.startsWith(QLatin1String("qbzr"))) {
foundQbzr = true; foundQbzr = true;
break; break;
} }
......
...@@ -81,7 +81,7 @@ FileViewDropboxPlugin::FileViewDropboxPlugin(QObject* parent, const QVariantList ...@@ -81,7 +81,7 @@ FileViewDropboxPlugin::FileViewDropboxPlugin(QObject* parent, const QVariantList
QStringList instanceDirs = dir.entryList(nameFilter); QStringList instanceDirs = dir.entryList(nameFilter);
QString aggregationDB = ""; QString aggregationDB = "";
for (const QString &instance : instanceDirs) { for (const QString &instance : instanceDirs) {
aggregationDB = dropboxDir + "/" + instance + "/" + "aggregation.dbx"; aggregationDB = dropboxDir + '/' + instance + '/' + "aggregation.dbx";
if (QFile::exists(aggregationDB)) { if (QFile::exists(aggregationDB)) {
d->databaseFileWatcher->addPath(aggregationDB); d->databaseFileWatcher->addPath(aggregationDB);
break; break;
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
class QLocalSocket; class QLocalSocket;
//The dropbox protocol info can be found in the dropboxd-protocol file //The dropbox protocol info can be found in the dropboxd-protocol file
//it can be found here http://dl.dropbox.com/u/4577542/dropbox/dropboxd-protocol.txt //it can be found here https://build.opensuse.org/package/view_file/home:faco84/dolphin-box-plugin/dropboxd-protocol
//Thanks Steffen Schuldenzucker! //Thanks Steffen Schuldenzucker!
/** /**
......
...@@ -39,7 +39,7 @@ class CheckoutDialog : public QDialog ...@@ -39,7 +39,7 @@ class CheckoutDialog : public QDialog
Q_OBJECT Q_OBJECT
public: public:
CheckoutDialog(QWidget* parent = 0); explicit CheckoutDialog(QWidget* parent = 0);
/** /**
* Returns the name of the selected tag or branch to be checkout out * Returns the name of the selected tag or branch to be checkout out
* @returns The name of the selected tag or branch * @returns The name of the selected tag or branch
......
...@@ -31,7 +31,7 @@ class PushDialog : public QDialog ...@@ -31,7 +31,7 @@ class PushDialog : public QDialog
Q_OBJECT Q_OBJECT
public: public:
PushDialog(QWidget* parent = 0); explicit PushDialog(QWidget* parent = 0);
QString destination() const; QString destination() const;
QString localBranch() const; QString localBranch() const;
QString remoteBranch() const; QString remoteBranch() const;
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd"> <kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
<kcfg> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<kcfgfile name="fileviewsvnpluginrc"/> <kcfgfile name="fileviewsvnpluginrc"/>
<group name="General"> <group name="General">
<entry name="showUpdates" type="bool"> <entry name="showUpdates" type="bool">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment