cleanup

svn path=/branches/KDE4/; revision=2391

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c6ca1f16c64f17d5aa5a70bfab8ecddbdeb04bd6..f095e0a78777909f1a6c70a27230bc80cffc6d59 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -80,7 +80,6 @@ set(kdenlive_SRCS
   headertrack.cpp
   customtrackview.cpp
   clipitem.cpp
-  labelitem.cpp
   moveclipcommand.cpp
   resizeclipcommand.cpp
   razorclipcommand.cpp

diff --git a/src/labelitem.cpp b/src/labelitem.cpp
deleted file mode 100644 (file)
index e486b84..0000000
--- a/src/labelitem.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2007 by Jean-Baptiste Mardelle (jb@kdenlive.org)        *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
- ***************************************************************************/
-
-
-#include <QPainter>
-#include <QStyleOptionGraphicsItem>
-
-#include <KDebug>
-
-
-#include "labelitem.h"
-#include "definitions.h"
-
-LabelItem::LabelItem(QString text, QGraphicsRectItem *parent)
-        : QGraphicsSimpleTextItem(" " + text + " ", parent) {
-    //setParentItem(parent);
-    //setFlags(QGraphicsItem::ItemIgnoresTransformations);
-    setZValue(200);
-}
-
-int LabelItem::type() const {
-    return LABELWIDGET;
-}
-
-// virtual
-
-void LabelItem::paint(QPainter *painter,
-                      const QStyleOptionGraphicsItem *option,
-                      QWidget *widget) {
-    //kDebug()<<"REPAINT LABEL ------------------------";
-    QRectF rep = option->exposedRect;
-    //painter->setClipRect(rep);
-    QGraphicsRectItem *parent = (QGraphicsRectItem *) parentItem();
-    QRectF par = mapFromScene(parent->rect()).boundingRect();
-    QRectF parrect = option->matrix.map(mapFromScene(par)).boundingRect();
-    painter->setClipRect(parrect);   //option->exposedRect );
-    QGraphicsSimpleTextItem::paint(painter, option, widget);
-    /*QPainterPath path;
-    path.addRoundRect(boundingRect(), 40);
-    painter->fillPath(path, QColor(200, 200, 200, 100));
-    //painter->fillRect(parrect, QColor(200, 50, 200, 100));
-    painter->drawText(boundingRect(), Qt::AlignCenter, text());*/
-}
-
-#include "labelitem.moc"

diff --git a/src/labelitem.h b/src/labelitem.h
deleted file mode 100644 (file)
index c978dd8..0000000
--- a/src/labelitem.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2007 by Jean-Baptiste Mardelle (jb@kdenlive.org)        *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
- ***************************************************************************/
-
-
-#ifndef LABELITEM_H
-#define LABELITEM_H
-
-#include <QGraphicsRectItem>
-#include <QGraphicsSimpleTextItem>
-#include <QGraphicsSceneMouseEvent>
-
-class LabelItem : public QGraphicsSimpleTextItem {
-
-public:
-    LabelItem(QString text, QGraphicsRectItem *parent = 0);
-    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
-    virtual int type() const;
-};
-
-#endif

diff --git a/src/moveclipcommand.cpp b/src/moveclipcommand.cpp
index 955b1147cf9d788e7a9e318762092f8f359cddd7..6767f673dd1d284d0fae7b8d6bfc16c8b49d38d1 100644 (file)
--- a/src/moveclipcommand.cpp
+++ b/src/moveclipcommand.cpp
@@ -41,4 +41,3 @@ void MoveClipCommand::redo() {
     m_doIt = true;
 }
 
-#include "moveclipcommand.moc"

diff --git a/src/moveeffectcommand.cpp b/src/moveeffectcommand.cpp
index 42040f813ccbd1287909a06b3a5936940ad33578..88df05ac8bb9c8932ad379ff874dfc95894af4a7 100644 (file)
--- a/src/moveeffectcommand.cpp
+++ b/src/moveeffectcommand.cpp
@@ -58,4 +58,3 @@ void MoveEffectCommand::redo() {
     m_view->moveEffect(m_track, m_pos, m_oldindex, m_newindex);
 }
 
-#include "moveeffectcommand.moc"

diff --git a/src/resizeclipcommand.cpp b/src/resizeclipcommand.cpp
index 75e09d0c0f837de5d3b7da15c6c87ca6e7d8fbb5..61f596ba31e2a63cfa0cbef0ac2692ffce369f6b 100644 (file)
--- a/src/resizeclipcommand.cpp
+++ b/src/resizeclipcommand.cpp
@@ -40,4 +40,3 @@ void ResizeClipCommand::redo() {
     m_doIt = true;
 }
 
-#include "resizeclipcommand.moc"