Fix formatting

Signed-off-by: Geoff Hutchison <geoff.hutchison@gmail.com>
OpenChemistry · Jul 25, 2023 · a0211c2 · a0211c2
1 parent a9c62d4
commit a0211c2
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 55 deletions.
diff --git a/avogadro/qtgui/extensionplugin.cpp b/avogadro/qtgui/extensionplugin.cpp
@@ -7,45 +7,34 @@
 
 namespace Avogadro::QtGui {
 
-ExtensionPlugin::ExtensionPlugin(QObject* parent_) : QObject(parent_)
-{
-}
+ExtensionPlugin::ExtensionPlugin(QObject* parent_) : QObject(parent_) {}
 
-ExtensionPlugin::~ExtensionPlugin()
-{
-}
+ExtensionPlugin::~ExtensionPlugin() {}
 
 QList<Io::FileFormat*> ExtensionPlugin::fileFormats() const
 {
   return QList<Io::FileFormat*>();
 }
 
-ExtensionPluginFactory::~ExtensionPluginFactory()
-{
-}
+ExtensionPluginFactory::~ExtensionPluginFactory() {}
 
 bool ExtensionPlugin::readMolecule(Molecule&)
 {
   return false;
 }
 
-void ExtensionPlugin::setScene(Rendering::Scene*)
-{
-}
+void ExtensionPlugin::setScene(Rendering::Scene*) {}
 
-void ExtensionPlugin::setCamera(Rendering::Camera* camera)
-{
-}
+void ExtensionPlugin::setCamera(Rendering::Camera* camera) {}
 
-void ExtensionPlugin::setActiveWidget(QWidget* widget)
-{
-}
+void ExtensionPlugin::setActiveWidget(QWidget* widget) {}
 
-bool ExtensionPlugin::handleCommand(const QString& command, const QVariantMap& options)
+bool ExtensionPlugin::handleCommand(const QString& command,
+                                    const QVariantMap& options)
 {
   Q_UNUSED(command);
   Q_UNUSED(options);
   return false;
 }
 
-} // End Avogadro namespace
+} // namespace Avogadro::QtGui
diff --git a/avogadro/qtgui/extensionplugin.h b/avogadro/qtgui/extensionplugin.h
@@ -23,7 +23,7 @@ class Molecule;
 namespace Rendering {
 class Camera;
 class Scene;
-}
+} // namespace Rendering
 
 namespace Io {
 class FileFormat;
@@ -106,13 +106,14 @@ public slots:
   /**
    * Called by the app to handle a command registered by the extension.
    * (e.g., "renderMovie" or "generateSurface", etc.)
-   * 
+   *
    * The app will turn the command into a string and pass it to the extension.
    * and any options will go from a JSON dictionary to a QVariantMap.
-   * 
+   *
    * @return true if the command was handled, false otherwise.
    */
-  virtual bool handleCommand(const QString& command, const QVariantMap& options);
+  virtual bool handleCommand(const QString& command,
+                             const QVariantMap& options);
 
 signals:
   /**
@@ -146,10 +147,10 @@ public slots:
   /**
    * Register a new command with the application. The command will be available
    * through scripting (e.g., "renderMovie" or "generateSurface", etc.)
-   * 
+   *
    * @param command The name of the command to register.
    * @param description A description of the command.
-   * 
+   *
    * @sa handleCommand
    */
   void registerCommand(QString command, QString description);
@@ -168,8 +169,8 @@ class AVOGADROQTGUI_EXPORT ExtensionPluginFactory
   ~ExtensionPluginFactory() override;
 };
 
-} // End QtGui namespace
-} // End Avogadro namespace
+} // namespace QtGui
+} // namespace Avogadro
 
 Q_DECLARE_INTERFACE(Avogadro::QtGui::ExtensionPluginFactory,
                     "org.openchemistry.avogadro.ExtensionPluginFactory")

