]> git.sesse.net Git - kdenlive/commitdiff
Krazy fixes: cleanup all headers
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Wed, 4 Mar 2009 00:22:46 +0000 (00:22 +0000)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Wed, 4 Mar 2009 00:22:46 +0000 (00:22 +0000)
svn path=/branches/KDE4/; revision=3096

100 files changed:
plugins/sampleplugin/sampleplugin.cpp
renderer/renderjob.cpp
src/abstractclipitem.cpp
src/abstractclipitem.h
src/abstractgroupitem.cpp
src/addclipcommand.cpp
src/addeffectcommand.cpp
src/addfoldercommand.cpp
src/addmarkercommand.cpp
src/addtimelineclipcommand.cpp
src/addtrackcommand.cpp
src/addtransitioncommand.cpp
src/addtransitioncommand.h
src/changespeedcommand.cpp
src/changetrackcommand.cpp
src/clipdurationdialog.cpp
src/clipdurationdialog.h
src/clipitem.cpp
src/clipmanager.cpp
src/clipproperties.cpp
src/clipproperties.h
src/complexparameter.cpp
src/customruler.cpp
src/customruler.h
src/customtrackscene.cpp
src/customtrackview.cpp
src/docclipbase.cpp
src/docclipbase.h
src/dvdwizard.cpp
src/dvdwizardmenu.cpp
src/dvdwizardvob.cpp
src/editclipcommand.cpp
src/editeffectcommand.cpp
src/editfoldercommand.cpp
src/editguidecommand.cpp
src/editkeyframecommand.cpp
src/edittransitioncommand.cpp
src/effectslist.cpp
src/effectslistview.cpp
src/effectslistview.h
src/effectslistwidget.cpp
src/effectslistwidget.h
src/effectstackedit.cpp
src/effectstackview.cpp
src/geometryval.cpp
src/graphicsscenerectmove.cpp
src/graphicsscenerectmove.h
src/guide.cpp
src/headertrack.cpp
src/initeffects.cpp
src/insertspacecommand.cpp
src/jogshuttle.cpp
src/kdenlivedoc.cpp
src/kdenlivedoc.h
src/kdenlivesettings.kcfg
src/kdenlivesettingsdialog.cpp
src/keyframehelper.cpp
src/kthumb.cpp
src/kthumb.h
src/locktrackcommand.cpp
src/mainwindow.cpp
src/managecapturesdialog.cpp
src/managecapturesdialog.h
src/markerdialog.cpp
src/markerdialog.h
src/monitor.cpp
src/monitormanager.cpp
src/moveclipcommand.cpp
src/moveeffectcommand.cpp
src/movegroupcommand.cpp
src/movetransitioncommand.cpp
src/profilesdialog.cpp
src/profilesdialog.h
src/projectitem.cpp
src/projectlist.cpp
src/projectlist.h
src/projectlistview.cpp
src/projectlistview.h
src/projectsettings.cpp
src/razorclipcommand.cpp
src/recmonitor.cpp
src/renderer.cpp
src/renderer.h
src/renderwidget.cpp
src/renderwidget.h
src/resizeclipcommand.cpp
src/slideshowclip.cpp
src/slideshowclip.h
src/smallruler.cpp
src/spacerdialog.cpp
src/spacerdialog.h
src/titlewidget.cpp
src/titlewidget.h
src/trackview.cpp
src/trackview.h
src/transition.cpp
src/transitionsettings.cpp
src/wizard.cpp
thumbnailer/westleypreview.cpp
thumbnailer/westleypreview.h

index 486f681f570f0625fa892c6db0a03d67310a35ad..177387f9246d1a71673f7db57bc33ff6bc6c2cad 100644 (file)
  ***************************************************************************/
 
 
-#include <QtGui>
-#include <QDialog>
-#include <QDomDocument>
-#include <QInputDialog>
+#include "sampleplugin.h"
+#include "ui_countdown_ui.h"
 
 #include <KUrlRequester>
 #include <KIntSpinBox>
 #include <KDebug>
 #include <KMessageBox>
 
