A lot of krazy2 (codechecker) fixes.

26 files changed, 133 insertions, 169 deletions

diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp
index 5d5178584..4c2bcd804 100644
--- a/src/mirall/application.cpp
+++ b/src/mirall/application.cpp
@@ -12,14 +12,6 @@
  * for more details.
  */
 
-#include <QtCore>
-#include <QtGui>
-#include <QHash>
-#include <QHashIterator>
-#include <QUrl>
-#include <QDesktopServices>
-#include <QTranslator>
-
 #include "mirall/application.h"
 #include "mirall/folder.h"
 #include "mirall/folderwatcher.h"
@@ -42,6 +34,14 @@
 #endif
 #include "mirall/inotify.h"
 
+#include <QtCore>
+#include <QtGui>
+#include <QHash>
+#include <QHashIterator>
+#include <QUrl>
+#include <QDesktopServices>
+#include <QTranslator>
+
 namespace Mirall {
 
 Application::Application(int &argc, char **argv) :
@@ -132,7 +132,7 @@ Application::Application(int &argc, char **argv) :
 
 #if QT_VERSION >= 0x040700
     qDebug() << "* Network is" << (_networkMgr->isOnline() ? "online" : "offline");
-    foreach (QNetworkConfiguration netCfg, _networkMgr->allConfigurations(QNetworkConfiguration::Active)) {
+    foreach (const QNetworkConfiguration& netCfg, _networkMgr->allConfigurations(QNetworkConfiguration::Active)) {
         //qDebug() << "Network:" << netCfg.identifier();
     }
 #endif
@@ -323,7 +323,7 @@ void Application::slotFolderOpenAction( const QString& alias )
         // work around a bug in QDesktopServices on Win32, see i-net
         QString filePath = f->path();
 
-        if (filePath.startsWith("\\\\") || filePath.startsWith("//"))
+        if (filePath.startsWith(QLatin1String("\\\\") || filePath.startsWith("//"))
             url.setUrl(QDir::toNativeSeparators(filePath));
         else
             url = QUrl::fromLocalFile(filePath);
@@ -469,34 +469,6 @@ void Application::slotRemoveFolder( const QString& alias )
     setupContextMenu();
 }
 
-#ifdef HAVE_FETCH_AND_PUSH
-void Application::slotFetchFolder( const QString& alias )
-{
-  qDebug() << "start to fetch folder with alias " << alias;
-
-  if( ! _folderMap.contains( alias ) ) {
-    qDebug() << "!! Can not fetch alias " << alias << ", can not be found in folderMap.";
-    return;
-  }
-
-  Folder *f = _folderMap[alias];
-
-}
-
-void Application::slotPushFolder( const QString& alias )
-{
-  qDebug() << "start to push folder with alias " << alias;
-
-  if( ! _folderMap.contains( alias ) ) {
-    qDebug() << "!! Can not push alias " << alias << ", can not be found in folderMap.";
-    return;
-  }
-
-  Folder *f = _folderMap[alias];
-
-}
-#endif
-
 void Application::slotInfoFolder( const QString& alias )
 {
     qDebug() << "details of folder with alias " << alias;
@@ -538,7 +510,7 @@ void Application::slotInfoFolder( const QString& alias )
 
     QMessageBox infoBox( QMessageBox::Information, tr( "Folder information" ), alias, QMessageBox::Ok );
     QStringList li = folderResult.errorStrings();
-    foreach( const QString l, li ) {
+    foreach( const QString& l, li ) {
         folderMessage += QString("<p>%1</p>").arg( l );
     }
 
@@ -562,8 +534,8 @@ void Application::slotInfoFolder( const QString& alias )
 
 	    QStringList files = change_it.value();
 	    QString fileList;
-	    foreach( QString file, files) {
-		fileList += file + "\n";
+            foreach( const QString& file, files) {
+                fileList += file + QChar('\n');
 	    }
 	    details += changeType + fileList;
 	}
@@ -619,7 +591,7 @@ void Application::slotSyncStateChange( const QString& alias )
 void Application::computeOverallSyncStatus()
 {
 
-    // display the info of the least succesful sync (eg. not just display the result of the latest sync
+    // display the info of the least successful sync (eg. not just display the result of the latest sync
     SyncResult overallResult = SyncResult::Success;
     QString trayMessage;
     Folder::Map map = _folderMan->map();
diff --git a/src/mirall/application.h b/src/mirall/application.h
index 64d121145..9dba5d66a 100644
--- a/src/mirall/application.h
+++ b/src/mirall/application.h
@@ -52,10 +52,6 @@ protected slots:
     void slotAddFolder();
     void slotOpenStatus();
     void slotRemoveFolder( const QString& );
-#ifdef HAVE_FETCH_AND_PUSH
-    void slotFetchFolder( const QString& );
-    void slotPushFolder( const QString& );
-#endif
     void slotEnableFolder( const QString&, const bool );
     void slotInfoFolder( const QString& );
     void slotConfigure();
diff --git a/src/mirall/csyncfolder.cpp b/src/mirall/csyncfolder.cpp
index 8380d9059..5e7fb0da5 100644
--- a/src/mirall/csyncfolder.cpp
+++ b/src/mirall/csyncfolder.cpp
@@ -12,6 +12,12 @@
  * for more details.
  */
 
+#include "mirall/csyncfolder.h"
+#include "mirall/csyncthread.h"
+#include "mirall/mirallconfigfile.h"
+
+#include <csync.h>
+
 #include <QDebug>
 #include <QDir>
 #include <QMutexLocker>
@@ -19,11 +25,6 @@
 #include <QStringList>
 #include <QTextStream>
 
-#include "csync.h"
-#include "mirall/csyncthread.h"
-#include "mirall/csyncfolder.h"
-#include "mirall/mirallconfigfile.h"
-
 namespace Mirall {
 
 CSyncFolder::CSyncFolder(const QString &alias,
diff --git a/src/mirall/csyncfolder.h b/src/mirall/csyncfolder.h
index e601191e3..89ff9bf61 100644
--- a/src/mirall/csyncfolder.h
+++ b/src/mirall/csyncfolder.h
@@ -16,13 +16,14 @@
  * for more details.
  */
 
-#include <QMutex>
-#include <QThread>
-#include <QString>
 
 #include "mirall/csyncthread.h"
 #include "mirall/folder.h"
 
+#include <QMutex>
+#include <QThread>
+#include <QString>
+
 namespace Mirall {
 
 
diff --git a/src/mirall/csyncthread.cpp b/src/mirall/csyncthread.cpp
index 4e2f61392..2366694b8 100644
--- a/src/mirall/csyncthread.cpp
+++ b/src/mirall/csyncthread.cpp
@@ -13,6 +13,9 @@
  * for more details.
  */
 
+#include "mirall/csyncthread.h"
+#include "mirall/mirallconfigfile.h"
+
 #include <QDebug>
 #include <QDir>
 #include <QMutexLocker>
@@ -20,10 +23,6 @@
 #include <QStringList>
 #include <QTextStream>
 #include <QTime>
-#include <QDebug>
-
-#include "mirall/csyncthread.h"
-#include "mirall/mirallconfigfile.h"
 
 namespace Mirall {
 
@@ -185,7 +184,7 @@ void CSyncThread::run()
             break;
         case CSYNC_ERR_TIMESKEW:
             errStr = tr("The system time between the local machine and the server differs "
-                        "too much. Please use a time syncronization service (ntp) on both machines.");
+                        "too much. Please use a time synchronization service (ntp) on both machines.");
             break;
         case CSYNC_ERR_FILESYSTEM:
             errStr = tr("CSync could not detect the filesystem type.");
diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp
index 5d2abdcc6..92fbb07ae 100644
--- a/src/mirall/folder.cpp
+++ b/src/mirall/folder.cpp
@@ -11,16 +11,15 @@
  * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
  * for more details.
  */
-
-#include <QDebug>
-#include <QTimer>
-#include <QUrl>
-
 #include "mirall/folder.h"
 #include "mirall/folderwatcher.h"
 #include "mirall/mirallconfigfile.h"
 #include "mirall/syncresult.h"
 
+#include <QDebug>
+#include <QTimer>
+#include <QUrl>
+
 #define DEFAULT_POLL_INTERVAL_SEC 15000
 
 namespace Mirall {
diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp
index 124549d88..9f440c890 100644
--- a/src/mirall/folderman.cpp
+++ b/src/mirall/folderman.cpp
@@ -11,18 +11,17 @@
  * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
  * for more details.
  */
-
-#include <QDesktopServices>
-#include <QtCore>
-
+#include "mirall/folderman.h"
 #include "mirall/mirallconfigfile.h"
 #include "mirall/unisonfolder.h"
 #include "mirall/csyncfolder.h"
 #include "mirall/owncloudfolder.h"
 #include "mirall/syncresult.h"
-#include "mirall/folderman.h"
 #include "mirall/inotify.h"
 
+#include <QDesktopServices>
+#include <QtCore>
+
 namespace Mirall {
 
 FolderMan::FolderMan(QObject *parent) :
@@ -90,7 +89,7 @@ int FolderMan::setupKnownFolders()
   dir.setFilter(QDir::Files);
   QStringList list = dir.entryList();
 
-  foreach ( QString alias, list ) {
+  foreach ( const QString& alias, list ) {
     Folder *f = setupFolderFromConfigFile( alias );
   }
   // return the number of valid folders.
@@ -103,7 +102,7 @@ Folder* FolderMan::setupFolderFromConfigFile(const QString &file) {
     Folder *folder = 0L;
 
     qDebug() << "  ` -> setting up:" << file;
-    QSettings settings( _folderConfigPath + "/" + file, QSettings::IniFormat);
+    QSettings settings( _folderConfigPath + QChar('/') + file, QSettings::IniFormat);
     qDebug() << "    -> file path: " + settings.fileName();
 
     settings.beginGroup( file ); // read the group with the same name as the file which is the folder alias
@@ -310,7 +309,7 @@ void FolderMan::addFolderDefinition( const QString& backend, const QString& alia
                                      bool onlyThisLAN )
 {
     // Create a settings file named after the alias
-    QSettings settings( _folderConfigPath + "/" + alias, QSettings::IniFormat);
+    QSettings settings( _folderConfigPath + QChar('/') + alias, QSettings::IniFormat);
 
     settings.setValue(QString("%1/localPath").arg(alias),   sourceFolder );
     settings.setValue(QString("%1/targetPath").arg(alias),  targetPath );
@@ -343,7 +342,7 @@ void FolderMan::removeFolder( const QString& alias )
       qDebug() << "!! Can not remove " << alias << ", not in folderMap.";
     }
 
-    QFile file( _folderConfigPath + "/" + alias );
+    QFile file( _folderConfigPath + QChar('/') + alias );
     if( file.exists() ) {
         qDebug() << "Remove folder config file " << file.fileName();
       file.remove();
diff --git a/src/mirall/folderwatcher.cpp b/src/mirall/folderwatcher.cpp
index e2358245b..837ca0c88 100644
--- a/src/mirall/folderwatcher.cpp
+++ b/src/mirall/folderwatcher.cpp
@@ -13,6 +13,11 @@
  */
 
 // event masks
+#include "mirall/folderwatcher.h"
+#include "mirall/folder.h"
+#include "mirall/inotify.h"
+#include "mirall/fileutils.h"
+
 #include <stdint.h>
 
 #include <QFileInfo>
@@ -23,11 +28,6 @@
 #include <QStringList>
 #include <QTimer>
 
-#include "mirall/folder.h"
-#include "mirall/inotify.h"
-#include "mirall/folderwatcher.h"
-#include "mirall/fileutils.h"
-
 #ifdef USE_INOTIFY
 #include <sys/inotify.h>
 #endif
@@ -60,7 +60,7 @@ FolderWatcher::FolderWatcher(const QString &root, QObject *parent)
     _inotify = new INotify(standard_event_mask);
     slotAddFolderRecursive(root);
     QObject::connect(_inotify, SIGNAL(notifyEvent(int, int, const QString &)),
-                     SLOT(slotINotifyEvent(int, int, const QString &)));
+                     this, SLOT(slotINotifyEvent(int, int, const QString &)));
 #endif
     // do a first synchronization to get changes while
     // the application was not running
@@ -165,7 +165,7 @@ void FolderWatcher::slotAddFolderRecursive(const QString &path)
         if (folder.exists() && !watchedFolders.contains(folder.path())) {
             subdirs++;
             // check that it does not match the ignore list
-            foreach (QString pattern, _ignores) {
+            foreach ( const QString& pattern, _ignores) {
                 QRegExp regexp(pattern);
                 regexp.setPatternSyntax(QRegExp::Wildcard);
                 if ( regexp.exactMatch(folder.path()) ) {
@@ -237,7 +237,7 @@ void FolderWatcher::slotINotifyEvent(int mask, int cookie, const QString &path)
         //qDebug() << cookie << " OTHER " << mask << " :" << path;
     }
 
-    foreach (QString pattern, _ignores) {
+    foreach (const QString& pattern, _ignores) {
         QRegExp regexp(pattern);
         regexp.setPatternSyntax(QRegExp::Wildcard);
 
diff --git a/src/mirall/folderwatcher.h b/src/mirall/folderwatcher.h
index ee37e0cb8..4d59afc85 100644
--- a/src/mirall/folderwatcher.h
+++ b/src/mirall/folderwatcher.h
@@ -15,6 +15,8 @@
 #ifndef MIRALL_FOLDERWATCHER_H
 #define MIRALL_FOLDERWATCHER_H
 
+#include "mirall/folder.h"
+
 #include <QList>
 #include <QObject>
 #include <QString>
@@ -22,15 +24,14 @@
 #include <QTime>
 #include <QHash>
 
-#include "mirall/folder.h"
-
 class QTimer;
+
+namespace Mirall {
+
 #ifdef USE_INOTIFY
 class INotify;
 #endif
 
-namespace Mirall {
-
 /**
  * Watches a folder and sub folders for changes
  *
diff --git a/src/mirall/folderwizard.cpp b/src/mirall/folderwizard.cpp
index 21b81add4..783f74350 100644
--- a/src/mirall/folderwizard.cpp
+++ b/src/mirall/folderwizard.cpp
@@ -12,6 +12,11 @@
  * for more details.
  */
 
+#include "mirall/folderwizard.h"
+#include "mirall/owncloudinfo.h"
+#include "mirall/mirallconfigfile.h"
+#include "mirall/theme.h"
+
 #include <QDebug>
 #include <QDesktopServices>
 #include <QFileDialog>
@@ -23,12 +28,6 @@
 
 #include <stdlib.h>
 
-#include "mirall/folderwizard.h"
-#include "mirall/owncloudinfo.h"
-#include "mirall/mirallconfigfile.h"
-#include "mirall/owncloudinfo.h"
-#include "mirall/theme.h"
-
 namespace Mirall
 {
 
@@ -433,7 +432,7 @@ void FolderWizardOwncloudPage::initializePage()
 {
     _ui.lineEditOCAlias->setText( "ownCloud" );
     _ui.lineEditOCUrl->setText( "http://localhost/owncloud" );
-    QString user( getenv("USER"));
+    QString user( qgetenv("USER"));
     _ui.lineEditOCUser->setText( user );
 }
 
diff --git a/src/mirall/gitfolder.cpp b/src/mirall/gitfolder.cpp
index c0e95fdcb..e1e3129f5 100644
--- a/src/mirall/gitfolder.cpp
+++ b/src/mirall/gitfolder.cpp
@@ -12,9 +12,10 @@
  * for more details.
  */
 
+#include "mirall/gitfolder.h"
+
 #include <QMutexLocker>
 #include <QProcess>
-#include "mirall/gitfolder.h"
 
 namespace Mirall {
 
diff --git a/src/mirall/inotify.cpp b/src/mirall/inotify.cpp
index 63764e736..140afaad0 100644
--- a/src/mirall/inotify.cpp
+++ b/src/mirall/inotify.cpp
@@ -14,17 +14,18 @@
  * for more details.
  */
 
-#include <mirall/folder.h>
-
 #ifdef USE_INOTIFY
 #include <sys/inotify.h>
 #endif
+#include "inotify.h"
+#include "mirall/folder.h"
+
 #include <cerrno>
 #include <unistd.h>
 #include <QDebug>
 #include <QStringList>
 
-#include "inotify.h"
+
 
 // Buffer Size for read() buffer
 #define DEFAULT_READ_BUFFERSIZE 2048
@@ -48,9 +49,9 @@ INotify::~INotify()
     s_thread->unregisterForNotification(this);
 
     // Remove all inotify watchs.
-    QString key;
-    foreach (key, _wds.keys())
-        inotify_rm_watch(s_fd, _wds.value(key));
+    foreach( int fd, _wds ) {
+        inotify_rm_watch(s_fd, fd);
+    }
 }
 
 void INotify::addPath(const QString &path)
@@ -99,8 +100,8 @@ INotify::fireEvent(int mask, int cookie, int wd, char* name)
 {
     //qDebug() << "****" << name;
     QStringList paths(_wds.keys(wd));
-    foreach (QString path, paths)
-        emit notifyEvent(mask, cookie, path + "/" + QString::fromUtf8(name));
+    foreach (const QString& path, paths)
+        emit notifyEvent(mask, cookie, path + QChar('/') + QString::fromUtf8(name));
 }
 
 void
diff --git a/src/mirall/mirallconfigfile.cpp b/src/mirall/mirallconfigfile.cpp
index b31307ce7..0171ef138 100644
--- a/src/mirall/mirallconfigfile.cpp
+++ b/src/mirall/mirallconfigfile.cpp
@@ -11,6 +11,11 @@
  * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
  * for more details.
  */
+
+#include "mirall/mirallconfigfile.h"
+#include "mirall/owncloudtheme.h"
+#include "mirall/miralltheme.h"
+
 #include <QtCore>
 #include <QtGui>
 
@@ -22,18 +27,14 @@
 #include <winbase.h>
 #endif
 
-#include "mirall/mirallconfigfile.h"
-#include "mirall/owncloudtheme.h"
-#include "mirall/miralltheme.h"
-
 #ifdef Q_OS_MAC 
 #include <mach-o/dyld.h>
 #endif
 
 namespace Mirall {
 
-QString MirallConfigFile::_passwd = QString();
-QString MirallConfigFile::_oCVersion = QString();
+QString MirallConfigFile::_passwd; //  = QString();
+QString MirallConfigFile::_oCVersion; // = QString();
 bool    MirallConfigFile::_askedUser = false;
 
 MirallConfigFile::MirallConfigFile()
@@ -139,14 +140,14 @@ void MirallConfigFile::writeOwncloudConfig( const QString& connection,
     QSettings settings( file, QSettings::IniFormat);
     QString cloudsUrl( url );
 
-    if( !cloudsUrl.startsWith("http") )
-        cloudsUrl.prepend( "http://" );
+    if( !cloudsUrl.startsWith( QLatin1String("http")) )
+        cloudsUrl.prepend(QLatin1String("http://"));
 
     settings.beginGroup( connection );
     settings.setValue("url", cloudsUrl );
     settings.setValue("user", user );
     if( skipPwd ) {
-        pwd = QString();
+        pwd.clear();
     }
 
     QByteArray pwdba = pwd.toUtf8();
@@ -294,7 +295,7 @@ bool MirallConfigFile::ownCloudSkipUpdateCheck( const QString& connection ) cons
 
 QByteArray MirallConfigFile::basicAuthHeader() const
 {
-    QString concatenated = ownCloudUser() + ":" + ownCloudPasswd();
+    QString concatenated = ownCloudUser() + QChar(':') + ownCloudPasswd();
     const QString b("Basic ");
     QByteArray data = b.toLocal8Bit() + concatenated.toLocal8Bit().toBase64();
 
diff --git a/src/mirall/mirallconfigfile.h b/src/mirall/mirallconfigfile.h
index c23e9f571..5a4dd7a43 100644
--- a/src/mirall/mirallconfigfile.h
+++ b/src/mirall/mirallconfigfile.h
@@ -15,6 +15,9 @@
 #ifndef MIRALLCONFIGFILE_H
 #define MIRALLCONFIGFILE_H
 
+#include <QString>
+
+
 namespace Mirall {
 
 
diff --git a/src/mirall/miralltheme.cpp b/src/mirall/miralltheme.cpp
index 5740342e4..65e8e8985 100644
--- a/src/mirall/miralltheme.cpp
+++ b/src/mirall/miralltheme.cpp
@@ -12,13 +12,13 @@
  * for more details.
  */
 
+#include "miralltheme.h"
+
 #include <QString>
 #include <QDebug>
 #include <QPixmap>
 #include <QIcon>
 
-#include "miralltheme.h"
-
 namespace Mirall {
 
 mirallTheme::mirallTheme()
diff --git a/src/mirall/networklocation.cpp b/src/mirall/networklocation.cpp
index 6cb330e63..b98565bd0 100644
--- a/src/mirall/networklocation.cpp
+++ b/src/mirall/networklocation.cpp
@@ -49,7 +49,7 @@ NetworkLocation NetworkLocation::currentLocation()
     QByteArray gwIp;
     while (ip.canReadLine()) {
         QByteArray line = ip.readLine();
-        if (line.startsWith("default")) {
+        if ( line.startsWith("default") ) { // krazy:exclude=strings
             QList<QByteArray> parts = line.split(' ');
             gwIp = parts[2];
             break;
diff --git a/src/mirall/owncloudfolder.cpp b/src/mirall/owncloudfolder.cpp
index c9c6711b3..ab378fe40 100644
--- a/src/mirall/owncloudfolder.cpp
+++ b/src/mirall/owncloudfolder.cpp
@@ -13,6 +13,11 @@
  * for more details.
  */
 
+#include "mirall/owncloudfolder.h"
+#include "mirall/mirallconfigfile.h"
+
+#include <csync.h>
+
 #include <QDebug>
 #include <QDir>
 #include <QUrl>
@@ -22,11 +27,6 @@
 #include <QTextStream>
 #include <QTimer>
 
-#include "csync.h"
-
-#include "mirall/owncloudfolder.h"
-#include "mirall/mirallconfigfile.h"
-
 namespace Mirall {
 
 #define POLL_TIMER_EXCEED 10
diff --git a/src/mirall/owncloudinfo.cpp b/src/mirall/owncloudinfo.cpp
index 215f5fdcd..940e04723 100644
--- a/src/mirall/owncloudinfo.cpp
+++ b/src/mirall/owncloudinfo.cpp
@@ -12,18 +12,15 @@
  * for more details.
  */
 
-
-#include <QtCore>
-#include <QtGui>
-#include <QAuthenticator>
-
-
 #include "mirall/owncloudinfo.h"
 #include "mirall/mirallconfigfile.h"
-#include "mirall/sslerrordialog.h"
 #include "mirall/version.h"
 #include "mirall/sslerrordialog.h"
 
+#include <QtCore>
+#include <QtGui>
+#include <QAuthenticator>
+
 #if QT46_IMPL
 #include <QHttp>
 #endif
@@ -258,11 +255,11 @@ void ownCloudInfo::slotReplyFinished()
     const QString version( reply->readAll() );
     const QString url = reply->url().toString();
     QString plainUrl(url);
-    plainUrl.remove("/status.php");
+    plainUrl.remove( QLatin1String("/status.php"));
 
     QString info( version );
 
-    if( url.endsWith("status.php") ) {
+    if( url.endsWith( QLatin1String("status.php")) ) {
         // it was a call to status.php
         if( reply->error() == QNetworkReply::NoError && info.isEmpty() ) {
             // This seems to be a bit strange behaviour of QNetworkAccessManager.
@@ -279,12 +276,11 @@ void ownCloudInfo::slotReplyFinished()
             info.remove(-1,1); // remove the last char which is a "}"
             QStringList li = info.split( QChar(',') );
 
-            QString infoString;
             QString versionStr;
             QString version;
             QString edition;
 
-            foreach ( infoString, li ) {
+            foreach ( const QString& infoString, li ) {
                 QStringList touple = infoString.split( QChar(':'));
                 QString key = touple[0];
                 key.remove(QChar('"'));
diff --git a/src/mirall/owncloudsetupwizard.cpp b/src/mirall/owncloudsetupwizard.cpp
index 71ae751ca..58e09e0f2 100644
--- a/src/mirall/owncloudsetupwizard.cpp
+++ b/src/mirall/owncloudsetupwizard.cpp
@@ -12,16 +12,16 @@
  * for more details.
  */
 
-#include <QtCore>
-#include <QProcess>
-#include <QMessageBox>
-#include <QDesktopServices>
-
 #include "mirall/owncloudsetupwizard.h"
 #include "mirall/mirallconfigfile.h"
 #include "mirall/owncloudinfo.h"
 #include "mirall/folderman.h"
 
+#include <QtCore>
+#include <QProcess>
+#include <QMessageBox>
+#include <QDesktopServices>
+
 namespace Mirall {
 
 class Theme;
@@ -364,7 +364,7 @@ void OwncloudSetupWizard::slotCreateRemoteFolderFinished( QNetworkReply::Network
     qDebug() << "** webdav mkdir request finished " << error;
 
     if( error == QNetworkReply::NoError ) {
-        _ocWizard->appendToResultWidget( tr("Remote folder %1 created sucessfully.").arg(_remoteFolder));
+        _ocWizard->appendToResultWidget( tr("Remote folder %1 created successfully.").arg(_remoteFolder));
 
         // Now write the resulting folder definition
         if( _folderMan ) {
diff --git a/src/mirall/owncloudtheme.cpp b/src/mirall/owncloudtheme.cpp
index 7ebd8ce98..1b3f807d9 100644
--- a/src/mirall/owncloudtheme.cpp
+++ b/src/mirall/owncloudtheme.cpp
@@ -12,13 +12,13 @@
  * for more details.
  */
 
+#include "owncloudtheme.h"
+
 #include <QString>
 #include <QDebug>
 #include <QPixmap>
 #include <QIcon>
 
-#include "owncloudtheme.h"
-
 namespace Mirall {
 
 ownCloudTheme::ownCloudTheme()
diff --git a/src/mirall/owncloudwizard.cpp b/src/mirall/owncloudwizard.cpp
index 9399b109f..f8d3e811b 100644
--- a/src/mirall/owncloudwizard.cpp
+++ b/src/mirall/owncloudwizard.cpp
@@ -12,6 +12,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
  * for more details.
  */
+#include "mirall/owncloudwizard.h"
 
 #include <QDebug>
 #include <QDesktopServices>
@@ -25,8 +26,6 @@
 
 #include <stdlib.h>
 
-#include "mirall/owncloudwizard.h"
-
 namespace Mirall
 {
 
@@ -125,7 +124,7 @@ bool OwncloudCredentialsPage::isComplete() const
 
 void OwncloudCredentialsPage::initializePage()
 {
-    QString user = getenv( "USER" );
+    QString user = qgetenv( "USER" );
     _ui.OCUserEdit->setText( user );
 }
 
@@ -311,10 +310,10 @@ void OwncloudWizard::slotCurrentPageChanged( int id )
     // preset the ftp url field
     CreateAnOwncloudPage *p = static_cast<CreateAnOwncloudPage*> (page( Page_Create_OC ));
     QString domain = p->domain();
-    if( domain.startsWith( "http://" )) {
+    if( domain.startsWith( QLatin1String("http://") )) {
       domain = domain.right( domain.length()-7 );
     }
-    if( domain.startsWith( "https://" )) {
+    if( domain.startsWith( QLatin1String("https://") )) {
       domain = domain.right( domain.length()-8 );
     }
 
diff --git a/src/mirall/sslerrordialog.cpp b/src/mirall/sslerrordialog.cpp
index 31f1164a5..70c339f16 100644
--- a/src/mirall/sslerrordialog.cpp
+++ b/src/mirall/sslerrordialog.cpp
@@ -11,14 +11,12 @@
  * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
  * for more details.
  */
+#include "sslerrordialog.h"
+#include "mirall/mirallconfigfile.h"
 
 #include <QtGui>
 #include <QtNetwork>
 
-#include "sslerrordialog.h"
-
-#include "mirall/mirallconfigfile.h"
-
 namespace Mirall
 {
 
@@ -92,7 +90,7 @@ bool SslErrorDialog::setErrorList( QList<QSslError> errors )
     // loop over the unknown certs and line up their errors.
             msg += QL("<h3>") + tr("Warnings about current SSL Connection:") + QL("</h3>");
     msg += QL("<div id=\"ca_errors\">");
-    foreach( QSslCertificate cert, _unknownCerts ) {
+    foreach( const QSslCertificate& cert, _unknownCerts ) {
         msg += QL("<div id=\"ca_error\">");
         // add the errors for this cert
         foreach( QSslError err, errors ) {
@@ -182,7 +180,7 @@ void SslErrorDialog::accept()
         sslCfg.setCaCertificates(ca_list);
         QSslConfiguration::setDefaultConfiguration(sslCfg);
 
-        foreach( QSslCertificate cert, _unknownCerts ) {
+        foreach( const QSslCertificate& cert, _unknownCerts ) {
             certs += cert.toPem() + '\n';
         }
 
diff --git a/src/mirall/statusdialog.cpp b/src/mirall/statusdialog.cpp
index 6f9f3b980..01bb5702f 100644
--- a/src/mirall/statusdialog.cpp
+++ b/src/mirall/statusdialog.cpp
@@ -12,14 +12,14 @@
  * for more details.
  */
 
- #include <QtCore>
- #include <QtGui>
-
 #include "mirall/statusdialog.h"
 #include "mirall/folder.h"
 #include "mirall/theme.h"
 #include "mirall/owncloudinfo.h"
 
+#include <QtCore>
+#include <QtGui>
+
 namespace Mirall {
 
 FolderStatusModel::FolderStatusModel()
@@ -183,13 +183,11 @@ StatusDialog::StatusDialog( Theme *theme, QWidget *parent) :
 
   connect(_ButtonClose,  SIGNAL(clicked()), this, SLOT(accept()));
   connect(_ButtonRemove, SIGNAL(clicked()), this, SLOT(slotRemoveFolder()));
-#ifdef HAVE_FETCH_AND_PUSH
-  connect(_ButtonFetch,  SIGNAL(clicked()), this, SLOT(slotFetchFolder()));
-  connect(_ButtonPush,   SIGNAL(clicked()), this, SLOT(slotPushFolder()));
-#else
+
+  // hide these two for now...
   _ButtonFetch->setVisible( false );
   _ButtonPush->setVisible( false );
-#endif
+
   connect(_ButtonEnable, SIGNAL(clicked()), this, SLOT(slotEnableFolder()));
   connect(_ButtonInfo,   SIGNAL(clicked()), this, SLOT(slotInfoFolder()));
   connect(_ButtonAdd,    SIGNAL(clicked()), this, SLOT(slotAddSync()));
@@ -421,7 +419,7 @@ void StatusDialog::slotOCInfo( const QString& url, const QString& versionStr, co
         // work around a bug in QDesktopServices on Win32, see i-net
         QString filePath = url;
 
-        if (filePath.startsWith("\\\\") || filePath.startsWith("//"))
+        if (filePath.startsWith(QLatin1String("\\\\") || filePath.startsWith(QLatin1String("//"))
             _OCUrl.setUrl(QDir::toNativeSeparators(filePath));
         else
             _OCUrl = QUrl::fromLocalFile(filePath);
diff --git a/src/mirall/temporarydir.cpp b/src/mirall/temporarydir.cpp
index 6f3ab03b3..07caef19d 100644
--- a/src/mirall/temporarydir.cpp
+++ b/src/mirall/temporarydir.cpp
@@ -12,6 +12,9 @@
  * for more details.
  */
 
+#include "mirall/temporarydir.h"
+#include "mirall/fileutils.h"
+
 #include <cstdlib>
 #include <cerrno>
 #include <cstring>
@@ -20,9 +23,6 @@
 #include <QDir>
 #include <QDateTime>
 
-#include "mirall/temporarydir.h"
-#include "mirall/fileutils.h"
-
 namespace Mirall
 {
 
diff --git a/src/mirall/unisonfolder.cpp b/src/mirall/unisonfolder.cpp
index 2c6373b95..3e4eb56d3 100644
--- a/src/mirall/unisonfolder.cpp
+++ b/src/mirall/unisonfolder.cpp
@@ -12,14 +12,14 @@
  * for more details.
  */
 
+#include "mirall/unisonfolder.h"
+
 #include <QDebug>
 #include <QDir>
 #include <QMutexLocker>
 #include <QStringList>
 #include <QTextStream>
 
-#include "mirall/unisonfolder.h"
-
 namespace Mirall {
 
     UnisonFolder::UnisonFolder(const QString &alias,
@@ -77,7 +77,7 @@ void UnisonFolder::startSync(const QStringList &pathList)
     if (_syncCount > 0 ) {
         // may be we should use a QDir in the API itself?
         QDir root(path());
-        foreach(QString changedPath, pathList) {
+        foreach( const QString& changedPath, pathList) {
             args << "-path" << root.relativeFilePath(changedPath);
         }
     }
diff --git a/src/mirall/updatedetector.cpp b/src/mirall/updatedetector.cpp
index 4e3d37c2b..ed72fd784 100644
--- a/src/mirall/updatedetector.cpp
+++ b/src/mirall/updatedetector.cpp
@@ -11,16 +11,16 @@
  * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
  * for more details.
  */
-#include <QtCore>
-#include <QtNetwork>
-#include <QtGui>
-
-#include "updatedetector.h"
 
+#include "mirall/updatedetector.h"
 #include "mirall/theme.h"
 #include "mirall/version.h"
 #include "mirall/occinfo.h"
 
+#include <QtCore>
+#include <QtNetwork>
+#include <QtGui>
+
 namespace Mirall {