Improved: Switched to stricter code formatter (Uncrustify) for better consistency across all source files.
This commit is contained in:
1 parent
a1be4cc70f
commit
57e8158efd
202 files changed
+4595
-4284
No files matched your search
+24
-24
@@ -1,20 +1,20 @@
|
||||
/*
|
||||
This file is part of EqualizerAPO, a system-wide equalizer.
|
||||
Copyright (C) 2015 Jonas Thedering
|
||||
This file is part of EqualizerAPO, a system-wide equalizer.
|
||||
Copyright (C) 2015 Jonas Thedering
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#include <QTranslator>
|
||||
@@ -27,12 +27,12 @@
|
||||
|
||||
using namespace std;
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
int result = -1;
|
||||
#ifdef _DEBUG
|
||||
//_CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF );
|
||||
//_CrtSetBreakAlloc(3318);
|
||||
// _CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF );
|
||||
// _CrtSetBreakAlloc(3318);
|
||||
#endif
|
||||
|
||||
QCoreApplication::addLibraryPath("qt");
|
||||
@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
|
||||
|
||||
QSettings settings(QString::fromWCharArray(EDITOR_REGPATH), QSettings::NativeFormat);
|
||||
QVariant languageValue = settings.value("language");
|
||||
if(languageValue.isValid())
|
||||
if (languageValue.isValid())
|
||||
QLocale::setDefault(languageValue.toString());
|
||||
else
|
||||
QLocale::setDefault(QLocale::system());
|
||||
@@ -58,17 +58,17 @@ int main(int argc, char *argv[])
|
||||
application.installTranslator(&editorTranslator);
|
||||
|
||||
QString configPath = QDir::currentPath();
|
||||
if(RegistryHelper::keyExists(APP_REGPATH) && RegistryHelper::valueExists(APP_REGPATH, L"ConfigPath"))
|
||||
if (RegistryHelper::keyExists(APP_REGPATH) && RegistryHelper::valueExists(APP_REGPATH, L"ConfigPath"))
|
||||
configPath = QString::fromStdWString(RegistryHelper::readValue(APP_REGPATH, L"ConfigPath"));
|
||||
QDir configDir(configPath);
|
||||
|
||||
if(!RegistryHelper::keyExists(USER_REGPATH))
|
||||
if (!RegistryHelper::keyExists(USER_REGPATH))
|
||||
RegistryHelper::createKey(USER_REGPATH);
|
||||
|
||||
if(!RegistryHelper::keyExists(EDITOR_REGPATH))
|
||||
if (!RegistryHelper::keyExists(EDITOR_REGPATH))
|
||||
RegistryHelper::createKey(EDITOR_REGPATH);
|
||||
|
||||
if(!RegistryHelper::keyExists(EDITOR_PER_FILE_REGPATH))
|
||||
if (!RegistryHelper::keyExists(EDITOR_PER_FILE_REGPATH))
|
||||
RegistryHelper::createKey(EDITOR_PER_FILE_REGPATH);
|
||||
|
||||
MainWindow w(configDir);
|
||||
@@ -77,10 +77,10 @@ int main(int argc, char *argv[])
|
||||
QCommandLineParser parser;
|
||||
parser.process(application);
|
||||
QStringList args = parser.positionalArguments();
|
||||
if(args.isEmpty() && w.isEmpty())
|
||||
if (args.isEmpty() && w.isEmpty())
|
||||
args = QStringList("config.txt");
|
||||
|
||||
for(QString arg : args)
|
||||
for (QString arg : args)
|
||||
w.load(configDir.absoluteFilePath(arg));
|
||||
|
||||
w.doChecks();
|
||||
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
|
||||
|
||||
restart = w.shouldRestart();
|
||||
}
|
||||
while(restart);
|
||||
while (restart);
|
||||
|
||||
return result;
|
||||
}
|
||||
Reference in new issue
Block a user