Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-01-27 14:57:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Coding style fixes.

Browse Source
This commit is contained in:
Felix Geyer 2012-05-20 23:14:34 +02:00
parent 5297722ede
commit bde397503e
8 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/DatabaseWidget.cpp
View File

@ -45,7 +45,6 @@ DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
, m_newEntry(0) , m_newEntry(0)
, m_newParent(0) , m_newParent(0)
{ {
m_searchUi->setupUi(m_searchWidget); m_searchUi->setupUi(m_searchWidget);
m_searchTimer = new QTimer(this); m_searchTimer = new QTimer(this);

2
src/gui/DatabaseWidget.h
View File

@ -77,7 +77,7 @@ public Q_SLOTS:
private Q_SLOTS: private Q_SLOTS:
void switchBackToEntryEdit(); void switchBackToEntryEdit();
void switchToView(bool accepted); void switchToView(bool accepted);
void switchToHistoryView(Entry *entry); void switchToHistoryView(Entry* entry);
void switchToEntryEdit(Entry* entry); void switchToEntryEdit(Entry* entry);
void switchToEntryEdit(Entry* entry, bool create); void switchToEntryEdit(Entry* entry, bool create);
void switchToGroupEdit(Group* entry, bool create); void switchToGroupEdit(Group* entry, bool create);

8
src/gui/DragTabBar.h
View File

@ -15,8 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef KEEPASSX_DRAGTABWIDGET_H #ifndef KEEPASSX_DRAGTABBAR_H
#define KEEPASSX_DRAGTABWIDGET_H #define KEEPASSX_DRAGTABBAR_H
#include <QtGui/QTabBar> #include <QtGui/QTabBar>
@ -25,7 +25,7 @@ class DragTabBar : public QTabBar
Q_OBJECT Q_OBJECT
public: public:
DragTabBar(QWidget* parent = 0); explicit DragTabBar(QWidget* parent = 0);
protected: protected:
void dragEnterEvent(QDragEnterEvent* event); void dragEnterEvent(QDragEnterEvent* event);
@ -42,4 +42,4 @@ private:
int m_tabSwitchIndex; int m_tabSwitchIndex;
}; };
#endif // KEEPASSX_DRAGTABWIDGET_H #endif // KEEPASSX_DRAGTABBAR_H

32
src/gui/LineEdit.cpp
View File

@ -17,34 +17,34 @@
LineEdit::LineEdit(QWidget* parent) LineEdit::LineEdit(QWidget* parent)
: QLineEdit(parent) : QLineEdit(parent)
{ {
clearButton = new QToolButton(this); m_clearButton = new QToolButton(this);
clearButton->setObjectName("clearButton"); m_clearButton->setObjectName("clearButton");
QIcon icon = dataPath()->icon("action", "edit-clear-locationbar-rtl"); QIcon icon = dataPath()->icon("action", "edit-clear-locationbar-rtl");
clearButton->setIcon(icon); m_clearButton->setIcon(icon);
clearButton->setCursor(Qt::ArrowCursor); m_clearButton->setCursor(Qt::ArrowCursor);
clearButton->setStyleSheet("QToolButton { border: none; padding: 0px; }"); m_clearButton->setStyleSheet("QToolButton { border: none; padding: 0px; }");
clearButton->hide(); m_clearButton->hide();
connect(clearButton, SIGNAL(clicked()), this, SLOT(clear())); connect(m_clearButton, SIGNAL(clicked()), this, SLOT(clear()));
connect(this, SIGNAL(textChanged(const QString&)), this, SLOT(updateCloseButton(const QString&))); connect(this, SIGNAL(textChanged(const QString&)), this, SLOT(updateCloseButton(const QString&)));
int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth); int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
setStyleSheet(QString("QLineEdit { padding-right: %1px; } ") setStyleSheet(QString("QLineEdit { padding-right: %1px; } ")
.arg(clearButton->sizeHint().width() + frameWidth + 1)); .arg(m_clearButton->sizeHint().width() + frameWidth + 1));
QSize msz = minimumSizeHint(); QSize msz = minimumSizeHint();
setMinimumSize(qMax(msz.width(), clearButton->sizeHint().height() + frameWidth * 2 + 2), setMinimumSize(qMax(msz.width(), m_clearButton->sizeHint().height() + frameWidth * 2 + 2),
qMax(msz.height(), clearButton->sizeHint().height() + frameWidth * 2 + 2)); qMax(msz.height(), m_clearButton->sizeHint().height() + frameWidth * 2 + 2));
} }
void LineEdit::resizeEvent(QResizeEvent*) void LineEdit::resizeEvent(QResizeEvent* event)
{ {
QSize sz = clearButton->sizeHint(); Q_UNUSED(event);
QSize sz = m_clearButton->sizeHint();
int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth); int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
clearButton->move(rect().right() - frameWidth - sz.width(), m_clearButton->move(rect().right() - frameWidth - sz.width(),
(rect().bottom() + 1 - sz.height())/2); (rect().bottom() + 1 - sz.height())/2);
} }
void LineEdit::updateCloseButton(const QString& text) void LineEdit::updateCloseButton(const QString& text)
{ {
clearButton->setVisible(!text.isEmpty()); m_clearButton->setVisible(!text.isEmpty());
} }

