Commit af7d9be0 authored by Michael Reeves's avatar Michael Reeves

Scrat unused code/vars

parent bc100c1c
......@@ -668,14 +668,6 @@ QStringList SourceData::readAndPreprocess(QTextCodec* pEncoding, bool bAutoDetec
if(faIn.exists())
{
#if defined(Q_OS_WIN)
QString catCmd = "type";
fileNameIn1.replace('/', "\\");
#else
QString catCmd = "cat";
#endif
// Run the first preprocessor
if(m_pOptions->m_PreProcessorCmd.isEmpty())
{
......@@ -710,8 +702,7 @@ QStringList SourceData::readAndPreprocess(QTextCodec* pEncoding, bool bAutoDetec
}
else
errorReason = "\n(" + errorReason + ")";
//QString cmd = catCmd + " \"" + fileNameInPP + "\" | " + ppCmd + " >\"" + fileNameOut1+"\"";
//::system( encodeString(cmd) );
bool bSuccess = errorReason.isEmpty() && m_normalData.readFile(fileNameOut1);
if(fileInSize > 0 && (!bSuccess || m_normalData.m_size == 0))
{
......@@ -759,8 +750,7 @@ QStringList SourceData::readAndPreprocess(QTextCodec* pEncoding, bool bAutoDetec
}
else
errorReason = "\n(" + errorReason + ")";
//QString cmd = catCmd + " \"" + fileNameInPP + "\" | " + ppCmd + " >\"" + fileNameOut2 + "\"";
//::system( encodeString(cmd) );
bool bSuccess = errorReason.isEmpty() && m_lmppData.readFile(fileNameOut2);
if(FileAccess(fileNameIn2).size() > 0 && (!bSuccess || m_lmppData.m_size == 0))
{
......
......@@ -811,9 +811,7 @@ void DiffTextWindowData::writeLine(
int deviceWidth)
{
QFont normalFont = p.font();
QFont diffFont = normalFont;
//never set
//diffFont.setItalic(m_pOptions->m_bItalicForDeltas);
const QFontMetrics& fm = p.fontMetrics();
int fontHeight = fm.lineSpacing();
int fontAscent = fm.ascent();
......@@ -921,10 +919,6 @@ void DiffTextWindowData::writeLine(
c = m_pOptions->m_fgColor;
}
//QRect outRect( xOffset + outPixelPos, yOffset, charWidth*spaces, fontHeight );
//if ( m_pOptions->m_bRightToLeftLanguage )
// outRect = QRect( deviceWidth-1-(xOffset + outPixelPos), yOffset, -charWidth*spaces, fontHeight ).normalized();
//if ( invalidRect.intersects( outRect ) )
{
frh.setBackground(bgColor);
if(!m_selection.within(line, outPos))
......
......@@ -2404,16 +2404,6 @@ void KDiff3App::slotAddManualDiffHelp()
KMessageBox::information(this, i18n("Nothing is selected in either diff input window."), i18n("Error while adding manual diff range"));
else
{
/*
ManualDiffHelpEntry mdhe;
if (!m_manualDiffHelpList.empty()) mdhe = m_manualDiffHelpList.front();
if ( winIdx==1 ) { mdhe.lineA1 = firstLine; mdhe.lineA2 = lastLine; }
if ( winIdx==2 ) { mdhe.lineB1 = firstLine; mdhe.lineB2 = lastLine; }
if ( winIdx==3 ) { mdhe.lineC1 = firstLine; mdhe.lineC2 = lastLine; }
m_manualDiffHelpList.clear();
m_manualDiffHelpList.push_back( mdhe );
*/
insertManualDiffHelp(&m_manualDiffHelpList, winIdx, firstLine, lastLine);
mainInit(nullptr, false); // Init without reload
......
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