summaryrefslogtreecommitdiffstats
path: root/src/qtconcurrent
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-01-17 20:14:07 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-20 13:10:57 +0100
commitcf01d7136fb79ee3f8e8522748b08519f0ea528f (patch)
treeed4021fd66f4da1b164ca27e522da28525b473f7 /src/qtconcurrent
parent2f2dd0137982e5894b93ca1770c096c19e3dc46c (diff)
whitespace fixes
remove trailing spaces & expand tabs Change-Id: If9909c94b52d9dacb7c8735470525d18a1c97d6b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'src/qtconcurrent')
-rw-r--r--src/qtconcurrent/codegenerator/example/main.cpp8
-rw-r--r--src/qtconcurrent/codegenerator/src/codegenerator.cpp8
-rw-r--r--src/qtconcurrent/codegenerator/src/codegenerator.h46
3 files changed, 31 insertions, 31 deletions
diff --git a/src/qtconcurrent/codegenerator/example/main.cpp b/src/qtconcurrent/codegenerator/example/main.cpp
index b1659dca1..4e69cec07 100644
--- a/src/qtconcurrent/codegenerator/example/main.cpp
+++ b/src/qtconcurrent/codegenerator/example/main.cpp
@@ -47,23 +47,23 @@ int main()
// The code generator works on items. Each item has a generate() function:
Item item("");
qDebug() << item.generate(); // produces "".
-
+
// There are several Item subclasses. Text items contains a text string which they
// reproduce when generate is called:
Text text(" Hi there");
qDebug() << text.generate(); // produces " Hi there".
-
+
// Items can be concatenated:
Item sentence = text + Text(" Bye there") ;
qDebug() << sentence.generate(); // produces "Hi there Bye there".
- // (Internally, this creates a tree of items, and generate is called recursively
+ // (Internally, this creates a tree of items, and generate is called recursively
// for items that have children.)
// Repeater items repeat their content when generate is called:
Repeater repeater = text;
repeater.setRepeatCount(3);
qDebug() << repeater.generate(); // produces "Hi there Hi there Hi there".
-
+
// Counters evaluate to the current repeat index.
Repeater repeater2 = text + Counter();
repeater2.setRepeatCount(3);
diff --git a/src/qtconcurrent/codegenerator/src/codegenerator.cpp b/src/qtconcurrent/codegenerator/src/codegenerator.cpp
index 82c1e6cba..87088c1f0 100644
--- a/src/qtconcurrent/codegenerator/src/codegenerator.cpp
+++ b/src/qtconcurrent/codegenerator/src/codegenerator.cpp
@@ -81,7 +81,7 @@ int BaseGenerator::repeatCount(GeneratorStack * const stack) const
GroupGenerator const * const group = static_cast<GroupGenerator const * const>(generator);
return group->currentRepeat;
} break;
-*/
+*/
default:
break;
}
@@ -90,7 +90,7 @@ int BaseGenerator::repeatCount(GeneratorStack * const stack) const
}
QByteArray RepeaterGenerator::generate(GeneratorStack * const stack)
-{
+{
GeneratorStacker stacker(stack, this);
QByteArray generated;
for (int i = repeatOffset; i < repeatCount + repeatOffset; ++i) {
@@ -101,7 +101,7 @@ QByteArray RepeaterGenerator::generate(GeneratorStack * const stack)
};
QByteArray GroupGenerator::generate(GeneratorStack * const stack)
-{
+{
const int repeatCount = currentCount(stack);
GeneratorStacker stacker(stack, this);
QByteArray generated;
@@ -134,7 +134,7 @@ const Compound operator+(const Item &a, const char * const text)
const Compound operator+(const char * const text, const Item &b)
{
- return Compound(Text(text), b);
+ return Compound(Text(text), b);
}
} \ No newline at end of file
diff --git a/src/qtconcurrent/codegenerator/src/codegenerator.h b/src/qtconcurrent/codegenerator/src/codegenerator.h
index 0f1bf23e9..02fe44d5c 100644
--- a/src/qtconcurrent/codegenerator/src/codegenerator.h
+++ b/src/qtconcurrent/codegenerator/src/codegenerator.h
@@ -51,7 +51,7 @@ namespace CodeGenerator
enum GeneratorType {NoopType, CompoundType, TextType, RepeaterType, CounterType, GroupType};
class BaseGenerator;
typedef QStack<BaseGenerator *> GeneratorStack;
-
+
template <typename ValueType>
class Stacker {
public:
@@ -61,7 +61,7 @@ namespace CodeGenerator
QStack<ValueType> *stack;
};
typedef Stacker<BaseGenerator *> GeneratorStacker;
-
+
class BaseGenerator
{
public:
@@ -70,7 +70,7 @@ namespace CodeGenerator
virtual QByteArray generate(GeneratorStack *stack) { Q_UNUSED(stack); return QByteArray(); };
int currentCount(GeneratorStack *stack) const;
int repeatCount(GeneratorStack *stack) const;
- GeneratorType type;
+ GeneratorType type;
};
class Item
@@ -84,34 +84,34 @@ namespace CodeGenerator
// QExplicitlySharedDataPointer<BaseGenerator> generator;
BaseGenerator * const generator;
};
-
+
class CompoundGenerator : public BaseGenerator
{
public:
- CompoundGenerator(BaseGenerator * const a, BaseGenerator * const b)
+ CompoundGenerator(BaseGenerator * const a, BaseGenerator * const b)
: BaseGenerator(CompoundType), a(a), b(b) {}
virtual QByteArray generate(GeneratorStack *stack)
{ return a->generate(stack) + b->generate(stack); };
- protected:
+ protected:
BaseGenerator * const a;
BaseGenerator * const b;
};
-
+
class Compound : public Item
{
public:
Compound(const Item &a, const Item &b) : Item(new CompoundGenerator(a.generator, b.generator)) {}
};
-
+
class TextGenerator : public BaseGenerator
{
public:
TextGenerator(const QByteArray &text) : BaseGenerator(TextType), text(text) {}
virtual QByteArray generate(GeneratorStack *) { return text; };
- protected:
+ protected:
QByteArray text;
};
-
+
class Text : public Item {
public:
Text(const QByteArray &text) : Item(new TextGenerator(text)) {}
@@ -121,7 +121,7 @@ namespace CodeGenerator
class RepeaterGenerator : public BaseGenerator
{
public:
- RepeaterGenerator(BaseGenerator * const childGenerator)
+ RepeaterGenerator(BaseGenerator * const childGenerator)
: BaseGenerator(RepeaterType), repeatCount(1), repeatOffset(0), childGenerator(childGenerator) {}
virtual QByteArray generate(GeneratorStack *stack);
@@ -130,22 +130,22 @@ namespace CodeGenerator
int currentRepeat;
BaseGenerator * const childGenerator;
};
-
+
class Repeater : public Item {
public:
Repeater(const Item &item) : Item(new RepeaterGenerator(item.generator)) {}
- void setRepeatCount(int count)
+ void setRepeatCount(int count)
{ static_cast<RepeaterGenerator * const>(generator)->repeatCount = count; }
void setRepeatOffset(int offset)
{ static_cast<RepeaterGenerator * const>(generator)->repeatOffset = offset; }
};
-
+
class CounterGenerator : public BaseGenerator
{
public:
CounterGenerator() : BaseGenerator(CounterType), offset(0), increment(1), reverse(false) {}
QByteArray generate(GeneratorStack *stack)
- {
+ {
if (reverse)
return QByteArray::number(repeatCount(stack) - (currentCount(stack) * increment) + offset + 1);
else
@@ -155,7 +155,7 @@ namespace CodeGenerator
int increment;
bool reverse;
};
-
+
class Counter : public Item {
public:
Counter() : Item(new CounterGenerator()) {}
@@ -168,12 +168,12 @@ namespace CodeGenerator
{ static_cast<CounterGenerator *>(generator)->reverse = reverse; }
};
-
+
class GroupGenerator : public BaseGenerator
{
public:
GroupGenerator(BaseGenerator * const childGenerator)
- : BaseGenerator(GroupType), currentRepeat(0), childGenerator(childGenerator),
+ : BaseGenerator(GroupType), currentRepeat(0), childGenerator(childGenerator),
separator(new BaseGenerator()), prefix(new BaseGenerator()), postfix(new BaseGenerator()) { }
virtual QByteArray generate(GeneratorStack *stack);
int currentRepeat;
@@ -182,20 +182,20 @@ namespace CodeGenerator
BaseGenerator *prefix;
BaseGenerator *postfix;
};
-
+
class Group : public Item
{
public:
Group(const Item &item) : Item(new GroupGenerator(item.generator)) { setSeparator(", "); }
- void setSeparator(const Item &separator)
+ void setSeparator(const Item &separator)
{ static_cast<GroupGenerator *>(generator)->separator = separator.generator; }
- void setPrefix(const Item &prefix)
+ void setPrefix(const Item &prefix)
{ static_cast<GroupGenerator *>(generator)->prefix = prefix.generator; }
- void setPostfix(const Item &postfix)
+ void setPostfix(const Item &postfix)
{ static_cast<GroupGenerator *>(generator)->postfix = postfix.generator; }
};
- const Compound operator+(const Item &a, const Item &b);
+ const Compound operator+(const Item &a, const Item &b);
const Compound operator+(const Item &a, const char * const text);
const Compound operator+(const char * const text, const Item &b);