From 4720701ac49d3dcadbb4a32a9f7af263d79f2090 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Sat, 9 Aug 2008 10:32:49 +0000 Subject: [PATCH] cleanup svn path=/branches/KDE4/; revision=2369 --- src/clipproperties.cpp | 24 ++++++++--------- src/customruler.cpp | 57 +++++++++++---------------------------- src/effectslistwidget.cpp | 6 ++--- src/kthumb.cpp | 5 ---- src/mainwindow.cpp | 12 ++++----- src/slideshowclip.cpp | 8 +++--- src/smallruler.cpp | 10 +++---- 7 files changed, 46 insertions(+), 76 deletions(-) diff --git a/src/clipproperties.cpp b/src/clipproperties.cpp index 4bb88aba..550a8ab7 100644 --- a/src/clipproperties.cpp +++ b/src/clipproperties.cpp @@ -28,18 +28,18 @@ #include "kthumb.h" #include "markerdialog.h" -#define VIDEOTAB 0 -#define AUDIOTAB 1 -#define COLORTAB 2 -#define SLIDETAB 3 -#define IMAGETAB 4 -#define MARKERTAB 5 -#define ADVANCEDTAB 6 - -#define TYPE_JPEG 0 -#define TYPE_PNG 1 -#define TYPE_BMP 2 -#define TYPE_GIF 3 +static const int VIDEOTAB = 0; +static const int AUDIOTAB = 1; +static const int COLORTAB = 2; +static const int SLIDETAB = 3; +static const int IMAGETAB = 4; +static const int MARKERTAB = 5; +static const int ADVANCEDTAB = 6; + +static const int TYPE_JPEG = 0; +static const int TYPE_PNG = 1; +static const int TYPE_BMP = 2; +static const int TYPE_GIF = 3; ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidget * parent): QDialog(parent), m_tc(tc), m_clip(clip), m_fps(fps), m_clipNeedsRefresh(false), m_count(0) { setFont(KGlobalSettings::toolBarFont()); diff --git a/src/customruler.cpp b/src/customruler.cpp index a7133bb1..1a10f32c 100644 --- a/src/customruler.cpp +++ b/src/customruler.cpp @@ -28,47 +28,22 @@ #include "customruler.h" -#define INIT_VALUE 0 -#define INIT_MIN_VALUE 0 -#define INIT_MAX_VALUE 100 -#define INIT_TINY_MARK_DISTANCE 1 -#define INIT_LITTLE_MARK_DISTANCE 5 -#define INIT_MIDDLE_MARK_DISTANCE (INIT_LITTLE_MARK_DISTANCE * 2) -#define INIT_BIG_MARK_DISTANCE (INIT_LITTLE_MARK_DISTANCE * 10) -#define INIT_SHOW_TINY_MARK false -#define INIT_SHOW_LITTLE_MARK true -#define INIT_SHOW_MEDIUM_MARK true -#define INIT_SHOW_BIG_MARK true -#define INIT_SHOW_END_MARK true -#define INIT_SHOW_POINTER true -#define INIT_SHOW_END_LABEL true - -#define INIT_PIXEL_PER_MARK (double)10.0 /* distance between 2 base marks in pixel */ -#define INIT_OFFSET (-20) -#define INIT_LENGTH_FIX true -#define INIT_END_OFFSET 0 - -#define FIX_WIDTH 24 /* widget width in pixel */ -#define LINE_END (FIX_WIDTH - 3) -#define END_MARK_LENGTH (FIX_WIDTH - 8) -#define END_MARK_X2 LINE_END -#define END_MARK_X1 (END_MARK_X2 - END_MARK_LENGTH) -#define BIG_MARK_LENGTH (END_MARK_LENGTH*3/4) -#define BIG_MARK_X2 LINE_END -#define BIG_MARK_X1 (BIG_MARK_X2 - BIG_MARK_LENGTH) -#define MIDDLE_MARK_LENGTH (END_MARK_LENGTH/2) -#define MIDDLE_MARK_X2 LINE_END -#define MIDDLE_MARK_X1 (MIDDLE_MARK_X2 - MIDDLE_MARK_LENGTH) -#define LITTLE_MARK_LENGTH (MIDDLE_MARK_LENGTH/2) -#define LITTLE_MARK_X2 LINE_END -#define LITTLE_MARK_X1 (LITTLE_MARK_X2 - LITTLE_MARK_LENGTH) -#define BASE_MARK_LENGTH (LITTLE_MARK_LENGTH/2) -#define BASE_MARK_X2 LINE_END -#define BASE_MARK_X1 (BASE_MARK_X2 - 3) //BASE_MARK_LENGTH - -#define LABEL_SIZE 9 -#define END_LABEL_X 4 -#define END_LABEL_Y (END_LABEL_X + LABEL_SIZE - 2) +static const int FIX_WIDTH = 24; /* widget width in pixel */ +static const int LINE_END = (FIX_WIDTH - 3); +static const int END_MARK_LENGTH = (FIX_WIDTH - 8); +static const int BIG_MARK_LENGTH = (END_MARK_LENGTH * 3 / 4); +static const int BIG_MARK_X2 = LINE_END; +static const int BIG_MARK_X1 = (BIG_MARK_X2 - BIG_MARK_LENGTH); +static const int MIDDLE_MARK_LENGTH = (END_MARK_LENGTH / 2); +static const int MIDDLE_MARK_X2 = LINE_END; +static const int MIDDLE_MARK_X1 = (MIDDLE_MARK_X2 - MIDDLE_MARK_LENGTH); +static const int LITTLE_MARK_LENGTH = (MIDDLE_MARK_LENGTH / 2); +static const int LITTLE_MARK_X2 = LINE_END; +static const int LITTLE_MARK_X1 = (LITTLE_MARK_X2 - LITTLE_MARK_LENGTH); + +static const int LABEL_SIZE = 9; +static const int END_LABEL_X = 4; +static const int END_LABEL_Y = (END_LABEL_X + LABEL_SIZE - 2); #include "definitions.h" diff --git a/src/effectslistwidget.cpp b/src/effectslistwidget.cpp index fa4ee150..ad0a35a4 100644 --- a/src/effectslistwidget.cpp +++ b/src/effectslistwidget.cpp @@ -27,9 +27,9 @@ #include "effectslist.h" #include "mainwindow.h" -#define EFFECT_VIDEO 1 -#define EFFECT_AUDIO 2 -#define EFFECT_CUSTOM 3 +static const int EFFECT_VIDEO = 1; +static const int EFFECT_AUDIO = 2; +static const int EFFECT_CUSTOM = 3; EffectsListWidget::EffectsListWidget(QMenu *menu, QWidget *parent) : KListWidget(parent), m_menu(menu) { diff --git a/src/kthumb.cpp b/src/kthumb.cpp index b380ee25..ec3fea70 100644 --- a/src/kthumb.cpp +++ b/src/kthumb.cpp @@ -126,11 +126,6 @@ void MyThread::run() { } -#define _S(a) (a)>255 ? 255 : (a)<0 ? 0 : (a) -#define _R(y,u,v) (0x2568*(y) + 0x3343*(u)) /0x2000 -#define _G(y,u,v) (0x2568*(y) - 0x0c92*(v) - 0x1a1e*(u)) /0x2000 -#define _B(y,u,v) (0x2568*(y) + 0x40cf*(v)) /0x2000 - KThumb::KThumb(ClipManager *clipManager, KUrl url, QObject * parent, const char *name): QObject(parent), m_clipManager(clipManager), m_url(url), m_producer(NULL), m_dar(1) { QCryptographicHash context(QCryptographicHash::Sha1); context.addData((KFileItem(m_url, "text/plain", S_IFREG).timeString() + m_url.fileName()).toAscii().data()); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 5c3f40e6..65c78640 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -77,12 +77,12 @@ #include "clipproperties.h" #include "wizard.h" -#define ID_STATUS_MSG 1 -#define ID_EDITMODE_MSG 2 -#define ID_TIMELINE_MSG 3 -#define ID_TIMELINE_BUTTONS 5 -#define ID_TIMELINE_POS 6 -#define ID_TIMELINE_FORMAT 7 +static const int ID_STATUS_MSG = 1; +static const int ID_EDITMODE_MSG = 2; +static const int ID_TIMELINE_MSG = 3; +static const int ID_TIMELINE_BUTTONS = 5; +static const int ID_TIMELINE_POS = 6; +static const int ID_TIMELINE_FORMAT = 7; namespace Mlt { class Producer; diff --git a/src/slideshowclip.cpp b/src/slideshowclip.cpp index 22693190..1a94ddcd 100644 --- a/src/slideshowclip.cpp +++ b/src/slideshowclip.cpp @@ -26,10 +26,10 @@ #include "kdenlivesettings.h" #include "slideshowclip.h" -#define TYPE_JPEG 0 -#define TYPE_PNG 1 -#define TYPE_BMP 2 -#define TYPE_GIF 3 +static const int TYPE_JPEG = 0; +static const int TYPE_PNG = 1; +static const int TYPE_BMP = 2; +static const int TYPE_GIF = 3; SlideshowClip::SlideshowClip(QWidget * parent): QDialog(parent), m_count(0) { setFont(KGlobalSettings::toolBarFont()); diff --git a/src/smallruler.cpp b/src/smallruler.cpp index 73243e0b..d64d0bc6 100644 --- a/src/smallruler.cpp +++ b/src/smallruler.cpp @@ -23,12 +23,12 @@ #include -#define LITTLE_MARK_X2 8 -#define LITTLE_MARK_X1 5 -#define MIDDLE_MARK_X1 3 -#define MIDDLE_MARK_X2 8 +static const int LITTLE_MARK_X2 = 8; +static const int LITTLE_MARK_X1 = 5; +static const int MIDDLE_MARK_X1 = 3; +static const int MIDDLE_MARK_X2 = 8; -#define LABEL_SIZE 8 +static const int LABEL_SIZE = 8; #include "smallruler.h" -- 2.39.2