r19983 by craig - Clarify some variable naming, remove unnecessary qdebug

[scribus-commit]

Author: craig
Date: Thu Apr  9 18:39:47 2015
New Revision: 19983

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19983
Log:
Clarify some variable naming, remove unnecessary qdebug

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribus.h

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=19983&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Thu Apr  9 18:39:47 2015
@@ -289,8 +289,8 @@
                        } // for all docItems
                } // if(OnMasterPage.isEmpty()
        } // if(!Embedded)
-       else
-               qDebug() << "QRegion empty";
+       //else
+       //      qDebug() << "QRegion empty";
        return result;
 }
 

Modified: trunk/Scribus/scribus/scribus.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=19983&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Thu Apr  9 18:39:47 2015
@@ -2874,20 +2874,20 @@
        rebuildRecentFileMenu();
 }
 
-void ScribusMainWindow::removeRecentFromWatcher(QString fn)
-{
-       removeRecent(fn, true);
-}
-
-void ScribusMainWindow::loadRecent(QString fn)
-{
-       QFileInfo fd(fn);
+void ScribusMainWindow::removeRecentFromWatcher(QString filename)
+{
+       removeRecent(filename, true);
+}
+
+void ScribusMainWindow::loadRecent(QString filename)
+{
+       QFileInfo fd(filename);
        if (!fd.exists())
        {
-               removeRecent(fn);
-               return;
-       }
-       loadDoc(fn);
+               removeRecent(filename);
+               return;
+       }
+       loadDoc(filename);
 }
 
 void ScribusMainWindow::rebuildRecentFileMenu()
@@ -3383,8 +3383,7 @@
        QFileInfo fi(fileName);
        if (!fi.exists())
        {
-               ScMessageBox::warning(this, CommonStrings::trWarning, tr("File 
does not exist on the specified path 
:\n%1").arg(QDir::toNativeSeparators(fileName)),
-                                          QMessageBox::Ok);
+               ScMessageBox::warning(this, CommonStrings::trWarning, tr("File 
does not exist on the specified path 
:\n%1").arg(QDir::toNativeSeparators(fileName)), QMessageBox::Ok);
                return false;
        }
        
@@ -3466,7 +3465,6 @@
                if (docFontDir3.exists())
                        
prefsManager->appPrefs.fontPrefs.AvailFonts.AddScalableFonts(fi.absolutePath()+"/Document
 fonts", FName);
                prefsManager->appPrefs.fontPrefs.AvailFonts.updateFontMap();
-
                doc=new ScribusDoc();
                doc->saveFilePermissions(QFile::permissions(fileName));
                doc->is12doc=is12doc;

Modified: trunk/Scribus/scribus/scribus.h
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=19983&path=/trunk/Scribus/scribus/scribus.h
==============================================================================
--- trunk/Scribus/scribus/scribus.h (original)
+++ trunk/Scribus/scribus/scribus.h Thu Apr  9 18:39:47 2015
@@ -330,8 +330,8 @@
        void slotFileAppend();
 
        void removeRecent(QString fn, bool fromFileWatcher = false);
-       void removeRecentFromWatcher(QString fn);
-       void loadRecent(QString fn);
+       void removeRecentFromWatcher(QString filename);
+       void loadRecent(QString filename);
        void rebuildRecentFileMenu();
        void rebuildRecentPasteMenu();
        void rebuildScrapbookMenu();


_______________________________________________
scribus-commit mailing list
scribus-commit@lists.scribus.net
http://lists.scribus.net/mailman/listinfo/scribus-commit