X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiToolbar.h;h=31146ee3999c7fff26c43d695a62e35bf0c5010e;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=5c0ea4196e2b6c86f2d09b9de2f6571c8b5d286d;hpb=051a50439dd3c6e71771cbc72d5f5addefc41e64;p=lyx.git

diff --git a/src/frontends/qt4/GuiToolbar.h b/src/frontends/qt4/GuiToolbar.h
index 5c0ea4196e..31146ee399 100644
--- a/src/frontends/qt4/GuiToolbar.h
+++ b/src/frontends/qt4/GuiToolbar.h
@@ -18,15 +18,10 @@
 
 #include "Session.h"
 
-#include <QAbstractProxyModel>
-#include <QComboBox>
 #include <QList>
 #include <QToolBar>
 #include <QToolButton>
 
-class QSortFilterProxyModel;
-class QStandardItemModel;
-
 namespace lyx {
 
 class DocumentClass;
@@ -39,76 +34,10 @@ class GuiCommandBuffer;
 class GuiLayoutFilterModel;
 class GuiToolbar;
 class GuiView;
-class LayoutItemDelegate;
+class LayoutBox;
 class ToolbarInfo;
 class ToolbarItem;
 
-class GuiLayoutBox : public QComboBox
-{
-	Q_OBJECT
-public:
-	GuiLayoutBox(GuiToolbar * bar, GuiView &);
-
-	/// select the right layout in the combobox.
-	void set(docstring const & layout);
-	/// Populate the layout combobox.
-	void updateContents(bool reset);
-	/// Add Item to Layout box according to sorting settings from preferences
-	void addItemSort(docstring const & item, docstring const & category,
-		bool sorted, bool sortedByCat, bool unknown);
-
-	///
-	void showPopup();
-	
-	///
-	bool eventFilter(QObject * o, QEvent * e);
-	///
-	QString const & filter() { return filter_; }
-
-private Q_SLOTS:
-	///
-	void selected(int index);
-	///
-	void setIconSize(QSize size);
-
-private:
-	friend class LayoutItemDelegate;
-
-	///
-	void resetFilter();
-	///
-	void setFilter(QString const & s);
-	///
-	QString charFilterRegExp(QString const & filter);
-	///
-	void countCategories();
-	
-	///
-	GuiView & owner_;
-	///
-	GuiToolbar * bar_;
-	///
-	DocumentClass const * text_class_;
-	///
-	Inset const * inset_;
-	
-	/// the layout model: 1st column translated, 2nd column raw layout name
-	QStandardItemModel * model_;
-	/// the proxy model filtering \c model_
-	GuiLayoutFilterModel * filterModel_;
-	/// the (model-) index of the last successful selection
-	int lastSel_;
-	/// the character filter
-	QString filter_;
-	///
-	LayoutItemDelegate * layoutItemDelegate_;
-	///
-	unsigned visibleCategories_;
-	///
-	bool inShowPopup_;
-};
-
-
 class MenuButton : public QToolButton
 {
 	Q_OBJECT
@@ -193,8 +122,6 @@ private:
 	///
 	GuiView & owner_;
 	///
-	GuiLayoutBox * layout_;
-	///
 	GuiCommandBuffer * command_buffer_;
 	///
 	ToolbarInfo const & tbinfo_;