More code style and some argument tweaks to functions.

ruslansin · Mar 21, 2016 · aab70a6 · aab70a6
1 parent 75c4bf9
commit aab70a6
Show file tree

Hide file tree

Showing 19 changed files with 108 additions and 111 deletions.
diff --git a/dialogs/areadialog.h b/dialogs/areadialog.h
@@ -42,7 +42,7 @@ class AreaDialog : public QDialog
     Q_OBJECT
 
 public:
-    AreaDialog(Screenshot* screenshot);
+    AreaDialog(Screenshot *screenshot);
     QRect &resultRect();
 
 protected slots:
@@ -52,22 +52,22 @@ protected slots:
     void grabRect();
 
 signals:
-    void regionGrabbed( const QPixmap & );
+    void regionGrabbed(const QPixmap &);
 
 protected:
-    void keyPressEvent( QKeyEvent* e );
-    void mouseDoubleClickEvent( QMouseEvent* );
-    void mouseMoveEvent( QMouseEvent* e );
-    void mousePressEvent( QMouseEvent* e );
-    void mouseReleaseEvent( QMouseEvent* e );
-    void paintEvent( QPaintEvent* e );
-    void resizeEvent( QResizeEvent* e );
-    void showEvent( QShowEvent* e );
+    void keyPressEvent(QKeyEvent *e);
+    void mouseDoubleClickEvent(QMouseEvent *);
+    void mouseMoveEvent(QMouseEvent *e);
+    void mousePressEvent(QMouseEvent *e);
+    void mouseReleaseEvent(QMouseEvent *e);
+    void paintEvent(QPaintEvent *e);
+    void resizeEvent(QResizeEvent *e);
+    void showEvent(QShowEvent *e);
 
     void updateHandles();
     QRegion handleMask() const;
 
-    QPoint limitPointToRect( const QPoint &p, const QRect &r ) const;
+    QPoint limitPointToRect(const QPoint &p, const QRect &r) const;
 
     bool   mAutoclose;
     QPoint mDragStartPoint;
@@ -92,7 +92,7 @@ protected slots:
     QRect mTLHandle, mTRHandle, mBLHandle, mBRHandle;
     QRect mLHandle, mTHandle, mRHandle, mBHandle;
 
-    QVector<QRect*>   mHandles;
+    QVector<QRect *>   mHandles;
     QPointer<QWidget> mAcceptWidget;
 };
 

diff --git a/dialogs/historydialog.cpp b/dialogs/historydialog.cpp
@@ -117,7 +117,7 @@ void HistoryDialog::clear()
     close();
 }
 
-void HistoryDialog::contextMenu(QPoint point)
+void HistoryDialog::contextMenu(const QPoint &point)
 {
     mContextIndex = ui->tableView->indexAt(point);;
 

diff --git a/dialogs/historydialog.h b/dialogs/historydialog.h
@@ -5,7 +5,7 @@
 #include <QItemSelection>
 
 namespace Ui {
-    class HistoryDialog;
+class HistoryDialog;
 }
 
 class QSqlTableModel;
@@ -15,32 +15,32 @@ class HistoryDialog : public QDialog
     Q_OBJECT
 
 public:
-  explicit HistoryDialog(QWidget *parent = 0);
-  ~HistoryDialog();
+    explicit HistoryDialog(QWidget *parent = 0);
+    ~HistoryDialog();
 
 private slots:
-  void clear();
-  void contextMenu(QPoint point);
-  void copy();
-  void deleteImage();
-  void location();
-  void removeHistoryEntry();
-  void refresh();
-  void open(const QModelIndex &index);
-  void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
-  void upload();
-  void uploadProgress(int progress);
+    void clear();
+    void contextMenu(const QPoint &point);
+    void copy();
+    void deleteImage();
+    void location();
+    void removeHistoryEntry();
+    void refresh();
+    void open(const QModelIndex &index);
+    void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
+    void upload();
+    void uploadProgress(int progress);
 
 protected:
-  bool eventFilter(QObject *object, QEvent *event);
-  bool event(QEvent *event);
+    bool eventFilter(QObject *object, QEvent *event);
+    bool event(QEvent *event);
 
 private:
-  Ui::HistoryDialog *ui;
-  QSqlTableModel *mModel;
-  QSortFilterProxyModel *mFilterModel;
-  QString     mSelectedScreenshot;
-  QModelIndex mContextIndex;
+    Ui::HistoryDialog *ui;
+    QSqlTableModel *mModel;
+    QSortFilterProxyModel *mFilterModel;
+    QString     mSelectedScreenshot;
+    QModelIndex mContextIndex;
 };
 
 #endif // UPLOADDIALOG_H
