Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
chore: clang-tidy cleanups (#1287)
* chore: fix syntax error in clang-tidy config file
  • Loading branch information
ckerr committed Jun 5, 2020
1 parent 1f28470 commit 51573a3
Show file tree
Hide file tree
Showing 56 changed files with 638 additions and 588 deletions.
56 changes: 45 additions & 11 deletions qt/.clang-tidy
@@ -1,30 +1,64 @@
---
Checks: "-*,\
# Many of these checks are disabled only because the code hasn't been
# cleaned up yet. Pull requests welcomed.
Checks: >
bugprone-*,
-bugprone-branch-clone,
-bugprone-narrowing-conversions,
cert-*,
-cert-err58-cpp,
clang-analyzer-optin*,
cppcoreguidelines-*,
-cppcoreguidelines-avoid-magic-numbers,
-cppcoreguidelines-init-variables,
-cppcoreguidelines-macro-usage,
-cppcoreguidelines-narrowing-conversions,
-cppcoreguidelines-non-private-member-variables-in-classes,
-cppcoreguidelines-owning-memory,
-cppcoreguidelines-pro-bounds-array-to-pointer-decay,
-cppcoreguidelines-pro-bounds-constant-array-index,
-cppcoreguidelines-pro-bounds-pointer-arithmetic,
-cppcoreguidelines-pro-type-const-cast,
-cppcoreguidelines-pro-type-cstyle-cast,
-cppcoreguidelines-pro-type-reinterpret-cast,
-cppcoreguidelines-pro-type-static-cast-downcast,
-cppcoreguidelines-special-member-functions,
google-readability-*,
google-runtime-operator,
hicpp-*,
-hicpp-multiway-paths-covered,
-hicpp-no-array-decay,
-hicpp-signed-bitwise,
-hicpp-special-member-functions,
misc-*,
-misc-no-recursion,
-misc-non-private-member-variables-in-classes,
modernize-*,
-modernize-avoid-c-arrays,
-modernize-loop-convert,
-modernize-pass-by-value,
-modernize-raw-string-literal,
-modernize-use-nodiscard,
-modernize-use-trailing-return-type,
-modernize-use-trailing-return-type, # keep
performance-*,
readability-*,
-readability-convert-member-functions-to-static,
-readability-implicit-bool-conversion,
-readability-inconsistent-declaration-parameter-name,
-readability-isolate-declaration,
-readability-magic-numbers,
-readability-redundant-access-specifiers,
-readability-static-accessed-through-instance,
WarningsAsErrors: "*"
...
-readability-static-accessed-through-instance
WarningsAsErrors: >
*
CheckOptions:
- { key: readability-identifier-naming.ClassCase, value: CamelCase }
- { key: readability-identifier-naming.ClassMethodCase, value: camelBack }
- { key: readability-identifier-naming.ConstexprVariableCase, value: CamelCase }
- { key: readability-identifier-naming.EnumConstantCase, value: UPPER_CASE }
- { key: readability-identifier-naming.FunctionCase, value: camelBack }
- { key: readability-identifier-naming.GlobalConstantCase, value: CamelCase }
- { key: readability-identifier-naming.MemberConstantCase, value: CamelCase }
- { key: readability-identifier-naming.NamespaceCase, value: lower_case }
- { key: readability-identifier-naming.PrivateMemberSuffix, value: _ }
- { key: readability-identifier-naming.ProtectedMemberSuffix, value: _ }
- { key: readability-identifier-naming.StaticConstantCase, value: CamelCase }
- { key: readability-identifier-naming.StructCase, value: CamelCase }
- { key: readability-identifier-naming.TemplateParameterCase, value: CamelCase }
- { key: readability-identifier-naming.VariableCase, value: lower_case }
2 changes: 1 addition & 1 deletion qt/AboutDialog.h
Expand Up @@ -28,7 +28,7 @@ private slots:
void showLicense();

private:
Ui::AboutDialog ui_;
Ui::AboutDialog ui_{};

QPointer<LicenseDialog> license_dialog_;
};
47 changes: 23 additions & 24 deletions qt/Application.cc
Expand Up @@ -6,6 +6,7 @@
*
*/

#include <array>
#include <ctime>
#include <iostream>

