rename Private -> LeitnerSystemViewPrivate, Private -> KEduVocDocumentPrivate

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=668638

diff --git a/kdeeducore/keduvocdocument.cpp b/kdeeducore/keduvocdocument.cpp
index 030658356f5593096367be4e89d8f050e5efe971..9f422bc4f51076bae1f8ca027373a7e0a20150a8 100644 (file)
--- a/kdeeducore/keduvocdocument.cpp
+++ b/kdeeducore/keduvocdocument.cpp
@@ -41,10 +41,10 @@
 #include "keduvocxdxfreader.h"
 #include "leitnersystem.h"
 
-class KEduVocDocument::Private
+class KEduVocDocument::KEduVocDocumentPrivate
 {
 public:
-  Private(KEduVocDocument* qq)
+  KEduVocDocumentPrivate(KEduVocDocument* qq)
     : q(qq)
   {
     init();
@@ -90,7 +90,7 @@ public:
 };
 
 
-void KEduVocDocument::Private::init()
+void KEduVocDocument::KEduVocDocumentPrivate::init()
 {
   m_lessonDescriptions.clear();
   m_articles.clear();
@@ -120,7 +120,7 @@ void KEduVocDocument::Private::init()
 
 
 KEduVocDocument::KEduVocDocument(QObject *parent)
-  : QObject(parent), d(new Private(this))
+  : QObject(parent), d(new KEduVocDocumentPrivate(this))
 {
 }
 
@@ -360,7 +360,7 @@ bool KEduVocDocument::saveAs(const KUrl & url, FileType ft, const QString & gene
     if (!saved) {
       QString msg = i18n("Could not save \"%1\"\nDo you want to try again?", tmp.path());
       int result = KMessageBox::warningContinueCancel(0, msg, i18n("Error Saving File"), KGuiItem(i18n("&Retry")));
-      if (result == KMessageBox::Cancel) 
+      if (result == KMessageBox::Cancel)
         return false;
     }
   }

diff --git a/kdeeducore/keduvocdocument.h b/kdeeducore/keduvocdocument.h
index 72c513b3b1790652327d09b0d743ad6dd63f1963..7238c58ff3f096aecd1f5b6d9edfc8f60ba46b16 100644 (file)
--- a/kdeeducore/keduvocdocument.h
+++ b/kdeeducore/keduvocdocument.h
@@ -617,8 +617,8 @@ Q_SIGNALS:
 
 private:
   // The private data of this - see KEduVocDocument::Private, implemented in keduvocdocument.cpp
-  class Private;
-  Private* const d;
+  class KEduVocDocumentPrivate;
+  KEduVocDocumentPrivate* const d;
 
   Q_DISABLE_COPY(KEduVocDocument)
 };

diff --git a/kdeeducore/leitnersystemview.cpp b/kdeeducore/leitnersystemview.cpp
index 23f4c5948ab19dc978f80de7590ba3dda5a1977c..1cc06f4eebd506ed7e16fa372cd0f75732dacdbc 100644 (file)
--- a/kdeeducore/leitnersystemview.cpp
+++ b/kdeeducore/leitnersystemview.cpp
@@ -26,10 +26,10 @@
 
 #include <kdebug.h>
 
-class LeitnerSystemView::Private
+class LeitnerSystemView::LeitnerSystemViewPrivate
 {
 public:
-       Private( LeitnerSystemView* qq )
+       LeitnerSystemViewPrivate( LeitnerSystemView* qq )
          : q( qq ), m_highlightedBox( -1 )
        {
        }
@@ -49,7 +49,7 @@ public:
 
 
 LeitnerSystemView::LeitnerSystemView( QWidget* parent )
-  : QWidget( parent ), d( new Private( this ) )
+  : QWidget( parent ), d( new LeitnerSystemViewPrivate( this ) )
 {
 }
 
@@ -59,7 +59,7 @@ LeitnerSystemView::~LeitnerSystemView()
        delete d;
 }
 
-void LeitnerSystemView::Private::drawSystem( QPainter* p )
+void LeitnerSystemView::LeitnerSystemViewPrivate::drawSystem( QPainter* p )
 {
        m_imageY = q->height() / 2 - 32;
 
@@ -80,7 +80,7 @@ void LeitnerSystemView::Private::drawSystem( QPainter* p )
        }
 }
 
-void LeitnerSystemView::Private::drawConnections(QPainter* p)
+void LeitnerSystemView::LeitnerSystemViewPrivate::drawConnections(QPainter* p)
 {
        //dist = number of boxes that are in between the two boxes
        //width = width of the rect for the arc
@@ -161,7 +161,7 @@ void LeitnerSystemView::paintEvent( QPaintEvent* )
        d->drawConnections( &p );
 }
 
-void LeitnerSystemView::Private::calculateSize()
+void LeitnerSystemView::LeitnerSystemViewPrivate::calculateSize()
 {
        //margin = 12
        //distance between boxes = 10

diff --git a/kdeeducore/leitnersystemview.h b/kdeeducore/leitnersystemview.h
index c0ceee9556620414312d26f790a926f03290073e..7682b59cded1c37febd89dd16b16a629d2030859 100644 (file)
--- a/kdeeducore/leitnersystemview.h
+++ b/kdeeducore/leitnersystemview.h
@@ -35,7 +35,7 @@ class LeitnerSystem;
 class KDEEDUCORE_EXPORT LeitnerSystemView : public QWidget
 {
        Q_OBJECT
-               
+
 public:
        /**
         * The public constructor
@@ -56,9 +56,9 @@ public:
         * @param box the number of the box to be highlighted
         */
        void highlightBox( int box );
-       
+
 Q_SIGNALS:
-       void boxClicked(int box);  //is emitted if the user clicks on a box 
+       void boxClicked(int box);  //is emitted if the user clicks on a box
 
 protected:
        virtual void paintEvent( QPaintEvent* );
@@ -66,8 +66,8 @@ protected:
        virtual void mousePressEvent(QMouseEvent* e);
 
 private:
-       class Private;
-       Private* const d;
+       class LeitnerSystemViewPrivate;
+       LeitnerSystemViewPrivate* const d;
 
        Q_DISABLE_COPY( LeitnerSystemView )
 };