reduce line noise

[features.git] / src / frontends / qt4 / GuiGraphics.cpp

diff --git a/src/frontends/qt4/GuiGraphics.cpp b/src/frontends/qt4/GuiGraphics.cpp
index 66a01ca51cf2a3dfd2f5f56bb642aaa4deb27360..5eb0fba11f66182d00e08e82001766cd5f81e0d9 100644 (file)
--- a/src/frontends/qt4/GuiGraphics.cpp
+++ b/src/frontends/qt4/GuiGraphics.cpp
@@ -22,7 +22,6 @@
 #include "LyXRC.h"
 #include "qt_helpers.h"
 #include "Validator.h"
-#include "frontend_helpers.h"
 
 #include "FuncRequest.h"
 #include "gettext.h"
@@ -95,7 +94,7 @@ using support::token;
  * checkbox is unchecked and clearing the line edit if it previously
  * said "text".
 */
-void setAutoTextCB(QCheckBox * checkBox, QLineEdit * lineEdit,
+static void setAutoTextCB(QCheckBox * checkBox, QLineEdit * lineEdit,
        LengthCombo * lengthCombo/*, string text = "auto"*/)
 {
        if (!checkBox->isChecked())
@@ -106,8 +105,6 @@ void setAutoTextCB(QCheckBox * checkBox, QLineEdit * lineEdit,
                                lengthCombo->currentLengthItem());
 }
 
-
-
 template<class Pair>
 vector<typename Pair::first_type> const
 getFirst(vector<Pair> const & pr)
@@ -129,6 +126,12 @@ getSecond(vector<Pair> const & pr)
         return tmp;
 }
 
+/// The (tranlated) GUI std::string and it's LaTeX equivalent.
+typedef std::pair<docstring, std::string> RotationOriginPair;
+///
+std::vector<RotationOriginPair> getRotationOriginData();
+
+
 GuiGraphics::GuiGraphics(LyXView & lv)
        : GuiDialog(lv, "graphics")
 {
@@ -279,7 +282,7 @@ void GuiGraphics::change_adaptor()
 void GuiGraphics::change_bb()
 {
        bbChanged = true;
-       LYXERR(Debug::GRAPHICS) << "[bb_Changed set to true]\n";
+       LYXERR(Debug::GRAPHICS, "[bb_Changed set to true]");
        changed();
 }
 
@@ -761,14 +764,15 @@ docstring const GuiGraphics::browse(docstring const & in_name) const
        // Does user clipart directory exist?
        string clipdir = addName(package().user_support().absFilename(), "clipart");
        FileName clip(clipdir);
-       if (!clip.exists() && clip.isDirectory())
-               // No - bail out to system clipart directory
+
+       // bail out to system clipart directory
+       if (!(clip.exists() && clip.isDirectory()))
                clipdir = addName(package().system_support().absFilename(), "clipart");
-       pair<docstring, docstring> dir1(_("Clipart|#C#c"), from_utf8(clipdir));
-       pair<docstring, docstring> dir2(_("Documents|#o#O"), from_utf8(lyxrc.document_path));
-       // Show the file browser dialog
+
        return browseRelFile(in_name, from_utf8(bufferFilepath()),
-               title, FileFilterList(), false, dir1, dir2);
+               title, FileFilterList(), false, 
+               _("Clipart|#C#c"), from_utf8(clipdir),
+               _("Documents|#o#O"), from_utf8(lyxrc.document_path));
 }
 
 
@@ -803,7 +807,7 @@ string const GuiGraphics::readBB(string const & file)
 bool GuiGraphics::isFilenameValid(string const & fname) const
 {
        // It may be that the filename is relative.
-       return makeAbsPath(fname, bufferFilepath()).isReadable();
+       return makeAbsPath(fname, bufferFilepath()).isFileReadable();
 }