Expand Down Expand Up @@ -41,12 +42,12 @@
namespace
{

auto const MY_CONFIG_NAME = QStringLiteral("transmission");
auto const MY_READABLE_NAME = QStringLiteral("transmission-qt");
auto const MyConfigName = QStringLiteral("transmission");
auto const MyReadableName = QStringLiteral("transmission-qt");

tr_option const opts[] =
std::array<tr_option, 8> const Opts =
{
{ 'g', "config-dir", "Where to look for configuration files", "g", true, "<path>" },
tr_option{ 'g', "config-dir", "Where to look for configuration files", "g", true, "<path>" },
{ 'm', "minimized", "Start minimized in system tray", "m", false, nullptr },
{ 'p', "port", "Port to use when connecting to an existing session", "p", true, "<port>" },
{ 'r', "remote", "Connect to an existing session at the specified hostname", "r", true, "<host>" },
Expand Down Expand Up @@ -87,7 +88,7 @@ bool loadTranslation(QTranslator& translator, QString const& name, QLocale const
Application::Application(int& argc, char** argv) :
QApplication(argc, argv)
{
setApplicationName(MY_CONFIG_NAME);
setApplicationName(MyConfigName);
loadTranslations();

Formatter::initUnits();
Expand All @@ -106,10 +107,8 @@ Application::Application(int& argc, char** argv) :

if (icon.isNull())
{
QList<int> sizes;
sizes << 16 << 22 << 24 << 32 << 48 << 64 << 72 << 96 << 128 << 192 << 256;

for (int const size : sizes)
static std::array<int, 11> constexpr Sizes = { 16, 22, 24, 32, 48, 64, 72, 96, 128, 192, 256 };
for (auto const size : Sizes)
{
icon.addPixmap(QPixmap(QStringLiteral(":/icons/transmission-%1.png").arg(size)));
}
Expand All @@ -132,7 +131,7 @@ Application::Application(int& argc, char** argv) :
QString config_dir;
QStringList filenames;

while ((c = tr_getopt(getUsage(), argc, const_cast<char const**>(argv), opts, &optarg)) != TR_OPT_DONE)
while ((c = tr_getopt(getUsage(), argc, const_cast<char const**>(argv), Opts.data(), &optarg)) != TR_OPT_DONE)
{
switch (c)
{
Expand Down Expand Up @@ -161,13 +160,13 @@ Application::Application(int& argc, char** argv) :
break;

case 'v':
std::cerr << qPrintable(MY_READABLE_NAME) << ' ' << LONG_VERSION_STRING << std::endl;
std::cerr << qPrintable(MyReadableName) << ' ' << LONG_VERSION_STRING << std::endl;
quitLater();
return;

case TR_OPT_ERR:
std::cerr << qPrintable(QObject::tr("Invalid option")) << std::endl;
tr_getopt_usage(qPrintable(MY_READABLE_NAME), getUsage(), opts);
tr_getopt_usage(qPrintable(MyReadableName), getUsage(), Opts.data());
quitLater();
return;

Expand Down Expand Up @@ -377,8 +376,8 @@ void Application::loadTranslations()
installTranslator(&qt_translator_);
}

if (loadTranslation(app_translator_, MY_CONFIG_NAME, locale, app_qm_dirs) ||
loadTranslation(app_translator_, MY_CONFIG_NAME, english_locale, app_qm_dirs))
if (loadTranslation(app_translator_, MyConfigName, locale, app_qm_dirs) ||
loadTranslation(app_translator_, MyConfigName, english_locale, app_qm_dirs))
{
installTranslator(&app_translator_);
}
Expand Down Expand Up @@ -464,11 +463,11 @@ Application::~Application()
{
if (prefs_ != nullptr && window_ != nullptr)
{
QRect const mainwinRect(window_->geometry());
prefs_->set(Prefs::MAIN_WINDOW_HEIGHT, std::max(100, mainwinRect.height()));
prefs_->set(Prefs::MAIN_WINDOW_WIDTH, std::max(100, mainwinRect.width()));
prefs_->set(Prefs::MAIN_WINDOW_X, mainwinRect.x());
prefs_->set(Prefs::MAIN_WINDOW_Y, mainwinRect.y());
auto const geometry = window_->geometry();
prefs_->set(Prefs::MAIN_WINDOW_HEIGHT, std::max(100, geometry.height()));
prefs_->set(Prefs::MAIN_WINDOW_WIDTH, std::max(100, geometry.width()));
prefs_->set(Prefs::MAIN_WINDOW_X, geometry.x());
prefs_->set(Prefs::MAIN_WINDOW_Y, geometry.y());
}

delete watch_dir_;
Expand Down Expand Up @@ -584,16 +583,16 @@ bool Application::notifyApp(QString const& title, QString const& body) const
{
#ifdef QT_DBUS_LIB

auto const DBUS_SERVICE_NAME = QStringLiteral("org.freedesktop.Notifications");
auto const DBUS_INTERFACE_NAME = QStringLiteral("org.freedesktop.Notifications");
auto const DBUS_PATH = QStringLiteral("/org/freedesktop/Notifications");
auto const dbus_service_name = QStringLiteral("org.freedesktop.Notifications");
auto const dbus_interface_name = QStringLiteral("org.freedesktop.Notifications");
auto const dbus_path = QStringLiteral("/org/freedesktop/Notifications");

QDBusConnection bus = QDBusConnection::sessionBus();

if (bus.isConnected())
{
QDBusMessage m =
QDBusMessage::createMethodCall(DBUS_SERVICE_NAME, DBUS_PATH, DBUS_INTERFACE_NAME, QStringLiteral("Notify"));
QDBusMessage::createMethodCall(dbus_service_name, dbus_path, dbus_interface_name, QStringLiteral("Notify"));
QVariantList args;
args.append(QStringLiteral("Transmission")); // app_name
args.append(0U); // replaces_id
Expand Down Expand Up @@ -627,7 +626,7 @@ FaviconCache& Application::faviconCache()
****
***/

int tr_main(int argc, char* argv[])
int tr_main(int argc, char** argv)
{
InteropHelper::initialize();

Expand Down
5 changes: 4 additions & 1 deletion qt/ColumnResizer.cc
Expand Up @@ -24,7 +24,10 @@ int itemColumnSpan(QGridLayout* layout, QLayoutItem const* item)
continue;
}

int row, column, row_span, column_span;
int row = {};
int column = {};
int row_span = {};
int column_span = {};
layout->getItemPosition(i, &row, &column, &row_span, &column_span);
return column_span;
}
Expand Down
8 changes: 4 additions & 4 deletions qt/ComInteropHelper.cc
Expand Up @@ -22,10 +22,10 @@ QAXCLASS(InteropObject)
QAXFACTORY_END()

// These are ActiveQt internals; declaring here as I don't like their WinMain much...
extern HANDLE qAxInstance;
extern bool qAxOutProcServer;
extern wchar_t qAxModuleFilename[MAX_PATH];
extern QString qAxInit();
extern HANDLE qAxInstance; // NOLINT
extern bool qAxOutProcServer; // NOLINT
extern wchar_t qAxModuleFilename[MAX_PATH]; // NOLINT
extern QString qAxInit(); // NOLINT

ComInteropHelper::ComInteropHelper() :
client_(new QAxObject(QStringLiteral("Transmission.QtClient")))
Expand Down
16 changes: 8 additions & 8 deletions qt/DBusInteropHelper.cc
Expand Up @@ -20,9 +20,9 @@
namespace
{

auto const DBUS_SERVICE = QStringLiteral("com.transmissionbt.Transmission");
auto const DBUS_OBJECT_PATH = QStringLiteral("/com/transmissionbt/Transmission");
auto const DBUS_INTERFACE = QStringLiteral("com.transmissionbt.Transmission");
auto const DBusService = QStringLiteral("com.transmissionbt.Transmission");
auto const DBusObjectPath = QStringLiteral("/com/transmissionbt/Transmission");
auto const DBusInterface = QStringLiteral("com.transmissionbt.Transmission");

} // namespace

Expand All @@ -33,7 +33,7 @@ bool DBusInteropHelper::isConnected() const

QVariant DBusInteropHelper::addMetainfo(QString const& metainfo)
{
QDBusMessage request = QDBusMessage::createMethodCall(DBUS_SERVICE, DBUS_OBJECT_PATH, DBUS_INTERFACE,
QDBusMessage request = QDBusMessage::createMethodCall(DBusService, DBusObjectPath, DBusInterface,
QStringLiteral("AddMetainfo"));
request.setArguments(QVariantList() << metainfo);

Expand All @@ -50,13 +50,13 @@ void DBusInteropHelper::registerObject(QObject* parent)
return;
}

if (!bus.registerService(DBUS_SERVICE))
if (!bus.registerService(DBusService))
{
std::cerr << "couldn't register " << qPrintable(DBUS_SERVICE) << std::endl;
std::cerr << "couldn't register " << qPrintable(DBusService) << std::endl;
}

if (!bus.registerObject(DBUS_OBJECT_PATH, new InteropObject(parent), QDBusConnection::ExportAllSlots))
if (!bus.registerObject(DBusObjectPath, new InteropObject(parent), QDBusConnection::ExportAllSlots))
{
std::cerr << "couldn't register " << qPrintable(DBUS_OBJECT_PATH) << std::endl;
std::cerr << "couldn't register " << qPrintable(DBusObjectPath) << std::endl;
}
}
3 changes: 3 additions & 0 deletions qt/DBusInteropHelper.h
Expand Up @@ -15,6 +15,9 @@ class QVariant;
class DBusInteropHelper
{
public:
DBusInteropHelper() = default;
~DBusInteropHelper() = default;

bool isConnected() const;

QVariant addMetainfo(QString const& metainfo);
Expand Down

0 comments on commit 51573a3

Please sign in to comment.