Author: jghali
Date: Mon Apr 13 11:09:31 2020
New Revision: 23602
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23602
Log:
Code style fixes
Modified:
trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
trunk/Scribus/scribus/scribus.cpp
trunk/Scribus/scribus/ui/pagepalette.cpp
trunk/Scribus/scribus/ui/pagepalette.h
trunk/Scribus/scribus/ui/pagepalette_pages.cpp
trunk/Scribus/scribus/ui/pagepalette_pages.h
Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23602&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp Mon Apr 13
11:09:31 2020
@@ -168,7 +168,7 @@
mainWin->outlinePalette->setDoc(mainWin->doc);
mainWin->outlinePalette->BuildTree();
mainWin->pagePalette->setView(mainWin->view);
- mainWin->pagePalette->Rebuild();
+ mainWin->pagePalette->rebuild();
mainWin->doc->RePos = false;
if (mainWin->doc->m_Selection->count() != 0)
mainWin->doc->m_Selection->itemAt(0)->emitAllToGUI();
Modified: trunk/Scribus/scribus/scribus.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23602&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Mon Apr 13 11:09:31 2020
@@ -2695,7 +2695,7 @@
scrActions["extrasGenerateTableOfContents"]->setEnabled(doc->hasTOCSetup());
scrActions["extrasUpdateDocument"]->setEnabled(true);
if (!doc->masterPageMode())
- pagePalette->Rebuild();
+ pagePalette->rebuild();
outlinePalette->setDoc(doc);
if (outlinePalette->isVisible())
{
@@ -3506,7 +3506,7 @@
ret = true;
}
if (!Mpa)
- pagePalette->Rebuild();
+ pagePalette->rebuild();
view->reformPages();
view->DrawNew();
return ret;
@@ -3930,7 +3930,7 @@
}
m_undoManager->switchStack(doc->documentFileName());
- pagePalette->Rebuild();
+ pagePalette->rebuild();
qApp->restoreOverrideCursor();
doc->setModified(false);
foreach (NotesStyle* NS, doc->m_docNotesStylesList)
@@ -4389,7 +4389,7 @@
inlinePalette->unsetDoc();
symbolPalette->unsetDoc();
pagePalette->setView(nullptr);
- pagePalette->Rebuild();
+ pagePalette->rebuild();
if (doc->appMode == modeEditClip)
view->requestMode(submodeEndNodeEdit);
bookmarkPalette->BView->clear();
@@ -5381,7 +5381,7 @@
Apply_MasterPage(name, doc->currentPage()->pageNr(), false);
view->reformPages();
view->DrawNew();
- pagePalette->Rebuild();
+ pagePalette->rebuild();
}
void ScribusMainWindow::slotNewPageP(int wo, const QString& templ)
@@ -5573,8 +5573,8 @@
if (!HaveDoc)
return;
view->deselectItems(true);
- int pageLocationIndex=-1;
- int pageLocationCount=0;
+ int pageLocationIndex = -1;
+ int pageLocationCount = 0;
if (doc->pagePositioning() != singlePage)
{
QStringList locationEntries;
@@ -5593,7 +5593,7 @@
{
bool copyFromMaster=false;
QString masterPageName;
- int pageLocation=0;
+ int pageLocation = 0;
copyDialog.values(masterPageName, copyFromMaster, pageLocation);
bool badMasterPageName =
doc->MasterNames.contains(masterPageName);
badMasterPageName |= (masterPageName ==
CommonStrings::masterPageNormal);
@@ -5615,10 +5615,10 @@
badMasterPageName |= (masterPageName ==
CommonStrings::trMasterPageNormalRight);
badMasterPageName |= masterPageName.isEmpty();
}
- int currentPageNumber=doc->currentPage()->pageNr();
- bool ok=doc->copyPageToMasterPage(currentPageNumber,
pageLocation, pageLocationCount, masterPageName, copyFromMaster);
+ int currentPageNumber = doc->currentPage()->pageNr();
+ bool ok = doc->copyPageToMasterPage(currentPageNumber,
pageLocation, pageLocationCount, masterPageName, copyFromMaster);
Q_ASSERT(ok); //TODO get a return value in case the copy was
not possible
- pagePalette->Rebuild();
+ pagePalette->rebuild();
}
}
@@ -7652,7 +7652,7 @@
doc->setCurrentPage(doc->DocPages.at(m_storedPageNum));
view->setContentsPos(static_cast<int>(m_storedViewXCoor *
m_storedViewScale), static_cast<int>(m_storedViewYCoor * m_storedViewScale));
view->DrawNew();
- pagePalette->Rebuild();
+ pagePalette->rebuild();
propertiesPalette->updateColorList();
contentPalette->updateColorList();
symbolPalette->editingFinished();
@@ -7713,7 +7713,7 @@
view->setContentsPos(static_cast<int>(m_storedViewXCoor *
m_storedViewScale), static_cast<int>(m_storedViewYCoor * m_storedViewScale));
doc->invalidateAll();
view->DrawNew();
- pagePalette->Rebuild();
+ pagePalette->rebuild();
propertiesPalette->unsetItem();
propertiesPalette->updateColorList();
contentPalette->unsetItem();
@@ -7851,7 +7851,7 @@
view->reformPages();
view->DrawNew();
- pagePalette->Rebuild();
+ pagePalette->rebuild();
// #9476 : call setupPage with false arg to setup only guidePalette GUI
// Otherwise setupPage() will apply guides to current page, doesn't
need that,
// Apply_MasterPage() has already done it
Modified: trunk/Scribus/scribus/ui/pagepalette.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23602&path=/trunk/Scribus/scribus/ui/pagepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette.cpp Mon Apr 13 11:09:31 2020
@@ -42,7 +42,7 @@
connect(pageWidget, SIGNAL(gotoMasterPage(QString)), m_scMW,
SLOT(editMasterPagesStart(QString)));
- Rebuild();
+ rebuild();
languageChange();
}
@@ -101,7 +101,7 @@
pageWidget->rebuildPages();
}
-void PagePalette::Rebuild()
+void PagePalette::rebuild()
{
rebuildMasters();
rebuildPages();
@@ -216,7 +216,7 @@
if (pageWidget)
{
pageWidget->setView(m_view);
- pageWidget->Rebuild();
+ pageWidget->rebuild();
}
setWindowTitle( tr( "Arrange Pages" ) );
}
Modified: trunk/Scribus/scribus/ui/pagepalette.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23602&path=/trunk/Scribus/scribus/ui/pagepalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette.h (original)
+++ trunk/Scribus/scribus/ui/pagepalette.h Mon Apr 13 11:09:31 2020
@@ -53,12 +53,12 @@
public slots:
void setView(ScribusView *view);
void enablePalette(const bool);
+ //! Rebuild all lists
+ void rebuild();
//! Recreate master pages thumbnails (if it's set on)
void rebuildMasters();
//! Recreate common pages arrangement
void rebuildPages();
- //! Rebuild all lists
- void Rebuild();
void markPage(uint nr);
void updateMasterPageList();
Modified: trunk/Scribus/scribus/ui/pagepalette_pages.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23602&path=/trunk/Scribus/scribus/ui/pagepalette_pages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_pages.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette_pages.cpp Mon Apr 13 11:09:31 2020
@@ -64,7 +64,7 @@
pix = IconManager::instance().loadPixmap("32/page-simple.png");
- Rebuild();
+ rebuild();
languageChange();
connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
@@ -313,7 +313,7 @@
connect(pageLayout, SIGNAL(selectedFirstPage(int)), this,
SLOT(handleFirstPage(int)));
}
-void PagePalette_Pages::Rebuild()
+void PagePalette_Pages::rebuild()
{
rebuildMasters();
rebuildPages();
@@ -402,7 +402,7 @@
{
pix = IconManager::instance().loadPixmap("32/page-simple.png");
if (currView != nullptr)
- Rebuild();
+ rebuild();
}
void PagePalette_Pages::languageChange()
Modified: trunk/Scribus/scribus/ui/pagepalette_pages.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23602&path=/trunk/Scribus/scribus/ui/pagepalette_pages.h
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_pages.h (original)
+++ trunk/Scribus/scribus/ui/pagepalette_pages.h Mon Apr 13 11:09:31 2020
@@ -46,7 +46,7 @@
void rebuildMasters();
//! Recreate common pages arrangement
void rebuildPages();
- void Rebuild();
+ void rebuild();
void markPage(uint nr);
void selMasterPage();
void languageChange();
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
