forked from qt-creator/qt-creator
Cleanup whitespace
Mostly trailing whitespace Change-Id: Ic324d20e8159c9d255895248ce04f25c692daf46 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
committed by
Orgad Shaneh
parent
752668b5f4
commit
82aa1380f2
@@ -113,5 +113,5 @@ while (<PIPE>) {
|
|||||||
if ($line =~ /^\+(.*)/) {
|
if ($line =~ /^\+(.*)/) {
|
||||||
checkLine($1, $filename, $pos);
|
checkLine($1, $filename, $pos);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
close(PIPE);
|
close(PIPE);
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ bool PositionerNodeInstance::isResizable() const
|
|||||||
}
|
}
|
||||||
|
|
||||||
PositionerNodeInstance::Pointer PositionerNodeInstance::create(QObject *object)
|
PositionerNodeInstance::Pointer PositionerNodeInstance::create(QObject *object)
|
||||||
{
|
{
|
||||||
QQuickBasePositioner *positioner = qobject_cast<QQuickBasePositioner*>(object);
|
QQuickBasePositioner *positioner = qobject_cast<QQuickBasePositioner*>(object);
|
||||||
|
|
||||||
Q_ASSERT(positioner);
|
Q_ASSERT(positioner);
|
||||||
|
|||||||
@@ -928,7 +928,7 @@ static inline QString fixComponentPathForIncompatibleQt(const QString &component
|
|||||||
}
|
}
|
||||||
|
|
||||||
QObject *ObjectNodeInstance::createComponent(const QString &componentPath, QDeclarativeContext *context)
|
QObject *ObjectNodeInstance::createComponent(const QString &componentPath, QDeclarativeContext *context)
|
||||||
{
|
{
|
||||||
QDeclarativeComponent component(context->engine(), QUrl::fromLocalFile(fixComponentPathForIncompatibleQt(componentPath)));
|
QDeclarativeComponent component(context->engine(), QUrl::fromLocalFile(fixComponentPathForIncompatibleQt(componentPath)));
|
||||||
QObject *object = component.beginCreate(context);
|
QObject *object = component.beginCreate(context);
|
||||||
|
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ protected:
|
|||||||
QDeclarativeItem *qmlGraphicsItem() const;
|
QDeclarativeItem *qmlGraphicsItem() const;
|
||||||
QDeclarativeAnchors *anchors() const;
|
QDeclarativeAnchors *anchors() const;
|
||||||
void resetHorizontal();
|
void resetHorizontal();
|
||||||
void resetVertical();
|
void resetVertical();
|
||||||
void refresh();
|
void refresh();
|
||||||
void recursiveDoComponentComplete(QDeclarativeItem *declarativeItem);
|
void recursiveDoComponentComplete(QDeclarativeItem *declarativeItem);
|
||||||
|
|
||||||
|
|||||||
@@ -29,9 +29,9 @@
|
|||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
Custom project wizard configuration example file. Note that by convention,
|
Custom project wizard configuration example file. Note that by convention,
|
||||||
the project file goes last.
|
the project file goes last.
|
||||||
The "class" and "firstpage" attributes specify that it is a Qt 4 wizard and
|
The "class" and "firstpage" attributes specify that it is a Qt 4 wizard and
|
||||||
leave room for the Qt 4 target page.
|
leave room for the Qt 4 target page.
|
||||||
-->
|
-->
|
||||||
<wizard version="1" kind="project"
|
<wizard version="1" kind="project"
|
||||||
|
|||||||
@@ -29,9 +29,9 @@
|
|||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
Custom project wizard configuration example file. Note that by convention,
|
Custom project wizard configuration example file. Note that by convention,
|
||||||
the project file goes last.
|
the project file goes last.
|
||||||
The "class" and "firstpage" attributes specify that it is a Qt 4 wizard and
|
The "class" and "firstpage" attributes specify that it is a Qt 4 wizard and
|
||||||
leave room for the Qt 4 target page.
|
leave room for the Qt 4 target page.
|
||||||
-->
|
-->
|
||||||
<wizard version="1" kind="project"
|
<wizard version="1" kind="project"
|
||||||
|
|||||||
@@ -29,9 +29,9 @@
|
|||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
Custom project wizard configuration example file. Note that by convention,
|
Custom project wizard configuration example file. Note that by convention,
|
||||||
the project file goes last.
|
the project file goes last.
|
||||||
The "class" and "firstpage" attributes specify that it is a Qt 4 wizard and
|
The "class" and "firstpage" attributes specify that it is a Qt 4 wizard and
|
||||||
leave room for the Qt 4 target page.
|
leave room for the Qt 4 target page.
|
||||||
-->
|
-->
|
||||||
<wizard version="1" kind="project"
|
<wizard version="1" kind="project"
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ minQtVersion(5, 0, 0) {
|
|||||||
|
|
||||||
win32:SUBDIRS += utils/process_ctrlc_stub.pro
|
win32:SUBDIRS += utils/process_ctrlc_stub.pro
|
||||||
|
|
||||||
# Windows: Compile Qt Creator CDB extension if Debugging tools can be detected.
|
# Windows: Compile Qt Creator CDB extension if Debugging tools can be detected.
|
||||||
win32 {
|
win32 {
|
||||||
include(qtcreatorcdbext/cdb_detect.pri)
|
include(qtcreatorcdbext/cdb_detect.pri)
|
||||||
exists($$CDB_PATH):SUBDIRS += qtcreatorcdbext
|
exists($$CDB_PATH):SUBDIRS += qtcreatorcdbext
|
||||||
|
|||||||
@@ -42,6 +42,6 @@ FORMS += \
|
|||||||
contextpanetext.ui
|
contextpanetext.ui
|
||||||
|
|
||||||
include(easingpane/easingpane.pri)
|
include(easingpane/easingpane.pri)
|
||||||
|
|
||||||
|
|
||||||
OTHER_FILES += qmleditorwidgets.pri
|
OTHER_FILES += qmleditorwidgets.pri
|
||||||
|
|||||||
@@ -606,7 +606,7 @@ void ServiceBrowser::autoRefresh()
|
|||||||
/*!
|
/*!
|
||||||
\fn void errorMessage(ZeroConf::ErrorMessage::SeverityLevel severity, const QString &msg, ZeroConf::ServiceBrowser *browser)
|
\fn void errorMessage(ZeroConf::ErrorMessage::SeverityLevel severity, const QString &msg, ZeroConf::ServiceBrowser *browser)
|
||||||
|
|
||||||
This signal is called every time a warning or error is emitted (for example when a library
|
This signal is called every time a warning or error is emitted (for example when a library
|
||||||
cannot be used and another one has to be used). Zeroconf will still work if severity < FailureLevel.
|
cannot be used and another one has to be used). Zeroconf will still work if severity < FailureLevel.
|
||||||
*/
|
*/
|
||||||
/*!
|
/*!
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ HEADERS += propertyeditorview.h \
|
|||||||
propertyeditorwidget.h \
|
propertyeditorwidget.h \
|
||||||
fileresourcesmodel.h \
|
fileresourcesmodel.h \
|
||||||
components/propertyeditor/gradientmodel.h
|
components/propertyeditor/gradientmodel.h
|
||||||
|
|
||||||
QT += qml quick
|
QT += qml quick
|
||||||
|
|
||||||
RESOURCES += propertyeditor.qrc
|
RESOURCES += propertyeditor.qrc
|
||||||
|
|||||||
@@ -8,23 +8,16 @@ QLabel {
|
|||||||
}
|
}
|
||||||
|
|
||||||
QStackedWidget {
|
QStackedWidget {
|
||||||
border: 0px;
|
border: 0px;
|
||||||
background-color: #4e4e4e;
|
background-color: #4e4e4e;
|
||||||
}
|
}
|
||||||
|
|
||||||
QGraphicsView {
|
QGraphicsView {
|
||||||
padding: 2px;
|
padding: 2px;
|
||||||
border: 0px;
|
border: 0px;
|
||||||
background-color: #4e4e4e;
|
background-color: #4e4e4e;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
QGraphicsView:focus {
|
QGraphicsView:focus {
|
||||||
|
background-color: #5f5f5f;
|
||||||
background-color: #5f5f5f;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ HEADERS += \
|
|||||||
$$PWD/callgrindstackbrowser.h \
|
$$PWD/callgrindstackbrowser.h \
|
||||||
$$PWD/callgrindrunner.h
|
$$PWD/callgrindrunner.h
|
||||||
|
|
||||||
SOURCES += \
|
SOURCES += \
|
||||||
$$PWD/callgrindparser.cpp \
|
$$PWD/callgrindparser.cpp \
|
||||||
$$PWD/callgrindparsedata.cpp \
|
$$PWD/callgrindparsedata.cpp \
|
||||||
$$PWD/callgrindfunction.cpp \
|
$$PWD/callgrindfunction.cpp \
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
QT *= network
|
QT *= network
|
||||||
|
|
||||||
HEADERS += \
|
HEADERS += \
|
||||||
$$PWD/memcheckrunner.h
|
$$PWD/memcheckrunner.h
|
||||||
|
|
||||||
SOURCES += \
|
SOURCES += \
|
||||||
$$PWD/memcheckrunner.cpp
|
$$PWD/memcheckrunner.cpp
|
||||||
|
|||||||
@@ -106,5 +106,4 @@
|
|||||||
<name>Qt3Support module</name>
|
<name>Qt3Support module</name>
|
||||||
</value>
|
</value>
|
||||||
</variable>
|
</variable>
|
||||||
|
|
||||||
</proiteminfo>
|
</proiteminfo>
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ public:
|
|||||||
|
|
||||||
TranslationUnit *parseStatement(const QByteArray &source)
|
TranslationUnit *parseStatement(const QByteArray &source)
|
||||||
{ return parse(source, TranslationUnit::ParseStatement); }
|
{ return parse(source, TranslationUnit::ParseStatement); }
|
||||||
|
|
||||||
class Diagnostic: public DiagnosticClient {
|
class Diagnostic: public DiagnosticClient {
|
||||||
public:
|
public:
|
||||||
int errorCount;
|
int errorCount;
|
||||||
@@ -92,8 +92,8 @@ public:
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
Diagnostic diag;
|
Diagnostic diag;
|
||||||
|
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void initTestCase();
|
void initTestCase();
|
||||||
|
|||||||
@@ -252,7 +252,7 @@ void tst_CodeFormatter::ifStatementWithoutBraces1()
|
|||||||
<< Line(" while (e)")
|
<< Line(" while (e)")
|
||||||
<< Line(" bar;")
|
<< Line(" bar;")
|
||||||
<< Line(" else")
|
<< Line(" else")
|
||||||
<< Line(" foo;")
|
<< Line(" foo;")
|
||||||
<< Line("}")
|
<< Line("}")
|
||||||
;
|
;
|
||||||
checkIndent(data);
|
checkIndent(data);
|
||||||
|
|||||||
@@ -145,7 +145,7 @@ void tst_SpecificRules::testMatch(Rule *rule)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void tst_SpecificRules::testMatch(Rule *rule, ProgressData *progress)
|
void tst_SpecificRules::testMatch(Rule *rule, ProgressData *progress)
|
||||||
{
|
{
|
||||||
QFETCH(QString, s);
|
QFETCH(QString, s);
|
||||||
|
|
||||||
QTEST(rule->matchSucceed(s, s.length(), progress), "match");
|
QTEST(rule->matchSucceed(s, s.length(), progress), "match");
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ include(../qttest.pri)
|
|||||||
|
|
||||||
win32:DEFINES += _CRT_SECURE_NO_WARNINGS
|
win32:DEFINES += _CRT_SECURE_NO_WARNINGS
|
||||||
|
|
||||||
SOURCES += tst_qtcprocess.cpp
|
SOURCES += tst_qtcprocess.cpp
|
||||||
|
|
||||||
DEFINES -= QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS
|
DEFINES -= QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS
|
||||||
DEFINES -= QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
|
DEFINES -= QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ MainWindow::~MainWindow()
|
|||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::simpleBP(int inc, const QString &inx)
|
void MainWindow::simpleBP(int inc, const QString &inx)
|
||||||
{
|
{
|
||||||
int array[2] = {1,2};
|
int array[2] = {1,2};
|
||||||
m_w++;
|
m_w++;
|
||||||
QString x = QLatin1String("h\344all\366");
|
QString x = QLatin1String("h\344all\366");
|
||||||
@@ -295,7 +295,7 @@ void MainWindow::on_actionExtTypes_triggered()
|
|||||||
std::set<std::string> stdSet;
|
std::set<std::string> stdSet;
|
||||||
stdSet.insert("s1");
|
stdSet.insert("s1");
|
||||||
QWidget *ww = this;
|
QWidget *ww = this;
|
||||||
QWidget &wwr = *ww;
|
QWidget &wwr = *ww;
|
||||||
QSharedPointer<QString> sps(new QString("hallo"));
|
QSharedPointer<QString> sps(new QString("hallo"));
|
||||||
QList<QSharedPointer<QString> > spsl;
|
QList<QSharedPointer<QString> > spsl;
|
||||||
spsl.push_back(sps);
|
spsl.push_back(sps);
|
||||||
@@ -317,7 +317,7 @@ void MainWindow::on_actionExtTypes_triggered()
|
|||||||
|
|
||||||
QList <QList<int> > nestedIntList;
|
QList <QList<int> > nestedIntList;
|
||||||
nestedIntList << QList<int>();
|
nestedIntList << QList<int>();
|
||||||
nestedIntList.front() << 1 << 2;
|
nestedIntList.front() << 1 << 2;
|
||||||
|
|
||||||
QVariantList vList;
|
QVariantList vList;
|
||||||
vList.push_back(QVariant(42));
|
vList.push_back(QVariant(42));
|
||||||
@@ -360,7 +360,7 @@ void Foo::MainWindow::on_actionScopes_triggered()
|
|||||||
int x = 2;
|
int x = 2;
|
||||||
Q_UNUSED(x)
|
Q_UNUSED(x)
|
||||||
}
|
}
|
||||||
qDebug() << x;
|
qDebug() << x;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Foo::MainWindow::on_actionLongString_triggered()
|
void Foo::MainWindow::on_actionLongString_triggered()
|
||||||
|
|||||||
@@ -32,7 +32,7 @@
|
|||||||
#include "mainwindow.h"
|
#include "mainwindow.h"
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
QApplication a(argc, argv);
|
QApplication a(argc, argv);
|
||||||
qDebug() << "pid=" << QApplication::applicationPid();
|
qDebug() << "pid=" << QApplication::applicationPid();
|
||||||
Foo::MainWindow w;
|
Foo::MainWindow w;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
include(../ssh.pri)
|
include(../ssh.pri)
|
||||||
|
|
||||||
TARGET=sftp
|
TARGET = sftp
|
||||||
SOURCES=main.cpp sftptest.cpp argumentscollector.cpp
|
SOURCES = main.cpp sftptest.cpp argumentscollector.cpp
|
||||||
HEADERS=sftptest.h argumentscollector.h parameters.h
|
HEADERS = sftptest.h argumentscollector.h parameters.h
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user