[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bgluon=5D_graphics=3A_Use_the_Q=5FPRIVATE=5FSLOT_mac?=
From:       Giulio Camuffo <giuliocamuffo () gmail ! com>
Date:       2011-01-26 13:49:00
Message-ID: 20110126134900.668A8A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit a9e386796b39c97304e30e211f8f13063ed24948 by Giulio Camuffo.
Pushed by camuffo into branch 'master'.

Use the Q_PRIVATE_SLOT macro instead of declaring a private slot. Better from a BC perspective.

M  +5    -5    graphics/materialinstance.cpp     
M  +2    -2    graphics/materialinstance.h     

http://commits.kde.org/fad2ae7b/a9e386796b39c97304e30e211f8f13063ed24948

diff --git a/graphics/materialinstance.cpp b/graphics/materialinstance.cpp
index cc52f6c..1ff9352 100644
--- a/graphics/materialinstance.cpp
+++ b/graphics/materialinstance.cpp
@@ -43,6 +43,11 @@ class MaterialInstance::MaterialInstancePrivate
             bound = false;
         }
 
+        void setActiveCamera( Camera* camera )
+        {
+            activeCamera = camera;
+        }
+
         Material* material;
 
         QHash<QString, int> uniformLocations;
@@ -259,9 +264,4 @@ void MaterialInstance::bindTexture( const QString& name, int tex )
     glUniform1i( uniformLocation( name ), id );
 }
 
-void MaterialInstance::setActiveCamera( Camera* cam )
-{
-    d->activeCamera = cam;
-}
-
 #include "materialinstance.moc"
diff --git a/graphics/materialinstance.h b/graphics/materialinstance.h
index e677873..844c566 100644
--- a/graphics/materialinstance.h
+++ b/graphics/materialinstance.h
@@ -166,8 +166,8 @@ namespace GluonGraphics
             class MaterialInstancePrivate;
             MaterialInstancePrivate* const d;
 
-        private Q_SLOTS:
-            void setActiveCamera( Camera* );
+            Q_PRIVATE_SLOT( d, void setActiveCamera( Camera* camera ) );
+
     };
 
 }


[prev in list] [next in list] [prev in thread] [next in thread]