diff --git a/avogadro/qtgui/toolplugin.cpp b/avogadro/qtgui/toolplugin.cpp
@@ -7,13 +7,9 @@
 
 namespace Avogadro::QtGui {
 
-ToolPlugin::ToolPlugin(QObject* parent_) : QObject(parent_)
-{
-}
+ToolPlugin::ToolPlugin(QObject* parent_) : QObject(parent_) {}
 
-ToolPlugin::~ToolPlugin()
-{
-}
+ToolPlugin::~ToolPlugin() {}
 
 QUndoCommand* ToolPlugin::mousePressEvent(QMouseEvent*)
 {
@@ -50,19 +46,16 @@ QUndoCommand* ToolPlugin::keyReleaseEvent(QKeyEvent*)
   return nullptr;
 }
 
-void ToolPlugin::draw(Rendering::GroupNode&)
-{
-}
+void ToolPlugin::draw(Rendering::GroupNode&) {}
 
-bool ToolPlugin::handleCommand(const QString& command, const QVariantMap& options)
+bool ToolPlugin::handleCommand(const QString& command,
+                               const QVariantMap& options)
 {
   Q_UNUSED(command);
   Q_UNUSED(options);
   return false;
 }
 
-ToolPluginFactory::~ToolPluginFactory()
-{
-}
+ToolPluginFactory::~ToolPluginFactory() {}
 
-} // End Avogadro namespace
+} // namespace Avogadro::QtGui
diff --git a/avogadro/qtgui/toolplugin.h b/avogadro/qtgui/toolplugin.h
@@ -21,7 +21,7 @@ namespace Avogadro {
 namespace Rendering {
 class GroupNode;
 class GLRenderer;
-}
+} // namespace Rendering
 
 namespace QtOpenGL {
 class GLWidget;
@@ -94,13 +94,14 @@ class AVOGADROQTGUI_EXPORT ToolPlugin : public QObject
   /**
    * Called by the app to handle a command registered by the plugin.
    * (e.g., "renderMovie" or "drawAtom", etc.)
-   * 
+   *
    * The app will turn the command into a string and pass it to the tool.
    * and any options will go from a JSON dictionary to a QVariantMap.
-   * 
+   *
    * @return true if the command was handled, false otherwise.
    */
-  virtual bool handleCommand(const QString& command, const QVariantMap& options);
+  virtual bool handleCommand(const QString& command,
+                             const QVariantMap& options);
 
 signals:
   /**
@@ -117,10 +118,10 @@ class AVOGADROQTGUI_EXPORT ToolPlugin : public QObject
   /**
    * Register a new command with the application. The command will be available
    * through scripting (e.g., "renderMovie" or "generateSurface", etc.)
-   * 
+   *
    * @param command The name of the command to register.
    * @param description A description of the command.
-   * 
+   *
    * @sa handleCommand
    */
   void registerCommand(QString command, QString description);
@@ -159,12 +160,12 @@ class AVOGADROQTGUI_EXPORT ToolPluginFactory
 public:
   virtual ~ToolPluginFactory();
 
-  virtual ToolPlugin* createInstance(QObject *parent = nullptr) = 0;
+  virtual ToolPlugin* createInstance(QObject* parent = nullptr) = 0;
   virtual QString identifier() const = 0;
 };
 
-} // End QtGui namespace
-} // End Avogadro namespace
+} // namespace QtGui
+} // namespace Avogadro
 
 Q_DECLARE_INTERFACE(Avogadro::QtGui::ToolPluginFactory,
                     "org.openchemistry.avogadro.ToolPluginFactory")

diff --git a/avogadro/qtplugins/spectra/spectra.cpp b/avogadro/qtplugins/spectra/spectra.cpp
@@ -110,7 +110,7 @@ void Spectra::setMode(int mode)
     double factor = 0.01 * m_amplitude;
     Index atom = 0;
     for (Vector3& v : atomDisplacements) {
-      v *= 10.0*factor;
+      v *= 10.0 * factor;
       m_molecule->setForceVector(atom, v);
       ++atom;
     }

diff --git a/avogadro/qtplugins/spectra/spectra.h b/avogadro/qtplugins/spectra/spectra.h
@@ -42,7 +42,8 @@ class Spectra : public QtGui::ExtensionPlugin
 
   void setMolecule(QtGui::Molecule* mol) override;
 
-  bool handleCommand(const QString& command, const QVariantMap& options) override;
+  bool handleCommand(const QString& command,
+                     const QVariantMap& options) override;
 
 public slots:
   void setMode(int mode);
@@ -68,7 +69,7 @@ private slots:
   int m_mode;
   int m_amplitude;
 };
-}
-}
+} // namespace QtPlugins
+} // namespace Avogadro
 
 #endif // AVOGADRO_QTPLUGINS_Spectra_H