From kde-commits  Sun Aug 24 15:33:16 2008
From: Rivo Laks <rivolaks () hot ! ee>
Date: Sun, 24 Aug 2008 15:33:16 +0000
To: kde-commits
Subject: playground/libs/kgllib/examples/widgets
Message-Id: <1219591996.802368.6847.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=121959200822045

SVN commit 851774 by rivol:

Rename glwidget.* to demoglwidget.* to avoid conflicts

 M  +1 -1      CMakeLists.txt  
 A             demoglwidget.cpp   glwidget.cpp#840695 [License: LGPL (v2.1+)]
 A             demoglwidget.h   glwidget.h#840695 [License: LGPL (v2.1+)]
 D             glwidget.cpp  
 D             glwidget.h  
 M  +1 -1      mainwidget.cpp  


--- trunk/playground/libs/kgllib/examples/widgets/CMakeLists.txt #851773:851774
@@ -6,7 +6,7 @@
 set(widgets_SRCS
         main.cpp
         mainwidget.cpp
-        glwidget.cpp
+        demoglwidget.cpp
         )
 qt4_automoc(${widgets_SRCS})
 add_executable(widgets ${widgets_SRCS})
--- trunk/playground/libs/kgllib/examples/widgets/mainwidget.cpp #851773:851774
@@ -17,7 +17,7 @@
 
 #include "mainwidget.h"
 
-#include "glwidget.h"
+#include "demoglwidget.h"
 #include <kgllib/widgetproxy.h>
 
 #include <QVBoxLayout>