minor cleanup

4 files changed, 9 insertions, 14 deletions

diff --git a/src/moapplication.cpp b/src/moapplication.cpp
index 46b9677b..9ddd9e54 100644
--- a/src/moapplication.cpp
+++ b/src/moapplication.cpp
@@ -129,18 +129,9 @@ bool MOApplication::notify(QObject *receiver, QEvent *event)
 

 void MOApplication::updateStyle(const QString &fileName)

 {

-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)

   if (fileName == "Fusion") {

     setStyle(QStyleFactory::create("fusion"));

     setStyleSheet("");

-#else

-  if (fileName == "Plastique") {

-    setStyle(new ProxyStyle(new QPlastiqueStyle));

-    setStyleSheet("");

-  } else if (fileName == "Cleanlooks") {

-    setStyle(new ProxyStyle(new QCleanlooksStyle));

-    setStyleSheet("");

-#endif

   } else {

     setStyle(new ProxyStyle(QStyleFactory::create(m_DefaultStyle)));

     if (QFile::exists(fileName)) {

diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index 9c900d53..76738a18 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -1023,8 +1023,9 @@ void OrganizerCore::spawnBinary(const QFileInfo &binary,
           LPDWORD processes = new DWORD[maxCount];

           if (::GetVFSProcessList(&numProcesses, processes)) {

             bool found = false;

-            for (size_t i = 0; i < std::min<DWORD>(maxCount, numProcesses);

-                 ++i) {

+            size_t count =

+                std::min<size_t>(static_cast<size_t>(maxCount), numProcesses);

+            for (size_t i = 0; i < count; ++i) {

               std::wstring processName = getProcessName(processes[i]);

               if (!boost::starts_with(processName, L"ModOrganizer.exe")) {

                 currentProcess = processes[i];

diff --git a/src/profile.cpp b/src/profile.cpp
index 9106cebe..558d9114 100644
--- a/src/profile.cpp
+++ b/src/profile.cpp
@@ -473,7 +473,9 @@ void Profile::setModPriority(unsigned int index, int &newPriority)
     return;
   }
 
-  int newPriorityTemp = (std::max)(0, (std::min<int>)(m_ModStatus.size() - 1, newPriority));
+  int newPriorityTemp =
+      (std::max)(0, (std::min<int>)(static_cast<int>(m_ModStatus.size()) - 1,
+                                    newPriority));
 
   // don't try to place below overwrite
   while ((m_ModIndexByPriority.at(newPriorityTemp) >= m_ModStatus.size()) ||
diff --git a/src/shared/leaktrace.cpp b/src/shared/leaktrace.cpp
index 73786c6b..1ff1fa9d 100644
--- a/src/shared/leaktrace.cpp
+++ b/src/shared/leaktrace.cpp
@@ -33,8 +33,9 @@ static struct __TraceData {
              "%d objects not freed, allocated at:\n%s",

              iter->second.size(), iter->first.toString().c_str());

       printf("Addresses: ");

-      for (int i = 0; i < (std::min<int>)(5, iter->second.size()); ++i) {

-        printf("%p, ", reinterpret_cast<void*>(iter->second[i]));

+      for (int i = 0;

+           i < (std::min<int>)(5, static_cast<int>(iter->second.size())); ++i) {

+        printf("%p, ", reinterpret_cast<void *>(iter->second[i]));

       }

       printf("\n");

     }