Commit 56c13726 authored by Joachim Eibl's avatar Joachim Eibl

Fix compiler warnings and errors.

Signed-off-by: default avatarjoachim99 <joachim.eibl@gmx.de>
parent 483d1184
......@@ -5,6 +5,7 @@ Version 0.9.98a - 2012-09-11
- Corrected display of highlighted text with Qt4.8.x on Ubuntu and Mac.
- Improved handling of texts with both right to left and left to right languages (mixed Arabic and western texts).
- Improved handling of Chinese and Japanese.
- Whitespace characters are now shown as dots for spaces and arrows for tabs, and not only in differences.
Version 0.9.97 - 2012-08-10
===========================
......
......@@ -1629,7 +1629,6 @@ void correctManualDiffAlignment( Diff3LineList& d3ll, ManualDiffHelpList* pManua
for( iMDHL = pManualDiffHelpList->begin(); iMDHL != pManualDiffHelpList->end(); ++iMDHL )
{
Diff3LineList::iterator i3 = d3ll.begin();
//int winIdxPreferred = 0;
int missingWinIdx = 0;
int alignedSum = (iMDHL->lineA1<0?0:1) + (iMDHL->lineB1<0?0:1) + (iMDHL->lineC1<0?0:1);
if (alignedSum==2)
......@@ -1638,7 +1637,6 @@ void correctManualDiffAlignment( Diff3LineList& d3ll, ManualDiffHelpList* pManua
// If only A & C are aligned then let B rather be aligned with A
// If only B & C are aligned then let A rather be aligned with B
missingWinIdx = iMDHL->lineA1<0 ? 1 : (iMDHL->lineB1<0 ? 2 : 3 );
//winIdxPreferred = missingWinIdx == 1 ? 2 : 1;
}
else if (alignedSum<=1)
{
......
......@@ -294,7 +294,7 @@ private:
int m_size;
int m_vSize; // Nr of lines in m_pBuf1 and size of m_v1, m_dv12 and m_dv13
QString m_unicodeBuf;
std::vector<LineData> m_v;
QVector<LineData> m_v;
bool m_bIsText;
bool m_bIncompleteConversion;
e_LineEndStyle m_eLineEndStyle;
......
......@@ -927,7 +927,7 @@ void DiffTextWindowData::writeLine(
// First calculate the "changed" information for each character.
int i=0;
QString lineString( pld->pLine, pld->size );
std::vector<UINT8> charChanged( pld->size );
QVector<UINT8> charChanged( pld->size );
Merger merger( pLineDiff1, pLineDiff2 );
while( ! merger.isEndReached() && i<pld->size )
{
......
......@@ -19,6 +19,7 @@
#include <kio/job.h>
#include <kio/jobclasses.h>
#include <kurl.h>
#include <list>
bool wildcardMultiMatch( const QString& wildcard, const QString& testString, bool bCaseSensitive );
......
......@@ -796,9 +796,7 @@ GnuDiff::change* GnuDiff::diff_2_files (struct comparison *cmp)
{
lin diags;
int f;
//struct change *e, *p;
struct change *script;
//int changes;
read_files (cmp->file, files_can_be_treated_as_binary);
......@@ -856,8 +854,6 @@ GnuDiff::change* GnuDiff::diff_2_files (struct comparison *cmp)
script = build_script (cmp->file);
//changes = (script != 0);
free (cmp->file[0].undiscarded);
free (flag_space);
......
......@@ -24,9 +24,9 @@
#include <QPixmap>
#include <QTimer>
#include <QStatusBar>
#include <QTextLayout>
class QPainter;
class QTextLayout;
class Overview : public QWidget
{
......
......@@ -375,7 +375,7 @@ private:
class OptionEncodingComboBox : public QComboBox, public OptionItem
{
std::vector<QTextCodec*> m_codecVec;
QVector<QTextCodec*> m_codecVec;
QTextCodec** m_ppVarCodec;
public:
OptionEncodingComboBox( const QString& saveName, QTextCodec** ppVarCodec,
......@@ -411,7 +411,7 @@ public:
{
if (c!=0)
{
for( unsigned int i=0; i<m_codecVec.size(); ++i )
for( int i=0; i<m_codecVec.size(); ++i )
{
if ( c==m_codecVec[i] )
return; // don't insert any codec twice
......@@ -441,7 +441,7 @@ public:
{
if (m_ppVarCodec!=0)
{
for(unsigned int i=0; i<m_codecVec.size(); ++i)
for( int i=0; i<m_codecVec.size(); ++i)
{
if ( *m_ppVarCodec==m_codecVec[i] )
{
......@@ -462,7 +462,7 @@ public:
void read (ValueMap* config)
{
QString codecName = config->readEntry( m_saveName, QString(m_codecVec[ currentIndex() ]->name()) );
for(unsigned int i=0; i<m_codecVec.size(); ++i)
for( int i=0; i<m_codecVec.size(); ++i)
{
if ( codecName == m_codecVec[i]->name() )
{
......
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