From 1e0c627c73d0af25498cf1e8d99ea4d7b8bc49ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= <larsbj@gullik.org>
Date: Tue, 17 Apr 2001 14:11:26 +0000
Subject: [PATCH] c++ mode and inherit privately from noncopyable

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1930 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/kde/ChangeLog         | 6 ++++++
 src/frontends/kde/dlg/emptytable.h  | 2 +-
 src/frontends/kde/dlg/lengthentry.h | 2 +-
 src/frontends/kde/dlg/tabstack.h    | 3 ++-
 src/graphics/ChangeLog              | 6 ++++++
 src/graphics/GraphicsCache.h        | 2 +-
 src/graphics/GraphicsCacheItem.h    | 2 +-
 src/graphics/ImageLoader.h          | 2 +-
 8 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/frontends/kde/ChangeLog b/src/frontends/kde/ChangeLog
index 1bf3a53dfe..a6bfe6afb3 100644
--- a/src/frontends/kde/ChangeLog
+++ b/src/frontends/kde/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-17  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+	* dlg/emptytable.h: C++ mode, inhrit privately from noncopyable
+	* dlg/tabstack.h: ditto
+	* dlg/lengthentry.h: ditto
+
 2001-04-03  John Levon  <moz@compsoc.man.ac.uk>
 
 	* Form*.C:
diff --git a/src/frontends/kde/dlg/emptytable.h b/src/frontends/kde/dlg/emptytable.h
index 4fcef29914..2e77893f6e 100644
--- a/src/frontends/kde/dlg/emptytable.h
+++ b/src/frontends/kde/dlg/emptytable.h
@@ -25,7 +25,7 @@
  * A simple widget for a quick "preview" in TabularCreateDialog.
  * The user can drag on the widget to change the table dimensions.
  */
-class EmptyTable : public QTableView, public boost::noncopyable {
+class EmptyTable : public QTableView, boost::noncopyable {
    Q_OBJECT
 public:
 	EmptyTable(QWidget * parent = 0, const char * name = 0);
diff --git a/src/frontends/kde/dlg/lengthentry.h b/src/frontends/kde/dlg/lengthentry.h
index 3fd06743d4..36df35de32 100644
--- a/src/frontends/kde/dlg/lengthentry.h
+++ b/src/frontends/kde/dlg/lengthentry.h
@@ -30,7 +30,7 @@ class QComboBox;
  * This widget provides a value edit and a combo box
  * for LyXLengths.
  */
-class LengthEntry : public QWidget, public boost::noncopyable {
+class LengthEntry : public QWidget, boost::noncopyable {
    Q_OBJECT
 public:
 	LengthEntry(QWidget * parent = 0, const char * name = 0);
diff --git a/src/frontends/kde/dlg/tabstack.h b/src/frontends/kde/dlg/tabstack.h
index 219de77506..3c0b827077 100644
--- a/src/frontends/kde/dlg/tabstack.h
+++ b/src/frontends/kde/dlg/tabstack.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /*
  * tabstack.h
  * (C) 2000 LyX Team
@@ -28,7 +29,7 @@ class QBoxLayout;
  * This widget provides a tab bar which can switch between a stack
  * of QFrames.
  */
-class TabStack : public QWidget, public boost::noncopyable {
+class TabStack : public QWidget, boost::noncopyable {
    Q_OBJECT
 public:
 	TabStack(QWidget * parent = 0, const char * name = 0);
diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog
index 3b8294e796..9ef681cf12 100644
--- a/src/graphics/ChangeLog
+++ b/src/graphics/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-17  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+	* GraphicsCache.h: inherit privately from noncopyable
+	* ImageLoader.h: ditto
+	* GraphicsCacheItem.h: ditto
+
 2001-04-16  Allan Rae  <rae@lyx.org>
 
 	* ImageLoaderXPM.C (runImageLoader): #warning triggers an error on Sun
diff --git a/src/graphics/GraphicsCache.h b/src/graphics/GraphicsCache.h
index 37eb8d1f08..712ad80062 100644
--- a/src/graphics/GraphicsCache.h
+++ b/src/graphics/GraphicsCache.h
@@ -31,7 +31,7 @@ class GraphicsCacheItem;
     GraphicsCache is a singleton class, there should be only one instance of
     it at any moment.
 */
-class GraphicsCache : public boost::noncopyable {
+class GraphicsCache : boost::noncopyable {
 public:
 	/// Get the instance of the class.
 	static GraphicsCache & getInstance();
diff --git a/src/graphics/GraphicsCacheItem.h b/src/graphics/GraphicsCacheItem.h
index f75b9a40db..5f22d950c5 100644
--- a/src/graphics/GraphicsCacheItem.h
+++ b/src/graphics/GraphicsCacheItem.h
@@ -29,7 +29,7 @@
 class LyXImage;
 
 /// A GraphicsCache item holder.
-class GraphicsCacheItem : public boost::noncopyable {
+class GraphicsCacheItem : boost::noncopyable {
 public:
 	/// c-tor
 	GraphicsCacheItem(string const & filename);
diff --git a/src/graphics/ImageLoader.h b/src/graphics/ImageLoader.h
index e2fe8b31b2..fa6f44d06b 100644
--- a/src/graphics/ImageLoader.h
+++ b/src/graphics/ImageLoader.h
@@ -29,7 +29,7 @@ class LyXImage;
  *  
  *  @Author Baruch Even, <baruch.even@writeme.com>
  */
-class ImageLoader : public boost::noncopyable {
+class ImageLoader : boost::noncopyable {
 public:
 	/// Errors that can be returned from this class.
 	enum Result {