diff --git a/dialogs/namingdialog.cpp b/dialogs/namingdialog.cpp
@@ -61,7 +61,7 @@ NamingDialog::NamingDialog(Screenshot::Naming naming, QWidget *parent) :
     resize(minimumSizeHint());
 }
 
-void NamingDialog::openUrl(QString url)
+void NamingDialog::openUrl(const QString &url)
 {
     QDesktopServices::openUrl(QUrl(url));
 }

diff --git a/dialogs/namingdialog.h b/dialogs/namingdialog.h
@@ -32,11 +32,11 @@ class NamingDialog : public QDialog
     explicit NamingDialog(Screenshot::Naming naming, QWidget *parent = 0);
 
 private slots:
-  void openUrl(QString url);
-  void saveSettings();
+    void openUrl(const QString &url);
+    void saveSettings();
 
 protected:
-  bool eventFilter(QObject *object, QEvent *event);
+    bool eventFilter(QObject *object, QEvent *event);
 
 private:
     Ui::NamingDialog ui;

diff --git a/dialogs/optionsdialog.h b/dialogs/optionsdialog.h
@@ -33,38 +33,38 @@ class OptionsDialog : public QDialog
     OptionsDialog(QWidget *parent = 0);
 
 public slots:
-  void accepted();
-  void checkUpdatesNow();
-  void exportSettings();
-  void imgurAlbumList();
-  void imgurAuthorize();
-  void imgurRequestAlbumList();
-  void imgurToken();
-  void importSettings();
-  void loadSettings();
-  void openUrl(QString url);
-  void restoreDefaults();
-  void saveSettings();
-  void updatePreview();
-  void viewHistory();
+    void accepted();
+    void checkUpdatesNow();
+    void exportSettings();
+    void imgurAlbumList();
+    void imgurAuthorize();
+    void imgurRequestAlbumList();
+    void imgurToken();
+    void importSettings();
+    void loadSettings();
+    void openUrl(QString url);
+    void restoreDefaults();
+    void saveSettings();
+    void updatePreview();
+    void viewHistory();
 
 protected:
-  bool event(QEvent *event);
+    bool event(QEvent *event);
 
 #ifdef Q_OS_WIN
-  bool nativeEvent(const QByteArray &eventType, void *message, long *result);
+    bool nativeEvent(const QByteArray &eventType, void *message, long *result);
 #endif
 
 private slots:
-  void browse();
-  void dialogButtonClicked(QAbstractButton *button);
-  void flipToggled(bool checked);
-  void init();
-  void namingOptions();
+    void browse();
+    void dialogButtonClicked(QAbstractButton *button);
+    void flipToggled(bool checked);
+    void init();
+    void namingOptions();
 
 private:
-  bool hotkeyCollision();
-  QSettings *settings() const;
+    bool hotkeyCollision();
+    QSettings *settings() const;
 
 private:
     Ui::OptionsDialog ui;

diff --git a/dialogs/previewdialog.h b/dialogs/previewdialog.h
@@ -29,41 +29,41 @@ class PreviewDialog : public QDialog
     Q_OBJECT
 
 public:
-  PreviewDialog(QWidget *parent);
+    PreviewDialog(QWidget *parent);
 
-  void add(Screenshot* screenshot);
-  int count() const;
+    void add(Screenshot *screenshot);
+    int count() const;
 
 public slots:
-  void setWidth(int w)  { resize(w, height()); }
-  void setHeight(int h) { resize(width(), h);  }
+    void setWidth(int w)  { resize(w, height()); }
+    void setHeight(int h) { resize(width(), h);  }
 
 signals:
-  void acceptAll();
-  void rejectAll();
-  void uploadAll();
+    void acceptAll();
+    void rejectAll();
+    void uploadAll();
 
 private slots:
-  void closePreview();
-  void enlargePreview();
-  void indexChanged(int i);
-  void next();
-  void previous();
-  void relocate();
+    void closePreview();
+    void enlargePreview();
+    void indexChanged(int i);
+    void next();
+    void previous();
+    void relocate();
 
 protected:
-  bool event(QEvent *event);
-  void timerEvent(QTimerEvent *event);
+    bool event(QEvent *event);
+    void timerEvent(QTimerEvent *event);
 
 private:
