mirror of
https://git.lyx.org/repos/lyx.git
synced 2025-01-17 21:36:00 +00:00
e30f3d76d2
This commit does a bulk fix of incorrect annotations (comments) at the
end of namespaces.
The commit was generated by initially running clang-format, and then
from the diff of the result extracting the hunks corresponding to
fixes of namespace comments. The changes being applied and all the
results have been manually reviewed. The source code successfully
builds on macOS.
Further details on the steps below, in case they're of interest to
someone else in the future.
1. Checkout a fresh and up to date version of src/
git pull && git checkout -- src && git status src
2. Ensure there's a suitable .clang-format in place, i.e. with options
to fix the comment at the end of namespaces, including:
FixNamespaceComments: true
SpacesBeforeTrailingComments: 1
and that clang-format is >= 5.0.0, by doing e.g.:
clang-format -dump-config | grep Comments:
clang-format --version
3. Apply clang-format to the source:
clang-format -i $(find src -name "*.cpp" -or -name "*.h")
4. Create and filter out hunks related to fixing the namespace
git diff -U0 src > tmp.patch
grepdiff '^} // namespace' --output-matching=hunk tmp.patch > fix_namespace.patch
5. Filter out hunks corresponding to simple fixes into to a separate patch:
pcregrep -M -e '^diff[^\n]+\nindex[^\n]+\n--- [^\n]+\n\+\+\+ [^\n]+\n' \
-e '^@@ -[0-9]+ \+[0-9]+ @@[^\n]*\n-\}[^\n]*\n\+\}[^\n]*\n' \
fix_namespace.patch > fix_namespace_simple.patch
6. Manually review the simple patch and then apply it, after first
restoring the source.
git checkout -- src
patch -p1 < fix_namespace_simple.path
7. Manually review the (simple) changes and then stage the changes
git diff src
git add src
8. Again apply clang-format and filter out hunks related to any
remaining fixes to the namespace, this time filter with more
context. There will be fewer hunks as all the simple cases have
already been handled:
clang-format -i $(find src -name "*.cpp" -or -name "*.h")
git diff src > tmp.patch
grepdiff '^} // namespace' --output-matching=hunk tmp.patch > fix_namespace2.patch
9. Manually review/edit the resulting patch file to remove hunks for files
which need to be dealt with manually, noting the file names and
line numbers. Then restore files to as before applying clang-format
and apply the patch:
git checkout src
patch -p1 < fix_namespace2.patch
10. Manually fix the files noted in the previous step. Stage files,
review changes and commit.
114 lines
3.0 KiB
C++
114 lines
3.0 KiB
C++
/**
|
|
* \file fancylineedit.h
|
|
* This file is part of LyX, the document processor.
|
|
* Licence details can be found in the file COPYING.
|
|
*
|
|
* \author Nokia Corporation (qt-info@nokia.com)
|
|
*
|
|
* Full author contact details are available in file CREDITS.
|
|
*
|
|
*/
|
|
|
|
// Code taken from the Qt Creator project and customized a little
|
|
|
|
#ifndef FANCYLINEEDIT_H
|
|
#define FANCYLINEEDIT_H
|
|
|
|
#include <QLineEdit>
|
|
#include <QAbstractButton>
|
|
|
|
namespace lyx {
|
|
namespace frontend {
|
|
|
|
class FancyLineEditPrivate;
|
|
|
|
class IconButton: public QAbstractButton
|
|
{
|
|
Q_OBJECT
|
|
Q_PROPERTY(float iconOpacity READ iconOpacity WRITE setIconOpacity)
|
|
Q_PROPERTY(bool autoHide READ hasAutoHide WRITE setAutoHide)
|
|
Q_PROPERTY(QPixmap pixmap READ pixmap WRITE setPixmap)
|
|
public:
|
|
explicit IconButton(QWidget *parent = 0);
|
|
void paintEvent(QPaintEvent *event);
|
|
void setPixmap(const QPixmap &pixmap) { m_pixmap = pixmap; update(); }
|
|
QPixmap pixmap() const { return m_pixmap; }
|
|
float iconOpacity() { return m_iconOpacity; }
|
|
void setIconOpacity(float value) { m_iconOpacity = value; update(); }
|
|
void animateShow(bool visible);
|
|
|
|
void setAutoHide(bool hide) { m_autoHide = hide; }
|
|
bool hasAutoHide() const { return m_autoHide; }
|
|
private:
|
|
float m_iconOpacity;
|
|
bool m_autoHide;
|
|
QPixmap m_pixmap;
|
|
};
|
|
|
|
/* A line edit with an embedded pixmap on one side that is connected to
|
|
* a menu. Additionally, it can display a grayed hintText (like "Type Here to")
|
|
* when not focused and empty. When connecting to the changed signals and
|
|
* querying text, one has to be aware that the text is set to that hint
|
|
* text if isShowingHintText() returns true (that is, does not contain
|
|
* valid user input).
|
|
*/
|
|
class FancyLineEdit : public QLineEdit
|
|
{
|
|
Q_DISABLE_COPY(FancyLineEdit)
|
|
Q_OBJECT
|
|
Q_ENUMS(Side)
|
|
|
|
public:
|
|
enum Side {Left = 0, Right = 1};
|
|
|
|
Q_SIGNALS:
|
|
void buttonClicked(Side side);
|
|
void leftButtonClicked();
|
|
void rightButtonClicked();
|
|
void downPressed();
|
|
|
|
public:
|
|
explicit FancyLineEdit(QWidget *parent = 0);
|
|
~FancyLineEdit();
|
|
|
|
QPixmap buttonPixmap(Side side) const;
|
|
void setButtonPixmap(Side side, const QPixmap &pixmap);
|
|
|
|
QMenu *buttonMenu(Side side) const;
|
|
void setButtonMenu(Side side, QMenu *menu);
|
|
|
|
void setButtonVisible(Side side, bool visible);
|
|
bool isButtonVisible(Side side) const;
|
|
|
|
void setButtonToolTip(Side side, const QString &);
|
|
void setButtonFocusPolicy(Side side, Qt::FocusPolicy policy);
|
|
|
|
// Set whether tabbing in will trigger the menu.
|
|
void setMenuTabFocusTrigger(Side side, bool v);
|
|
bool hasMenuTabFocusTrigger(Side side) const;
|
|
|
|
// Set if icon should be hidden when text is empty
|
|
void setAutoHideButton(Side side, bool h);
|
|
bool hasAutoHideButton(Side side) const;
|
|
|
|
private Q_SLOTS:
|
|
void checkButtons(const QString &);
|
|
void iconClicked();
|
|
|
|
protected:
|
|
virtual void resizeEvent(QResizeEvent *e);
|
|
virtual void keyPressEvent(QKeyEvent *e);
|
|
|
|
private:
|
|
void updateMargins();
|
|
void updateButtonPositions();
|
|
|
|
FancyLineEditPrivate *m_d;
|
|
QString m_oldText;
|
|
};
|
|
|
|
} // namespace frontend
|
|
} // namespace lyx
|
|
|
|
#endif // FANCYLINEEDIT_H
|