Merge branch 'v1-1'

Author: Martin Preisler

include/MainWindow.h

@@ -240,7 +240,7 @@ class MainWindow : public QMainWindow
         /**
          * @brief We signal this to show the dialog
          *
-         * This is to make sure we open the dialog in the event loop, not 
+         * This is to make sure we open the dialog in the event loop, not
          * before it even starts.
          */
         void showOpenFileDialog();

include/RemediationRoleSaver.h

@@ -45,7 +45,7 @@ class RemediationSaverBase
         void removeFileWhenEmpty(const QString& filename);
 
         QWidget* mParentWindow;
-        DiagnosticsDialog * mDiagnostics;
+        DiagnosticsDialog* mDiagnostics;
 
         const QString mSaveMessage;
         const QString mFiletypeExtension;

include/RemoteMachineComboBox.h

@@ -64,7 +64,7 @@ class RemoteMachineComboBox : public QWidget
         QSettings* mQSettings;
 
         QStringList mRecentTargets;
-        QComboBox *mRecentComboBox;
+        QComboBox* mRecentComboBox;
 };
 
 #endif

include/TailorProfileDialog.h

@@ -33,7 +33,7 @@ class TailorProfileDialog : public QDialog
     Q_OBJECT
 
     public:
-        TailorProfileDialog(const QString &startId, bool xccdf12, QWidget* parent = 0);
+        TailorProfileDialog(const QString& startId, bool xccdf12, QWidget* parent = 0);
         virtual ~TailorProfileDialog();
 
         QString getProfileID() const;

include/TailoringUndoCommands.h

@@ -99,7 +99,7 @@ class ProfileTitleChangeUndoCommand : public QUndoCommand
         virtual void redo();
         virtual void undo();
 
-        virtual bool mergeWith(const QUndoCommand *other);
+        virtual bool mergeWith(const QUndoCommand* other);
 
     private:
         void refreshText();
@@ -124,7 +124,7 @@ class ProfileDescriptionChangeUndoCommand : public QUndoCommand
         virtual void redo();
         virtual void undo();
 
-        virtual bool mergeWith(const QUndoCommand *other);
+        virtual bool mergeWith(const QUndoCommand* other);
 
     private:
         void refreshText();

include/TailoringWindow.h

@@ -177,8 +177,8 @@ class TailoringWindow : public QMainWindow
         void syncCollapsedItem(QTreeWidgetItem* item, QSet<QString>& usedCollapsedIds);
 
         void createTreeItem(QTreeWidgetItem* treeItem, struct xccdf_item* xccdfItem);
-        void synchronizeTreeItemSelections(QTreeWidgetItem *treeItem);
-        
+        void synchronizeTreeItemSelections(QTreeWidgetItem* treeItem);
+
         void createSelectionMacro(QTreeWidgetItem* treeItem, bool checkState, const QString& commandName);
 
         MainWindow* mParentMainWindow;
@@ -222,7 +222,7 @@ class TailoringWindow : public QMainWindow
 
         typedef std::map<struct xccdf_value*, std::vector<struct xccdf_rule*> > ValueAffectsRulesMap;
         ValueAffectsRulesMap mValueAffectsRulesMap;
-        
+
         QAction* mSelectAllAction;
         QAction* mDeselectAllAction;
 

src/APIHelpers.cpp

@@ -51,7 +51,7 @@ QString oscapItemGetReadableTitle(struct xccdf_item* item, struct xccdf_policy*
     return ret;
 }
 
-QString oscapItemGetReadableDescription(struct xccdf_item *item, struct xccdf_policy *policy, const QString& lang)
+QString oscapItemGetReadableDescription(struct xccdf_item* item, struct xccdf_policy* policy, const QString& lang)
 {
     struct oscap_text_iterator* desc_it = xccdf_item_get_description(item);
     oscap_text* unresolved = oscap_textlist_get_preferred_text(desc_it, lang.isEmpty() ? NULL : lang.toUtf8().constData());

src/DiagnosticsDialog.cpp

@@ -138,18 +138,18 @@ void DiagnosticsDialog::pushMessage(MessageSeverity severity, const QString& ful
     strSeverity = strSeverity.leftJustified(8);
 
     std::cerr << stime << " | " << strSeverity.toUtf8().constData() << " | " << fullMessage.toUtf8().constData() << std::endl;
-   
+
     QString outputMessage = fullMessage;
     if (format & MF_XML)
     {
         outputMessage = Qt::escape(outputMessage);
     }
-    
+
     if (format & MF_PREFORMATTED)
     {
         outputMessage = QString("<pre>%1</pre>").arg(outputMessage);
     }
-    
+
     mUI.messages->append(
         QString("<table><tr><td style=\"padding:5px 0px 0px 5px\"><pre>%1 </pre></td><td style=\"background: %2; padding:5px\"><pre>%3 </pre></td><td>%4</td></tr></table>\n")
             .arg(stime, bgCol, strSeverity, outputMessage)

src/MainWindow.cpp

@@ -1225,7 +1225,7 @@ void MainWindow::scanWarningMessage(const QString& message)
     mDiagnosticsDialog->warningMessage(message);
 }
 
-void MainWindow::scanErrorMessage(const QString &message)
+void MainWindow::scanErrorMessage(const QString& message)
 {
     mDiagnosticsDialog->errorMessage(message);
 }

src/RemediationRoleSaver.cpp

@@ -252,25 +252,30 @@ void ResultBasedLibraryRemediationSaver::saveToFile(const QString& filename)
 {
     struct oscap_source* source = oscap_source_new_from_file(mArfFile.fileName().toUtf8().constData());
     oscap_document_type_t document_type = oscap_source_get_scap_type(source);
-    if (document_type != OSCAP_DOCUMENT_ARF) {
+    if (document_type != OSCAP_DOCUMENT_ARF)
+    {
         throw std::runtime_error("Expected an ARF file");
     }
 
     struct ds_rds_session* arf_session = ds_rds_session_new_from_source(source);
-    if (arf_session == NULL) {
+    if (arf_session == NULL)
+    {
         throw std::runtime_error("Couldn't open ARF session");
     }
-    struct oscap_source *report_source = ds_rds_session_select_report(arf_session, NULL);
-    if (report_source == NULL) {
+    struct oscap_source* report_source = ds_rds_session_select_report(arf_session, NULL);
+    if (report_source == NULL)
+    {
         throw std::runtime_error("Couldn't get report source from the ARF session");
     }
-    struct oscap_source *report_request_source = ds_rds_session_select_report_request(arf_session, NULL);
-    if (report_request_source == NULL) {
+    struct oscap_source* report_request_source = ds_rds_session_select_report_request(arf_session, NULL);
+    if (report_request_source == NULL)
+    {
         throw std::runtime_error("Couldn't get report request source from the ARF session");
     }
 
     struct xccdf_session* session = xccdf_session_new_from_source(oscap_source_clone(report_request_source));
-    if (xccdf_session_add_report_from_source(session, oscap_source_clone(report_source))) {
+    if (xccdf_session_add_report_from_source(session, oscap_source_clone(report_source)))
+    {
         throw std::runtime_error("Couldn't get report request source from the ARF session");
     }
     oscap_source_free(source);