-  int mAutoclose;
-  int mAutocloseAction;
-  int mAutocloseReset;
-  int mPosition; //0: top left, 1: top right, 2: bottom left, 3: bottom rigth (default)
-  int mSize;
-  QPushButton*    mNextButton;
-  QPushButton*    mPrevButton;
-  QStackedLayout* mStack;
+    int mAutoclose;
+    int mAutocloseAction;
+    int mAutocloseReset;
+    int mPosition; //0: top left, 1: top right, 2: bottom left, 3: bottom rigth (default)
+    int mSize;
+    QPushButton    *mNextButton;
+    QPushButton    *mPrevButton;
+    QStackedLayout *mStack;
 };
 
 #endif // PREVIEWDIALOG_H
diff --git a/dialogs/updaterdialog.h b/dialogs/updaterdialog.h
@@ -23,16 +23,16 @@
 
 class UpdaterDialog : public QProgressDialog
 {
-  Q_OBJECT
+    Q_OBJECT
 
 public:
-  UpdaterDialog(QWidget* parent = 0);
+    UpdaterDialog(QWidget *parent = 0);
 
 public slots:
-  void updateDone(bool result);
+    void updateDone(bool result);
 
 private slots:
-  void link(QString url);
+    void link(QString url);
 
 };
 

diff --git a/lightscreenwindow.cpp b/lightscreenwindow.cpp
@@ -675,7 +675,7 @@ void LightscreenWindow::showUploaderError(const QString &error)
     notify(Screenshot::Fail);
 }
 
-void LightscreenWindow::showUploaderMessage(QString fileName, QString url)
+void LightscreenWindow::showUploaderMessage(const QString &fileName, const QString &url)
 {
     if (mTrayIcon && settings()->value("options/message").toBool() && !url.isEmpty()) {
         QString screenshot = QFileInfo(fileName).fileName();

diff --git a/lightscreenwindow.h b/lightscreenwindow.h
@@ -67,7 +67,7 @@ public slots:
     void showOptions();
     void showScreenshotMessage(const Screenshot::Result &result, const QString &fileName);
     void showUploaderError(const QString &error);
-    void showUploaderMessage(QString fileName, QString url);
+    void showUploaderMessage(const QString &fileName, const QString &url);
     void toggleVisibility(QSystemTrayIcon::ActivationReason reason = QSystemTrayIcon::DoubleClick);
     void updateStatus();
     void updaterDone(bool result);

diff --git a/tools/os.cpp b/tools/os.cpp
@@ -291,7 +291,7 @@ QGraphicsEffect *os::shadow(QColor color, int blurRadius, int offset)
     return shadowEffect;
 }
 
-QIcon os::icon(QString name, QColor backgroundColor)
+QIcon os::icon(const QString &name, QColor backgroundColor)
 {
     if (!backgroundColor.isValid()) {
         backgroundColor = qApp->palette().color(QPalette::Button);

diff --git a/tools/os.h b/tools/os.h
@@ -55,11 +55,8 @@ void setStartup(bool startup, bool hide);
 // Creates a new QGraphicsDropShadowEffect to apply to widgets.
 QGraphicsEffect *shadow(QColor color = Qt::black, int blurRadius = 6, int offset = 1);
 
-// Translates the ui to the given language name.
-void translate(QString language);
-
 // Returns a QIcon for the given icon name (taking into account color schemes and whatnot).
-QIcon icon(QString name, QColor backgroundColor = QColor());
+QIcon icon(const QString &name, QColor backgroundColor = QColor());
 
 // X11-specific functions for the Window Picker
 #if defined(Q_OS_LINUX)

diff --git a/tools/screenshot.cpp b/tools/screenshot.cpp
@@ -286,7 +286,7 @@ void Screenshot::save()
     }
 }
 
-void Screenshot::setPixmap(QPixmap pixmap)
+void Screenshot::setPixmap(const QPixmap &pixmap)
 {
     mPixmap = pixmap;
 
@@ -339,7 +339,7 @@ void Screenshot::upload()
     }
 }
 
-void Screenshot::uploadDone(QString url)
+void Screenshot::uploadDone(const QString &url)
 {
     if (mOptions.imgurClipboard && !url.isEmpty()) {
         QApplication::clipboard()->setText(url, QClipboard::Clipboard);

diff --git a/tools/screenshot.h b/tools/screenshot.h
@@ -104,10 +104,10 @@ public slots:
     void optimize();
     void optimizationDone();
     void save();
-    void setPixmap(QPixmap pixmap);
+    void setPixmap(const QPixmap &pixmap);
     void take();
     void upload();
-    void uploadDone(QString url);
+    void uploadDone(const QString &url);
 
 signals:
     void askConfirmation();