7
src/gui/LineEdit.h
View File

@ -19,17 +19,16 @@ class LineEdit : public QLineEdit
Q_OBJECT Q_OBJECT
public: public:
LineEdit(QWidget* parent = 0); explicit LineEdit(QWidget* parent = 0);
protected: protected:
void resizeEvent(QResizeEvent*); void resizeEvent(QResizeEvent* event);
private Q_SLOTS: private Q_SLOTS:
void updateCloseButton(const QString& text); void updateCloseButton(const QString& text);
private: private:
QToolButton* clearButton; QToolButton* m_clearButton;
}; };
#endif // KEEPASSX_LINEEDIT_H #endif // KEEPASSX_LINEEDIT_H

4
src/gui/entry/EditEntryWidget.h
View File

@ -50,7 +50,7 @@ public:
~EditEntryWidget(); ~EditEntryWidget();
void loadEntry(Entry* entry, bool create, bool history, const QString& groupName, void loadEntry(Entry* entry, bool create, bool history, const QString& groupName,
Database *database); Database* database);
static const QColor CorrectSoFarColor; static const QColor CorrectSoFarColor;
static const QColor ErrorColor; static const QColor ErrorColor;
@ -75,7 +75,7 @@ private Q_SLOTS:
void restoreHistoryEntry(); void restoreHistoryEntry();
void deleteHistoryEntry(); void deleteHistoryEntry();
void deleteAllHistoryEntries(); void deleteAllHistoryEntries();
void emitHistoryEntryActivated(const QModelIndex &index); void emitHistoryEntryActivated(const QModelIndex& index);
void updateHistoryButtons(const QModelIndex& current, const QModelIndex& previous); void updateHistoryButtons(const QModelIndex& current, const QModelIndex& previous);
private: private:

6
src/gui/entry/EntryView.cpp
View File

@ -40,10 +40,10 @@ EntryView::EntryView(QWidget* parent)
setDragEnabled(true); setDragEnabled(true);
setSortingEnabled(true); setSortingEnabled(true);
connect(this, SIGNAL(activated(const QModelIndex&)), SLOT(emitEntryActivated(const QModelIndex&))); connect(this, SIGNAL(activated(QModelIndex)), SLOT(emitEntryActivated(QModelIndex)));
connect(selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), SIGNAL(entrySelectionChanged())); connect(selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), SIGNAL(entrySelectionChanged()));
connect(m_model, SIGNAL(switchedToSearch()), this, SLOT(switchToSearch())); connect(m_model, SIGNAL(switchedToSearch()), SLOT(switchToSearch()));
connect(m_model, SIGNAL(switchedToView()), this, SLOT(switchToView())); connect(m_model, SIGNAL(switchedToView()), SLOT(switchToView()));
sortByColumn(0, Qt::AscendingOrder); sortByColumn(0, Qt::AscendingOrder);
} }

1
tests/gui/TestGui.cpp
View File

@ -213,7 +213,6 @@ void TestGui::testSearch()
QTest::qWait(20); QTest::qWait(20);
QCOMPARE(entryView->model()->rowCount(), 1); QCOMPARE(entryView->model()->rowCount(), 1);
} }
void TestGui::cleanupTestCase() void TestGui::cleanupTestCase()