[fondue-commits] [SCM] Fondue Font Editor branch, master, updated. 333e3ebf439fbb46c17eec9b008f734a92c1a1ac

[Eugeniy Meshcheryakov]

The following commit has been merged in the master branch:
commit 333e3ebf439fbb46c17eec9b008f734a92c1a1ac
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Tue Aug 12 16:56:49 2008 +0200

    fix some gcc warnings

diff --git a/gui/cvteditor.cxx b/gui/cvteditor.cxx
index 9336b50..316dbd2 100644
--- a/gui/cvteditor.cxx
+++ b/gui/cvteditor.cxx
@@ -26,7 +26,7 @@ CVTEditor::CVTEditor(class QAbstractItemModel *model, QWidget *parent) : QDialog
 	setAttribute(Qt::WA_DeleteOnClose);
 
 	Qt::WindowFlags flags = windowFlags();
-	setWindowFlags(flags & ~Qt::Dialog | Qt::Window);
+	setWindowFlags((flags & ~Qt::Dialog) | Qt::Window);
 
 	// Qt does not like this on non-top-level windows
 	setAttribute(Qt::WA_QuitOnClose, false);
diff --git a/gui/documentinfoeditor.cxx b/gui/documentinfoeditor.cxx
index cc292ee..789f7d7 100644
--- a/gui/documentinfoeditor.cxx
+++ b/gui/documentinfoeditor.cxx
@@ -28,8 +28,8 @@ DocumentInfoEditor::DocumentInfoEditor(QAbstractItemModel *model, QWidget *paren
 	setAttribute(Qt::WA_DeleteOnClose);
 
 	Qt::WindowFlags flags = windowFlags();
-	setWindowFlags(flags & ~Qt::Dialog | Qt::Window);
-	
+	setWindowFlags((flags & ~Qt::Dialog) | Qt::Window);
+
 	// Qt does not like this on non-top-level windows
 	setAttribute(Qt::WA_QuitOnClose, false);
 
diff --git a/gui/glyphpropertieseditor.cxx b/gui/glyphpropertieseditor.cxx
index 08dc3de..d0784b1 100644
--- a/gui/glyphpropertieseditor.cxx
+++ b/gui/glyphpropertieseditor.cxx
@@ -45,7 +45,7 @@ GlyphPropertiesEditor::GlyphPropertiesEditor(QAbstractItemModel *model, const QM
 	setAttribute(Qt::WA_DeleteOnClose);
 
 	Qt::WindowFlags flags = windowFlags();
-	setWindowFlags(flags & ~Qt::Dialog | Qt::Window);
+	setWindowFlags((flags & ~Qt::Dialog) | Qt::Window);
 
 	// Qt does not like this on non-top-level windows
 	setAttribute(Qt::WA_QuitOnClose, false);
diff --git a/gui/ttieditor.cxx b/gui/ttieditor.cxx
index de8733f..972d68c 100644
--- a/gui/ttieditor.cxx
+++ b/gui/ttieditor.cxx
@@ -39,7 +39,7 @@ TTIEditor::TTIEditor(QAbstractItemModel *model, const QModelIndex &item, QWidget
 	Q_ASSERT(model);
 
 	Qt::WindowFlags flags = windowFlags();
-	setWindowFlags(flags & ~Qt::Dialog | Qt::Window);
+	setWindowFlags((flags & ~Qt::Dialog) | Qt::Window);
 
 	setAttribute(Qt::WA_DeleteOnClose);
 

-- 
Fondue Font Editor