Commit 75b42f18 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

Merge remote branch 'origin/1.3'

Trailing whitespace removal re-applied manually.
parents 43203140 a6ca3486
......@@ -215,8 +215,8 @@
\snippet examples/addressbook-sdk/part1/main.cpp main function
The code constructs a new \c AddressBook widget on the stack and
invokes its \l{QWidget::}{show()} function to display it.
The code constructs a new \c AddressBook widget on the stack and
invokes its \l{QWidget::}{show()} function to display it.
However, the widget will not be shown until the application's event
loop is started. This is done by calling the application's
\l{QApplication::}{exec()} function. Finally, the result returned by
......
......@@ -32,8 +32,8 @@ that you:
the case that you have better ideas, discuss them with other developers
before writing the code.
\o Take advantage of Qt. Don't re-invent the wheel. Think about what parts
of your code are generic enough that they might be incorporated into
Qt proper.
of your code are generic enough that they might be incorporated into
Qt proper.
\o Document interfaces. Right now we use qdoc, but changing to doxygen
is being considered.
\endlist
......@@ -88,7 +88,7 @@ in C++.
\endcode
\o Using Qt's foreach is ok in non-time critical code when using a QTL
\o Using Qt's foreach is ok in non-time critical code when using a QTL
container. It is a nice way to keep line noise down and to give the
loop variable a proper name:
......@@ -102,14 +102,14 @@ in C++.
for (Container::iterator it = container.begin(); it != end; ++it)
doSomething(*it);
\endcode
If the loop variable can be made const, do so. This can prevent
If the loop variable can be made const, do so. This can prevent
unnecessary detaching of shared data in some cases. So:
\code
foreach (const QString &name, someListOfNames)
doSomething(name);
- NOT -
foreach (QString name, someListOfNames)
......@@ -137,7 +137,7 @@ Only one declaration on each line.
-NOT-
QString a = "Joe", b = "Foo"; // not used in Qt Creator
\endcode
[Note that 'QString a = "Joe"' is formally calling a copy constructor
[Note that 'QString a = "Joe"' is formally calling a copy constructor
on a temporary constructed from a string literal and therefore has the
potential of being more expensive then direct construction by
'QString a("joe")'. However the compiler is allowed to elide the copy
......@@ -146,7 +146,7 @@ Only one declaration on each line.
line with the traditional C-style initialization, _and_ cannot be
mistaken as function declaration, _and_ reduces the level of nested
parantheses in more initializations.]
\section2 Pointers and references
......@@ -419,7 +419,7 @@ Line breaks
\section2 File headers
If you create a new file, the top of the file should include a
If you create a new file, the top of the file should include a
header comment equal to the one found in other source files of Qt Creator.
\section2 Include order
......@@ -454,7 +454,7 @@ Line breaks
You document for the other developers, not for yourself.
In the header you should document interfaces, i.e. what the function does,
not the implementation.
In the .cpp files you document the implementation if the implementation
In the .cpp files you document the implementation if the implementation
in non-obvious.
......
......@@ -2476,7 +2476,7 @@
that if the user uses the SSH Library in an application they wish to
redistribute, then the complete source code for your application must
be available and freely redistributable under reasonable conditions.
For more information on the used QPL License see:
For more information on the used QPL License see:
QtCreator/src/libs/3rdparty/net7ssh/LICENSE.QPL
\endlist\br\br
The source code of NetSieben Secure Shell C++ Library can be found
......
......@@ -83,5 +83,5 @@ exit 0
## Properly close subshell
)
)
exit $?
......@@ -54,5 +54,5 @@ exit 0
## Properly close subshell
)
)
exit $?
......@@ -999,7 +999,7 @@ class Dumper:
self.putNumChild(0)
isHandled = True
#warn("TARGET: %s " % target)
#warn("TARGET: %s " % target)
if (not isHandled) and (target == "char"
or target == "signed char" or target == "unsigned char"):
# Display values up to given length directly
......
......@@ -1078,7 +1078,7 @@ static void qDumpQAbstractItem(QDumper &d)
{
ModelIndex *mm = reinterpret_cast<ModelIndex *>(&mi);
mm->r = mm->c = 0;
mm->p = mm->m = 0;
mm->p = mm->m = 0;
static const char *printFormat = sizeof(void *) == sizeof(long) ?
"%d,%d,0x%lx,0x%lx" : "%d,%d,0x%llx,0x%llx";
sscanf(d.templateParameters[0], printFormat, &mm->r, &mm->c, &mm->p, &mm->m);
......@@ -2150,7 +2150,7 @@ static void qDumpQVariantHelper(const QVariant *v, QString *value,
case QVariant::KeySequence:
#ifndef QT_NO_SHORTCUT
*value = qvariant_cast<QKeySequence>(*v).toString();
#else
#else
*value = QString::fromLatin1("Disabled by QT_NO_SHORTCUT");
#endif
break;
......@@ -2803,7 +2803,7 @@ static void qDumpQSharedPointer(QDumper &d)
const QSharedPointer<int> &ptr =
*reinterpret_cast<const QSharedPointer<int> *>(d.data);
if (ptr.isNull()) {
if (ptr.isNull()) {
d.putItem("value", "<null>");
d.putItem("valueeditable", "false");
d.putItem("numchild", 0);
......@@ -3746,9 +3746,9 @@ static inline void dumpSizes(QDumper &d)
const SizeMap::const_iterator cend = sizeMap.constEnd();
for (SizeMap::const_iterator it = sizeMap.constBegin(); it != cend; ++it) {
// new size list
if (it.key() != lastSize) {
if (it.key() != lastSize) {
if (lastSize)
d.put("],");
d.put("],");
d.put("[\"");
d.put(it.key());
lastSize = it.key();
......@@ -3758,7 +3758,7 @@ static inline void dumpSizes(QDumper &d)
d.put(it.value());
d.put('"');
}
d.put("]]");
d.put("]]");
}
extern "C" Q_DECL_EXPORT
......
TEMPLATE = lib
CONFIG += shared
linux-* {
linux-* {
CONFIG -= release
CONFIG += debug
}
SOURCES = gdbmacros.cpp
false {
false {
DEFINES += USE_QT_GUI=0
QT = core
}
else {
else {
DEFINES += USE_QT_GUI=1
QT = core \
gui
......
......@@ -225,10 +225,10 @@ def qdump__QFileInfo(d, item):
def qdump__QFlags(d, item):
#warn("QFLAGS: %s" % item.value)
#warn("QFLAGS: %s" % item.value)
i = item.value["i"]
enumType = item.value.type.template_argument(0)
#warn("QFLAGS: %s" % item.value["i"].cast(enumType))
#warn("QFLAGS: %s" % item.value["i"].cast(enumType))
d.putValue("%s (%s)" % (i.cast(enumType), i))
d.putNumChild(0)
......
......@@ -248,7 +248,7 @@ static int dumpQMapQStringString()
test.insert(QLatin1String("42s"), QLatin1String("fortytwo"));
test.insert(QLatin1String("423"), QLatin1String("fortytree"));
}
prepareInBuffer("QMap", "local.qmapqstringqstring", "local.qmapqstringqstring", "QString@QString");
prepareInBuffer("QMap", "local.qmapqstringqstring", "local.qmapqstringqstring", "QString@QString");
qDumpObjectData440(2, 42, testAddress(&test), 1, sizeof(QString), sizeof(QString), sizeof(mapNode), valueOffset);
fputs(qDumpOutBuffer, stdout);
fputc('\n', stdout);
......@@ -454,7 +454,7 @@ static int dumpStdQStringSet()
static int dumpStdMapIntString()
{
std::map<int,std::string> test;
std::map<int,std::string> test;
std::map<int,std::string>::value_type entry(42, std::string("fortytwo"));
if (!optEmptyContainers) {
test.insert(entry);
......
......@@ -196,7 +196,7 @@ christian@christian-linux ran 'configure.py --os=linux --cpu=ia32 --cc=gcc --dis
Target
-------
Compiler: g++ -O2 -finline-functions
Compiler: g++ -O2 -finline-functions
Arch: ia32/ia32
OS: linux
......
......@@ -182,7 +182,7 @@ kheimric@deepburner ran 'E:\dev\creator\src\libs\3rdparty\botan\configure.py --c
Target
-------
Compiler: cl.exe /O2
Compiler: cl.exe /O2
Arch: ia64/ia64
OS: windows
......
......@@ -56,7 +56,7 @@ int main(int argc, char* argv[])
printf("Usage: %s <file>\n", argv[0]);
return 1;
}
Botan::LibraryInitializer init;
try {
......
......@@ -16,7 +16,7 @@ using namespace Botan;
int main()
{
Botan::LibraryInitializer init;
try
{
AutoSeeded_RNG rng;
......
......@@ -37,7 +37,7 @@ int main()
if(p.bits() != bits)
{
std::cout << "Asked for " << bits << " got " << p
std::cout << "Asked for " << bits << " got " << p
<< " " << p.bits() << " bits\n";
return 1;
}
......
......@@ -7,7 +7,7 @@ include(../../../../qtcreatorlibrary.pri)
DEPENDPATH += .
INCLUDEPATH += $$PWD $$PWD/../build $$PWD/../build/botan
win32 {
LIBS += advapi32.lib user32.lib
win32-msvc*: QMAKE_CXXFLAGS += -wd4251 -wd4290
......
......@@ -31,7 +31,7 @@ def run_test(files, rootdir, testname, expected):
result = validate(ca_certs, certs, crls, end_entity)
result = repr(result).replace('botan._botan.verify_result.', '')
if result != expected:
print "FAILED: got %s, expected %s" % (result, expected)
else:
......@@ -56,6 +56,6 @@ def main():
run_test(files, root, thistest, results[thistest])
else:
print "%s... skipping - no expected result set" % thistest
if __name__ == "__main__":
sys.exit(main())
......@@ -126,7 +126,7 @@ void export_x509()
.value("crl_signing", X509_Store::CRL_SIGNING);
{
python::scope in_class =
python::scope in_class =
python::class_<X509_Store>("X509_Store")
.def("add_cert", &X509_Store::add_cert, add_cert_ols())
.def("validate", &X509_Store::validate_cert, validate_cert_ols())
......
......@@ -15,7 +15,7 @@ def hash_it(hash, input):
out = pipe.read(0)
def main:
......
......@@ -9,7 +9,7 @@ def encrypt(input):
print cipher_key.length
cipher = botan.Filter("ARC4", key = cipher_key)
pipe = botan.Pipe(cipher, botan.Filter("Hex_Encoder"))
pipe.start_msg()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment