Commit 76b84180 authored by Ray Lehtiniemi's avatar Ray Lehtiniemi

[PATCH 1/2] Kill a bunch of unused member variables

Signed-off-by: default avatarRay Lehtiniemi <rayl@mail.com>

svn path=/trunk/kdenlive/; revision=3282
parent 51c3afba
......@@ -63,10 +63,6 @@ private:
QTime m_startTime;
void initKdenliveDbusInterface();
bool m_usekuiserver;
/** \brief Used to create a temporary file for logging */
QTemporaryFile m_logfile;
/** \brief Used to write to the log file */
QTextStream m_logstream;
signals:
void renderingFinished();
......
......@@ -32,10 +32,9 @@
#include <QMimeData>
AbstractGroupItem::AbstractGroupItem(double fps) :
AbstractGroupItem::AbstractGroupItem(double /* fps */) :
QObject(),
QGraphicsItemGroup(),
m_fps(fps)
QGraphicsItemGroup()
{
setZValue(2);
setFlags(QGraphicsItem::ItemClipsToShape | QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
......
......@@ -50,9 +50,6 @@ protected:
private:
QPainterPath groupShape(QPointF);
void fixItemRect();
double m_fps;
GenTime m_startPos;
int m_track;
};
#endif
......@@ -40,10 +40,8 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, b
AbstractClipItem(info, QRectF(), fps),
m_clip(clip),
m_resizeMode(NONE),
m_grabPoint(0),
m_startFade(0),
m_endFade(0),
m_maxTrack(0),
m_audioOnly(false),
m_videoOnly(false),
m_startPix(QPixmap()),
......@@ -52,13 +50,11 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, b
startThumbTimer(NULL),
endThumbTimer(NULL),
m_selectedEffect(-1),
m_opacity(1.0),
m_timeLine(0),
m_startThumbRequested(false),
m_endThumbRequested(false),
m_hover(false),
m_speed(speed),
audioThumbWasDrawn(false),
framePixelWidth(0)
{
setZValue(1);
......
......@@ -124,14 +124,12 @@ protected:
private:
DocClipBase *m_clip;
OPERATIONTYPE m_resizeMode;
int m_grabPoint;
QString m_producer;
CLIPTYPE m_clipType;
QString m_clipName;
QString m_effectNames;
int m_startFade;
int m_endFade;
int m_maxTrack;
bool m_audioOnly;
bool m_videoOnly;
......@@ -142,7 +140,6 @@ private:
QTimer *endThumbTimer;
int m_selectedEffect;
double m_opacity;
QTimeLine *m_timeLine;
bool m_startThumbRequested;
bool m_endThumbRequested;
......@@ -152,9 +149,8 @@ private:
EffectsList m_effectList;
QList <Transition*> m_transitionsList;
QMap<int, QPixmap> audioThumbCachePic;
bool audioThumbWasDrawn, audioThumbReady;
bool audioThumbReady;
double framePixelWidth;
QMap<int, QPainterPath > channelPaths;
/** Called when clip start is resized, adjust keyframes values */
void checkEffectsKeyframesPos(const int previous, const int current, bool fromStart);
QPixmap m_videoPix;
......
......@@ -30,8 +30,6 @@ ComplexParameter::ComplexParameter(QWidget *parent) :
ui.setupUi(this);
//ui.effectlist->horizontalHeader()->setVisible(false);
//ui.effectlist->verticalHeader()->setVisible(false);
activeRow = -1;
clipref = NULL;
ui.buttonLeftRight->setIcon(KIcon("go-next"));//better icons needed
......
......@@ -33,13 +33,9 @@ public:
ComplexParameter(QWidget *parent = 0);
QDomElement getParamDesc();
private:
int activeRow;
QList<QDomElement> effects;
Ui::KeyframeWidget_UI ui;
ClipItem* clipref;
void setupListView();
void updateButtonStatus();
QMap<QString, EffectsList*> effectLists;
QDomElement param;
public slots:
......
......@@ -48,7 +48,6 @@ protected:
virtual void mouseMoveEvent(QMouseEvent * event);
private:
int m_cursorPosition;
Timecode m_timecode;
CustomTrackView *m_view;
int m_zoneStart;
......
......@@ -84,7 +84,6 @@
CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscene, QWidget *parent) :
QGraphicsView(projectscene, parent),
m_tracksHeight(KdenliveSettings::trackheight()),
m_selectedTrack(0),
m_projectDuration(0),
m_cursorPos(0),
m_document(doc),
......
......@@ -169,7 +169,6 @@ protected:
private:
int m_tracksHeight;
uint m_selectedTrack;
int m_projectDuration;
int m_cursorPos;
KdenliveDoc *m_document;
......@@ -216,7 +215,6 @@ private:
int m_scrollOffset;
bool m_clipDrag;
QList <CommentedTime> m_searchStrings;
int m_findIndex;
PROJECTTOOL m_tool;
QCursor m_razorCursor;
......
......@@ -36,7 +36,6 @@
DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QString &id, bool placeHolder) :
QObject(),
audioFrameChache(),
m_description(),
m_refcount(0),
m_baseTrackProducers(),
m_audioTrackProducers(),
......
......@@ -185,8 +185,6 @@ Q_OBJECT public:
private: // Private attributes
/** A description of this clip */
QString m_description;
/** The number of times this clip is used in the project - the number of references to this clip
* that exist. */
uint m_refcount;
......
......@@ -37,7 +37,6 @@
DvdWizard::DvdWizard(const QString &url, const QString &profile, QWidget *parent) :
QWizard(parent),
m_profile(profile),
m_dvdauthor(NULL),
m_mkiso(NULL)
{
......@@ -49,7 +48,7 @@ DvdWizard::DvdWizard(const QString &url, const QString &profile, QWidget *parent
if (!url.isEmpty()) m_pageVob->setUrl(url);
m_pageMenu = new DvdWizardMenu(m_profile, this);
m_pageMenu = new DvdWizardMenu(profile, this);
m_pageMenu->setTitle(i18n("Create DVD Menu"));
addPage(m_pageMenu);
......
......@@ -48,7 +48,6 @@ private:
DvdWizardMenu *m_pageMenu;
Ui::DvdWizardIso_UI m_iso;
Ui::DvdWizardStatus_UI m_status;
QString m_profile;
KTemporaryFile m_menuFile;
KTemporaryFile m_authorFile;
QProcess *m_dvdauthor;
......
......@@ -122,7 +122,6 @@ private:
Ui::DvdWizardMenu_UI m_view;
bool m_isPal;
DvdScene *m_scene;
DvdButton *m_button;
QGraphicsPixmapItem *m_background;
QGraphicsRectItem *m_color;
QGraphicsRectItem *m_safeRect;
......
......@@ -119,7 +119,6 @@ Q_OBJECT public:
private:
KUrl m_url;
QDomDocument m_document;
QString m_projectName;
double m_fps;
int m_zoom;
/** Cursor position at document opening */
......
......@@ -68,7 +68,6 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent) :
m_configEnv.capturefolderurl->lineEdit()->setObjectName("kcfg_capturefolder");
page2 = addPage(p2, i18n("Environment"), "terminal");
m_captureFolder = KdenliveSettings::capturefolder();
QWidget *p4 = new QWidget;
m_configCapture.setupUi(p4);
page4 = addPage(p4, i18n("Capture"), "audio-card");
......
......@@ -74,13 +74,9 @@ private:
Ui::ConfigCapture_UI m_configCapture;
Ui::ConfigJogShuttle_UI m_configShuttle;
Ui::ConfigSdl_UI m_configSdl;
QStringList m_mltProfilesList;
QStringList m_customProfilesList;
bool m_isCustomProfile;
QString m_defaultProfile;
QString m_defaultPath;
KProcess m_readProcess;
QString m_captureFolder;
void initDevices();
signals:
......
......@@ -124,8 +124,7 @@ KThumb::KThumb(ClipManager *clipManager, KUrl url, const QString &id, const QStr
m_dar(1),
m_producer(NULL),
m_clipManager(clipManager),
m_id(id),
m_mainFrame(-1)
m_id(id)
{
m_thumbFile = clipManager->projectFolder() + "/thumbs/" + hash + ".thumb";
connect(&audioThumbProducer, SIGNAL(audioThumbProgress(const int)), this, SLOT(slotAudioThumbProgress(const int)));
......
......@@ -114,7 +114,6 @@ private:
Mlt::Producer *m_producer;
ClipManager *m_clipManager;
QString m_id;
int m_mainFrame;
signals:
void thumbReady(int, QPixmap);
......
......@@ -108,8 +108,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
#ifndef NO_JOGSHUTTLE
m_jogProcess(NULL),
#endif /* NO_JOGSHUTTLE */
m_findActivated(false),
m_initialized(false)
m_findActivated(false)
{
// Create DBus interface
......
......@@ -138,9 +138,6 @@ private:
KComboBox *m_timecodeFormat;
QDockWidget *overviewDock;
CustomTrackView *m_overView;
QMenu *m_customEffectsMenu;
QMenu *m_timelineContextMenu;
QMenu *m_timelineContextClipMenu;
......@@ -176,7 +173,6 @@ private:
bool m_findActivated;
QString m_findString;
QTimer m_findTimer;
bool m_initialized;
void readOptions();
void saveOptions();
......
......@@ -31,7 +31,6 @@ MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, cons
m_producer(NULL),
m_profile(NULL),
m_clip(clip),
m_marker(t),
m_tc(tc)
{
setFont(KGlobalSettings::toolBarFont());
......
......@@ -54,7 +54,6 @@ private:
Mlt::Profile *m_profile;
Ui::MarkerDialog_UI m_view;
DocClipBase *m_clip;
CommentedTime m_marker;
Timecode m_tc;
double m_fps;
double m_dar;
......
......@@ -54,8 +54,6 @@ private slots:
private:
Ui::ProfilesDialog_UI m_view;
QStringList m_mltProfilesList;
QStringList m_customProfilesList;
int m_selectedProfileIndex;
bool m_profileIsModified;
bool m_isCustomProfile;
......
......@@ -27,8 +27,7 @@
#include <QDir>
ProjectSettings::ProjectSettings(int videotracks, int audiotracks, const QString projectPath, bool readOnlyTracks, QWidget * parent) :
QDialog(parent),
m_isCustomProfile(false)
QDialog(parent)
{
m_view.setupUi(this);
......
......@@ -44,9 +44,6 @@ private slots:
private:
Ui::ProjectSettings_UI m_view;
QStringList m_mltProfilesList;
QStringList m_customProfilesList;
bool m_isCustomProfile;
QPushButton *buttonOk;
};
......
......@@ -32,8 +32,6 @@
#include <KDateTime>
#include "ui_recmonitor_ui.h"
#include "smallruler.h"
#include "regiongrabber.h"
class RecMonitor : public QWidget
{
......@@ -52,9 +50,7 @@ protected:
private:
Ui::RecMonitor_UI ui;
QString m_tmpFolder;
QString m_name;
RegionGrabber *rgnGrab;
bool m_isActive;
KDateTime m_captureTime;
......@@ -64,7 +60,6 @@ private:
QProcess *captureProcess;
QProcess *displayProcess;
QTimer *m_initTimer;
bool m_isCapturing;
/** did the user capture something ? */
bool m_didCapture;
......
......@@ -53,20 +53,18 @@ static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr
}
}
Render::Render(const QString & rendererName, int winid, int extid, QWidget *parent) :
Render::Render(const QString & rendererName, int winid, int /* extid */, QWidget *parent) :
QObject(parent),
m_isBlocked(true),
m_name(rendererName),
m_mltConsumer(NULL),
m_mltProducer(NULL),
m_mltTextProducer(NULL),
m_framePosition(0),
m_isZoneMode(false),
m_isLoopMode(false),
m_isSplitView(false),
m_blackClip(NULL),
m_winid(winid),
m_externalwinid(extid)
m_winid(winid)
{
kDebug() << "////////// USING PROFILE: " << (char*)KdenliveSettings::current_profile().toUtf8().data();
refreshTimer = new QTimer(this);
......@@ -77,8 +75,6 @@ Render::Render(const QString & rendererName, int winid, int extid, QWidget *pare
osdTimer = new QTimer(this);
connect(osdTimer, SIGNAL(timeout()), this, SLOT(slotOsdTimeout()));
m_osdProfile = KStandardDirs::locate("data", "kdenlive/profiles/metadata.properties");
buildConsumer();
m_mltProducer = m_blackClip->cut(0, 50);
......
......@@ -195,8 +195,6 @@ private: // Private attributes & methods
QString m_name;
Mlt::Consumer * m_mltConsumer;
Mlt::Producer * m_mltProducer;
Mlt::Producer *m_mltTextProducer;
Mlt::Filter *m_osdInfo;
Mlt::Profile *m_mltProfile;
double m_framePosition;
double m_fps;
......@@ -211,17 +209,13 @@ private: // Private attributes & methods
bool m_isSplitView;
Mlt::Producer *m_blackClip;
/** Holds the path to on screen display profile */
QString m_osdProfile;
QString m_activeProfile;
QTimer *refreshTimer;
QTimer *osdTimer;
KUrl m_exportedFile;
/** A human-readable description of this renderer. */
int m_winid;
int m_externalwinid;
/** Sets the description of this renderer to desc. */
void closeMlt();
......
......@@ -76,11 +76,7 @@ private:
CustomTrackScene *m_scene;
KdenliveDoc *m_doc;
QVBoxLayout *m_tracksLayout;
QVBoxLayout *m_headersLayout;
QScrollArea *m_scrollArea;
QFrame *m_scrollBox;
QVBoxLayout *m_tracksAreaLayout;
QString m_documentErrors;
void parseDocument(QDomDocument doc);
int slotAddProjectTrack(int ix, QDomElement xml, bool locked);
......
......@@ -40,7 +40,6 @@ Transition::Transition(const ItemInfo info, int transitiontrack, double fps, QDo
setRect(0, 0, (info.endPos - info.startPos).frames(fps) - 0.02, (qreal)(KdenliveSettings::trackheight() / 3 * 2 - 1));
setPos(info.startPos.frames(fps), (qreal)(info.track * KdenliveSettings::trackheight() + KdenliveSettings::trackheight() / 3 * 2));
m_singleClip = true;
m_transitionTrack = transitiontrack;
m_secondClip = NULL;
m_cropStart = GenTime();
......
......@@ -78,7 +78,6 @@ protected:
virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
private:
bool m_singleClip;
QString m_name;
bool m_forceTransitionTrack;
......
......@@ -48,7 +48,6 @@ protected:
private:
QProcess *m_inigoprocess;
QStringList customargs;
KRandomSequence *m_rand;
QString playerBin;
bool startAndWaitProcess(const QStringList &args);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment