mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Another small tweak to whitespace tool

Browse source 
clang-format doesn't appear to reindent multi line #define statements
correctly - so this hopefully will clean those up.

The included whitespace corrections to the code should stay in place when
using the updated tool.

This includes cleaning up some multi-line comments that were messed up the
last time around as well as a few other minor changes.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-03-05 12:19:45 -08:00
parent 13a2f14be0
commit 1b103c5c69
9 changed files with 69 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

52
qt-ui/kmessagewidget.h
View file

@ -105,8 +105,8 @@ public:
};
/**
* Constructs a KMessageWidget with the specified parent.
*/
* Constructs a KMessageWidget with the specified parent.
*/
explicit KMessageWidget(QWidget *parent = 0);
explicit KMessageWidget(const QString &text, QWidget *parent = 0);
@ -132,9 +132,9 @@ public:
int heightForWidth(int width) const;
/**
* The icon shown on the left of the text. By default, no icon is shown.
* @since 4.11
*/
* The icon shown on the left of the text. By default, no icon is shown.
* @since 4.11
*/
QIcon icon() const;
public
@ -148,40 +148,40 @@ Q_SLOTS:
void setMessageType(KMessageWidget::MessageType type);
/**
* Show the widget using an animation, unless
* KGlobalSettings::graphicsEffectLevel() does not allow simple effects.
*/
* Show the widget using an animation, unless
* KGlobalSettings::graphicsEffectLevel() does not allow simple effects.
*/
void animatedShow();
/**
* Hide the widget using an animation, unless
* KGlobalSettings::graphicsEffectLevel() does not allow simple effects.
*/
* Hide the widget using an animation, unless
* KGlobalSettings::graphicsEffectLevel() does not allow simple effects.
*/
void animatedHide();
/**
* Define an icon to be shown on the left of the text
* @since 4.11
*/
* Define an icon to be shown on the left of the text
* @since 4.11
*/
void setIcon(const QIcon &icon);
Q_SIGNALS:
/**
* This signal is emitted when the user clicks a link in the text label.
* The URL referred to by the href anchor is passed in contents.
* @param contents text of the href anchor
* @see QLabel::linkActivated()
* @since 4.10
*/
* This signal is emitted when the user clicks a link in the text label.
* The URL referred to by the href anchor is passed in contents.
* @param contents text of the href anchor
* @see QLabel::linkActivated()
* @since 4.10
*/
void linkActivated(const QString &contents);
/**
* This signal is emitted when the user hovers over a link in the text label.
* The URL referred to by the href anchor is passed in contents.
* @param contents text of the href anchor
* @see QLabel::linkHovered()
* @since 4.11
*/
* This signal is emitted when the user hovers over a link in the text label.
* The URL referred to by the href anchor is passed in contents.
* @param contents text of the href anchor
* @see QLabel::linkHovered()
* @since 4.11
*/
void linkHovered(const QString &contents);
protected:

5
qt-ui/models.cpp
View file

@ -191,7 +191,7 @@ void CylindersModel::passInData(const QModelIndex &index, const QVariant &value)
/* Has the string value changed */
#define CHANGED() \
(vString = value.toString()) != data(index, role).toString()
(vString = value.toString()) != data(index, role).toString()
bool CylindersModel::setData(const QModelIndex &index, const QVariant &value, int role)
{
@ -934,8 +934,7 @@ bool TreeItem::setData(const QModelIndex &index, const QVariant &value, int role
return false;
}
QModelIndex TreeModel::index(int row, int column, const QModelIndex &parent)
const
QModelIndex TreeModel::index(int row, int column, const QModelIndex &parent) const
{
if (!hasIndex(row, column, parent))
return QModelIndex();

2
qt-ui/printlayout.cpp
View file

@ -114,7 +114,7 @@ int PrintLayout::estimateTotalDives() const
* p is the padding between elements
*/
#define ESTIMATE_DIVE_DIM(S, n, p) \
((S) - ((n) - 1) * (p)) / (n);
((S) - ((n) - 1) * (p)) / (n);
void PrintLayout::printProfileDives(int divesPerRow, int divesPerColumn)
{