From: Lars Gullik Bjønnes <larsbj@gullik.org>
Date: Mon, 5 Mar 2001 10:16:03 +0000 (+0000)
Subject: qtchar.diff
X-Git-Tag: 1.6.10~21532
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=078e4c896c8afde6c892dde83d44cb9b4af9a29e;p=lyx.git

qtchar.diff


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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 2f4a7129db..f31e4090a2 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,12 @@
+2001-02-16  Edwin Leuven  <leuven@fee.uva.nl>
+
+	* remove inheritance from noncopyable in Form*.h
+	* Character dialog added:
+	* FormCharacter.[Ch]
+	* chardlg.ui
+	* chardlg.[Ch]
+	* chardlgimpl.[Ch]
+	
 2001-02-16  John Levon  <moz@compsoc.man.ac.uk>
 
 	* FormParagraph.C: fix bview->update()
diff --git a/src/frontends/qt2/Dialogs.C b/src/frontends/qt2/Dialogs.C
index 89bb944a44..1f6b9cfb02 100644
--- a/src/frontends/qt2/Dialogs.C
+++ b/src/frontends/qt2/Dialogs.C
@@ -12,6 +12,7 @@
 #include <config.h>
 
 #include "Dialogs.h"
+#include "FormCharacter.h"
 #include "FormCitation.h"
 #include "FormCopyright.h"
 #include "FormDocument.h"
@@ -44,6 +45,7 @@ Signal0<void> Dialogs::redrawGUI;
 
 Dialogs::Dialogs(LyXView * lv)
 {
+	dialogs_.push_back(new FormCharacter(lv, this));
 	dialogs_.push_back(new FormCitation(lv, this));
 	dialogs_.push_back(new FormCopyright(lv, this));
 	dialogs_.push_back(new FormDocument(lv, this));
diff --git a/src/frontends/qt2/FormCopyright.h b/src/frontends/qt2/FormCopyright.h
index d0a9af86a6..852d051f21 100644
--- a/src/frontends/qt2/FormCopyright.h
+++ b/src/frontends/qt2/FormCopyright.h
@@ -28,7 +28,7 @@ class FormCopyrightDialog;
 /**
   @author Jürgen Vigna
   */
-class FormCopyright : public DialogBase, public noncopyable {
+class FormCopyright : public DialogBase {
 public: 
 	FormCopyright(LyXView *, Dialogs *);
 	~FormCopyright();
diff --git a/src/frontends/qt2/FormParagraph.h b/src/frontends/qt2/FormParagraph.h
index d560d86456..8c061b80cf 100644
--- a/src/frontends/qt2/FormParagraph.h
+++ b/src/frontends/qt2/FormParagraph.h
@@ -17,7 +17,7 @@ class Dialogs;
 class LyXView;
 class ParagraphDlgImpl;
 
-class FormParagraph : public DialogBase, public noncopyable {
+class FormParagraph : public DialogBase {
 public: 
 	/**@name Constructors and Destructors */
 	//@{
diff --git a/src/frontends/qt2/FormPrint.h b/src/frontends/qt2/FormPrint.h
index bd8fe30524..5af1912af6 100644
--- a/src/frontends/qt2/FormPrint.h
+++ b/src/frontends/qt2/FormPrint.h
@@ -19,7 +19,7 @@ class PrintDlgImpl;
 using SigC::Connection;
 #endif
 
-class FormPrint : public DialogBase, public noncopyable {
+class FormPrint : public DialogBase {
 public: 
 	/**@name Constructors and Destructors */
 	//@{
diff --git a/src/frontends/qt2/FormTabularCreate.h b/src/frontends/qt2/FormTabularCreate.h
index cfae3318f9..9fa0223d88 100644
--- a/src/frontends/qt2/FormTabularCreate.h
+++ b/src/frontends/qt2/FormTabularCreate.h
@@ -23,7 +23,7 @@ class Dialogs;
 class LyXView; 
 class TabularCreateDlgImpl;
 
-class FormTabularCreate : public DialogBase, public noncopyable {
+class FormTabularCreate : public DialogBase {
 public: 
 	/**@name Constructors and Destructors */
 	//@{
diff --git a/src/frontends/qt2/Makefile.am b/src/frontends/qt2/Makefile.am
index 96cbe3756c..46e5d6f852 100644
--- a/src/frontends/qt2/Makefile.am
+++ b/src/frontends/qt2/Makefile.am
@@ -11,6 +11,8 @@ CXXFLAGS= $(DEFINES)
 # moc generated files
 BUILTSOURCES = 	moc_FormCopyrightDialogBase.C \
                 moc_FormCopyrightDialog.C \
+	       moc_chardlg.C \
+	       moc_chardlgimpl.C \
 	       moc_paragraphdlg.C \
 	       moc_paragraphdlgimpl.C \
 	       moc_printdlg.C \
@@ -64,6 +66,12 @@ libqt2_la_SOURCES = \
 	$(BUILTSOURCES) \
 	Dialogs.C \
 	GUIRunTime.C \
+	FormCharacter.C	\
+	FormCharacter.h	\
+	chardlg.C \
+	chardlg.h \
+	chardlgimpl.C \
+	chardlgimpl.h \
 	FormCopyright.C	\
 	FormCopyright.h	\
 	FormCopyrightDialog.C \
@@ -146,3 +154,14 @@ moc_tabularcreatedlgimpl.C: tabularcreatedlgimpl.h
 	$(MOC) -o $@ $<
 moc_emptytable.C: emptytable.h
 	$(MOC) -o $@ $<
+
+FormCharacter.C: chardlg.h
+chardlg.h: chardlg.ui
+	$(UIC) -o $@ $<
+chardlg.C: chardlg.ui
+	$(UIC) -impl chardlg.h -o $@ $<
+moc_chardlg.C: chardlg.h
+	$(MOC) -o $@ $<
+moc_chardlgimpl.C: chardlgimpl.h
+	$(MOC) -o $@ $<
+