-#include "sampleplugin.h"
-#include "ui_countdown_ui.h"
+#include <QDialog>
+#include <QDomDocument>
+#include <QInputDialog>
 
 QStringList SamplePlugin::generators() const {
     return QStringList() << i18n("Countdown") << i18n("Noise");
index b6808743c44b4eeceae5ecfb44c62b00ec50ab39..33f7b7b4680b57fbe952195145c3da458de31c04 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
+
+#include "renderjob.h"
+
 #include <QtDBus>
 #include <QFile>
 #include <QThread>
-#include "renderjob.h"
 
 // Can't believe I need to do this to sleep.
 class SleepThread : QThread {
index b2b90e77a067fe79e756501d466649f9fe8336b3..7cff160189e56142abe2dd101d050e8a8d5799ea 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QGraphicsScene>
-#include <QGraphicsView>
-#include <QScrollBar>
-#include <QToolTip>
+#include "abstractclipitem.h"
+#include "customtrackscene.h"
+#include "kdenlivesettings.h"
 
 #include <KDebug>
 #include <KLocale>
 
-#include "abstractclipitem.h"
-#include "customtrackscene.h"
-#include "kdenlivesettings.h"
+#include <QPainter>
+#include <QToolTip>
 
 AbstractClipItem::AbstractClipItem(const ItemInfo info, const QRectF& rect, double fps): QGraphicsRectItem(rect), m_track(0), m_fps(fps), m_editedKeyframe(-1), m_selectedKeyframe(0), m_keyframeFactor(1) {
     setFlags(/*QGraphicsItem::ItemClipsToShape | */QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
@@ -367,7 +365,7 @@ bool AbstractClipItem::hasKeyFrames() const {
     return !m_keyframes.isEmpty();
 }
 
-QRect AbstractClipItem::visibleRect() {
+/*QRect AbstractClipItem::visibleRect() {
     QRect rectInView;
     if (scene()->views().size() > 0) {
         rectInView = scene()->views()[0]->viewport()->rect();
@@ -376,7 +374,7 @@ QRect AbstractClipItem::visibleRect() {
         //kDebug() << scene()->views()[0]->viewport()->rect() << " " <<  scene()->views()[0]->horizontalScrollBar()->value();
     }
     return rectInView;
-}
+}*/
 
 CustomTrackScene* AbstractClipItem::projectScene() {
     if (scene()) return static_cast <CustomTrackScene*>(scene());
index 5d0b835e6b3083f7e70fff95818badd50aed384b..e91c479f8edd2810e119b2b5d85e2e8be6c2d223 100644 (file)
@@ -74,7 +74,7 @@ protected:
     double m_fps;
     QPainterPath upperRectPart(QRectF);
     QPainterPath lowerRectPart(QRectF);
-    QRect visibleRect();
+    //QRect visibleRect();
     void drawKeyFrames(QPainter *painter, QRectF exposedRect);
     int mouseOverKeyFrames(QPointF pos);
 };
index b4f8c1eb7479a2196eaa6dc3e749f189a177147f..f605218d144d2902b9760a4bdecf633f914aef23 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QGraphicsScene>
-#include <QGraphicsView>
-#include <QScrollBar>
-#include <QStyleOptionGraphicsItem>
-#include <QToolTip>
-
-#include <KDebug>
-#include <KLocale>
-
 #include "abstractgroupitem.h"
 #include "abstractclipitem.h"
 #include "kdenlivesettings.h"
 #include "customtrackscene.h"
 
+#include <KDebug>
+
+#include <QPainter>
+#include <QStyleOptionGraphicsItem>
+
+
 AbstractGroupItem::AbstractGroupItem(double fps): QGraphicsItemGroup(), m_fps(fps) {
     setZValue(2);
     setFlags(QGraphicsItem::ItemClipsToShape | QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
index 1807e38c4922fb4d30aa9c6c3c97ffd41fd4a8ea..b6b4b4c1aa543c51a052ddf8076d79941f065852 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <KLocale>
 
 #include "addclipcommand.h"
 #include "kdenlivedoc.h"
 
+#include <KLocale>
+
 AddClipCommand::AddClipCommand(KdenliveDoc *doc, const QDomElement &xml, const QString &id, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_doc(doc), m_xml(xml), m_id(id), m_doIt(doIt) {
     if (doIt) setText(i18n("Add clip"));
     else setText(i18n("Delete clip"));
index d5564868c90548bd5d57dc42e6ea9101874d0203..7d8d5057af28b5fc1a539c299ffad4470389d3f9 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <KLocale>
 
 #include "addeffectcommand.h"
 #include "customtrackview.h"
 
+#include <KLocale>
+
 AddEffectCommand::AddEffectCommand(CustomTrackView *view, const int track, GenTime pos, QDomElement effect, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_track(track), m_pos(pos), m_effect(effect), m_doIt(doIt) {
     QString effectName;
     QDomNode namenode = effect.elementsByTagName("name").item(0);
index 3d7d98a343e92238ad7c8d559e02c0b5e8a0590b..59760de04164382ba55b6accae1ce74152d6ff1c 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <KLocale>
 
 #include "addfoldercommand.h"
 #include "projectlist.h"
 
+#include <KLocale>
+
 AddFolderCommand::AddFolderCommand(ProjectList *view, const QString folderName, const QString &clipId, bool doIt, QUndoCommand *parent) : QUndoCommand(parent), m_view(view), m_name(folderName), m_id(clipId), m_doIt(doIt) {
     if (doIt) setText(i18n("Add folder"));
     else setText(i18n("Delete folder"));
index da747f14e2a052589e741541d0b6c6335984380b..ed1c2a1ca6a5b52bfcf1b787b0d0a68ae3dcbe5d 100644 (file)
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <KLocale>
+
 
 #include "addmarkercommand.h"
 #include "customtrackview.h"
 
+#include <KLocale>
+
 AddMarkerCommand::AddMarkerCommand(CustomTrackView *view, const QString &oldcomment, const QString &comment, const QString &id, const GenTime &pos, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_oldcomment(oldcomment), m_comment(comment), m_id(id), m_pos(pos), m_doIt(doIt) {
     if (m_comment.isEmpty()) setText(i18n("Delete marker"));
     else if (m_oldcomment.isEmpty()) setText(i18n("Add marker"));
index 939de38a3a7f2836ba9f926ad941f3ebe6b807e9..394a7aff07bfcd0030fae4831001804ff8b3ab5a 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <KLocale>
 
 #include "addtimelineclipcommand.h"
 #include "customtrackview.h"
 
+#include <KLocale>
+
 AddTimelineClipCommand::AddTimelineClipCommand(CustomTrackView *view, QDomElement xml, const QString &clipId, ItemInfo info, EffectsList effects, bool doIt, bool doRemove, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_xml(xml), m_clipId(clipId), m_clipInfo(info), m_effects(effects),  m_doIt(doIt), m_remove(doRemove) {
     if (!m_remove) setText(i18n("Add timeline clip"));
     else setText(i18n("Delete timeline clip"));
index b47cb119827ae09ef0634659b36049f1a9c1e200..5e848726515dad8a02640b3c538bcd54b4b58688 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <KLocale>
 
 #include "addtrackcommand.h"
 #include "customtrackview.h"
 
+#include <KLocale>
+
 AddTrackCommand::AddTrackCommand(CustomTrackView *view, int ix, TrackInfo info, bool addTrack, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_ix(ix), m_info(info), m_addTrack(addTrack), m_doIt(doIt) {
     if (addTrack) setText(i18n("Add track"));
     else setText(i18n("Delete track"));
index e41adff1194e694da76c369715e09c1fe186a4e7..7f402f1dff28071bc19e4506e6dc1cfefff39375 100644 (file)
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <KLocale>
+
 
 #include "addtransitioncommand.h"
 #include "customtrackview.h"
 
+#include <KLocale>
+
 AddTransitionCommand::AddTransitionCommand(CustomTrackView *view, ItemInfo info, int transitiontrack, QDomElement params, bool remove, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_info(info), m_track(transitiontrack), m_params(params), m_remove(remove), m_doIt(doIt) {
     if (m_remove) setText(i18n("Delete transition from clip"));
     else setText(i18n("Add transition to clip"));
index 67c3383b8b9fb71533a62ad09b3b6378db36b032..1994d10aed08762773f2ee0dcd4604adb401da56 100644 (file)
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef TIMELINETRANSITIONCOMMAND_H
-#define TIMELINETRANSITIONCOMMAND_H
+#ifndef ADDTRANSITIONCOMMAND_H
+#define ADDTRANSITIONCOMMAND_H
 
 #include <QUndoCommand>
 #include <QGraphicsView>
index 35468c9176a0211be49badc2c685f7f47acf2bcc..badcb9b0e075954e11a556fd46d1008f3c00c4c2 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <KLocale>
 
 #include "changespeedcommand.h"
 #include "customtrackview.h"
 
+#include <KLocale>
+
 ChangeSpeedCommand::ChangeSpeedCommand(CustomTrackView *view, ItemInfo info, double old_speed, double new_speed, const QString &clipId, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_clipInfo(info), m_old_speed(old_speed), m_new_speed(new_speed), m_clipId(clipId), m_doIt(doIt) {
     setText(i18n("Adjust clip length"));
 }
index 6abef1f32d5bc76bf541885ad9e6a4444ad79500..a532d1c3bee4a8246c0ba96dd82d2c9e6eadaba2 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <KLocale>
 
 #include "changetrackcommand.h"
 #include "customtrackview.h"
 
+#include <KLocale>
+
 ChangeTrackCommand::ChangeTrackCommand(CustomTrackView *view, int ix, TrackInfo oldInfo, TrackInfo newInfo, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_ix(ix), m_oldinfo(oldInfo), m_newinfo(newInfo), m_doIt(doIt) {
     setText(i18n("Change track type"));
 }
index 3948df27910074a207f0836116cf9dd99bdb9fb5..6d40276e41507bf7115db3f4829c284fdcfd8eb9 100644 (file)
  ***************************************************************************/
 
 
-#include <KDebug>
-
-#include "clipitem.h"
 #include "clipdurationdialog.h"
+#include "clipitem.h"
 #include "kdenlivesettings.h"
+
+#include <KDebug>
+
 #include <QWheelEvent>
 
 ClipDurationDialog::ClipDurationDialog(AbstractClipItem *clip, Timecode tc, QWidget * parent): QDialog(parent), m_tc(tc), m_clip(clip) {
index f0fbcff9ca0a09fd6d715313c0cb07d6d36db029..81536662904c55653711918055f00d9446e5295b 100644 (file)
@@ -21,7 +21,6 @@
 #ifndef CLIPDURATIONDIALOG_H
 #define CLIPDURATIONDIALOG_H
 
-#include <QDialog>
 
 #include "abstractclipitem.h"
 #include "timecode.h"
index 3f7c3d8dafbdcad337f0a9484a81fa1f7ae975e4..1aeaec11341a959a74a85ec5942f88afa613d3e7 100644 (file)
  ***************************************************************************/
 
 
-
-#include <QPainter>
-#include <QTimer>
-#include <QStyleOptionGraphicsItem>
-#include <QGraphicsScene>
-#include <QGraphicsView>
-#include <QScrollBar>
-#include <QMimeData>
-#include <QApplication>
-
-#include <KDebug>
-
 #include "clipitem.h"
 #include "customtrackview.h"
 #include "customtrackscene.h"
 #include "kdenlivesettings.h"
 #include "kthumb.h"
 
+#include <KDebug>
+
+#include <QPainter>
+#include <QTimer>
+#include <QStyleOptionGraphicsItem>
+#include <QGraphicsScene>
+#include <QMimeData>
+
 
 ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, bool generateThumbs)
         : AbstractClipItem(info, QRectF(), fps), m_clip(clip), m_resizeMode(NONE), m_grabPoint(0), m_maxTrack(0), m_hasThumbs(false), startThumbTimer(NULL), endThumbTimer(NULL), audioThumbWasDrawn(false), m_opacity(1.0), m_timeLine(0), m_startThumbRequested(false), m_endThumbRequested(false), m_startFade(0), m_endFade(0), m_hover(false), m_selectedEffect(-1), m_speed(speed), framePixelWidth(0), m_startPix(QPixmap()), m_endPix(QPixmap()) {
@@ -653,7 +649,7 @@ void ClipItem::paint(QPainter *painter,
                 framepos = br.x() + pos.frames(m_fps);
                 const QRectF r1(framepos + 0.04, 10, itemWidth - framepos - 2, itemHeight - 10);
                 const QRectF r2 = painter->matrix().mapRect(r1);
-                const QRectF txtBounding = painter->boundingRect(r2, Qt::AlignLeft | Qt::AlignTop, " " + (*it).comment() + " ");
+                const QRectF txtBounding = painter->boundingRect(r2, Qt::AlignLeft | Qt::AlignTop, ' ' + (*it).comment() + ' ');
 
                 QPainterPath path;
                 path.addRoundedRect(txtBounding, 3, 3);
@@ -719,7 +715,7 @@ void ClipItem::paint(QPainter *painter,
     }
 
     // Draw clip name
-    QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, " " + m_clipName + " ");
+    QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, ' ' + m_clipName + ' ');
     painter->fillRect(txtBounding, QBrush(QColor(0, 0, 0, 150)));
     //painter->setPen(QColor(0, 0, 0, 180));
     //painter->drawText(txtBounding, Qt::AlignCenter, m_clipName);
@@ -1352,7 +1348,7 @@ double ClipItem::speed() const {
 void ClipItem::setSpeed(const double speed) {
     m_speed = speed;
     if (m_speed == 1.0) m_clipName = baseClip()->name();
-    else m_clipName = baseClip()->name() + " - " + QString::number(speed * 100, 'f', 0) + "%";
+    else m_clipName = baseClip()->name() + " - " + QString::number(speed * 100, 'f', 0) + '%';
     //update();
 }
 
index c310f79d32507d143f5f0b9ffef78139d41c3f10..2960180f385b924461ab09594a0bd19547e9bb38 100644 (file)
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
-#include <KDebug>
-#include <KFileDialog>
-#include <kio/netaccess.h>
 
+
+#include "clipmanager.h"
 #include "addclipcommand.h"
 #include "kdenlivesettings.h"
-#include "clipmanager.h"
 #include "docclipbase.h"
 #include "kdenlivedoc.h"
 
 #include <mlt++/Mlt.h>
 
+#include <KDebug>
+#include <KFileDialog>
+#include <kio/netaccess.h>
+
 ClipManager::ClipManager(KdenliveDoc *doc): m_doc(doc), m_audioThumbsEnabled(false), m_audioThumbsQueue(QList <QString> ()), m_generatingAudioId(QString()) {
     m_clipIdCounter = 1;
     m_folderIdCounter = 1;
index 825ca86ed291230c5e10d90c67c5469285b89196..923fdfb7037af70386914c863686692c99c2a2c8 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QDir>
+
+#include "clipproperties.h"
+#include "kdenlivesettings.h"
+#include "kthumb.h"
+#include "markerdialog.h"
 
 #include <KStandardDirs>
 #include <KDebug>
 #include <KFileItem>
 
-#include "kdenlivesettings.h"
-#include "clipproperties.h"
-#include "kthumb.h"
-#include "markerdialog.h"
+#include <QDir>
 
 static const int VIDEOTAB = 0;
 static const int AUDIOTAB = 1;
index 6e486fe03da8cdfd5eff7dc683e59e7b24245631..cae1652b5b3a68d8e656a5346d46e332235a17b8 100644 (file)
  ***************************************************************************/
 
 
-#ifndef CLIPPROPSDIALOG_H
-#define CLIPPROPSDIALOG_H
+#ifndef CLIPPROPERTIES_H
+#define CLIPPROPERTIES_H
 
-#include <QDialog>
 
 #include "definitions.h"
 #include "timecode.h"
index b632e3b78c39a353b1b63ff6052d893892241819..be688609ea20ed14ab24c3dc40cb875a47fbbddf 100644 (file)
  *                                                                         *
  ***************************************************************************/
 
+#include "complexparameter.h"
+
 #include <KDebug>
 #include <KLocale>
 
-#include "complexparameter.h"
-#include "effectslist.h"
-#include "clipitem.h"
+
 #include <QHeaderView>
 #include <QMenu>
 
index 23241b92ae6893aefc1bef57a723ca9c79d15f51..4e4421e5ae848452052169ef874eb62eb80961d6 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QMouseEvent>
-#include <QStylePainter>
+#include "customruler.h"
 
 #include <KDebug>
 #include <KIcon>
 #include <KCursor>
 #include <KGlobalSettings>
 
-#include "customruler.h"
-
+#include <QMouseEvent>
+#include <QStylePainter>
 
 static const int FIX_WIDTH = 24; /* widget width in pixel */
 static const int LINE_END = (FIX_WIDTH - 3);
index 76959fcd6eaa64a546e278d531b5bf42133276c1..f84fdb56b3cb81c16b4bd545bba26860c65fce25 100644 (file)
@@ -1,3 +1,22 @@
+/***************************************************************************
+ *   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 CUSTOMRULER_H
 #define CUSTOMRULER_H
 
index e2cc7345c61cdd5a52e4466665547079e769b9c3..9dedfa8ba8b8e859b278aea6da4a2912a2c1c49d 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <KStandardDirs>
-
-#include "kdenlivedoc.h"
 #include "customtrackscene.h"
+#include "kdenlivedoc.h"
+
+#include <KStandardDirs>
 
 CustomTrackScene::CustomTrackScene(KdenliveDoc *doc, QObject *parent)
         : QGraphicsScene(parent), m_document(doc), m_scale(1.0) {
index 49647d3c9cbae1d256334e8df49a9ba5351be062..bc312dc6b355ac46a2a8cccede39e3c564e29286 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QMouseEvent>
-#include <QStylePainter>
-#include <QGraphicsItem>
-#include <QDomDocument>
-#include <QScrollBar>
-#include <QApplication>
-#include <QInputDialog>
-
-#include <KDebug>
-#include <KLocale>
-#include <KUrl>
-#include <KIcon>
-#include <KCursor>
 
 #include "customtrackview.h"
 #include "customtrackscene.h"
@@ -52,8 +39,6 @@
 #include "razorclipcommand.h"
 #include "kdenlivesettings.h"
 #include "transition.h"
-#include "clipitem.h"
-#include "customtrackview.h"
 #include "clipmanager.h"
 #include "renderer.h"
 #include "markerdialog.h"
 #include "initeffects.h"
 #include "locktrackcommand.h"
 
+#include <KDebug>
+#include <KLocale>
+#include <KUrl>
+#include <KIcon>
+#include <KCursor>
+
+#include <QMouseEvent>
+#include <QStylePainter>
+#include <QGraphicsItem>
+#include <QDomDocument>
+#include <QScrollBar>
+#include <QApplication>
+#include <QInputDialog>
+
+
 //TODO:
 // disable animation if user asked it in KDE's global settings
 // http://lists.kde.org/?l=kde-commits&m=120398724717624&w=2
index ade305e491d3a808c189a716d6b3d4681bc3f53e..f82402adcb357c48d253bde52d63807b171249a1 100644 (file)
@@ -3,7 +3,8 @@
                              -------------------
     begin                : Fri Apr 12 2002
     copyright            : (C) 2002 by Jason Wood
-    email                : jasonwood@blueyonder.co.uk
+    copyright            : (C) 2009 by Jean-Baptiste Mardelle
+
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  ***************************************************************************/
 
-#include <QCryptographicHash>
 
-#include <KDebug>
-
-#include "kdenlivesettings.h"
 #include "docclipbase.h"
+#include "kdenlivesettings.h"
 #include "kthumb.h"
 #include "clipmanager.h"
 
+#include <KDebug>
+
+#include <QCryptographicHash>
+
 DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QString &id):
         m_id(id), m_description(QString()), m_refcount(0), m_audioThumbCreated(false), m_duration(GenTime()), m_thumbProd(NULL), m_audioTimer(NULL), m_properties(QMap <QString, QString> ()), audioFrameChache(QMap<int, QMap<int, QByteArray> > ()), m_baseTrackProducers(QList <Mlt::Producer *>()), m_snapMarkers(QList < CommentedTime > ())  {
     int type = xml.attribute("type").toInt();
index a956bf7398d59478a4bd5384d1291d4b19f26f90..a690377a998e76fd63636f39a6b6b14516fe8f72 100644 (file)
@@ -50,7 +50,7 @@ class Producer;
 class DocClipBase: public QObject {
 Q_OBJECT public:
     /** this enum determines the types of "feed" available within this clip. types must be non-exclusive
-     * - e.g. if you can have audio and video seperately, it should be possible to combin the two, as is
+     * - e.g. if you can have audio and video separately, it should be possible to combin the two, as is
      *   done here. If a new clip type is added then it should be possible to combine it with both audio
      *   and video. */
 
index f35aab08848546ea2f018c03bc97aad469a3f52a..87219acd9e14f7d128f929a28d1bfc0437e16fe9 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QLabel>
-#include <QFile>
-#include <QXmlStreamWriter>
-#include <QApplication>
-#include <QTimer>
-#include <QGraphicsView>
-#include <QDomDocument>
+
+#include "dvdwizard.h"
+#include "kdenlivesettings.h"
+#include "profilesdialog.h"
 
 #include <KStandardDirs>
 #include <KLocale>
 #include <KIO/NetAccess>
 #include <KMessageBox>
 
-#include "kdenlivesettings.h"
-#include "profilesdialog.h"
-#include "dvdwizard.h"
+#include <QFile>
+#include <QApplication>
+#include <QTimer>
+#include <QDomDocument>
+
 
 DvdWizard::DvdWizard(const QString &url, const QString &profile, QWidget *parent): QWizard(parent), m_profile(profile) {
     //setPixmap(QWizard::WatermarkPixmap, QPixmap(KStandardDirs::locate("appdata", "banner.png")));
index a010ef79daef7c81bc2e0c99e2254b01a41736cc..189c81632d96dae60f0d279e13b421f7a8f61e3a 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
+#include "dvdwizardmenu.h"
 
 #include <KDebug>
 
-#include "dvdwizardmenu.h"
 
 DvdWizardMenu::DvdWizardMenu(const QString &profile, QWidget *parent): QWizardPage(parent) {
     m_view.setupUi(this);
index 2b78a245eeeabc714723d16bb7f8e844f594900d..3c82cef247405e870f578d4b8b35df58cff44f9d 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
+#include "dvdwizardvob.h"
+
 #include <KUrlRequester>
 #include <KDebug>
 #include <KStandardDirs>
 
-#include "dvdwizardvob.h"
 
 DvdWizardVob::DvdWizardVob(QWidget *parent): QWizardPage(parent) {
     m_view.setupUi(this);
index 14ea52fe3b9ecce35d5441813abc19990ceac829..90b27cdfb533a618b3f3cf1010da643d5abe4278 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <KLocale>
-
 #include "editclipcommand.h"
 #include "projectlist.h"
 
+#include <KLocale>
+
 EditClipCommand::EditClipCommand(ProjectList *list, const QString &id, QMap <QString, QString> oldparams, QMap <QString, QString> newparams, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_list(list), m_id(id), m_oldparams(oldparams), m_newparams(newparams), m_doIt(doIt) {
     setText(i18n("Edit clip"));
 }
index 903e8f45d74d51af443bf6b6ec74a3c7e86b156c..909ace148c1e8dd5b8bc76be99ea321815896341 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <KLocale>
 
 #include "editeffectcommand.h"
 #include "customtrackview.h"
 
+#include <KLocale>
+
 EditEffectCommand::EditEffectCommand(CustomTrackView *view, const int track, GenTime pos, QDomElement oldeffect, QDomElement effect, int stackPos, bool doIt)
         : m_view(view), m_track(track), m_pos(pos), m_oldeffect(oldeffect), m_stackPos(stackPos), m_doIt(doIt) {
     m_effect = effect.cloneNode().toElement();
index ffc3b877fbc09659bdde5ee408eb013e5a23ca54..93183c6f1ba49ba8b641fe8dea2f6f2728b2e97b 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <KLocale>
 
 #include "editfoldercommand.h"
 #include "projectlist.h"
 
+#include <KLocale>
+
 EditFolderCommand::EditFolderCommand(ProjectList *view, const QString newfolderName, const QString oldfolderName, const QString &clipId, bool doIt, QUndoCommand *parent) : QUndoCommand(parent), m_view(view), m_name(newfolderName), m_oldname(oldfolderName), m_id(clipId), m_doIt(doIt) {
     setText(i18n("Rename folder"));
 }
index c60a90e3ad063971a4eac10ac9068f7e523a4c8d..582b76b4c682c84a5634ead1889381145514eb74 100644 (file)
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <KLocale>
+
 
 #include "editguidecommand.h"
 #include "customtrackview.h"
 
+#include <KLocale>
+
 EditGuideCommand::EditGuideCommand(CustomTrackView *view, const GenTime oldPos, const QString &oldcomment, const GenTime pos, const QString &comment, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_oldPos(oldPos), m_oldcomment(oldcomment), m_pos(pos), m_comment(comment), m_doIt(doIt) {
     if (m_oldcomment.isEmpty()) setText(i18n("Add guide"));
     else if (m_oldPos == m_pos) setText(i18n("Edit guide"));
index 8e4d397eb5309082b79ac4788ce0dc4e1d3e8d59..ab8ab5fd66205c4e1a6552818e01ed947e60f2d1 100644 (file)
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <KLocale>
+
 
 #include "editkeyframecommand.h"
 #include "customtrackview.h"
 
+#include <KLocale>
+
 EditKeyFrameCommand::EditKeyFrameCommand(CustomTrackView *view, const int track, GenTime pos, const int effectIndex, const QString& oldkeyframes, const QString& newkeyframes, bool doIt) : m_view(view), m_track(track), m_pos(pos), m_index(effectIndex), m_oldkfr(oldkeyframes), m_newkfr(newkeyframes), m_doIt(doIt) {
     int prev = m_oldkfr.split(';', QString::SkipEmptyParts).count();
     int next = m_newkfr.split(';', QString::SkipEmptyParts).count();
index 89c2081f49cbbf1c28db9c32a330101d4a9aa3f2..66e19b53e6207a3beaf6c4da4a46c3c41d94079d 100644 (file)
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <KLocale>
 
 #include "edittransitioncommand.h"
 #include "customtrackview.h"
 
+#include <KLocale>
+
 EditTransitionCommand::EditTransitionCommand(CustomTrackView *view, const int track, GenTime pos, QDomElement oldeffect, QDomElement effect, bool doIt)
         : m_view(view), m_track(track), m_pos(pos), m_oldeffect(oldeffect), m_doIt(doIt) {
     m_effect = effect.cloneNode().toElement();
index fecf4b9b44933fb646a6ef2662ba5f45f9dd8e7b..91f1119f867344a51764bed04a621960b8235f31 100644 (file)
  *                                                                         *
  ***************************************************************************/
 
-#include <KDebug>
-#include <KLocale>
 
 #include "effectslist.h"
 
+#include <KDebug>
+#include <KLocale>
+
 
 EffectsList::EffectsList():
         QList < QDomElement > () {
index 90060c62cdbd0c21c44e0519f8001396497c231a..9c94ee3d2e9e14624956b1f6b09d1b99361d13c1 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QMenu>
-#include <QMenu>
-#include <QDir>
-
-#include <KDebug>
-#include <KLocale>
-#include <KStandardDirs>
 
 #include "effectslistview.h"
 #include "effectslistwidget.h"
 #include "effectslist.h"
 #include "kdenlivesettings.h"
 
+#include <KDebug>
+#include <KLocale>
+#include <KStandardDirs>
+
+#include <QMenu>
+#include <QDir>
+
 EffectsListView::EffectsListView(QWidget *parent)
         : QWidget(parent) {
     ui.setupUi(this);
index 25cf985939f52e0a443c87f9ec77e0f3c2a2cff9..72c95cc08e75b98de909cdb5c1ad457a52ba4e69 100644 (file)
@@ -18,8 +18,8 @@
  ***************************************************************************/
 
 
-#ifndef EFFECTLISTVIEW_H
-#define EFFECTLISTVIEW_H
+#ifndef EFFECTSLISTVIEW_H
+#define EFFECTSLISTVIEW_H
 
 #include <KIcon>
 
index f4453f6bcaba3380aa34fe703528b2698be6577d..2f60bc1b4a698630d23fc79ecf6b0ab3093047ca 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include "QApplication"
-#include "QMouseEvent"
-#include <QMenu>
-
-#include "KDebug"
 
 #include "effectslistwidget.h"
 #include "effectslist.h"
 #include "mainwindow.h"
 
+#include "KDebug"
+
+#include "QApplication"
+#include "QMouseEvent"
+#include <QMenu>
+
+
 static const int EFFECT_VIDEO = 1;
 static const int EFFECT_AUDIO = 2;
 static const int EFFECT_CUSTOM = 3;
index 1091c5b60b8282f61f07fce628017d55a6ac0acd..127e734690f176e575fe20ef028d5feae1081495 100644 (file)
@@ -18,8 +18,8 @@
  ***************************************************************************/
 
 
-#ifndef EFFECTLISTWIDGET_H
-#define EFFECTLISTWIDGET_H
+#ifndef EFFECTSLISTWIDGET_H
+#define EFFECTSLISTWIDGET_H
 
 #include <KListWidget>
 #include <QDomElement>
index 0a4967bcad7796c6213f5264f27bd835707ea238..2adf966a3b1835037ab59946c965243b4fbf9ad3 100644 (file)
  *                                                                         *
  ***************************************************************************/
 
-#include <QVBoxLayout>
-#include <QSlider>
-#include <QLabel>
-#include <QPushButton>
-#include <QCheckBox>
-#include <QScrollArea>
-
-#include <KDebug>
-#include <KLocale>
-
+#include "effectstackedit.h"
 #include "ui_constval_ui.h"
 #include "ui_listval_ui.h"
 #include "ui_boolval_ui.h"
 #include "ui_positionval_ui.h"
 #include "ui_wipeval_ui.h"
 #include "complexparameter.h"
-#include "effectstackedit.h"
 #include "geometryval.h"
-
 #include "kdenlivesettings.h"
 
+#include <KDebug>
+#include <KLocale>
+
+#include <QVBoxLayout>
+#include <QSlider>
+#include <QLabel>
+#include <QPushButton>
+#include <QCheckBox>
+#include <QScrollArea>
+
 QMap<QString, QImage> EffectStackEdit::iconCache;
 
 EffectStackEdit::EffectStackEdit(QWidget *parent): QWidget(parent), m_in(0), m_out(0) {
index 871471003c72caeab280fce1089ba6a34a266735..f28ee882f96795f676667055d9b50e950a82e653 100644 (file)
  *                                                                         *
  ***************************************************************************/
 
-#include <QHeaderView>
-#include <QMenu>
-#include <QInputDialog>
-#include <QTextStream>
-#include <QFile>
-
-#include <KDebug>
-#include <KLocale>
-#include <KMessageBox>
-#include <KStandardDirs>
 
 #include "effectstackview.h"
 #include "effectslist.h"
 #include "mainwindow.h"
 #include "kdenlivesettings.h"
 
+#include <KDebug>
+#include <KLocale>
+#include <KMessageBox>
+#include <KStandardDirs>
+
+#include <QMenu>
+#include <QTextStream>
+#include <QFile>
+#include <QInputDialog>
+
+
 EffectStackView::EffectStackView(QWidget *parent)
         : QWidget(parent) {
     ui.setupUi(this);
index ac9e0988bfa789f2b29fb1e54ae6c251f95741e1..a42d96d1d4a317d143948cd23b72adc1e3d4d4fe 100644 (file)
  *                                                                         *
  ***************************************************************************/
 
+#include "geometryval.h"
+#include "graphicsscenerectmove.h"
+#include "kdenlivesettings.h"
 
+#include <KDebug>
 
 #include <QGraphicsView>
 #include <QVBoxLayout>
-#include <QGraphicsScene>
 #include <QGraphicsRectItem>
-#include <QMouseEvent>
 #include <QMenu>
 
-#include <KDebug>
-
-#include "graphicsscenerectmove.h"
-#include "geometryval.h"
-#include "kdenlivesettings.h"
 
 Geometryval::Geometryval(const MltVideoProfile profile, QWidget* parent): QWidget(parent), m_profile(profile), m_geom(NULL), m_path(NULL), paramRect(NULL), m_fixedMode(false) {
     ui.setupUi(this);
index 7fba479ba5117771305f8ebc5718645b9c848b7e..3c94eccf98524b3675e44624de1a8abb2dae1806 100644 (file)
@@ -1,3 +1,24 @@
+/***************************************************************************
+ *   copyright (C) 2008 by Marco Gittler                                   *
+ *   Copyright (C) 2008 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 "graphicsscenerectmove.h"
 
 #include <KDebug>
 #include <QGraphicsSceneMouseEvent>
@@ -11,7 +32,6 @@
 #include <QApplication>
 #include <QTextBlock>
 
-#include "graphicsscenerectmove.h"
 
 GraphicsSceneRectMove::GraphicsSceneRectMove(QObject *parent): QGraphicsScene(parent), m_selectedItem(NULL), resizeMode(NoResize), m_tool(TITLE_RECTANGLE) {
     //grabMouse();
index 45bd5f7dd1d15a8c1d35c6a1f7e89c3369613754..7a4b12395de010420806151ffd6ca2b0dc7ee761 100644 (file)
@@ -1,5 +1,25 @@
-#ifndef GRAPHICSVIEWRECTMOVE_H
-#define GRAPHICSVIEWRECTMOVE_H
+/***************************************************************************
+ *   copyright (C) 2008 by Marco Gittler                                   *
+ *   Copyright (C) 2008 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 GRAPHICSSCENERECTMOVE_H
+#define GRAPHICSSCENERECTMOVE_H
 
 #include <QGraphicsScene>
 
index 37be746d7ee46be7afc043f1587398bade961d61..ed2a85bee0b0bd77008a8ffd70ff9cbf3864724d 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-
-#include <QPen>
-#include <QBrush>
-#include <QScrollBar>
-
-#include <KDebug>
-
 #include "guide.h"
 #include "customtrackview.h"
 #include "customtrackscene.h"
 #include "kdenlivesettings.h"
 
+#include <KDebug>
+
+#include <QPen>
+#include <QBrush>
+
 Guide::Guide(CustomTrackView *view, GenTime pos, QString label, double fps, double height)
         : QGraphicsLineItem(), m_view(view), m_position(pos), m_label(label), m_fps(fps) {
     setFlags(QGraphicsItem::ItemIsMovable);
index 87d221238421b41535ed499448996cb5db85a29e..0b2f8b8f9994449b7a3e58257cb565d28dae1b52 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QMouseEvent>
-#include <QStylePainter>
-#include <QFrame>
-#include <QWidget>
-#include <QPainter>
-#include <QAction>
+
+#include "headertrack.h"
+#include "kdenlivesettings.h"
 
 #include <KIcon>
 #include <KLocale>
 #include <KDebug>
 
-#include "kdenlivesettings.h"
-#include "headertrack.h"
+#include <QMouseEvent>
+#include <QWidget>
+#include <QPainter>
+#include <QAction>
 
 HeaderTrack::HeaderTrack(int index, TrackInfo info, QWidget *parent)
         : QWidget(parent), m_index(index), m_type(info.type) {
index adb65e279573de8ea7988c572a0194ffb71b4c41..c6384cfdb354423e7dff188a4338948f0d8d33c3 100644 (file)
  *                                                                         *
  ***************************************************************************/
 
-
-#include <QFile>
-#include <qregexp.h>
-#include <QDir>
-#include <QIcon>
-
-#include <KDebug>
-#include <kglobal.h>
-#include <KStandardDirs>
-
 #include "initeffects.h"
 #include "kdenlivesettings.h"
 #include "effectslist.h"
 #include "effectstackedit.h"
 #include "mainwindow.h"
 
+#include <KDebug>
+#include <kglobal.h>
+#include <KStandardDirs>
+
+#include <QFile>
+#include <qregexp.h>
+#include <QDir>
+#include <QIcon>
+
 initEffectsThumbnailer::initEffectsThumbnailer() {
 
 }
index c080357283837dae1e90e9b29e6066af33b5f9bc..1a6cc43fdac23b7f79ceb6b87eec7f7b2d6c2844 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <KLocale>
 
 #include "insertspacecommand.h"
 #include "customtrackview.h"
 
+#include <KLocale>
+
 InsertSpaceCommand::InsertSpaceCommand(CustomTrackView *view, QList<ItemInfo> clipsToMove, QList<ItemInfo> transToMove, int track, const GenTime &duration, bool doIt, QUndoCommand * parent)
         : QUndoCommand(parent), m_view(view), m_clipsToMove(clipsToMove), m_transToMove(transToMove), m_track(track), m_duration(duration), m_doIt(doIt) {
     if (duration > GenTime()) setText(i18n("Insert space"));
index 208706cc4a744c5a0f7d9458372543cfc15acbd3..1b6df679dbac2ba348eaaa17dcff3c3793069faa 100644 (file)
  ***************************************************************************/
 
 
+#include "jogshuttle.h"
+
+#include <KDebug>
+#include <kde_file.h>
+
+#include <QApplication>
+#include <QEvent>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <linux/input.h>
+
 
 #define DELAY 10
 
 #define JOG_STOP 10009
 
 
-#include <QApplication>
-#include <QEvent>
-
-#include <KDebug>
-#include <kde_file.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <linux/input.h>
-
-
-
-#include "jogshuttle.h"
-
-
 void ShuttleThread::init(QObject *parent, QString device) {
     m_parent = parent;
     m_device = device;
index c6e42c1bb93f008f5e7bf24808cdb41e0131f838..539f87a7e0b446a443c2499463c8a3f442b1009c 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QCryptographicHash>
-#include <QFile>
+
+#include "kdenlivedoc.h"
+#include "docclipbase.h"
+#include "profilesdialog.h"
+#include "kdenlivesettings.h"
+#include "renderer.h"
+#include "clipmanager.h"
+#include "titlewidget.h"
+#include "mainwindow.h"
 
 #include <KDebug>
 #include <KStandardDirs>
 #include <KIO/CopyJob>
 #include <KApplication>
 
+#include <QCryptographicHash>
+#include <QFile>
 
 #include <mlt++/Mlt.h>
 
-#include "kdenlivedoc.h"
-#include "docclipbase.h"
-#include "profilesdialog.h"
-#include "kdenlivesettings.h"
-#include "renderer.h"
-#include "clipmanager.h"
-#include "titlewidget.h"
-#include "mainwindow.h"
 
 KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, const QString &profileName, const QPoint tracks, Render *render, MainWindow *parent): QObject(parent), m_render(render), m_url(url), m_projectFolder(projectFolder), m_commandStack(new QUndoStack(undoGroup)), m_modified(false), m_documentLoadingProgress(0), m_documentLoadingStep(0.0), m_startPos(0), m_zoom(7), m_autosave(NULL), m_zoneStart(0), m_zoneEnd(100), m_abortLoading(false) {
     m_clipManager = new ClipManager(this);
index 11456d04d80dfb75a86fbb77cb6d746537148075..f474ab24153381422cfef4481850ed2a31b0de5f 100644 (file)
@@ -168,7 +168,7 @@ signals:
     void updateClipDisplay(const QString&);
     void deleteTimelineClip(const QString&);
     void progressInfo(const QString &, int);
-    /** emited when the document state has been modified (= needs saving or not) */
+    /** emitted when the document state has been modified (= needs saving or not) */
     void docModified(bool);
     void selectLastAddedClip(const QString &);
     void guidesUpdated();
index 503a9a90c11ec7926d6cf2d4d480289ebb87787e..3a7661cb5945a328aaabd811dee1aa670ae7ca15 100644 (file)
       <default></default>
     </entry>
   </group>
-</kcfg>
\ No newline at end of file
+</kcfg>
index 285cd4f43208a92b52fc9edf26e840fabfe87f95..b43bb4345f8bb986e2b7bb0bc9171d9303b3d792 100644 (file)
@@ -17,8 +17,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QDir>
-#include <QTimer>
+#include "kdenlivesettingsdialog.h"
+#include "profilesdialog.h"
+#include "kdenlivesettings.h"
 
 #include <KStandardDirs>
 #include <KDebug>
@@ -26,6 +27,9 @@
 #include <KConfigDialogManager>
 #include <kde_file.h>
 
+#include <QDir>
+#include <QTimer>
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -34,9 +38,6 @@
 #include <linux/input.h>
 #endif /* NO_JOGSHUTTLE */
 
-#include "profilesdialog.h"
-#include "kdenlivesettings.h"
-#include "kdenlivesettingsdialog.h"
 
 KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent): KConfigDialog(parent, "settings", KdenliveSettings::self()) {
 
index e8c6dd1f226a2c49941b2cf72b55f9a95338ca56..c0bf5d7ac2696dda7d4f2760d5927cf96deaed3d 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QMouseEvent>
-#include <QStylePainter>
+
+#include "keyframehelper.h"
+#include "definitions.h"
 
 #include <KDebug>
 #include <KGlobalSettings>
 
-#include "keyframehelper.h"
-#include "definitions.h"
+#include <QMouseEvent>
+#include <QStylePainter>
 
 
 KeyframeHelper::KeyframeHelper(QWidget *parent)
index f5963c1a6db991e3ab13bae6e48587208f00f3eb..0fb223d900b005c178e058920bdce7a97e20560a 100644 (file)
  *                                                                         *
  ***************************************************************************/
 
-#include <qxml.h>
-#include <QImage>
-#include <QApplication>
+#include "kthumb.h"
+#include "clipmanager.h"
+#include "renderer.h"
+#include "kdenlivesettings.h"
+
+#include <mlt++/Mlt.h>
 
 #include <kio/netaccess.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kdenlivesettings.h>
 #include <kfileitem.h>
 #include <kmessagebox.h>
 #include <KStandardDirs>
 
-#include <mlt++/Mlt.h>
-
-#include "clipmanager.h"
-#include "renderer.h"
-#include "kthumb.h"
-#include "kdenlivesettings.h"
-
+#include <qxml.h>
+#include <QImage>
+#include <QApplication>
 
 void MyThread::init(QObject *parent, KUrl url, QString target, double frame, double frameLength, int frequency, int channels, int arrayWidth) {
     stop_me = false;
index f571bdbef14656dc57de19c798205aa23c29b8ba..53600f6836629bc360ba058387bb71e6a64de44e 100644 (file)
@@ -32,7 +32,7 @@
 /**KRender encapsulates the client side of the interface to a renderer.
 From Kdenlive's point of view, you treat the KRender object as the
 renderer, and simply use it as if it was local. Calls are asyncrhonous -
-you send a call out, and then recieve the return value through the
+you send a call out, and then receive the return value through the
 relevant signal that get's emitted once the call completes.
   *@author Jason Wood
   */
index 9d854a800fbca2725fc9da828fd9ef1b6f1ff428..f082152d72868379894f3bf095724d65f6aadfc4 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <KLocale>
-
 #include "locktrackcommand.h"
 #include "customtrackview.h"
 
+#include <KLocale>
+
 LockTrackCommand::LockTrackCommand(CustomTrackView *view, int ix, bool lock, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_ix(ix), m_lock(lock), m_doIt(doIt) {
     if (lock) setText(i18n("Lock track"));
     else setText(i18n("Unlock track"));
index 96ba5066a9b1aa9350db0c8db8ddeec8a07e9451..85f5b8857691c1904bdf74e4bc443ae2fe6ddf7b 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <stdlib.h>
-
-#include <QTextStream>
-#include <QTimer>
-#include <QAction>
-#include <QtTest>
-#include <QtCore>
-#include <QKeyEvent>
-
-#include <KApplication>
-#include <KAction>
-#include <KLocale>
-#include <KGlobal>
-#include <KActionCollection>
-#include <KStandardAction>
-#include <KFileDialog>
-#include <KMessageBox>
-#include <KDebug>
-#include <KIO/NetAccess>
-#include <KSaveFile>
-#include <KRuler>
-#include <KConfigDialog>
-#include <KXMLGUIFactory>
-#include <KStatusBar>
-#include <kstandarddirs.h>
-#include <KUrlRequesterDialog>
-#include <KTemporaryFile>
-#include <KActionMenu>
-#include <KMenu>
-#include <locale.h>
-#include <ktogglefullscreenaction.h>
-#include <KFileItem>
-#include <KNotification>
-#include <KNotifyConfigWidget>
-#include <knewstuff2/engine.h>
-#include <knewstuff2/ui/knewstuffaction.h>
-
-
 
 #include "mainwindow.h"
 #include "mainwindowadaptor.h"
 #include "titlewidget.h"
 #include "markerdialog.h"
 #include "clipitem.h"
-
 #include "interfaces.h"
 
-// #include "scriptingpart.h"
+#include <KApplication>
+#include <KAction>
+#include <KLocale>
+#include <KGlobal>
+#include <KActionCollection>
+#include <KStandardAction>
+#include <KFileDialog>
+#include <KMessageBox>
+#include <KDebug>
+#include <KIO/NetAccess>
+#include <KSaveFile>
+#include <KRuler>
+#include <KConfigDialog>
+#include <KXMLGUIFactory>
+#include <KStatusBar>
+#include <kstandarddirs.h>
+#include <KUrlRequesterDialog>
+#include <KTemporaryFile>
+#include <KActionMenu>
+#include <KMenu>
+#include <locale.h>
+#include <ktogglefullscreenaction.h>
+#include <KFileItem>
+#include <KNotification>
+#include <KNotifyConfigWidget>
+#include <knewstuff2/engine.h>
+#include <knewstuff2/ui/knewstuffaction.h>
+
+#include <QTextStream>
+#include <QTimer>
+#include <QAction>
+#include <QKeyEvent>
+
+#include <stdlib.h>
 
 static const int ID_STATUS_MSG = 1;
 static const int ID_EDITMODE_MSG = 2;
@@ -2086,7 +2080,7 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip) {
 void MainWindow::customEvent(QEvent* e) {
     if (e->type() == QEvent::User) {
         // The timeline playing position changed...
-        kDebug() << "RECIEVED JOG EVEMNT!!!";
+        kDebug() << "RECEIVED JOG EVEMNT!!!";
     }
 }
 void MainWindow::slotActivateEffectStackView() {
index fbd32451c87da770ada34b1c10e574a441b9a2a3..497564cf58cf76b6960a2018a02ed43f3fc311b7 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QTreeWidgetItem>
-#include <QFile>
-#include <QHeaderView>
-#include <QIcon>
-#include <QPixmap>
-#include <QTimer>
+
+#include "managecapturesdialog.h"
+#include "kthumb.h"
 
 #include <KDebug>
 #include <KGlobalSettings>
 #include <KFileItem>
 #include <KIO/NetAccess>
 
-#include "managecapturesdialog.h"
-#include "kthumb.h"
+#include <QTreeWidgetItem>
+#include <QFile>
+#include <QHeaderView>
+#include <QIcon>
+#include <QPixmap>
+#include <QTimer>
 
 
 ManageCapturesDialog::ManageCapturesDialog(KUrl::List files, QWidget * parent): QDialog(parent) {
index 756056793ef11876829d07c9a9767024adb827f7..dbddb278936508a1b5f9189d2c106fca1dcd42c0 100644 (file)
@@ -21,7 +21,6 @@
 #ifndef CAPTUREDIALOG_H
 #define CAPTUREDIALOG_H
 
-#include <QDialog>
 #include <QPushButton>
 
 #include <KUrl>
index a26b33791ca71db294ab6ef8198fa844ff3655f1..7f32b501fc6e4c1e9ed3ed511e0161ab36b79ffd 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QWheelEvent>
-#include <KDebug>
 
 #include "markerdialog.h"
 #include "kthumb.h"
 #include "kdenlivesettings.h"
 
+#include <QWheelEvent>
+#include <KDebug>
+
+
 MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, const QString &caption, QWidget * parent): QDialog(parent), m_tc(tc), m_clip(clip), m_marker(t), m_producer(NULL), m_profile(NULL) {
     setFont(KGlobalSettings::toolBarFont());
     m_fps = m_tc.fps();
index 6a238c0d818e8bef94564ab0f5510cbe9e7daf47..6d56e124381528303f21157cb05a8ef773a2355f 100644 (file)
@@ -21,7 +21,6 @@
 #ifndef MARKERDIALOG_H
 #define MARKERDIALOG_H
 
-#include <QDialog>
 
 #include "docclipbase.h"
 #include "timecode.h"
index eb001c65be51bb76b8dbdc098ec199000bcc9b91..4faf482ada31ed0c22a644ad96d5f2b94d149041 100644 (file)
  ***************************************************************************/
 
 
+#include "monitor.h"
+#include "renderer.h"
+#include "monitormanager.h"
+#include "smallruler.h"
+#include "docclipbase.h"
+
+#include <KDebug>
+#include <KLocale>
+#include <KFileDialog>
+#include <KApplication>
+#include <KMessageBox>
+
 #include <QMouseEvent>
 #include <QStylePainter>
 #include <QMenu>
 #include <QDesktopWidget>
 #include <QLabel>
 
-#include <KDebug>
-#include <KLocale>
-#include <KFileDialog>
-#include <KApplication>
-#include <KMessageBox>
-
-#include "monitor.h"
-#include "renderer.h"
-#include "monitormanager.h"
-#include "smallruler.h"
-#include "docclipbase.h"
 
 Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent)
         : QWidget(parent), render(NULL), m_monitorManager(manager), m_name(name), m_isActive(false), m_currentClip(NULL), m_dragStarted(false) {
index 00515de5fda074295e45b5db5963eb05a04d3956..c620ece28ced9d1f7ac9bb58d56903cb24e7f870 100644 (file)
  ***************************************************************************/
 
 
-#include <QObject>
-#include <QTimer>
+#include "monitormanager.h"
+#include "kdenlivesettings.h"
 
 #include <mlt++/Mlt.h>
 
-#include "monitormanager.h"
-#include "kdenlivesettings.h"
+#include <QObject>
+#include <QTimer>
+
 
 MonitorManager::MonitorManager(QWidget *parent)
         : QObject(parent) {
index 5d9f91c796e45e6d2c2cde9a06b0fa3f32b92a3d..fe0d0eda15a558a96dac50265415057dc9437c75 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <KLocale>
 
 #include "moveclipcommand.h"
 #include "customtrackview.h"
+
+#include <KLocale>
+
 MoveClipCommand::MoveClipCommand(CustomTrackView *view, const ItemInfo start, const ItemInfo end, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_startPos(start), m_endPos(end), m_doIt(doIt) {
     setText(i18n("Move clip"));
 }
index cc0e90ae16a898147340a6a100f74261f9175322..e6271afd91285fae791295fd07468973c6a411f8 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <KLocale>
 
 #include "moveeffectcommand.h"
 #include "customtrackview.h"
 
+#include <KLocale>
+
 MoveEffectCommand::MoveEffectCommand(CustomTrackView *view, const int track, GenTime pos, int oldPos, int newPos, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_track(track), m_pos(pos), m_oldindex(oldPos), m_newindex(newPos), m_doIt(doIt) {
     /*    QString effectName;
         QDomNode namenode = effect.elementsByTagName("name").item(0);
index 38b2ba8f7716cac0333e5b9d88c7776971db5f3b..8d4bd3a4926a58aca3b028c0b2baa73e380a6354 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <KLocale>
 
 #include "movegroupcommand.h"
 #include "customtrackview.h"
 
+#include <KLocale>
+
 MoveGroupCommand::MoveGroupCommand(CustomTrackView *view, const QList <ItemInfo> startClip, const QList <ItemInfo> startTransition, const GenTime offset, const int trackOffset, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_startClip(startClip), m_startTransition(startTransition), m_offset(offset), m_trackOffset(trackOffset), m_doIt(doIt) {
     setText(i18n("Move clip"));
 }
index 2164f157b5f0bd7e216c8b2f6f0b9e4567d67e7d..4b4bf236a7b10b3ed95e543c66bdec9799735d48 100644 (file)
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <KLocale>
 
 #include "movetransitioncommand.h"
 #include "customtrackview.h"
+
+#include <KLocale>
+
 MoveTransitionCommand::MoveTransitionCommand(CustomTrackView *view, const ItemInfo start, const ItemInfo end, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_startPos(start), m_endPos(end), m_doIt(doIt) {
     setText(i18n("Move transition"));
 }
index 965f8f68dd763f1eca1e216fd1e10efac4b93c2a..97a822e93665f6c618abf23c9eaaf004554ab329 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QDir>
-#include <QCloseEvent>
+#include "profilesdialog.h"
+#include "kdenlivesettings.h"
 
 #include <KStandardDirs>
 #include <KDebug>
 #include <KMessageBox>
 #include <KIO/NetAccess>
 
-#include "kdenlivesettings.h"
-#include "profilesdialog.h"
+#include <QDir>
+#include <QCloseEvent>
 
 ProfilesDialog::ProfilesDialog(QWidget * parent): QDialog(parent), m_isCustomProfile(false), m_profileIsModified(false) {
     m_view.setupUi(this);
index 00b2369425873e2b63afdc46864e8cae5cc1794f..04dbe8dc72c07ad0af0cbbd9bf0905033534025d 100644 (file)
@@ -21,7 +21,6 @@
 #ifndef PROFILESDIALOG_H
 #define PROFILESDIALOG_H
 
-#include <QDialog>
 
 #include "definitions.h"
 #include "ui_profiledialog_ui.h"
index 37de725083e4ae5d1f0be5ae2d6d3a6ca8ab4f06..18211a1873c7f66e6e6dd6a870aa06f221e05b0a 100644 (file)
  ***************************************************************************/
 
 
-#include <QMouseEvent>
-#include <QStylePainter>
-#include <QLabel>
-#include <QLayout>
+#include "projectitem.h"
+#include "timecode.h"
+#include "kdenlivesettings.h"
+#include "docclipbase.h"
 
 #include <KDebug>
 #include <KLocale>
 #include <KIcon>
 
 
-#include "projectitem.h"
-#include "timecode.h"
-#include "kdenlivesettings.h"
-#include "docclipbase.h"
-
 const int NameRole = Qt::UserRole;
 const int DurationRole = NameRole + 1;
 const int UsageRole = NameRole + 2;
index f632976db3d4bd1432723cb0c4a2945cdb113087..eb936d0a2ad3cd1057b64f1d56e11fbb73697e6d 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-
-#include <QMouseEvent>
-#include <QStylePainter>
-#include <QPixmap>
-#include <QIcon>
-#include <QDialog>
-#include <QtGui>
-
-#include <KDebug>
-#include <KAction>
-#include <KLocale>
-#include <KFileDialog>
-#include <KInputDialog>
-#include <KMessageBox>
-
-#include <nepomuk/global.h>
-#include <nepomuk/resourcemanager.h>
-//#include <nepomuk/tag.h>
-
 #include "projectlist.h"
 #include "projectitem.h"
 #include "addfoldercommand.h"
 #include "editclipcommand.h"
 #include "editfoldercommand.h"
 
+
+#include <KDebug>
+#include <KAction>
+#include <KLocale>
+#include <KFileDialog>
+#include <KInputDialog>
+#include <KMessageBox>
+
+#include <nepomuk/global.h>
+#include <nepomuk/resourcemanager.h>
+//#include <nepomuk/tag.h>
+
+#include <QMouseEvent>
+#include <QStylePainter>
+#include <QPixmap>
+#include <QIcon>
+#include <QMenu>
+#include <QProcess>
+
 ProjectList::ProjectList(QWidget *parent)
         : QWidget(parent), m_render(NULL), m_fps(-1), m_commandStack(NULL), m_selectedItem(NULL), m_infoQueue(QMap <QString, QDomElement> ()), m_thumbnailQueue(QList <QString> ()), m_refreshed(false), m_editAction(NULL), m_openAction(NULL), m_deleteAction(NULL), m_reloadAction(NULL) {
 
index dc04ec60f3c481c824784ec76cdf56d4da6deb07..e0679d03e2a9b51e2eaf8a9515509025bd73c94c 100644 (file)
@@ -18,8 +18,8 @@
  ***************************************************************************/
 
 
-#ifndef PRJECTLIST_H
-#define PRJECTLIST_H
+#ifndef PROJECTLIST_H
+#define PROJECTLIST_H
 
 #include <QDomNodeList>
 #include <QToolBar>
index d76e85c4ff132be9fc19a703ae3b2ff161abb17c..117d04565d0ac75dbf770a6bd6837229c45470dc 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QApplication>
-#include <QHeaderView>
-#include <QAction>
+
+#include "projectlistview.h"
+#include "projectitem.h"
+#include "kdenlivesettings.h"
 
 #include <KDebug>
 #include <KMenu>
 #include <KLocale>
 
-#include "projectitem.h"
-#include "projectlistview.h"
-#include "kdenlivesettings.h"
-
+#include <QApplication>
+#include <QHeaderView>
+#include <QAction>
 
 ProjectListView::ProjectListView(QWidget *parent)
         : QTreeWidget(parent), m_dragStarted(false) {
index 4b302e5e83be1028c1297f98f67418d870d97fc6..cc9be0db0496df429600057af2ad16092a07366c 100644 (file)
  ***************************************************************************/
 
 
-#ifndef PRJECTLISTVIEW_H
-#define PRJECTLISTVIEW_H
+#ifndef PROJECTLISTVIEW_H
+#define PROJECTLISTVIEW_H
 
 #include <QTreeWidget>
 #include <QContextMenuEvent>
 #include <QPainter>
 
+class DocClipBase;
+
+class KUrl;
 
 class ProjectListView : public QTreeWidget {
     Q_OBJECT
index 7f1cea7d938a60303e887c0af5b1848c7df436cf..0d37b990d74354622a02645a208dd1fd0fbf3c44 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QDir>
+#include "projectsettings.h"
+#include "kdenlivesettings.h"
+#include "profilesdialog.h"
 
 #include <KStandardDirs>
 #include <KDebug>
 
-#include "kdenlivesettings.h"
-#include "profilesdialog.h"
-#include "projectsettings.h"
+#include <QDir>
 
 ProjectSettings::ProjectSettings(int videotracks, int audiotracks, const QString projectPath, bool readOnlyTracks, QWidget * parent): QDialog(parent), m_isCustomProfile(false) {
     m_view.setupUi(this);
index 7485910a2f7b8852efbf94e96122aafb0c76f40a..071351f91ecfa93077a4384ac4ec5040d7325a9d 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <KLocale>
 
 #include "razorclipcommand.h"
 #include "customtrackview.h"
 
+#include <KLocale>
+
 RazorClipCommand::RazorClipCommand(CustomTrackView *view, const ItemInfo info, const GenTime cutTime, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_info(info), m_cutTime(cutTime), m_doIt(doIt) {
     setText(i18n("Razor clip"));
 }
index ea57ca3a0fd78a8fffb50ddf6cc51c77bf5aa69a..479d0568300512fd2bf658d76bb73a52955395bf 100644 (file)
  ***************************************************************************/
 
 
-#include <QMouseEvent>
-#include <QStylePainter>
-#include <QMenu>
-#include <QToolButton>
-#include <QFile>
-#include <QDir>
-#include <QDesktopWidget>
+#include "recmonitor.h"
+#include "gentime.h"
+#include "kdenlivesettings.h"
+#include "managecapturesdialog.h"
 
 #include <KDebug>
 #include <KLocale>
+#include <QPainter>
 #include <KStandardDirs>
 #include <KComboBox>
 #include <KIO/NetAccess>
 #include <KFileItem>
 
-#include "gentime.h"
-#include "kdenlivesettings.h"
-#include "managecapturesdialog.h"
-#include "recmonitor.h"
+#include <QMouseEvent>
+#include <QMenu>
+#include <QToolButton>
+#include <QFile>
+#include <QDir>
+
 
 RecMonitor::RecMonitor(QString name, QWidget *parent)
         : QWidget(parent), m_name(name), m_isActive(false), m_isCapturing(false), m_isPlaying(false), m_didCapture(false) {
index d5f23306cf2480f0ac8f249b9fc61cc9f33bdcbb..810944c1cf4b5fd6f314d774b0ca2e9c9cfb69d6 100644 (file)
  *                                                                         *
  ***************************************************************************/
 
-#include <stdlib.h>
 
-#include <QTimer>
-#include <QDir>
-#include <QApplication>
+#include "renderer.h"
+#include "kdenlivesettings.h"
+#include "kthumb.h"
+#include "definitions.h"
+
+#include <mlt++/Mlt.h>
 
 #include <KDebug>
 #include <KStandardDirs>
 #include <KLocale>
 #include <KTemporaryFile>
 
-#include "renderer.h"
-#include "kdenlivesettings.h"
-#include "kthumb.h"
-#include "definitions.h"
-
-#include <mlt++/Mlt.h>
+#include <QTimer>
+#include <QDir>
+#include <QApplication>
 
+#include <stdlib.h>
 
 static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr) {
     // detect if the producer has finished playing. Is there a better way to do it ?
@@ -520,7 +520,7 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo
     }
 
     if (producer == NULL || producer->is_blank() || !producer->is_valid()) {
-        kDebug() << " / / / / / / / /ERRROR / / / / // CANNOT LOAD PRODUCER: ";
+        kDebug() << " / / / / / / / / ERROR / / / / // CANNOT LOAD PRODUCER: ";
         emit removeInvalidClip(clipId);
         return;
     }
@@ -614,7 +614,7 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo
     char property[200];
     if (producer->get_int("video_index") > -1) {
         /*if (context->duration == AV_NOPTS_VALUE) {
-        kDebug() << " / / / / / / / /ERRROR / / / CLIP HAS UNKNOWN DURATION";
+        kDebug() << " / / / / / / / /ERROR / / / CLIP HAS UNKNOWN DURATION";
             emit removeInvalidClip(clipId);
             return;
         }*/
@@ -681,7 +681,7 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo
         QString name = metadata.get_name(i);
         QString value = QString::fromUtf8(metadata.get(i));
         if (name.endsWith("markup") && !value.isEmpty())
-            metadataPropertyMap[ name.section(".", 0, -2)] = value;
+            metadataPropertyMap[ name.section('.', 0, -2)] = value;
     }
 
     emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer);
index 3f3fbe0d8352baad490fbabb0f4886b503ee1bf4..8685765e63fd89e4e6adfd2cb61727291d41eb21 100644 (file)
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef KRENDER_H
-#define KRENDER_H
+#ifndef RENDERER_H
+#define RENDERER_H
 
 #include <qdom.h>
 #include <qstring.h>
@@ -37,7 +37,8 @@ relevant signal that get's emitted once the call completes.
   */
 
 class Render;
-//class EffectParamDesc;
+
+class QTimer;
 class QPixmap;
 
 namespace Mlt {
index 461bd71b6faab9966c1d1e7ff29f2d17e44b5a98..92e4c61417023b1f975a097fccd29d6f10996524 100644 (file)
  ***************************************************************************/
 
 
-#include <QDomDocument>
-#include <QItemDelegate>
-#include <QTreeWidgetItem>
-#include <QListWidgetItem>
-#include <QHeaderView>
-#include <QMenu>
-#include <QProcess>
-#include <QInputDialog>
+#include "renderwidget.h"
+#include "kdenlivesettings.h"
+#include "ui_saveprofile_ui.h"
 
 #include <KStandardDirs>
 #include <KDebug>
 #include <KIO/NetAccess>
 // #include <knewstuff2/engine.h>
 
-#include "kdenlivesettings.h"
-#include "renderwidget.h"
-#include "ui_saveprofile_ui.h"
+#include <QDomDocument>
+#include <QItemDelegate>
+#include <QTreeWidgetItem>
+#include <QListWidgetItem>
+#include <QHeaderView>
+#include <QMenu>
+#include <QProcess>
+#include <QInputDialog>
 
 const int GroupRole = Qt::UserRole;
 const int ExtensionRole = GroupRole + 1;
@@ -614,7 +614,7 @@ void RenderWidget::slotExport(bool scriptExport) {
     if (group == "dvd" && m_view.open_dvd->isChecked()) {
         renderItem->setData(0, Qt::UserRole, group);
         if (renderArgs.contains("profile=")) {
-            // rendering profile contains an MLT profile, so pass it to the running jog item, usefull for dvd
+            // rendering profile contains an MLT profile, so pass it to the running jog item, useful for dvd
             QString prof = renderArgs.section("profile=", 1, 1);
             prof = prof.section(' ', 0, 0);
             kDebug() << "// render profile: " << prof;
index 926e0e5409fccff7131be46657ecfcedf2a5fe19..a97a8b1af6c4dbddc8835553a895bb5135163ded 100644 (file)
@@ -21,7 +21,6 @@
 #ifndef RENDERWIDGET_H
 #define RENDERWIDGET_H
 
-#include <QDialog>
 #include <QPushButton>
 #include <QPainter>
 #include <QItemDelegate>
@@ -29,6 +28,8 @@
 #include "definitions.h"
 #include "ui_renderwidget_ui.h"
 
+class QDomElement;
+
 
 // RenderViewDelegate is used to draw the progress bars.
 class RenderViewDelegate : public QItemDelegate {
index f76c7687069d1de9f8973c63aa94fff6449c19dd..3f491c37e85e99ad2ce1c28c87e0f23ce975d967 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <KLocale>
 
 #include "resizeclipcommand.h"
 #include "customtrackview.h"
 
+#include <KLocale>
+
 ResizeClipCommand::ResizeClipCommand(CustomTrackView *view, const ItemInfo start, const ItemInfo end, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_startPos(start), m_endPos(end), m_doIt(doIt) {
     setText(i18n("Resize clip"));
 }
index 01b33b723051d72e2bf847f218e075309d84d0ac..bd5f12df9a9d51a698a053f2eb8675478bd99b65 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QDir>
+#include "slideshowclip.h"
+#include "kdenlivesettings.h"
 
 #include <KStandardDirs>
 #include <KDebug>
 #include <KFileItem>
 
-#include "kdenlivesettings.h"
-#include "slideshowclip.h"
+#include <QDir>
 
 SlideshowClip::SlideshowClip(QWidget * parent): QDialog(parent), m_count(0) {
     setFont(KGlobalSettings::toolBarFont());
index fd4c32cc903da61e2c8e3a2ae3da73f187df3066..7c101c6f907af0639e798cb621147301792732f1 100644 (file)
  ***************************************************************************/
 
 
-#ifndef SLIDESHOWDIALOG_H
-#define SLIDESHOWDIALOG_H
+#ifndef SLIDESHOWCLIP_H
+#define SLIDESHOWCLIP_H
 
-#include <QDialog>
 
 #include "definitions.h"
 #include "docclipbase.h"
index fdd6fd9fcf08e330c9bbe2f58d5aa31f871cfde7..a07d1755fbbd2368bfef71103f49f7cf12e7e3f2 100644 (file)
  ***************************************************************************/
 
 
-#include <QMouseEvent>
-#include <QStylePainter>
+#include "smallruler.h"
 
 #include <KDebug>
 
-#include "smallruler.h"
-
+#include <QMouseEvent>
+#include <QStylePainter>
 
 SmallRuler::SmallRuler(QWidget *parent)
         : QWidget(parent), m_scale(1), m_maxval(25) {
index 756dd5ef6342099d0aa8bfd5c0f7b4c42d3ef309..cb0fc9ba55430628c880e2ff1c54a3eb6087432d 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QWheelEvent>
-#include <KDebug>
 
 #include "spacerdialog.h"
 #include "kthumb.h"
 #include "kdenlivesettings.h"
 
+#include <QWheelEvent>
+#include <KDebug>
+
+
 SpacerDialog::SpacerDialog(const GenTime duration, Timecode tc, int track, int trackNumber, QWidget * parent): QDialog(parent), m_tc(tc) {
     setFont(KGlobalSettings::toolBarFont());
     m_fps = m_tc.fps();
index e474a3b5f7e50f178377d55b84aa050d9cdb07a2..516de61a1fa5433e9029b2245bfe5232c6ebd176 100644 (file)
@@ -21,7 +21,6 @@
 #ifndef SPACERDIALOG_H
 #define SPACERDIALOG_H
 
-#include <QDialog>
 
 #include "timecode.h"
 #include "ui_spacerdialog_ui.h"
index f0e43c3d827c4cfcff8b69f4aa7020d06709afaa..ed1b6801d9e5a8dc1e0c43a2c5d9d777eb5997dd 100644 (file)
  *                                                                         *
  ***************************************************************************/
 
+#include "titlewidget.h"
+#include "kdenlivesettings.h"
 
+#include <KDebug>
+#include <KGlobalSettings>
+#include <KFileDialog>
+#include <KStandardDirs>
 
-#include <QGraphicsView>
 #include <QDomDocument>
 #include <QGraphicsItem>
 #include <QGraphicsSvgItem>
 #include <QTimer>
-
 #include <QToolBar>
 #include <QMenu>
 
-#include <KDebug>
-#include <KGlobalSettings>
-#include <KFileDialog>
-#include <KStandardDirs>
-
-#include "titlewidget.h"
-#include "kdenlivesettings.h"
-
 int settingUp = false;
 
 TitleWidget::TitleWidget(KUrl url, QString projectPath, Render *render, QWidget *parent): QDialog(parent), m_render(render), m_count(0), m_projectPath(projectPath), startViewport(NULL), endViewport(NULL) {
index a67112b7d0541ead6cc0d959d6952403e0172b93..9378aac783a336bf3641fda3e56c89ce8ef23516 100644 (file)
@@ -19,8 +19,6 @@
 #define TITLEWIDGET_H
 
 
-#include <QDialog>
-
 #include <QMap>
 
 #include "ui_titlewidget_ui.h"
index c1f66bad8edfd218f6ba77705d880a1ca546d4ac..72cf2823ec818a2f22f0b9796f78697fb7d911e5 100644 (file)
  ***************************************************************************/
 
 
-#include <QScrollBar>
-
-#include <KDebug>
-#include <KMessageBox>
-
+#include "trackview.h"
 #include "definitions.h"
 #include "headertrack.h"
-#include "trackview.h"
 #include "clipitem.h"
 #include "transition.h"
 #include "kdenlivesettings.h"
 #include "customtrackview.h"
 #include "initeffects.h"
 
+#include <KDebug>
+#include <KMessageBox>
+
+#include <QScrollBar>
+
 TrackView::TrackView(KdenliveDoc *doc, QWidget *parent)
         : QWidget(parent), m_doc(doc), m_scale(1.0), m_projectTracks(0) {
 
index ae88ac2ca51b79a1e82afb6054f21667b1ccbcf6..8a0c06c8bda801bbedd019336491fabbe9708826 100644 (file)
@@ -29,7 +29,6 @@
 #include <QGraphicsLineItem>
 #include <QDomElement>
 
-#define FRAME_SIZE 90
 
 #include "customtrackscene.h"
 #include "ui_timeline_ui.h"
index d574e5f67dee48fa38408f77323cbffd99f176d3..e345d08f149934ace2049f7f27c4a64cf8359372 100644 (file)
  *                                                                         *
  ***************************************************************************/
 
-#include <QBrush>
-#include <QDomElement>
-#include <QPainter>
-#include <QGraphicsScene>
-#include <QGraphicsView>
-#include <QScrollBar>
-#include <QStyleOptionGraphicsItem>
-
-#include <kdebug.h>
-#include <KIcon>
-#include <klocale.h>
-
 #include "transition.h"
 #include "clipitem.h"
 #include "kdenlivesettings.h"
 #include "customtrackscene.h"
 #include "mainwindow.h"
 
+#include <kdebug.h>
+#include <KIcon>
+#include <klocale.h>
+
+#include <QBrush>
+#include <QDomElement>
+#include <QPainter>
+#include <QStyleOptionGraphicsItem>
+
+
 Transition::Transition(const ItemInfo info, int transitiontrack, double fps, QDomElement params, bool automaticTransition) : AbstractClipItem(info, QRectF(), fps), m_automaticTransition(automaticTransition), m_forceTransitionTrack(false) {
     setZValue(2);
     setRect(0, 0, (info.endPos - info.startPos).frames(fps) - 0.02, (qreal)(KdenliveSettings::trackheight() / 3 * 2 - 1));
index 304c6f9519ac2b4ba428c199cc2a4d39fe34a9db..cfa77d1ad0606b621f0c9a76eeae9fed0a2e4dd3 100644 (file)
@@ -16,7 +16,6 @@
  ***************************************************************************/
 
 
-#include <KDebug>
 
 #include "transitionsettings.h"
 #include "transition.h"
@@ -25,6 +24,8 @@
 #include "kdenlivesettings.h"
 #include "mainwindow.h"
 
+#include <KDebug>
+
 TransitionSettings::TransitionSettings(QWidget* parent): QWidget(parent), m_tracksCount(0), m_usedTransition(NULL) {
     ui.setupUi(this);
     effectEdit = new EffectStackEdit(ui.frame);
index c6865623b78a8f5b6b632469ff2c023112093043..c858906ce92a998aa6115fcea4b2f1cc9b71fce3 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QLabel>
-#include <QFile>
-#include <QXmlStreamWriter>
-#include <QApplication>
-#include <QTimer>
+#include "wizard.h"
+#include "kdenlivesettings.h"
+#include "profilesdialog.h"
 
 #include <KStandardDirs>
 #include <KLocale>
 #include <KProcess>
 #include <kmimetype.h>
 
-#include "kdenlivesettings.h"
-#include "profilesdialog.h"
-#include "wizard.h"
+#include <QLabel>
+#include <QFile>
+#include <QXmlStreamWriter>
+#include <QTimer>
 
 Wizard::Wizard(QWidget *parent): QWizard(parent) {
     setPixmap(QWizard::WatermarkPixmap, QPixmap(KStandardDirs::locate("appdata", "banner.png")));
index c6679bfcd18ae2de788bebcf88051b3d5aad0d00..547fd5d0b5dc5ce310568ff032595f3a659b8c46 100644 (file)
@@ -18,6 +18,8 @@
     Boston, MA 02110-1301, USA.
  ***************************************************************************/
 
+#include "westleypreview.h"
+
 #include <qfile.h>
 #include <qimage.h>
 #include <QtCore/QVarLengthArray>
@@ -34,7 +36,6 @@
 
 #include <unistd.h>
 
-#include "westleypreview.h"
 
 #define DBG_AREA
 
index 79820accb33e5c7df5a708c8811b1d9f80142267..3b85cf151a83dc4ab17a3b1d1278bce1d09cf562 100644 (file)
  ***************************************************************************/
 
 
-#ifndef _westleypreview_H_
-#define _westleypreview_H_
-
-#include <qstring.h>
+#ifndef WESTLEYPREVIEW_H
+#define WESTLEYPREVIEW_H
 
 #include <kio/thumbcreator.h>
+
+#include <qstring.h>
+#include <qstringlist.h>
 #include <qobject.h>
 
 class QProcess;
 class KTempDir;
 class KRandomSequence;
 
-
-
-
 class WestleyPreview : public QObject, public ThumbCreator {
     Q_OBJECT
 public: