r21940 by craig - Clazy part 6: Remove unused variables
scribus-commit
scribus-commit at lists.scribus.net
Thu Apr 20 18:55:08 UTC 2017
Author: craig
Date: Thu Apr 20 18:55:08 2017
New Revision: 21940
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21940
Log:
Clazy part 6: Remove unused variables
Modified:
trunk/Scribus/scribus/canvasmode.cpp
trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp
trunk/Scribus/scribus/collapsedtablepainterex.cpp
trunk/Scribus/scribus/gtaction.cpp
trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.cpp
trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.cpp
trunk/Scribus/scribus/langmgr.cpp
trunk/Scribus/scribus/pdflib_core.cpp
trunk/Scribus/scribus/pslib.cpp
trunk/Scribus/scribus/scimagecachemanager.cpp
trunk/Scribus/scribus/scpageoutput.cpp
trunk/Scribus/scribus/scribus.cpp
trunk/Scribus/scribus/scribusdoc.cpp
trunk/Scribus/scribus/ui/checkDocument.cpp
trunk/Scribus/scribus/ui/colorlistbox.cpp
trunk/Scribus/scribus/ui/extimageprops.cpp
trunk/Scribus/scribus/ui/hruler.cpp
trunk/Scribus/scribus/ui/pagepalette_widgets.cpp
trunk/Scribus/scribus/ui/prefs_display.cpp
trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
trunk/Scribus/scribus/ui/prefs_printer.cpp
trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
trunk/Scribus/scribus/ui/resourcemanager.cpp
trunk/Scribus/scribus/ui/storyeditor.cpp
trunk/Scribus/scribus/urllauncher.cpp
trunk/Scribus/scribus/util_color.cpp
trunk/Scribus/scribus/util_ghostscript.cpp
Modified: trunk/Scribus/scribus/canvasmode.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/canvasmode.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode.cpp (original)
+++ trunk/Scribus/scribus/canvasmode.cpp Thu Apr 20 18:55:08 2017
@@ -1054,7 +1054,7 @@
{
int kk = e->key();
Qt::KeyboardModifiers buttonModifiers = e->modifiers();
- QString uc = e->text();
+// QString uc = e->text();
ScribusMainWindow* mainWindow = m_view->m_ScMW;
QList<QMdiSubWindow *> windows;
Modified: trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp Thu Apr 20 18:55:08 2017
@@ -138,11 +138,11 @@
{
QPen p1b = QPen(Qt::blue, 1.0 / m_canvas->m_viewMode.scale, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
QPen p1bd = QPen(Qt::blue, 1.0 / m_canvas->m_viewMode.scale, Qt::DotLine, Qt::FlatCap, Qt::MiterJoin);
- QPen p8b = QPen(Qt::blue, 8.0 / m_canvas->m_viewMode.scale, Qt::SolidLine, Qt::RoundCap, Qt::MiterJoin);
+// QPen p8b = QPen(Qt::blue, 8.0 / m_canvas->m_viewMode.scale, Qt::SolidLine, Qt::RoundCap, Qt::MiterJoin);
QPen p8r = QPen(Qt::red, 8.0 / m_canvas->m_viewMode.scale, Qt::SolidLine, Qt::RoundCap, Qt::MiterJoin);
QPen p8m = QPen(Qt::magenta, 8.0 / m_canvas->m_viewMode.scale, Qt::SolidLine, Qt::RoundCap, Qt::MiterJoin);
- QPen p14r = QPen(Qt::red, 18.0 / m_canvas->m_viewMode.scale, Qt::SolidLine, Qt::RoundCap, Qt::MiterJoin);
- QPen p14w = QPen(Qt::white, 18.0 / m_canvas->m_viewMode.scale, Qt::SolidLine, Qt::RoundCap, Qt::MiterJoin);
+// QPen p14r = QPen(Qt::red, 18.0 / m_canvas->m_viewMode.scale, Qt::SolidLine, Qt::RoundCap, Qt::MiterJoin);
+// QPen p14w = QPen(Qt::white, 18.0 / m_canvas->m_viewMode.scale, Qt::SolidLine, Qt::RoundCap, Qt::MiterJoin);
psx->setTransform(currItem->getTransform(), true);
psx->setPen(p1b);
psx->setBrush(Qt::NoBrush);
Modified: trunk/Scribus/scribus/collapsedtablepainterex.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/collapsedtablepainterex.cpp
==============================================================================
--- trunk/Scribus/scribus/collapsedtablepainterex.cpp (original)
+++ trunk/Scribus/scribus/collapsedtablepainterex.cpp Thu Apr 20 18:55:08 2017
@@ -463,7 +463,6 @@
p->setStrokeMode(ScPainterExBase::Solid);
p->setFillMode(ScPainterExBase::None);
- QColor lineColor;
QPointF lineStart, lineEnd;
foreach (const TableBorderLine& line, border.borderLines())
{
Modified: trunk/Scribus/scribus/gtaction.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/gtaction.cpp
==============================================================================
--- trunk/Scribus/scribus/gtaction.cpp (original)
+++ trunk/Scribus/scribus/gtaction.cpp Thu Apr 20 18:55:08 2017
@@ -264,7 +264,7 @@
const ParagraphStyle& paraStyle = m_textFrame->doc()->paragraphStyles()[paragraphStyle];
gtFont* font = style->getFont();
- QString fontName = validateFont(font).scName();
+// QString fontName = validateFont(font).scName();
CharStyle lastStyle, newStyle;
int lastStyleStart = 0;
Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.cpp (original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.cpp Thu Apr 20 18:55:08 2017
@@ -1171,7 +1171,6 @@
ScTextStream ts2(&m_BBox, QIODevice::ReadOnly);
ts2 >> x >> y >> b >> h;
QFileInfo fi = QFileInfo(fn);
- QString ext = fi.suffix().toLower();
QString tmpFile = QDir::toNativeSeparators(ScPaths::tempFileDir() + "sc1.jpg");
QFile f2(tmpFile);
QString tmp;
@@ -1307,7 +1306,6 @@
ScTextStream ts2(&m_BBox, QIODevice::ReadOnly);
ts2 >> x >> y >> b >> h;
QFileInfo fi = QFileInfo(fn);
- QString ext = fi.suffix().toLower();
QString tmpFile = QDir::toNativeSeparators(ScPaths::tempFileDir() + "sc1.jpg");
QFile f2(tmpFile);
QString tmp;
Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.cpp (original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.cpp Thu Apr 20 18:55:08 2017
@@ -534,7 +534,7 @@
short channelType;
uchar blendKey[4];
uchar opacity, clipping, flags, filler;
- QString layerName, blend;
+ QString blend;
struct PSDLayer lay;
s >> layerinfo;
s >> numLayers;
Modified: trunk/Scribus/scribus/langmgr.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/langmgr.cpp
==============================================================================
--- trunk/Scribus/scribus/langmgr.cpp (original)
+++ trunk/Scribus/scribus/langmgr.cpp Thu Apr 20 18:55:08 2017
@@ -1063,7 +1063,6 @@
{
if (dictName.length()<=2)
{
- QString shortAbbrev(LanguageManager::getShortAbbrevFromAbbrev(dictName));
dictionaryMap.insert(dictName, dictionaryPaths.at(i)+dn+".dic");
}
if (dictName.length()>2)
Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp (original)
+++ trunk/Scribus/scribus/pdflib_core.cpp Thu Apr 20 18:55:08 2017
@@ -10803,7 +10803,6 @@
void PDFLibCore::PDF_End_Bookmarks()
{
- QByteArray tmp;
BookMItem* ip;
QByteArray Inhal = "";
QMap<int,QByteArray> Inha;
Modified: trunk/Scribus/scribus/pslib.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/pslib.cpp
==============================================================================
--- trunk/Scribus/scribus/pslib.cpp (original)
+++ trunk/Scribus/scribus/pslib.cpp Thu Apr 20 18:55:08 2017
@@ -2623,7 +2623,6 @@
{
for (int am = 0; am < page->FromMaster.count() && !abortExport; ++am)
{
- QString tmps;
PageItem *ite = page->FromMaster.at(am);
if (usingGUI)
ScQApp->processEvents();
@@ -3475,7 +3474,6 @@
void PSLib::HandleDiamondGradient(PageItem* c)
{
- QString GCol;
QString hs,ss,vs,ks;
int ch,cs,cv,ck;
QStringList cols;
Modified: trunk/Scribus/scribus/scimagecachemanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/scimagecachemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/scimagecachemanager.cpp (original)
+++ trunk/Scribus/scribus/scimagecachemanager.cpp Thu Apr 20 18:55:08 2017
@@ -606,7 +606,7 @@
}
else
{
- QFileInfo info(absolutePath(iss.key()));
+// QFileInfo info(absolutePath(iss.key()));
if (!references.contains(ref))
references[ref] = 1;
else
Modified: trunk/Scribus/scribus/scpageoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/scpageoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/scpageoutput.cpp (original)
+++ trunk/Scribus/scribus/scpageoutput.cpp Thu Apr 20 18:55:08 2017
@@ -1533,7 +1533,6 @@
else
{
multiLine ml = m_doc->MLineStyles[item->NamedLStyle];
- QColor tmp;
if (ml[0].Color != CommonStrings::None)
{
ScColorShade tmp(m_doc->PageColors[ml[0].Color], ml[0].Shade);
Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Thu Apr 20 18:55:08 2017
@@ -7265,11 +7265,10 @@
if (errorMsg.isEmpty() && doc->pdfOptions().openAfterExport && !doc->pdfOptions().doMultiFile)
{
QString pdfViewer(PrefsManager::instance()->appPrefs.extToolPrefs.pdfViewerExecutable);
- QFileInfo fi(pdfViewer);
if (pdfViewer.isEmpty())
{
pdfViewer = QFileDialog::getOpenFileName(this, tr("Locate your PDF viewer"), QString::null, QString::null);
- if (!QFileInfo(pdfViewer).exists())
+ if (!QFileInfo::exists(pdfViewer))
pdfViewer="";
PrefsManager::instance()->appPrefs.extToolPrefs.pdfViewerExecutable=pdfViewer;
}
@@ -8237,7 +8236,7 @@
//Build our list of hyphenation dictionaries we have in the install dir
//Grab the language abbreviation from it, get the full language text
//Insert the name as key and a new string list into the map
- QString hyphDirName = QDir::toNativeSeparators(ScPaths::instance().dictDir()+"/hyph/");
+// QString hyphDirName = QDir::toNativeSeparators(ScPaths::instance().dictDir()+"/hyph/");
// QDir hyphDir(hyphDirName, "hyph*.dic", QDir::Name, QDir::Files | QDir::NoSymLinks);
//IL if ((hyphDir.exists()) && (hyphDir.count() != 0))
//IL {
@@ -9252,7 +9251,6 @@
{
if (HaveDoc)
{
- QColor tmpc;
slotDocCh();
doc->PageColors = dia->m_colorList;
if (dia->replaceColorMap.isEmpty())
Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Thu Apr 20 18:55:08 2017
@@ -2708,7 +2708,6 @@
assert( Pages->count() > 1 && Pages->count() > pageNumber );
setCurrentPage(Pages->at(0));
ScPage* page = Pages->takeAt(pageNumber);
- QString oldPageName(page->pageName());
delete page;
// #10658 : renumber masterpages and masterpage objects
// in order to avoid crash after masterpage deletion
@@ -3666,7 +3665,7 @@
//Make the doc delete the items, not the view. TODO: Currently does nada, zilch, zero
bool ScribusDoc::deleteTaggedItems()
{
- QString tooltip = Um::ItemsInvolved + "\n";
+// QString tooltip = Um::ItemsInvolved + "\n";
//Master Items
for (int i = 0; i < MasterItems.count(); ++i)
{
@@ -4597,7 +4596,6 @@
void ScribusDoc::getUsedProfiles(ProfilesL& usedProfiles)
{
PageItem* it = NULL;
- QString profileName;
QStringList profileNames;
int counter = 0;
usedProfiles.clear();
@@ -5771,7 +5769,6 @@
{
if (m_hasGUI)
{
- QFileInfo fi(pageItem->Pfile);
ScCore->fileWatcher->addFile(pageItem->Pfile);
}
}
Modified: trunk/Scribus/scribus/ui/checkDocument.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/ui/checkDocument.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/checkDocument.cpp (original)
+++ trunk/Scribus/scribus/ui/checkDocument.cpp Thu Apr 20 18:55:08 2017
@@ -471,7 +471,6 @@
for (int mPage = 0; mPage < doc->MasterPages.count(); ++mPage)
{
- QString tmp;
hasError = false;
pageGraveError = false;
QTreeWidgetItem * page=NULL;
Modified: trunk/Scribus/scribus/ui/colorlistbox.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/ui/colorlistbox.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorlistbox.cpp (original)
+++ trunk/Scribus/scribus/ui/colorlistbox.cpp Thu Apr 20 18:55:08 2017
@@ -477,7 +477,6 @@
if (currentSel.isEmpty())
return;
- QString first;
QMenu *pmen = new QMenu();
pmen->addAction( tr("Sort by Name"));
pmen->addAction( tr("Sort by Color"));
Modified: trunk/Scribus/scribus/ui/extimageprops.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/ui/extimageprops.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/extimageprops.cpp (original)
+++ trunk/Scribus/scribus/ui/extimageprops.cpp Thu Apr 20 18:55:08 2017
@@ -179,7 +179,7 @@
}
opacitySpinBox->setEnabled(true);
blendMode->setEnabled(true);
- QString tmp;
+
QList<PSDLayer>::iterator it2;
uint counter = 0;
for (it2 = info->layerInfo.begin(); it2 != info->layerInfo.end(); ++it2)
Modified: trunk/Scribus/scribus/ui/hruler.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/ui/hruler.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/hruler.cpp (original)
+++ trunk/Scribus/scribus/ui/hruler.cpp Thu Apr 20 18:55:08 2017
@@ -495,7 +495,6 @@
{
if (m_doc->isLoading())
return;
- QString tx = "";
double sc = m_view->scale();
Scaling = sc;
QFont ff = font();
Modified: trunk/Scribus/scribus/ui/pagepalette_widgets.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/ui/pagepalette_widgets.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_widgets.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette_widgets.cpp Thu Apr 20 18:55:08 2017
@@ -364,11 +364,9 @@
void SeView::dragMoveEvent(QDragMoveEvent *e)
{
- QString str, tmp;
if (e->mimeData()->hasFormat("page/magic"))
{
e->acceptProposedAction();
- str = e->mimeData()->text();
int a = rowAt(e->pos().y());
int b = columnAt(e->pos().x());
ClearPix();
Modified: trunk/Scribus/scribus/ui/prefs_display.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/ui/prefs_display.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_display.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_display.cpp Thu Apr 20 18:55:08 2017
@@ -105,7 +105,7 @@
{
docUnitIndex = prefsData->docSetupPrefs.docUnitIndex;
double unitRatio = unitGetRatioFromIndex(docUnitIndex);
- QString unitSuffix = unitGetSuffixFromIndex(docUnitIndex);
+// QString unitSuffix = unitGetSuffixFromIndex(docUnitIndex);
showImagesCheckBox->setChecked(prefsData->guidesPrefs.showPic);
showControlCharsCheckBox->setChecked(prefsData->guidesPrefs.showControls);
Modified: trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp Thu Apr 20 18:55:08 2017
@@ -197,7 +197,6 @@
bool Prefs_KeyboardShortcuts::exportKeySet(QString filename)
{
- QFileInfo fi = QFileInfo(filename);
QString exportFileName;
if (filename.endsWith(".xml"))
exportFileName = filename;
Modified: trunk/Scribus/scribus/ui/prefs_printer.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/ui/prefs_printer.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_printer.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_printer.cpp Thu Apr 20 18:55:08 2017
@@ -48,7 +48,6 @@
unitChange(docUnitIndex);
double unitRatio = unitGetRatioFromIndex(docUnitIndex);
- QString Pcap;
QString printerName;
QStringList printerNames = PrinterUtil::getPrinterNames();
int numPrinters = printerNames.count();
Modified: trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp Thu Apr 20 18:55:08 2017
@@ -618,7 +618,7 @@
connect(m_enhanced, SIGNAL(paletteShown(bool)), bulletCharTableButton, SLOT(setChecked(bool)));
m_enhanced->setDoc(m_doc);
m_enhanced->setEnabled(true);
- QString styleName = peCharStyleCombo->currentText();
+// QString styleName = peCharStyleCombo->currentText();
setCurrentComboItem(m_enhanced->fontSelector, m_item->currentStyle().charStyle().font().scName());
m_enhanced->newFont(m_enhanced->fontSelector->currentIndex());
m_enhanced->show();
Modified: trunk/Scribus/scribus/ui/resourcemanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/ui/resourcemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/resourcemanager.cpp (original)
+++ trunk/Scribus/scribus/ui/resourcemanager.cpp Thu Apr 20 18:55:08 2017
@@ -1046,9 +1046,7 @@
if (d.filetype=="zip")
{
QString fn(ScPaths::userDictDir(static_cast<ScPaths::DictType>(fileType), true)+d.files);
- QFile dledFile(fn);
- QFileInfo fi(dledFile);
- if (!dledFile.exists())
+ if (!QFileInfo::exists(fn))
qDebug()<<"File doesn\'t exist"<<fn;
else
{
Modified: trunk/Scribus/scribus/ui/storyeditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/ui/storyeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.cpp (original)
+++ trunk/Scribus/scribus/ui/storyeditor.cpp Thu Apr 20 18:55:08 2017
@@ -330,7 +330,7 @@
return;
}
- QString uc = k->text();
+// QString uc = k->text();
if ((k->modifiers() == Qt::ControlModifier) ||
(k->modifiers() == (Qt::ControlModifier | Qt::ShiftModifier)) ||
(k->modifiers() == (Qt::ControlModifier | Qt::KeypadModifier)) ||
@@ -701,7 +701,6 @@
{
setTextColor(Qt::black);
setUpdatesEnabled(false);
- QString Text = "";
StyledText.clear();
StyledText.setDefaultStyle(currItem->itemText.defaultStyle());
StyledText.insertChars(0, tx);
@@ -724,7 +723,7 @@
{
if (StyledText.length() == 0 || len == 0)
return;
- QString chars, text = "";
+ QString text;
++blockContentsChangeHook;
setUpdatesEnabled(false);
this->blockSignals(true);
Modified: trunk/Scribus/scribus/urllauncher.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/urllauncher.cpp
==============================================================================
--- trunk/Scribus/scribus/urllauncher.cpp (original)
+++ trunk/Scribus/scribus/urllauncher.cpp Thu Apr 20 18:55:08 2017
@@ -56,7 +56,6 @@
if (p==0)
p=ScCore->primaryMainWindow();
QString extBrowser(PrefsManager::instance()->extBrowserExecutable());
- QFileInfo fi(extBrowser);
if (extBrowser.isEmpty())
{
if (!QDesktopServices::openUrl(link))
Modified: trunk/Scribus/scribus/util_color.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/util_color.cpp
==============================================================================
--- trunk/Scribus/scribus/util_color.cpp (original)
+++ trunk/Scribus/scribus/util_color.cpp Thu Apr 20 18:55:08 2017
@@ -631,7 +631,7 @@
QString ext = fi.suffix().toLower();
if (extensionIndicatesEPSorPS(ext))
{
- QString tmp, tmp2, FarNam;
+ QString tmp, FarNam;
double c, m, y, k;
ScColor cc;
QFile f(fileName);
@@ -776,10 +776,10 @@
{
quint16 vendor, numcolors, colType;
ts >> vendor;
- QString title = readAdobeUniCodeString(ts);
- QString prefix = readAdobeUniCodeString(ts);
- QString postfix = readAdobeUniCodeString(ts);
- QString description = readAdobeUniCodeString(ts);
+// QString title = readAdobeUniCodeString(ts);
+// QString prefix = readAdobeUniCodeString(ts);
+// QString postfix = readAdobeUniCodeString(ts);
+// QString description = readAdobeUniCodeString(ts);
ts >> numcolors;
ts.skipRawData(4);
ts >> colType;
Modified: trunk/Scribus/scribus/util_ghostscript.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21940&path=/trunk/Scribus/scribus/util_ghostscript.cpp
==============================================================================
--- trunk/Scribus/scribus/util_ghostscript.cpp (original)
+++ trunk/Scribus/scribus/util_ghostscript.cpp Thu Apr 20 18:55:08 2017
@@ -411,7 +411,7 @@
QPixmap LoadPDF(QString fn, int Page, int Size, int *w, int *h)
{
- QString tmp, cmd1, cmd2;
+ QString tmp;
QString pdfFile = QDir::toNativeSeparators(fn);
QString tmpFile = QDir::toNativeSeparators(ScPaths::tempFileDir() + "sc.png");
QPixmap pm;
More information about the scribus-commit
mailing list