Those classes (and their associated [Ch] files) are renamed :

QLAction -> Action
lcolorcache -> ColorCache
qfont_loader.C -> FontLoader




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

src/frontends/qt4/Action.C

@@ -1,5 +1,5 @@
 /**
- * \file QLAction.C
+ * \file Action.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -22,7 +22,7 @@
 #include "LyXView.h"
 #include "qt_helpers.h"
 
-#include "QLAction.h"
+#include "Action.h"
 
 #include "support/lstrings.h"
 
@@ -39,7 +39,7 @@ int const statusbar_timer_value = 3000;
 
 } // namespace anon
 
-QLAction::QLAction(LyXView & lyxView, string const & text,
+Action::Action(LyXView & lyxView, string const & text,
 		FuncRequest const & func, string const & tooltip)
 		: QAction(this), lyxView_(lyxView), func_(func)
 {
@@ -50,7 +50,7 @@ QLAction::QLAction(LyXView & lyxView, string const & text,
 	this->setCheckable(true);
 }
 
-QLAction::QLAction(LyXView & lyxView, string const & icon, string const & text,
+Action::Action(LyXView & lyxView, string const & icon, string const & text,
 		FuncRequest const & func, string const & tooltip)
 		: QAction(this), lyxView_(lyxView), func_(func)
 {
@@ -63,13 +63,13 @@ QLAction::QLAction(LyXView & lyxView, string const & icon, string const & text,
 }
 
 /*
-void QLAction::setAction(FuncRequest const & func)
+void Action::setAction(FuncRequest const & func)
 {
 	func_=func;
 }
 */
 
-void QLAction::update()
+void Action::update()
 {
 	FuncStatus const status = lyxView_.getLyXFunc().getStatus(func_);
 
@@ -78,7 +78,7 @@ void QLAction::update()
 }
 
 
-void QLAction::action()
+void Action::action()
 {
 //	lyxerr[Debug::ACTION] << "calling LyXFunc::dispatch: func_: " << func_ << endl;
 
@@ -88,4 +88,4 @@ void QLAction::action()
 } // namespace frontend
 } // namespace lyx
 
-#include "QLAction_moc.cpp"
+#include "Action_moc.cpp"

src/frontends/qt4/Action.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file QLAction.h
+ * \file Action.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -9,8 +9,8 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef QLACTION_H
-#define QLACTION_H
+#ifndef ACTION_H
+#define ACTION_H
 
 // Must be here because of moc.
 #include <config.h>
