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

List:       kde-commits
Subject:    koffice
From:       Sven Langkamp <sven.langkamp () gmail ! com>
Date:       2009-03-20 19:01:32
Message-ID: 1237575692.077648.19216.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 941946 by langkamp:

resources don't need to be qobjects

 M  +0 -2      krita/image/kis_pattern.cc  
 M  +0 -2      krita/image/kis_pattern.h  
 M  +0 -4      krita/plugins/paintops/libbrush/kis_gbr_brush.cpp  
 M  +0 -4      krita/plugins/paintops/libbrush/kis_gbr_brush.h  
 M  +0 -2      krita/plugins/paintops/libbrush/kis_imagepipe_brush.cpp  
 M  +0 -2      krita/plugins/paintops/libbrush/kis_imagepipe_brush.h  
 M  +0 -2      libs/resources/KoAbstractGradient.cpp  
 M  +0 -1      libs/resources/KoAbstractGradient.h  
 M  +0 -2      libs/resources/KoColorSet.cpp  
 M  +0 -2      libs/resources/KoColorSet.h  
 M  +0 -2      libs/resources/KoPattern.cpp  
 M  +0 -1      libs/resources/KoPattern.h  
 M  +0 -2      libs/resources/KoResource.cpp  
 M  +1 -3      libs/resources/KoResource.h  
 M  +0 -3      libs/resources/KoSegmentGradient.cc  
 M  +0 -2      libs/resources/KoSegmentGradient.h  
 M  +0 -2      libs/resources/KoStopGradient.cpp  
 M  +0 -1      libs/resources/KoStopGradient.h  


--- trunk/koffice/krita/image/kis_pattern.cc #941945:941946
@@ -87,5 +87,3 @@
     pattern->setName(name());
     return pattern;
 }
-
-#include "kis_pattern.moc"
--- trunk/koffice/krita/image/kis_pattern.h #941945:941946
@@ -35,8 +35,6 @@
 class KRITAIMAGE_EXPORT KisPattern : public KoPattern
 {
 
-    Q_OBJECT
-
 public:
     KisPattern(const QString& file);
     KisPattern(KisPaintDevice* image, int x, int y, int w, int h);
--- trunk/koffice/krita/plugins/paintops/libbrush/kis_gbr_brush.cpp #941945:941946
@@ -530,11 +530,7 @@
     return d->useColorAsMask;
 }
 
-
 QString KisGbrBrush::defaultFileExtension() const
 {
     return QString(".gbr");
 }
-
-
-#include "kis_gbr_brush.moc"
--- trunk/koffice/krita/plugins/paintops/libbrush/kis_gbr_brush.h #941945:941946
@@ -45,10 +45,6 @@
 class BRUSH_EXPORT KisGbrBrush : public KisBrush
 {
 
-    class ScaledBrush;
-
-    Q_OBJECT
-
 protected:
 
 public:
--- trunk/koffice/krita/plugins/paintops/libbrush/kis_imagepipe_brush.cpp #941945:941946
@@ -364,5 +364,3 @@
     }
 }
 
-#include "kis_imagepipe_brush.moc"
-
--- trunk/koffice/krita/plugins/paintops/libbrush/kis_imagepipe_brush.h #941945:941946
@@ -51,8 +51,6 @@
 class BRUSH_EXPORT KisImagePipeBrush : public KisGbrBrush
 {
 
-    Q_OBJECT
-
 public:
     KisImagePipeBrush(const QString& filename);
     /**
--- trunk/koffice/libs/resources/KoAbstractGradient.cpp #941945:941946
@@ -141,5 +141,3 @@
 {
     d->img = generatePreview( PREVIEW_WIDTH, PREVIEW_HEIGHT );
 }
-
-#include "KoAbstractGradient.moc"
--- trunk/koffice/libs/resources/KoAbstractGradient.h #941945:941946
@@ -27,7 +27,6 @@
 
 /// Write API docs here
 class KORESOURCES_EXPORT KoAbstractGradient : public KoResource {
-    Q_OBJECT
 
 public:
     KoAbstractGradient(const QString& filename);
--- trunk/koffice/libs/resources/KoColorSet.cpp #941945:941946
@@ -259,5 +259,3 @@
 {
     return m_colors[index];
 }
-
-#include "KoColorSet.moc"
--- trunk/koffice/libs/resources/KoColorSet.h #941945:941946
@@ -45,8 +45,6 @@
 class KORESOURCES_EXPORT KoColorSet : public KoResource {
     typedef KoResource super;
 
-    Q_OBJECT
-
 public:
     /**
      * Load a color set from a file. This can be a Gimp
--- trunk/koffice/libs/resources/KoPattern.cpp #941945:941946
@@ -302,5 +302,3 @@
 {
     return QString(".pat");
 }
-
-#include "KoPattern.moc"
--- trunk/koffice/libs/resources/KoPattern.h #941945:941946
@@ -23,7 +23,6 @@
 
 /// Write API docs here
 class KORESOURCES_EXPORT KoPattern : public KoResource {
-    Q_OBJECT
 
 public:
 
--- trunk/koffice/libs/resources/KoResource.cpp #941945:941946
@@ -90,5 +90,3 @@
     return QString();
 }
 
-#include "KoResource.moc"
-
--- trunk/koffice/libs/resources/KoResource.h #941945:941946
@@ -20,7 +20,6 @@
 #define KORESOURCE_H
 
 #include <QtGui/QImage>
-#include <QtCore/QObject>
 #include <QtCore/QString>
 #include <koresource_export.h>
 
@@ -33,8 +32,7 @@
  *
  * This replaces the KisKrayon facility that used to be present in Krayon.
  */
-class KORESOURCES_EXPORT KoResource : public QObject {
-    Q_OBJECT
+class KORESOURCES_EXPORT KoResource {
 
 public:
 
--- trunk/koffice/libs/resources/KoSegmentGradient.cc #941945:941946
@@ -688,6 +688,3 @@
 
     return value;
 }
-
-#include "KoSegmentGradient.moc"
-
--- trunk/koffice/libs/resources/KoSegmentGradient.h #941945:941946
@@ -226,8 +226,6 @@
 /// Write API docs here
 class KORESOURCES_EXPORT KoSegmentGradient : public KoAbstractGradient {
 
-    Q_OBJECT
-
 public:
     KoSegmentGradient(const QString& file);
     virtual ~KoSegmentGradient();
--- trunk/koffice/libs/resources/KoStopGradient.cpp #941945:941946
@@ -642,5 +642,3 @@
 {
     return QString(".svg");
 }
-
-#include "KoStopGradient.moc"
--- trunk/koffice/libs/resources/KoStopGradient.h #941945:941946
@@ -34,7 +34,6 @@
  * Resource for colorstop based gradients like Karbon gradients and SVG gradients
  */
 class KORESOURCES_EXPORT KoStopGradient : public KoAbstractGradient {
-    Q_OBJECT
 
 public:
     KoStopGradient(const QString& filename);
[prev in list] [next in list] [prev in thread] [next in thread]