From: Montel L. <mo...@kd...> - 2013-06-12 05:32:42
|
Git commit 1be0881b4461775039fd8d79755c354fd229abbf by Montel Laurent. Committed on 12/06/2013 at 07:32. Pushed by mlaurent into branch 'master'. Normalize signal/slots M +1 -1 src/core/bin/bin.cpp M +1 -1 src/core/bin/projectitemmodel.cpp M +2 -2 src/core/monitor/monitormanager.cpp M +2 -2 src/core/timelineview/markerswidget.cpp http://commits.kde.org/kdenlive/1be0881b4461775039fd8d79755c354fd229abbf diff --git a/src/core/bin/bin.cpp b/src/core/bin/bin.cpp index 1b832d1..8f78784 100644 --- a/src/core/bin/bin.cpp +++ b/src/core/bin/bin.cpp @@ -173,7 +173,7 @@ void Bin::setProject(Project* project) m_itemModel->setIconSize(m_iconSize); connect(m_itemModel, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(rowsInserted(QModelIndex,int,int))); connect(m_itemModel, SIGNAL(selectModel(QModelIndex)), this, SLOT(selectModel(QModelIndex))); - connect(m_itemModel, SIGNAL(markersNeedUpdate(const QString&,const QList <int>)), this, SLOT(slotMarkersNeedUpdate(const QString&,const QList <int>))); + connect(m_itemModel, SIGNAL(markersNeedUpdate(QString,QList<int>)), this, SLOT(slotMarkersNeedUpdate(QString,QList<int>))); connect(m_eventEater, SIGNAL(focusClipMonitor()), project->bin()->monitor(), SLOT(slotFocusClipMonitor()), Qt::UniqueConnection); connect(m_eventEater, SIGNAL(editItemInTimeline(QString,QString,ProducerWrapper*)), this, SLOT(slotOpenClipTimeline(QString,QString,ProducerWrapper*)), Qt::UniqueConnection); connect(m_eventEater, SIGNAL(editItem(QString)), this, SLOT(showClipProperties(QString)), Qt::UniqueConnection); diff --git a/src/core/bin/projectitemmodel.cpp b/src/core/bin/projectitemmodel.cpp index b4867aa..a3bd064 100644 --- a/src/core/bin/projectitemmodel.cpp +++ b/src/core/bin/projectitemmodel.cpp @@ -37,7 +37,7 @@ ProjectItemModel::ProjectItemModel(BinModel* binModel, QObject* parent) : connect(m_binModel, SIGNAL(aboutToRemoveItem(AbstractProjectItem*)), this, SLOT(onAboutToRemoveItem(AbstractProjectItem*))); connect(m_binModel, SIGNAL(itemRemoved(AbstractProjectItem*)), this, SLOT(onItemRemoved(AbstractProjectItem*))); connect(m_binModel, SIGNAL(itemUpdated(AbstractProjectItem*)), this, SLOT(onItemUpdated(AbstractProjectItem*))); - connect(m_binModel, SIGNAL(markersNeedUpdate(const QString&,const QList <int>)), this, SIGNAL(markersNeedUpdate(const QString&,const QList <int>))); + connect(m_binModel, SIGNAL(markersNeedUpdate(QString,QList<int>)), this, SIGNAL(markersNeedUpdate(QString,QList<int>))); } ProjectItemModel::~ProjectItemModel() diff --git a/src/core/monitor/monitormanager.cpp b/src/core/monitor/monitormanager.cpp index 6c7456f..cc3db85 100644 --- a/src/core/monitor/monitormanager.cpp +++ b/src/core/monitor/monitormanager.cpp @@ -66,7 +66,7 @@ MonitorManager::MonitorManager(QObject* parent) : pCore->window()->addDock(i18n("Monitor"), "auto_monitor", autoView); m_monitors.insert(autoView->id(), autoView); connect(autoView, SIGNAL(controllerChanged(MONITORID,MltController*)), this, SLOT(updateController(MONITORID,MltController*))); - connect(autoView, SIGNAL(zoneChanged(MONITORID, QPoint)), this, SLOT(slotManageZoneChange(MONITORID, QPoint))); + connect(autoView, SIGNAL(zoneChanged(MONITORID,QPoint)), this, SLOT(slotManageZoneChange(MONITORID,QPoint))); m_lastActiveMonitor = autoView; } else { @@ -74,7 +74,7 @@ MonitorManager::MonitorManager(QObject* parent) : pCore->window()->addDock(i18n("Clip Monitor"), "clip_monitor", autoView); m_monitors.insert(autoView->id(), autoView); connect(autoView, SIGNAL(controllerChanged(MONITORID,MltController*)), this, SLOT(updateController(MONITORID,MltController*))); - connect(autoView, SIGNAL(zoneChanged(MONITORID, QPoint)), this, SLOT(slotManageZoneChange(MONITORID,QPoint))); + connect(autoView, SIGNAL(zoneChanged(MONITORID,QPoint)), this, SLOT(slotManageZoneChange(MONITORID,QPoint))); MonitorView *autoView2 = new MonitorView(mode, new Mlt::Profile(), ProjectMonitor, ProjectMonitor, pCore->window()); pCore->window()->addDock(i18n("Project Monitor"), "project_monitor", autoView2); diff --git a/src/core/timelineview/markerswidget.cpp b/src/core/timelineview/markerswidget.cpp index 5666054..37a47d5 100644 --- a/src/core/timelineview/markerswidget.cpp +++ b/src/core/timelineview/markerswidget.cpp @@ -30,8 +30,8 @@ MarkersWidget::MarkersWidget(KToolBar *toolbar, QWidget* parent) : m_addAction = new KAction(KIcon("list-add"), i18n("Add Marker"), this); m_removeAction = new KAction(KIcon("list-remove"), i18n("Delete Marker"), this); m_editAction = new KAction(KIcon("document-edit"), i18n("Edit Marker"), this); - connect(m_addAction, SIGNAL(triggered ()), this, SIGNAL(addMarker())); - connect(m_removeAction, SIGNAL(triggered ()), this, SLOT(slotRemoveMarker())); + connect(m_addAction, SIGNAL(triggered()), this, SIGNAL(addMarker())); + connect(m_removeAction, SIGNAL(triggered()), this, SLOT(slotRemoveMarker())); m_removeAction->setEnabled(false); m_editAction->setEnabled(false); |