@@ -28,18 +28,18 @@ namespace lyx {
 namespace frontend {
 
 /**
- * QLAction - Qt interface with LyX' FuncRequest.
+ * Action - Qt interface with LyX' FuncRequest.
  *
- * QLAction can be used in LyX menubar and/or toolbars.
+ * Action can be used in LyX menubar and/or toolbars.
  */
-class QLAction: public QAction {
+class Action: public QAction {
 	Q_OBJECT
 public:
 
-	QLAction(LyXView & lyxView, std::string const & text,
+	Action(LyXView & lyxView, std::string const & text,
 		FuncRequest const & func, std::string const & tooltip="");
 
-	QLAction(LyXView & lyxView, std::string const & icon, std::string const & text,
+	Action(LyXView & lyxView, std::string const & icon, std::string const & text,
 		FuncRequest const & func, std::string const & tooltip="");
 
 	void update();
@@ -59,4 +59,4 @@ private:
 } // namespace frontend
 } // namespace lyx
 
-#endif // QLACTION_H
+#endif // ACTION_H

src/frontends/qt4/ColorCache.C

@@ -1,5 +1,5 @@
 /**
- * \file lcolorcache.C
+ * \file ColorCache.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,11 +11,11 @@
 #include <config.h>
 
 #include "Color.h"
-#include "lcolorcache.h"
+#include "ColorCache.h"
 
 #include "LColor.h"
 
-LColorCache lcolorcache;
+ColorCache lcolorcache;
 
 const QColor grey40(0x66, 0x66, 0x66);
 const QColor grey60(0x99, 0x99, 0x99);
@@ -24,11 +24,11 @@ const QColor grey90(0xe5, 0xe5, 0xe5);
 const QColor none = Qt::black;
 
 
-LColorCache::LColorCache()
+ColorCache::ColorCache()
 {
 }
 
-QColor const & LColorCache::get(LColor_color col) const
+QColor const & ColorCache::get(LColor_color col) const
 {
 	lcolor_map::const_iterator cit = colormap.find(col);
 	if (cit != colormap.end())
@@ -51,7 +51,7 @@ QColor const & LColorCache::get(LColor_color col) const
 }
 
 
-void LColorCache::clear()
+void ColorCache::clear()
 {
 	colormap.clear();
 }

src/frontends/qt4/ColorCache.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file lcolorcache.h
+ * \file ColorCache.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -9,8 +9,8 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef LCOLORCACHE_H
-#define LCOLORCACHE_H
+#ifndef COLORCACHE_H
+#define COLORCACHE_H
 
 #include "LColor.h"
 
@@ -29,9 +29,9 @@ struct RGBColor;
 /**
  * Cache from LColor to QColor.
  */
-class LColorCache {
+class ColorCache {
 public:
-	LColorCache();
+	ColorCache();
 
 	/// get the given color
 	QColor const & get(LColor_color color) const;
@@ -46,8 +46,8 @@ private:
 };
 
 /// singleton instance
-extern LColorCache lcolorcache;
+extern ColorCache lcolorcache;
 
 ///
 QColor const rgb2qcolor(lyx::RGBColor const &);
-#endif // LCOLORCACHE_H
+#endif // COLORCACHE_H

src/frontends/qt4/FontLoader.C

@@ -11,7 +11,7 @@
 
 #include <config.h>
 
-#include "qfont_loader.h"
+#include "FontLoader.h"
 #include "qt_helpers.h"
 
 #include "debug.h"

src/frontends/qt4/FontLoader.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file qfont_loader.h
+ * \file FontLoader.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *

src/frontends/qt4/Makefile.am

@@ -32,7 +32,9 @@ AM_CPPFLAGS += \
 libqt4_la_SOURCES = \
 	QDialogView.C \
 	QDialogView.h \
+	Action.C Action.h \
 	Alert_pimpl.C \
+	ColorCache.h ColorCache.C \
 	Dialogs.C \
 	FileDialog.C \
 	LyXKeySymFactory.C \
@@ -56,7 +58,6 @@ libqt4_la_SOURCES = \
 	QGraphics.C QGraphics.h \
 	QInclude.C QInclude.h \
 	QIndex.C QIndex.h \
-	QLAction.C QLAction.h \
 	QLImage.C QLImage.h \
 	QLog.C QLog.h \
 	QViewSource.C QViewSource.h \
@@ -85,10 +86,9 @@ libqt4_la_SOURCES = \
 	WorkAreaFactory.C \
 	checkedwidgets.C checkedwidgets.h \
 	lyx_gui.C \
-	lcolorcache.h lcolorcache.C \
 	panelstack.h panelstack.C \
 	qfontexample.h qfontexample.C \
-	qfont_loader.h qfont_loader.C \
+	FontLoader.h FontLoader.C \
 	qfont_metrics.C \
 	qlkey.h \
 	qt_helpers.h qt_helpers.C \

src/frontends/qt4/Makefile.dialogs

@@ -72,6 +72,7 @@ UIFILES = \
 	QWrapUi.ui
 
 MOCFILES = \
+	Action.C Action.h \
 	BulletsModule.C BulletsModule.h \
 	emptytable.C emptytable.h \
 	FileDialog_private.C FileDialog_private.h \
@@ -100,7 +101,6 @@ MOCFILES = \
 	QGraphicsDialog.C QGraphicsDialog.h \
 	QIncludeDialog.C QIncludeDialog.h \
 	QIndexDialog.C QIndexDialog.h \
-	QLAction.C QLAction.h \
 	QLogDialog.C QLogDialog.h \
 	QViewSourceDialog.C QViewSourceDialog.h \
 	QViewSource.C QViewSource.h \

src/frontends/qt4/QBranches.C

@@ -13,7 +13,7 @@
 
 #include "QBranches.h"
 
-#include "lcolorcache.h"
+#include "ColorCache.h"
 #include "validators.h"
 #include "qt_helpers.h"
 

src/frontends/qt4/QLPainter.C

@@ -16,8 +16,8 @@
 #include "QWorkArea.h"
 #include "QLImage.h"
 
-#include "lcolorcache.h"
-#include "qfont_loader.h"
+#include "ColorCache.h"
+#include "FontLoader.h"
 
 #include "debug.h"
 #include "language.h"

src/frontends/qt4/QLPopupMenu.C

@@ -17,7 +17,7 @@
 // All is well if the namespace is visible first.
 #include "QtView.h"
 
-#include "QLAction.h"
+#include "Action.h"
 #include "QLPopupMenu.h"
 #include "QLMenubar.h"
 #include "qt_helpers.h"
@@ -120,7 +120,7 @@ void QLPopupMenu::populate(QMenu* qMenu, Menu * menu)
 			string label = getLabel(*m);
 			addBinding(label, *m);
 
-			QLAction * action = new QLAction(*(owner_->view()), label, m->func());
+			Action * action = new Action(*(owner_->view()), label, m->func());
 			action->setEnabled(m->status().enabled());
 			action->setChecked(m->status().onoff(true));
 			// Actually insert the menu item

src/frontends/qt4/QLToolbar.C

@@ -26,7 +26,7 @@
 
 #include "QtView.h"
 #include "QLToolbar.h"
-#include "QLAction.h"
+#include "Action.h"
 #include "qt_helpers.h"
 #include "InsertTableWidget.h"
 
@@ -256,7 +256,7 @@ void QLToolbar::add(FuncRequest const & func, string const & tooltip)
 		if (owner_.getLyXFunc().getStatus(func).unknown())
 			break;
 
-		QLAction * action = new QLAction(owner_, toolbarbackend.getIcon(func), "", func, tooltip);
+		Action * action = new Action(owner_, toolbarbackend.getIcon(func), "", func, tooltip);
 		toolbar_->addAction(action);
 		ActionVector.push_back(action);
 		break;

src/frontends/qt4/QLToolbar.h

@@ -30,7 +30,7 @@ namespace frontend {
 
 class QLayoutBox;
 class QtView;
-class QLAction;
+class Action;
 
 
 class QLayoutBox : public QObject, public LayoutBox {
@@ -76,7 +76,7 @@ signals:
 
 private:
 
-	std::vector<QLAction *> ActionVector;
+	std::vector<Action *> ActionVector;
 	QtView & owner_;
 	QToolBar * toolbar_;
 

src/frontends/qt4/QPrefs.C

@@ -13,7 +13,7 @@
 #include "QPrefs.h"
 #include "QPrefsDialog.h"
 
-#include "lcolorcache.h"
+#include "ColorCache.h"
 #include "Qt2BC.h"
 #include "qt_helpers.h"
 

src/frontends/qt4/QPrefsDialog.C

@@ -13,7 +13,7 @@
 #include "debug.h"
 #include "qt_helpers.h"
 
-#include "lcolorcache.h"
+#include "ColorCache.h"
 #include "Qt2BC.h"
 #include "qt_helpers.h"
 
@@ -40,7 +40,7 @@
 
 #include "gettext.h"
 #include "LColor.h"
-#include "lcolorcache.h"
+#include "ColorCache.h"
 
 #include "controllers/ControlPrefs.h"
 

src/frontends/qt4/QWorkArea.C

@@ -18,7 +18,7 @@
 #include "QLyXKeySym.h"
 #include "QtView.h"
 
-#include "lcolorcache.h"
+#include "ColorCache.h"
 #include "qt_helpers.h"
 #include "BufferView.h"
 #include "debug.h"

src/frontends/qt4/QtView.C

@@ -35,7 +35,7 @@
 
 #include "QtView.h"
 #include "QLMenubar.h"
-#include "qfont_loader.h"
+#include "FontLoader.h"
 #include "QCommandBuffer.h"
 #include "qt_helpers.h"
 

src/frontends/qt4/lyx_gui.C

@@ -43,8 +43,8 @@
 #include <boost/shared_ptr.hpp>
 
 #include "QtView.h"
-#include "lcolorcache.h"
-#include "qfont_loader.h"
+#include "ColorCache.h"
+#include "FontLoader.h"
 #include "QLImage.h"
 #include "qt_helpers.h"
 #include "socket_callback.h"

src/frontends/qt4/qfont_metrics.C

@@ -14,7 +14,7 @@
 #include "frontends/font_metrics.h"
 #include "frontends/lyx_gui.h"
 
-#include "qfont_loader.h"
+#include "FontLoader.h"
 
 #include "language.h"
 

src/frontends/qt4/qfontexample.C

@@ -12,8 +12,7 @@
 
 #include "qfontexample.h"
 
-#include <qpainter.h>
-//Added by qt3to4:
+#include <QPainter>
 #include <QPaintEvent>
 
 void QFontExample::set(QFont const & font, QString const & text)