From 61709265126913836cb408a19dc57d612ed0acdc Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Sun, 9 Apr 2006 08:42:58 +0000 Subject: [PATCH] clean up the function renaming cleanup git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13613 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/BulletsModule.C | 14 +++++++------- src/frontends/qt4/QBibtex.C | 8 ++++---- src/frontends/qt4/QBibtexDialog.C | 8 ++++---- src/frontends/qt4/QCommandBuffer.C | 6 +++--- src/frontends/qt4/QTexinfo.C | 2 -- src/frontends/qt4/QtView.C | 4 ++-- src/frontends/qt4/emptytable.C | 2 +- src/frontends/qt4/qfont_loader.C | 4 ---- 8 files changed, 21 insertions(+), 27 deletions(-) diff --git a/src/frontends/qt4/BulletsModule.C b/src/frontends/qt4/BulletsModule.C index 0bc09e3fc3..7c84657ee0 100644 --- a/src/frontends/qt4/BulletsModule.C +++ b/src/frontends/qt4/BulletsModule.C @@ -26,7 +26,7 @@ #include -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 71d56e5ead..e18b6f2520 100644 --- 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 @@ -31,7 +31,7 @@ #include -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::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::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 11ea7a06af..a682a65fd3 100644 --- a/src/frontends/qt4/QBibtexDialog.C +++ b/src/frontends/qt4/QBibtexDialog.C @@ -29,7 +29,7 @@ #include #include -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 76610a8ff0..aea7f31a5c 100644 --- a/src/frontends/qt4/QCommandBuffer.C +++ b/src/frontends/qt4/QCommandBuffer.C @@ -33,7 +33,7 @@ #include #include -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 d874cc8063..71d1f7b424 100644 --- a/src/frontends/qt4/QTexinfo.C +++ b/src/frontends/qt4/QTexinfo.C @@ -21,8 +21,6 @@ #include #include -using lyx::support::OnlyFilename; - using std::string; namespace lyx { diff --git a/src/frontends/qt4/QtView.C b/src/frontends/qt4/QtView.C index 7cb47096a7..03ad639a45 100644 --- 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 d64bff367b..8b913d17d1 100644 --- 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 95c703960e..a822680b47 100644 --- 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; -- 2.39.2