Use upstream code style (#42)

Author: nbolton

.clang-format

@@ -13,16 +13,40 @@ BasedOnStyle: LLVM
 # Turn off LLVM default alignment of params with the opening bracket,
 # which can be less readable in some cases in our code base.
 #
-# Using `AlwaysBreak` will result in:
+# Using `BlockIndent` will result in:
 #   void fooBarBazQuxHelloWorld(
 #     int a,
-#     int b);
+#     int b
+#   );
 #
 # Instead of:
 #   void fooBarBazQuxHelloWorld(int a,
 #                               int b);
-AlignAfterOpenBracket: AlwaysBreak
+AlignAfterOpenBracket: BlockIndent
 
 # Turn off LLVM default packing of ctor initializers.
 # This makes it easier to see which members were initialized and in what order.
 PackConstructorInitializers: CurrentLine
+
+# up our limit to 120
+ColumnLimit: 120
+
+# Custom Breaking rules
+BreakBeforeBraces: Custom
+BraceWrapping:
+    AfterCaseLabel: false
+    AfterClass: true
+    AfterControlStatement: Never
+    AfterEnum: true
+    AfterFunction: true
+    AfterNamespace: false
+    AfterStruct: true
+    AfterUnion: true
+    AfterExternBlock: true
+    BeforeCatch: false
+    BeforeElse: false
+    BeforeLambdaBody: false
+    BeforeWhile: false
+
+# no single line functions
+AllowShortFunctionsOnASingleLine: None

odin

@@ -38,12 +38,12 @@ using namespace deskflow::gui;
 using namespace synergy::gui;
 using namespace synergy::license;
 
-ActivationDialog::ActivationDialog(
-    QWidget *parent, AppConfig &appConfig, LicenseHandler &licenseHandler)
+ActivationDialog::ActivationDialog(QWidget *parent, AppConfig &appConfig, LicenseHandler &licenseHandler)
     : QDialog(parent),
       m_ui(new Ui::ActivationDialog),
       m_pAppConfig(&appConfig),
-      m_licenseHandler(licenseHandler) {
+      m_licenseHandler(licenseHandler)
+{
 
   m_ui->setupUi(this);
 
@@ -56,7 +56,8 @@ ActivationDialog::ActivationDialog(
   }
 }
 
-void ActivationDialog::refreshSerialKey() {
+void ActivationDialog::refreshSerialKey()
+{
 
   const QString envSerialKey = qEnvironmentVariable("SYNERGY_TEST_SERIAL_KEY");
   if (!envSerialKey.isEmpty()) {
@@ -77,9 +78,13 @@ void ActivationDialog::refreshSerialKey() {
   }
 }
 
-ActivationDialog::~ActivationDialog() { delete m_ui; }
+ActivationDialog::~ActivationDialog()
+{
+  delete m_ui;
+}
 
-void ActivationDialog::reject() {
+void ActivationDialog::reject()
+{
   // don't show the cancel confirmation dialog if they've already registered,
   // since it's not relevant to customers who are changing their serial key.
   const auto &license = m_licenseHandler.license();
@@ -95,7 +100,8 @@ void ActivationDialog::reject() {
   }
 }
 
-void ActivationDialog::accept() {
+void ActivationDialog::accept()
+{
   using Result = LicenseHandler::SetSerialKeyResult;
   auto serialKey = m_ui->m_pTextEditSerialKey->toPlainText();
 
@@ -114,84 +120,77 @@ void ActivationDialog::accept() {
   QDialog::accept();
 }
 
-void ActivationDialog::showResultDialog(
-    LicenseHandler::SetSerialKeyResult result) {
+void ActivationDialog::showResultDialog(LicenseHandler::SetSerialKeyResult result)
+{
   const QString title = "Activation";
 
   switch (result) {
     using enum LicenseHandler::SetSerialKeyResult;
 
   case kUnchanged:
-    QMessageBox::information(
-        this, title,
-        "Heads up, the serial key you entered was the same as last time.");
+    QMessageBox::information(this, title, "Heads up, the serial key you entered was the same as last time.");
     QDialog::accept();
     break;
 
   case kInvalid:
     QMessageBox::critical(
         this, title,
-        QString(
-            "Invalid serial key. "
-            R"(Please <a href="%1" style="color: %2">contact us</a> for help.)")
+        QString("Invalid serial key. "
+                R"(Please <a href="%1" style="color: %2">contact us</a> for help.)")
             .arg(kUrlContact)
-            .arg(kColorSecondary));
+            .arg(kColorSecondary)
+    );
     break;
 
   case kExpired:
     QMessageBox::warning(
         this, title,
-        QString(
-            "Sorry, that serial key has expired. "
-            R"(Please <a href="%1" style="color: %2">renew</a> your license.)")
+        QString("Sorry, that serial key has expired. "
+                R"(Please <a href="%1" style="color: %2">renew</a> your license.)")
             .arg(kUrlPurchase)
-            .arg(kColorSecondary));
+            .arg(kColorSecondary)
+    );
     break;
 
   default:
     qFatal("unexpected change serial key result: %d", static_cast<int>(result));
   }
 }
 
-void ActivationDialog::showSuccessDialog() {
+void ActivationDialog::showSuccessDialog()
+{
   const auto &license = m_licenseHandler.license();
 
   QString title = "Activation successful";
-  QString message = tr("<p>Thanks for activating %1.</p>")
-                        .arg(m_licenseHandler.productName());
+  QString message = tr("<p>Thanks for activating %1.</p>").arg(m_licenseHandler.productName());
 
   const auto tlsAvailable = m_licenseHandler.license().isTlsAvailable();
   if (tlsAvailable && m_pAppConfig->tlsEnabled()) {
-    message +=
-        "<p>To ensure that TLS encryption works correctly, "
-        "please activate all of your computers with the same serial key.</p>";
+    message += "<p>To ensure that TLS encryption works correctly, "
+               "please activate all of your computers with the same serial key.</p>";
   }
 
   if (license.isTimeLimited()) {
     auto daysLeft = license.daysLeft().count();
     if (license.isTrial()) {
       title = "Trial started";
-      message += QString("Your trial will expire in %1 %2.")
-                     .arg(daysLeft)
-                     .arg((daysLeft == 1) ? "day" : "days");
+      message += QString("Your trial will expire in %1 %2.").arg(daysLeft).arg((daysLeft == 1) ? "day" : "days");
     } else if (license.isSubscription()) {
-      message += QString("Your license will expire in %1 %2.")
-                     .arg(daysLeft)
-                     .arg((daysLeft == 1) ? "day" : "days");
+      message += QString("Your license will expire in %1 %2.").arg(daysLeft).arg((daysLeft == 1) ? "day" : "days");
     }
   }
 
   QMessageBox::information(this, title, message);
 }
 
-void ActivationDialog::showErrorDialog(const QString &message) {
-  QString fullMessage =
-      QString("<p>There was a problem activating Deskflow.</p>"
-              R"(<p>Please <a href="%1" style="color: %2">contact us</a> )"
-              "and provide the following information:</p>"
-              "%3")
-          .arg(kUrlContact)
-          .arg(kColorSecondary)
-          .arg(message);
+void ActivationDialog::showErrorDialog(const QString &message)
+{
+  QString fullMessage = QString("<p>There was a problem activating Deskflow.</p>"
+                                R"(<p>Please <a href="%1" style="color: %2">contact us</a> )"
+                                "and provide the following information:</p>"
+                                "%3")
+                            .arg(kUrlContact)
+                            .arg(kColorSecondary)
+                            .arg(message);
   QMessageBox::critical(this, "Activation failed", fullMessage);
 }

src/lib/synergy/gui/ActivationDialog.cpp

@@ -27,18 +27,20 @@ class ActivationDialog;
 
 class AppConfig;
 
-class ActivationDialog : public QDialog {
+class ActivationDialog : public QDialog
+{
   Q_OBJECT
 
 public:
-  ActivationDialog(
-      QWidget *parent, AppConfig &appConfig, LicenseHandler &licenseHandler);
+  ActivationDialog(QWidget *parent, AppConfig &appConfig, LicenseHandler &licenseHandler);
   ~ActivationDialog() override;
 
-  class ActivationMessageError : public std::runtime_error {
+  class ActivationMessageError : public std::runtime_error
+  {
   public:
-    ActivationMessageError()
-        : std::runtime_error("could not show activation message") {}
+    ActivationMessageError() : std::runtime_error("could not show activation message")
+    {
+    }
   };
 
 public slots:

src/lib/synergy/gui/ActivationDialog.h

@@ -26,7 +26,8 @@ namespace synergy::gui {
 
 const auto kTestTimeEnvVar = "SYNERGY_TEST_START_TIME";
 
-AppTime::AppTime() {
+AppTime::AppTime()
+{
   m_realStartTime = system_clock::now();
   if (qEnvironmentVariableIsSet(kTestTimeEnvVar)) {
     const auto testTime = qEnvironmentVariable(kTestTimeEnvVar).toLongLong();
@@ -35,9 +36,13 @@ AppTime::AppTime() {
   }
 }
 
-bool AppTime::hasTestTime() const { return m_testStartTime.has_value(); }
+bool AppTime::hasTestTime() const
+{
+  return m_testStartTime.has_value();
+}
 
-time_point AppTime::now() {
+time_point AppTime::now()
+{
   if (m_testStartTime.has_value()) {
     const auto runtime = system_clock::now() - m_realStartTime;
     return time_point{m_testStartTime.value()} + runtime;

src/lib/synergy/gui/AppTime.cpp

@@ -22,7 +22,8 @@
 
 namespace synergy::gui {
 
-class AppTime {
+class AppTime
+{
   using time_point = std::chrono::system_clock::time_point;
 
 public:

src/lib/synergy/gui/AppTime.h

@@ -21,13 +21,15 @@
 
 #include "QPushButton"
 
-CancelActivationDialog::CancelActivationDialog(QWidget *parent)
-    : QDialog(parent),
-      ui(new Ui::CancelActivationDialog) {
+CancelActivationDialog::CancelActivationDialog(QWidget *parent) : QDialog(parent), ui(new Ui::CancelActivationDialog)
+{
   ui->setupUi(this);
 
   ui->m_pButtonBox->button(QDialogButtonBox::Cancel)->setText("&Back");
   ui->m_pButtonBox->button(QDialogButtonBox::Ok)->setText("&Exit");
 }
 
-CancelActivationDialog::~CancelActivationDialog() { delete ui; }
+CancelActivationDialog::~CancelActivationDialog()
+{
+  delete ui;
+}

src/lib/synergy/gui/CancelActivationDialog.cpp

@@ -23,7 +23,8 @@ namespace Ui {
 class CancelActivationDialog;
 }
 
-class CancelActivationDialog : public QDialog {
+class CancelActivationDialog : public QDialog
+{
   Q_OBJECT
 
 public:

src/lib/synergy/gui/CancelActivationDialog.h

@@ -31,11 +31,8 @@ const auto kLinkBuy = R"(<a href="%1" style="color: %2">Buy now</a>)";
 const auto kLinkRenew = R"(<a href="%1" style="color: %2">Renew now</a>)";
 const auto kLinkDownload = R"(<a href="%1" style="color: %2">Download now</a>)";
 
-const auto kUrlPurchase =
-    QString("%1/purchase?%2").arg(kUrlWebsite, kUrlSourceQuery);
-const auto kUrlPersonalUpgrade =
-    QString("%1/purchase/upgrade?%2").arg(kUrlWebsite, kUrlSourceQuery);
-const auto kUrlContact =
-    QString("%1/contact?%2").arg(kUrlWebsite, kUrlSourceQuery);
+const auto kUrlPurchase = QString("%1/purchase?%2").arg(kUrlWebsite, kUrlSourceQuery);
+const auto kUrlPersonalUpgrade = QString("%1/purchase/upgrade?%2").arg(kUrlWebsite, kUrlSourceQuery);
+const auto kUrlContact = QString("%1/contact?%2").arg(kUrlWebsite, kUrlSourceQuery);
 
 } // namespace synergy::gui

src/lib/synergy/gui/constants.h

@@ -22,13 +22,14 @@
 #include <QtCore>
 #include <QtGui>
 
-UpgradeDialog::UpgradeDialog(QWidget *parent) : QMessageBox(parent) {
+UpgradeDialog::UpgradeDialog(QWidget *parent) : QMessageBox(parent)
+{
   m_cancel = addButton("Cancel", QMessageBox::RejectRole);
   m_upgrade = addButton("Upgrade", QMessageBox::AcceptRole);
 }
 
-void UpgradeDialog::showDialog(
-    const QString &title, const QString &body, const QString &link) {
+void UpgradeDialog::showDialog(const QString &title, const QString &body, const QString &link)
+{
   setWindowTitle(title);
   setText(body);
   exec();