forked from qt-creator/qt-creator
7ed1576083
Done using the following ruby script:
Dir.glob('**/*.h').each { |file|
if File.file?(file)
s = File.read(file)
t = s.gsub(/^namespace .+ \{\n\s*class .*;\n\s*\}.*$/) { |m| m.gsub(/\n\s*/, ' ').gsub(/\s*\/\/.*$/, '') }
if t != s
puts file
File.open(file, 'w').write(t)
end
end
}
Change-Id: Iffcb966e90eb8e1a625eccd5dd0b94f000ae368e
Reviewed-by: hjk <hjk121@nokiamail.com>
105 lines
3.4 KiB
C++
105 lines
3.4 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
|
|
** Contact: http://www.qt-project.org/legal
|
|
**
|
|
** This file is part of Qt Creator.
|
|
**
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and Digia. For licensing terms and
|
|
** conditions see http://qt.digia.com/licensing. For further information
|
|
** use the contact form at http://qt.digia.com/contact-us.
|
|
**
|
|
** GNU Lesser General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
** General Public License version 2.1 as published by the Free Software
|
|
** Foundation and appearing in the file LICENSE.LGPL included in the
|
|
** packaging of this file. Please review the following information to
|
|
** ensure the GNU Lesser General Public License version 2.1 requirements
|
|
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** In addition, as a special exception, Digia gives you certain additional
|
|
** rights. These rights are described in the Digia Qt LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#ifndef STASHDIALOG_H
|
|
#define STASHDIALOG_H
|
|
|
|
#include <QDialog>
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
class QSortFilterProxyModel;
|
|
class QPushButton;
|
|
class QModelIndex;
|
|
QT_END_NAMESPACE
|
|
|
|
namespace Git {
|
|
namespace Internal {
|
|
|
|
namespace Ui { class StashDialog; }
|
|
class StashModel;
|
|
|
|
/* StashDialog: Non-modal dialog that manages the list of stashes
|
|
* of the repository. Offers to show, restore, restore to branch
|
|
* (in case restore fails due to conflicts) on current and
|
|
* delete on selection/all. */
|
|
|
|
class StashDialog : public QDialog
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
explicit StashDialog(QWidget *parent = 0);
|
|
~StashDialog();
|
|
|
|
static QString msgRepositoryLabel(const QString &repository);
|
|
|
|
public slots:
|
|
void refresh(const QString &repository, bool force);
|
|
|
|
private slots:
|
|
void deleteAll();
|
|
void deleteSelection();
|
|
void showCurrent();
|
|
void restoreCurrent();
|
|
void restoreCurrentInBranch();
|
|
void enableButtons();
|
|
void forceRefresh();
|
|
|
|
private:
|
|
// Prompt dialog for modified repositories. Ask to undo or stash away.
|
|
enum ModifiedRepositoryAction {
|
|
ModifiedRepositoryCancel,
|
|
ModifiedRepositoryStash,
|
|
ModifiedRepositoryDiscard
|
|
};
|
|
|
|
ModifiedRepositoryAction promptModifiedRepository(const QString &stash);
|
|
bool promptForRestore(QString *stash, QString *branch /* = 0 */, QString *errorMessage);
|
|
bool ask(const QString &title, const QString &what, bool defaultButton = true);
|
|
void warning(const QString &title, const QString &what, const QString &details = QString());
|
|
int currentRow() const;
|
|
QList<int> selectedRows() const; \
|
|
|
|
Ui::StashDialog *ui;
|
|
StashModel *m_model;
|
|
QSortFilterProxyModel *m_proxyModel;
|
|
QPushButton *m_deleteAllButton;
|
|
QPushButton *m_deleteSelectionButton;
|
|
QPushButton *m_showCurrentButton;
|
|
QPushButton *m_restoreCurrentButton;
|
|
QPushButton *m_restoreCurrentInBranchButton;
|
|
QPushButton *m_refreshButton;
|
|
QString m_repository;
|
|
};
|
|
|
|
} // namespace Internal
|
|
} // namespace Git
|
|
|
|
#endif // STASHDIALOG_H
|