Package: qgit
Version: 1.5.5-1
Usertags: ftbfs-gcc-4.3
Tags: patch
Your package fails to build with GCC 4.3. Version 4.3 has not been
released yet but I'm building with a snapshot in order to find errors
and give people an advance warning.
You can reproduce this problem with gcc-snapshot (20070422-1 or higher)
from unstable. (Currently not available for i386, but for amd64, powerpc
and ia64. I hope to have i386 binaries in the archive in the near
future.)
> Automatic build of qgit_1.5.5-1 on em64t by sbuild/amd64 0.53
...
> if x86_64-linux-gnu-g++ -DHAVE_CONFIG_H -I. -I. -I.. -g -O2
> -I/usr/share/qt3/include -D_REENTRANT -DQT_THREAD_SUPPORT -g -O2 -Wall
> -Wno-non-virtual-dtor -W -Wno-long-long -pedantic -frepo -MT annotate.o -MD
> -MP -MF ".deps/annotate.Tpo" -c -o annotate.o annotate.cpp; \
> then mv -f ".deps/annotate.Tpo" ".deps/annotate.Po"; else rm -f
> ".deps/annotate.Tpo"; exit 1; fi
> In file included from /usr/share/qt3/include/qobject.h:45,
> from /usr/share/qt3/include/qwidget.h:43,
> from /usr/share/qt3/include/qdesktopwidget.h:40,
> from /usr/share/qt3/include/qapplication.h:42,
> from annotate.cpp:9:
> In file included from annotate.cpp:11:
> annotate.h:22: error: extra ';'
> annotate.h:23: error: extra ';'
> annotate.h:32: error: extra ';'
> annotate.h:33: error: extra ';'
> annotate.h:34: error: extra ';'
> annotate.h:46: error: extra ';'
> annotate.h:47: error: extra ';'
> annotate.h:48: error: extra ';'
> annotate.h:49: error: extra ';'
> annotate.h:50: error: extra ';'
> annotate.cpp: In member function 'void Annotate::setAnnotation(const
> QString&, const QString&, const QStringList&, QStringList&, int)':
--- src/annotate.h~ 2007-04-27 08:20:07.000000000 +0000
+++ src/annotate.h 2007-04-27 08:20:28.000000000 +0000
@@ -19,8 +19,8 @@
class ReachInfo {
public:
- ReachInfo() {};
- ReachInfo(SCRef s, int i, int t) : sha(s), id(i), type(t) {};
+ ReachInfo() {}
+ ReachInfo(SCRef s, int i, int t) : sha(s), id(i), type(t) {}
const QString sha;
int id, type;
QStringList roots;
@@ -29,9 +29,9 @@
class RangeInfo {
public:
- RangeInfo() { clear(); };
- RangeInfo(int s, int e, bool m) : start(s), end(e), modified(m) {};
- void clear() { start = end = 0; modified = false; };
+ RangeInfo() { clear(); }
+ RangeInfo(int s, int e, bool m) : start(s), end(e), modified(m) {}
+ void clear() { start = end = 0; modified = false; }
int start, end; // ranges count file lines from 1 like patches diffs
bool modified;
};
@@ -43,11 +43,11 @@
void deleteWhenDone();
const FileAnnotation* lookupAnnotation(SCRef sha, SCRef fileName);
bool start(const FileHistory* fh);
- bool isValid() { return valid; };
- bool isCanceled() { return canceled; };
- int count() { return ah.count(); };
- int elapsed() { return processingTime.elapsed(); };
- const QString file() { return fileName; };
+ bool isValid() { return valid; }
+ bool isCanceled() { return canceled; }
+ int count() { return ah.count(); }
+ int elapsed() { return processingTime.elapsed(); }
+ const QString file() { return fileName; }
const QString getAncestor(SCRef sha, SCRef fileName, int* shaIdx);
bool getRange(SCRef sha, RangeInfo* r);
bool seekPosition(int* rangeStart, int* rangeEnd, SCRef fromSha, SCRef
toSha);
--- src/domain.h~ 2007-04-27 08:21:28.000000000 +0000
+++ src/domain.h 2007-04-27 08:22:16.000000000 +0000
@@ -23,7 +23,7 @@
public:
explicit UpdateDomainEvent(bool fromMaster, bool force = false)
: QCustomEvent(fromMaster ? QGit::UPD_DM_MST_EV : QGit::UPD_DM_EV),
f(force) {}
- bool isForced() const { return f; };
+ bool isForced() const { return f; }
private:
bool f;
};
@@ -35,18 +35,18 @@
bool operator==(const StateInfo& newState) const;
bool operator!=(const StateInfo& newState) const;
void clear();
- const QString sha(bool n = true) const { return (n ? curS.sha :
prevS.sha); };
- const QString fileName(bool n = true) const { return (n ? curS.fn :
prevS.fn); };
- const QString diffToSha(bool n = true) const {return(n ? curS.dtSha :
prevS.dtSha); };
- bool selectItem(bool n = true) const { return( n ? curS.sel :
prevS.sel); };
- bool isMerge(bool n = true) const { return( n ? curS.isM : prevS.isM);
};
- bool allMergeFiles(bool n = true) const { return( n ? curS.allM :
prevS.allM); };
- void setSha(const QString& s) { if (isLocked) nextS.sha = s; else
curS.sha = s; };
- void setFileName(const QString& s) { if (isLocked) nextS.fn = s; else
curS.fn = s; };
- void setDiffToSha(const QString& s) { if (isLocked) nextS.dtSha = s;
else curS.dtSha = s; };
- void setSelectItem(bool b) { if (isLocked) nextS.sel = b; else curS.sel
= b; };
- void setIsMerge(bool b) { if (isLocked) nextS.isM = b; else curS.isM =
b; };
- void setAllMergeFiles(bool b) { if (isLocked) nextS.allM = b; else
curS.allM = b; };
+ const QString sha(bool n = true) const { return (n ? curS.sha :
prevS.sha); }
+ const QString fileName(bool n = true) const { return (n ? curS.fn :
prevS.fn); }
+ const QString diffToSha(bool n = true) const {return(n ? curS.dtSha :
prevS.dtSha); }
+ bool selectItem(bool n = true) const { return( n ? curS.sel :
prevS.sel); }
+ bool isMerge(bool n = true) const { return( n ? curS.isM : prevS.isM); }
+ bool allMergeFiles(bool n = true) const { return( n ? curS.allM :
prevS.allM); }
+ void setSha(const QString& s) { if (isLocked) nextS.sha = s; else
curS.sha = s; }
+ void setFileName(const QString& s) { if (isLocked) nextS.fn = s; else
curS.fn = s; }
+ void setDiffToSha(const QString& s) { if (isLocked) nextS.dtSha = s;
else curS.dtSha = s; }
+ void setSelectItem(bool b) { if (isLocked) nextS.sel = b; else curS.sel
= b; }
+ void setIsMerge(bool b) { if (isLocked) nextS.isM = b; else curS.isM =
b; }
+ void setAllMergeFiles(bool b) { if (isLocked) nextS.allM = b; else
curS.allM = b; }
bool isChanged(uint what = ANY) const;
enum Field {
@@ -60,21 +60,21 @@
private:
friend class Domain;
- bool requestPending() const { return (!nextS.sha.isEmpty() && (nextS !=
curS)); };
- void setLock(bool b) { isLocked = b; if (b) nextS = curS; };
- void commit() { prevS = curS; };
+ bool requestPending() const { return (!nextS.sha.isEmpty() && (nextS !=
curS)); }
+ void setLock(bool b) { isLocked = b; if (b) nextS = curS; }
+ void commit() { prevS = curS; }
void rollBack() {
if (nextS == curS)
nextS.clear(); // invalidate to avoid infinite loop
curS = prevS;
- };
+ }
bool flushQueue() {
if (requestPending()) {
curS = nextS;
return true;
}
return false;
- };
+ }
class S {
public:
--- src/filecontent.h~ 2007-04-27 08:22:42.000000000 +0000
+++ src/filecontent.h 2007-04-27 08:22:44.000000000 +0000
@@ -28,7 +28,7 @@
FileContent(Domain* parent, Git* git, QTextEdit* f);
~FileContent();
void update(bool force = false);
- bool annotateAvailable() { return curAnn != NULL; };
+ bool annotateAvailable() { return curAnn != NULL; }
void clear();
void copySelection();
void goToAnnotation(int id);
--- src/filecontent.cpp~ 2007-04-27 08:24:10.000000000 +0000
+++ src/filecontent.cpp 2007-04-27 08:24:13.000000000 +0000
@@ -30,7 +30,7 @@
class FileHighlighter : public QSyntaxHighlighter {
public:
- FileHighlighter(QTextEdit* te, FileContent* fc) :
QSyntaxHighlighter(te), f(fc) {};
+ FileHighlighter(QTextEdit* te, FileContent* fc) :
QSyntaxHighlighter(te), f(fc) {}
virtual int highlightParagraph(const QString& p, int) {
if (f->isHtmlSource)
--- src/lanes.h~ 2007-04-27 08:24:52.000000000 +0000
+++ src/lanes.h 2007-04-27 08:25:03.000000000 +0000
@@ -13,8 +13,8 @@
class Lanes {
public:
- Lanes() {}; // init() will setup us later, when data is available
- bool isEmpty() { return typeVec.empty(); };
+ Lanes() {} // init() will setup us later, when data is available
+ bool isEmpty() { return typeVec.empty(); }
void init(const QString& expectedSha);
void clear();
bool isFork(const QString& sha, bool& isDiscontinuity);
@@ -30,7 +30,7 @@
void afterBranch();
void afterApplied();
void nextParent(const QString& sha);
- void getLanes(QValueVector<int> &ln){ ln = typeVec; }; // O(1) vector
is implicitly shared
+ void getLanes(QValueVector<int> &ln){ ln = typeVec; } // O(1) vector is
implicitly shared
private:
int findNextSha(const QString& next, int pos);
--- src/revdesc.h~ 2007-04-27 08:26:13.000000000 +0000
+++ src/revdesc.h 2007-04-27 08:26:15.000000000 +0000
@@ -21,7 +21,7 @@
Q_OBJECT
public:
RevDesc(QWidget* parent, const char* name);
- void setDomain(Domain* dm) { d = dm; };
+ void setDomain(Domain* dm) { d = dm; }
protected:
virtual QPopupMenu* createPopupMenu(const QPoint& pos);
--
Martin Michlmayr
http://www.cyrius.com/
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
