From: André Pönitz <poenitz@gmx.net>
Date: Sat, 20 Sep 2008 11:47:38 +0000 (+0000)
Subject: cosmetics;
X-Git-Tag: 1.6.10~3406
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ae62ef20f89a2bf0f91b8a6e2bcf735c660cb733;p=features.git

cosmetics;
also use QT_NO_CAST_TO_ASCII and QT_NO_STL for better checks on type
conversions


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

diff --git a/src/frontends/qt4/BulletsModule.cpp b/src/frontends/qt4/BulletsModule.cpp
index 876fa9d57c..438fa0475a 100644
--- a/src/frontends/qt4/BulletsModule.cpp
+++ b/src/frontends/qt4/BulletsModule.cpp
@@ -20,7 +20,8 @@ using namespace std;
 
 namespace lyx {
 
-BulletsModule::BulletsModule(QWidget * , char const * , Qt::WFlags)
+BulletsModule::BulletsModule(QWidget * parent)
+    : QWidget(parent)
 {
 	setupUi(this);
 
@@ -186,7 +187,7 @@ void BulletsModule::setBullet(int level, Bullet const & bullet)
 }
 
 
-Bullet const & BulletsModule::getBullet(int level) const
+Bullet const & BulletsModule::bullet(int level) const
 {
 	return bullets_[level];
 }
diff --git a/src/frontends/qt4/BulletsModule.h b/src/frontends/qt4/BulletsModule.h
index b0577fb6c4..8feeb22b90 100644
--- a/src/frontends/qt4/BulletsModule.h
+++ b/src/frontends/qt4/BulletsModule.h
@@ -9,9 +9,8 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef QBULLETSMODULE_H
-#define QBULLETSMODULE_H
-
+#ifndef BULLETSMODULE_H
+#define BULLETSMODULE_H
 
 #include "ui_BulletsUi.h"
 #include "Bullet.h"
@@ -21,17 +20,18 @@
 
 namespace lyx {
 
-class BulletsModule : public QWidget, public Ui::BulletsUi {
+class BulletsModule : public QWidget, public Ui::BulletsUi
+{
 	Q_OBJECT
 
 public:
 	///
-	BulletsModule(QWidget * parent = 0, const char * name = 0, Qt::WFlags fl = 0);
+	BulletsModule(QWidget * parent = 0);
 
 	/// set a bullet
 	void setBullet(int level, Bullet const & bullet);
 	/// get bullet setting
-	Bullet const & getBullet(int level) const;
+	Bullet const & bullet(int level) const;
 	/// update 1st level
 	void init();
 
diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 60cccaadb1..b8e56d73cf 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -1543,10 +1543,10 @@ void GuiDocument::apply(BufferParams & params)
 	}
 
 	// bullets
-	params.user_defined_bullet(0) = bulletsModule->getBullet(0);
-	params.user_defined_bullet(1) = bulletsModule->getBullet(1);
-	params.user_defined_bullet(2) = bulletsModule->getBullet(2);
-	params.user_defined_bullet(3) = bulletsModule->getBullet(3);
+	params.user_defined_bullet(0) = bulletsModule->bullet(0);
+	params.user_defined_bullet(1) = bulletsModule->bullet(1);
+	params.user_defined_bullet(2) = bulletsModule->bullet(2);
+	params.user_defined_bullet(3) = bulletsModule->bullet(3);
 
 	// packages
 	params.graphicsDriver =
diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 14eeea81b2..b20fc223f2 100644
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -39,6 +39,8 @@ liblyxqt4_la_LIBADD = $(QT4_LIB)
 
 AM_CPPFLAGS += \
 	$(QT4_CPPFLAGS) \
+	-DQT_NO_CAST_TO_ASCII \
+	-DQT_NO_STL \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/frontends \
 	-I$(top_srcdir)/images \