clean up the function renaming cleanup

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13613 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/BulletsModule.C b/src/frontends/qt4/BulletsModule.C
index 0bc09e3fc3ef3cc01b0fa1a4796688b0464fd880..7c84657ee04804db1fbfb1d38f1a8307fa4a82ef 100644 (file)
--- a/src/frontends/qt4/BulletsModule.C
+++ b/src/frontends/qt4/BulletsModule.C
@@ -26,7 +26,7 @@
 
 #include <boost/assert.hpp>
 
-using lyx::support::LibFileSearch;
+using lyx::support::libFileSearch;
 
 using std::string;
 
@@ -89,22 +89,22 @@ BulletsModule::BulletsModule(QWidget * parent,  const char * name, Qt::WFlags fl
 
        // insert pixmaps
        string bmfile;
-       bmfile = LibFileSearch("images", "standard", "xpm");
+       bmfile = libFileSearch("images", "standard", "xpm");
        standard_->insertItem(QPixmap(toqstr(bmfile)));
 
-       bmfile = LibFileSearch("images", "amssymb", "xpm");
+       bmfile = libFileSearch("images", "amssymb", "xpm");
        maths_->insertItem(QPixmap(toqstr(bmfile)));
 
-       bmfile = LibFileSearch("images", "psnfss1", "xpm");
+       bmfile = libFileSearch("images", "psnfss1", "xpm");
        ding1_->insertItem(QPixmap(toqstr(bmfile)));
 
-       bmfile = LibFileSearch("images", "psnfss2", "xpm");
+       bmfile = libFileSearch("images", "psnfss2", "xpm");
        ding2_->insertItem(QPixmap(toqstr(bmfile)));
 
-       bmfile = LibFileSearch("images", "psnfss3", "xpm");
+       bmfile = libFileSearch("images", "psnfss3", "xpm");
        ding3_->insertItem(QPixmap(toqstr(bmfile)));
 
-       bmfile = LibFileSearch("images", "psnfss4", "xpm");
+       bmfile = libFileSearch("images", "psnfss4", "xpm");
        ding4_->insertItem(QPixmap(toqstr(bmfile)));
 
        connect(standard_, SIGNAL(selected(int, int)),

diff --git a/src/frontends/qt4/QBibtex.C b/src/frontends/qt4/QBibtex.C
index 71d56e5ead8666ef6223a52372698ec1ce33d61a..e18b6f2520489e7a59d0347d6bd61201e5fb22f0 100644 (file)
--- a/src/frontends/qt4/QBibtex.C
+++ b/src/frontends/qt4/QBibtex.C
@@ -23,7 +23,7 @@
 
 #include "controllers/ControlBibtex.h"
 
-#include "support/filetools.h" // ChangeExtension
+#include "support/filetools.h" // changeExtension
 #include "support/lstrings.h"
 
 #include <qpushbutton.h>
@@ -31,7 +31,7 @@
 #include <qcheckbox.h>
 
 
-using lyx::support::ChangeExtension;
+using lyx::support::changeExtension;
 using lyx::support::split;
 using lyx::support::trim;
 
@@ -91,7 +91,7 @@ void QBibtex::update_contents()
        controller().getBibFiles(bib_str);
        for (vector<string>::const_iterator it = bib_str.begin();
                it != bib_str.end(); ++it) {
-               string bibItem(ChangeExtension(*it, ""));
+               string bibItem(changeExtension(*it, ""));
                dialog_->add_->bibLB->insertItem(toqstr(bibItem));
        }
 
@@ -118,7 +118,7 @@ void QBibtex::update_contents()
        controller().getBibStyles(str);
        for (vector<string>::const_iterator it = str.begin();
                it != str.end(); ++it) {
-               string item(ChangeExtension(*it, ""));
+               string item(changeExtension(*it, ""));
                if (item == bibstyle)
                        item_nr = int(it - str.begin());
                dialog_->styleCB->insertItem(toqstr(item));

diff --git a/src/frontends/qt4/QBibtexDialog.C b/src/frontends/qt4/QBibtexDialog.C
index 11ea7a06afa20e4e5710ad777e993c1f0afda235..a682a65fd316fe952319cdd568da20cca84c707d 100644 (file)
--- a/src/frontends/qt4/QBibtexDialog.C
+++ b/src/frontends/qt4/QBibtexDialog.C
@@ -29,7 +29,7 @@
 #include <qlineedit.h>
 #include <q3listbox.h>
 
-using lyx::support::ChangeExtension;
+using lyx::support::changeExtension;
 using lyx::support::trim;
 
 using std::string;
@@ -111,7 +111,7 @@ void QBibtexDialog::browsePressed()
        string const file = form_->controller().browseBst("");
 
        if (!file.empty()) {
-               string const filen = ChangeExtension(file, "");
+               string const filen = changeExtension(file, "");
                bool present = false;
                unsigned int pres = 0;
 
@@ -136,7 +136,7 @@ void QBibtexDialog::browseBibPressed()
        string const file = trim(form_->controller().browseBib(""));
 
        if (!file.empty()) {
-               string const f = ChangeExtension(file, "");
+               string const f = changeExtension(file, "");
                bool present = false;
 
                for (unsigned int i = 0; i != add_->bibLB->count(); i++) {
@@ -180,7 +180,7 @@ void QBibtexDialog::addDatabase()
        }
 
        if (!file.empty()) {
-               QString const f = toqstr(ChangeExtension(file, ""));
+               QString const f = toqstr(changeExtension(file, ""));
                if ((databaseLB->findItem(f)) == 0)
                        databaseLB->insertItem(f);
        }

diff --git a/src/frontends/qt4/QCommandBuffer.C b/src/frontends/qt4/QCommandBuffer.C
index 76610a8ff02d757a6716b71787da25501d31f216..aea7f31a5c81728be272a45a1c7ac86225c8c3a5 100644 (file)
--- a/src/frontends/qt4/QCommandBuffer.C
+++ b/src/frontends/qt4/QCommandBuffer.C
@@ -33,7 +33,7 @@
 #include <QToolTip>
 #include <QPushButton>
 
-using lyx::support::LibFileSearch;
+using lyx::support::libFileSearch;
 
 using std::vector;
 using std::string;
@@ -77,8 +77,8 @@ protected:
 QCommandBuffer::QCommandBuffer(QtView * view, ControlCommandBuffer & control, QWidget * parent)
        : QWidget(parent), view_(view), controller_(control)
 {
-       QPixmap qpup(toqstr(LibFileSearch("images", "up", "xpm")));
-       QPixmap qpdown(toqstr(LibFileSearch("images", "down", "xpm")));
+       QPixmap qpup(toqstr(libFileSearch("images", "up", "xpm")));
+       QPixmap qpdown(toqstr(libFileSearch("images", "down", "xpm")));
 
        QVBoxLayout * top = new QVBoxLayout(this);
        QHBoxLayout * layout = new QHBoxLayout(0);

diff --git a/src/frontends/qt4/QTexinfo.C b/src/frontends/qt4/QTexinfo.C
index d874cc8063a7d65f24f306720db3f45bad21b853..71d1f7b4248ed8604068b0dd51086f30f90801b4 100644 (file)
--- a/src/frontends/qt4/QTexinfo.C
+++ b/src/frontends/qt4/QTexinfo.C
@@ -21,8 +21,6 @@
 #include <q3listbox.h>
 #include <qpushbutton.h>
 
-using lyx::support::OnlyFilename;
-
 using std::string;
 
 namespace lyx {

diff --git a/src/frontends/qt4/QtView.C b/src/frontends/qt4/QtView.C
index 7cb47096a7ebff67b0609f18c1b5fb29f172cd3a..03ad639a45a215fee7aa2596d396202756f1f46d 100644 (file)
--- a/src/frontends/qt4/QtView.C
+++ b/src/frontends/qt4/QtView.C
@@ -57,7 +57,7 @@ FontLoader fontloader;
 namespace lyx {
 
 using support::subst;
-using support::LibFileSearch;
+using support::libFileSearch;
 
 namespace frontend {
 
@@ -93,7 +93,7 @@ QtView::QtView(unsigned int width, unsigned int height)
 #ifndef Q_WS_MACX
        //  assign an icon to main form. We do not do it under Qt/Mac,
        //  since the icon is provided in the application bundle.
-       string const iconname = LibFileSearch("images", "lyx", "xpm");
+       string const iconname = libFileSearch("images", "lyx", "xpm");
        if (!iconname.empty())
                setIcon(QPixmap(toqstr(iconname)));
 #endif

diff --git a/src/frontends/qt4/emptytable.C b/src/frontends/qt4/emptytable.C
index d64bff367bf30d10f78519db516fb80e9bcaeb5d..8b913d17d1b518544667e3261e4ffc6c8a796925 100644 (file)
--- a/src/frontends/qt4/emptytable.C
+++ b/src/frontends/qt4/emptytable.C
@@ -109,4 +109,4 @@ void EmptyTable::mouseMoveEvent(QMouseEvent *ev)
        if (y > 0)
                setNumberRows(y / cellsize + rowCount()-1);
 }
-*/
\ No newline at end of file
+*/

diff --git a/src/frontends/qt4/qfont_loader.C b/src/frontends/qt4/qfont_loader.C
index 95c703960eb4bca8266d93b790d1fd29ae9487dd..a822680b47fbfb229fee86f0b7a0fdfadf143582 100644 (file)
--- a/src/frontends/qt4/qfont_loader.C
+++ b/src/frontends/qt4/qfont_loader.C
@@ -35,10 +35,6 @@
 #endif
 
 using lyx::support::contains;
-using lyx::support::LibFileSearch;
-using lyx::support::OnlyPath;
-using lyx::support::QuoteName;
-using lyx::support::Systemcall;
 
 using std::endl;
 using std::make_pair;