Commit b5ba77eb authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

Fixed a number of compiler warnings reported by newer clang compiler

parent 35fb0290

qtools/qtextcodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1967,7 +1967,7 @@ public: 
    int heuristicNameMatch(const char* hint) const;



private:

    int forwardIndex;

    //int forwardIndex;

};

qtools/qxml.h

+6 −6
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ private: 
    QValueStack<QMap<QString, QString> > nsStack;

    QMap<QString, QString> ns;



    QXmlNamespaceSupportPrivate *d;

    //QXmlNamespaceSupportPrivate *d;

};
@@ -150,7 +150,7 @@ private: 
    QStringList localnameList;

    QStringList valueList;



    QXmlAttributesPrivate *d;

    //QXmlAttributesPrivate *d;



    friend class QXmlSimpleReader;

};
@@ -175,7 +175,7 @@ private: 


    QString input;



    QXmlInputSourcePrivate *d;

    //QXmlInputSourcePrivate *d;

};



//
@@ -202,7 +202,7 @@ private: 
    QString pub;

    QString sys;



    QXmlParseExceptionPrivate *d;

    //QXmlParseExceptionPrivate *d;

};
@@ -392,7 +392,7 @@ public: 
private:

    QXmlSimpleReader* reader;



    QXmlLocatorPrivate *d;

    //QXmlLocatorPrivate *d;

};



//
@@ -511,7 +511,7 @@ public: 
    QString errorString();



private:

    QXmlDefaultHandlerPrivate *d;

    //QXmlDefaultHandlerPrivate *d;

};



#ifdef _WS_QWS_

src/docbookgen.cpp

+1 −3
Original line number Diff line number Diff line
@@ -191,8 +191,7 @@ class DocbookCodeGenerator : public CodeOutputInterface 
{

  public:

    DocbookCodeGenerator(FTextStream &t) : m_t(t), m_lineNumber(-1),

    m_insideCodeLine(FALSE), m_normalHLNeedStartTag(TRUE),

    m_insideSpecialHL(FALSE) {}

    m_insideCodeLine(FALSE), m_insideSpecialHL(FALSE) {}

    virtual ~DocbookCodeGenerator() {}



    void codify(const char *text)
@@ -291,7 +290,6 @@ class DocbookCodeGenerator : public CodeOutputInterface 
    bool m_isMemberRef;

    int col;

    bool m_insideCodeLine;

    bool m_normalHLNeedStartTag;

    bool m_insideSpecialHL;

};

src/docparser.h

+1 −4
Original line number Diff line number Diff line
@@ -983,8 +983,7 @@ class DocParamSect : public CompAccept<DocParamSect>, public DocNode 
       In=1, Out=2, InOut=3, Unspecified=0

    };

    DocParamSect(DocNode *parent,Type t) 

      : m_type(t), m_dir(Unspecified), 

        m_hasInOutSpecifier(FALSE), m_hasTypeSpecifier(FALSE) 

      : m_type(t), m_hasInOutSpecifier(FALSE), m_hasTypeSpecifier(FALSE) 

    { m_parent = parent; }

    int parse(const QCString &cmdName,bool xmlContext,Direction d);

    Kind kind() const          { return Kind_ParamSect; }
@@ -995,7 +994,6 @@ class DocParamSect : public CompAccept<DocParamSect>, public DocNode 


  private:

    Type            m_type;

    Direction       m_dir;

    bool            m_hasInOutSpecifier;

    bool            m_hasTypeSpecifier;

};
@@ -1189,7 +1187,6 @@ class DocHtmlCaption : public CompAccept<DocHtmlCaption>, public DocNode 


  private:

    HtmlAttribList m_attribs;

    bool           m_atTop;

};



/** Node representing a HTML table row */

src/dot.cpp

+3 −3
Original line number Diff line number Diff line
@@ -1180,8 +1180,8 @@ uint DotRunnerQueue::count() const 


//--------------------------------------------------------------------



DotWorkerThread::DotWorkerThread(int id,DotRunnerQueue *queue)

      : m_id(id), m_queue(queue)

DotWorkerThread::DotWorkerThread(DotRunnerQueue *queue)

      : m_queue(queue)

{

  m_cleanupItems.setAutoDelete(TRUE);

}
@@ -1235,7 +1235,7 @@ DotManager::DotManager() : m_dotMaps(1007) 
    if (numThreads==0) numThreads = QMAX(2,QThread::idealThreadCount()+1);

    for (i=0;i<numThreads;i++)

    {

      DotWorkerThread *thread = new DotWorkerThread(i,m_queue);

      DotWorkerThread *thread = new DotWorkerThread(m_queue);

      thread->start();

      if (thread->isRunning())

      {