From kde-commits Sat Aug 15 11:51:29 2009 From: George Kiagiadakis Date: Sat, 15 Aug 2009 11:51:29 +0000 To: kde-commits Subject: playground/network/kcall Message-Id: <1250337089.354185.21336.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=125033711120701 SVN commit 1011664 by gkiagia: Fix most issues reported by krazy. M +1 -1 kcall_handler/calllog.h M +2 -2 libkcallprivate/constants.h M +4 -4 libkgstdevices/abstractrenderer.h M +1 -1 libkgstdevices/devicemanager.cpp M +2 -2 libkgstdevices/devicemanager.h M +6 -6 libkgstdevices/devicesmodel.cpp M +2 -2 libkgstdevices/devicesmodel.h M +3 -3 libkgstdevices/overlayrenderer.h M +2 -2 libkgstdevices/tabledevicechooser.h M +2 -2 libkgstdevices/videowidget.h M +2 -2 libqtgstreamer/interfaces/qgstxoverlay.h M +2 -2 libqtgstreamer/qgstbin.h M +2 -2 libqtgstreamer/qgstbus.h M +2 -2 libqtgstreamer/qgstcaps.h M +2 -2 libqtgstreamer/qgstdeclarations.h M +2 -2 libqtgstreamer/qgstelement.h M +2 -2 libqtgstreamer/qgstelementfactory.h M +2 -2 libqtgstreamer/qgstghostpad.h M +2 -2 libqtgstreamer/qgstglobal.h M +2 -2 libqtgstreamer/qgstmessage.h M +2 -2 libqtgstreamer/qgstminiobject.h M +2 -2 libqtgstreamer/qgstobject.h M +2 -2 libqtgstreamer/qgstpad.h M +2 -2 libqtgstreamer/qgstpipeline.h M +2 -2 libqtgstreamer/qgststructure.h M +2 -2 libqtgstreamer/qgstvalue.h --- trunk/playground/network/kcall/kcall_handler/calllog.h #1011663:1011664 @@ -33,7 +33,7 @@ Error }; - CallLog(QPlainTextEdit *logView, QObject *parent = 0); + explicit CallLog(QPlainTextEdit *logView, QObject *parent = 0); bool errorHasBeenLogged() const { return m_errorLogged; } public slots: --- trunk/playground/network/kcall/libkcallprivate/constants.h #1011663:1011664 @@ -14,8 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#ifndef _KCALL_CONSTANTS_H -#define _KCALL_CONSTANTS_H +#ifndef KCALL_CONSTANTS_H +#define KCALL_CONSTANTS_H #include #include --- trunk/playground/network/kcall/libkgstdevices/abstractrenderer.h #1011663:1011664 @@ -14,8 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this library. If not, see . */ -#ifndef _KGSTDEVICES_ABSTRACTRENDERER_H -#define _KGSTDEVICES_ABSTRACTRENDERER_H +#ifndef KGSTDEVICES_ABSTRACTRENDERER_H +#define KGSTDEVICES_ABSTRACTRENDERER_H #include "kgstdevices_export.h" #include "../libqtgstreamer/qgstdeclarations.h" @@ -66,12 +66,12 @@ * element and @a parent as a parent. @a element can be later retrieved * using the videoSink() function. */ - AbstractRenderer(const QtGstreamer::QGstElementPtr & element, QObject *parent = 0); + explicit AbstractRenderer(const QtGstreamer::QGstElementPtr & element, QObject *parent = 0); virtual ~AbstractRenderer(); /** Sets the widget where video should be painted on. This function must * be called for video rendering to begin. It should be called only once - * in the beggining. If no widget is set, this will lead to undefined behavior + * in the beginning. If no widget is set, this will lead to undefined behavior * when the pipeline goes into PLAYING mode. */ virtual void beginRendering(QWidget *videoWidget) = 0; --- trunk/playground/network/kcall/libkgstdevices/devicemanager.cpp #1011663:1011664 @@ -478,7 +478,7 @@ //this part is for kdelibs < r1006441 #if !KDE_IS_VERSION(4, 3, 63) -# ifdef Q_CC_GNU +# ifdef __GNUC__ # warning "Using the v4l2 vs v4l1 detection hack" # endif //HACK to detect if the device has a v4l1 or v4l2 driver --- trunk/playground/network/kcall/libkgstdevices/devicemanager.h #1011663:1011664 @@ -14,8 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#ifndef _KGSTDEVICES_DEVICEMANAGER_H -#define _KGSTDEVICES_DEVICEMANAGER_H +#ifndef KGSTDEVICES_DEVICEMANAGER_H +#define KGSTDEVICES_DEVICEMANAGER_H #include "kgstdevices_export.h" #include "../libqtgstreamer/qgstelement.h" --- trunk/playground/network/kcall/libkgstdevices/devicesmodel.cpp #1011663:1011664 @@ -77,17 +77,17 @@ case 1: { QByteArray driver = d->m_manager->availableDevices(d->m_type)[index.row()].driver(); - if ( driver.startsWith("auto") ) { + if ( driver.startsWith("auto") ) { //krazy:exclude=strings return i18nc("autodetected audio or video system", "Autodetected"); - } else if ( driver.startsWith("alsa") ) { + } else if ( driver.startsWith("alsa") ) { //krazy:exclude=strings return i18n("ALSA"); - } else if ( driver.startsWith("oss") ) { + } else if ( driver.startsWith("oss") ) { //krazy:exclude=strings return i18n("OSS"); - } else if ( driver.startsWith("jack") ) { + } else if ( driver.startsWith("jack") ) { //krazy:exclude=strings return i18n("JACK"); - } else if ( driver.startsWith("pulse") ) { + } else if ( driver.startsWith("pulse") ) { //krazy:exclude=strings return i18n("PULSE"); - } else if ( driver.startsWith("v4l") ) { + } else if ( driver.startsWith("v4l") ) { //krazy:exclude=strings return i18n("Video4Linux"); } else { return i18nc("Unknown audio or video system", "Unknown"); --- trunk/playground/network/kcall/libkgstdevices/devicesmodel.h #1011663:1011664 @@ -14,8 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#ifndef _KGSTDEVICES_DEVICESMODEL_H -#define _KGSTDEVICES_DEVICESMODEL_H +#ifndef KGSTDEVICES_DEVICESMODEL_H +#define KGSTDEVICES_DEVICESMODEL_H #include "devicemanager.h" #include --- trunk/playground/network/kcall/libkgstdevices/overlayrenderer.h #1011663:1011664 @@ -14,8 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this library. If not, see . */ -#ifndef _KGSTDEVICES_OVERLAYRENDERER_H -#define _KGSTDEVICES_OVERLAYRENDERER_H +#ifndef KGSTDEVICES_OVERLAYRENDERER_H +#define KGSTDEVICES_OVERLAYRENDERER_H #include "abstractrenderer.h" @@ -36,7 +36,7 @@ * You should ensure that @a element is a valid video sink element * that supports GstXOverlay. */ - OverlayRenderer(const QtGstreamer::QGstElementPtr & element, QObject *parent = 0); + explicit OverlayRenderer(const QtGstreamer::QGstElementPtr & element, QObject *parent = 0); virtual ~OverlayRenderer(); virtual void beginRendering(QWidget *videoWidget); --- trunk/playground/network/kcall/libkgstdevices/tabledevicechooser.h #1011663:1011664 @@ -14,8 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#ifndef _KGSTDEVICES_TABLEDEVICECHOOSER_H -#define _KGSTDEVICES_TABLEDEVICECHOOSER_H +#ifndef KGSTDEVICES_TABLEDEVICECHOOSER_H +#define KGSTDEVICES_TABLEDEVICECHOOSER_H #include "devicemanager.h" #include --- trunk/playground/network/kcall/libkgstdevices/videowidget.h #1011663:1011664 @@ -14,8 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this library. If not, see . */ -#ifndef _KGSTDEVICES_VIDEOWIDGET_H -#define _KGSTDEVICES_VIDEOWIDGET_H +#ifndef KGSTDEVICES_VIDEOWIDGET_H +#define KGSTDEVICES_VIDEOWIDGET_H #include "kgstdevices_export.h" #include "../libqtgstreamer/qgstdeclarations.h" --- trunk/playground/network/kcall/libqtgstreamer/interfaces/qgstxoverlay.h #1011663:1011664 @@ -14,8 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#ifndef _QTGSTREAMER_QGSTXOVERLAY_H -#define _QTGSTREAMER_QGSTXOVERLAY_H +#ifndef QTGSTREAMER_QGSTXOVERLAY_H +#define QTGSTREAMER_QGSTXOVERLAY_H #include "../qgstelement.h" --- trunk/playground/network/kcall/libqtgstreamer/qgstbin.h #1011663:1011664 @@ -14,8 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#ifndef _QTGSTREAMER_QGSTBIN_H -#define _QTGSTREAMER_QGSTBIN_H +#ifndef QTGSTREAMER_QGSTBIN_H +#define QTGSTREAMER_QGSTBIN_H #include "qgstelement.h" --- trunk/playground/network/kcall/libqtgstreamer/qgstbus.h #1011663:1011664 @@ -14,8 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#ifndef _QTGSTREAMER_QGSTBUS_H -#define _QTGSTREAMER_QGSTBUS_H +#ifndef QTGSTREAMER_QGSTBUS_H +#define QTGSTREAMER_QGSTBUS_H #include "qgstobject.h" --- trunk/playground/network/kcall/libqtgstreamer/qgstcaps.h #1011663:1011664 @@ -14,8 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#ifndef _QTGSTREAMER_QGSTCAPS_H -#define _QTGSTREAMER_QGSTCAPS_H +#ifndef QTGSTREAMER_QGSTCAPS_H +#define QTGSTREAMER_QGSTCAPS_H #include "qgstdeclarations.h" #include --- trunk/playground/network/kcall/libqtgstreamer/qgstdeclarations.h #1011663:1011664 @@ -14,8 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#ifndef _QTGSTREAMER_QGSTDECLARATIONS_H -#define _QTGSTREAMER_QGSTDECLARATIONS_H +#ifndef QTGSTREAMER_QGSTDECLARATIONS_H +#define QTGSTREAMER_QGSTDECLARATIONS_H #include --- trunk/playground/network/kcall/libqtgstreamer/qgstelement.h #1011663:1011664 @@ -14,8 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#ifndef _QTGSTREAMER_QGSTELEMENT_H -#define _QTGSTREAMER_QGSTELEMENT_H +#ifndef QTGSTREAMER_QGSTELEMENT_H +#define QTGSTREAMER_QGSTELEMENT_H #include "qgstobject.h" --- trunk/playground/network/kcall/libqtgstreamer/qgstelementfactory.h #1011663:1011664 @@ -14,8 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#ifndef _QTGSTREAMER_QGSTELEMENTFACTORY_H -#define _QTGSTREAMER_QGSTELEMENTFACTORY_H +#ifndef QTGSTREAMER_QGSTELEMENTFACTORY_H +#define QTGSTREAMER_QGSTELEMENTFACTORY_H #include "qgstobject.h" --- trunk/playground/network/kcall/libqtgstreamer/qgstghostpad.h #1011663:1011664 @@ -14,8 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#ifndef _QTGSTREAMER_QGSTGHOSTPAD_H -#define _QTGSTREAMER_QGSTGHOSTPAD_H +#ifndef QTGSTREAMER_QGSTGHOSTPAD_H +#define QTGSTREAMER_QGSTGHOSTPAD_H #include "qgstpad.h" --- trunk/playground/network/kcall/libqtgstreamer/qgstglobal.h #1011663:1011664 @@ -14,8 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#ifndef _QTGSTREAMER_QGSTGLOBAL_H -#define _QTGSTREAMER_QGSTGLOBAL_H +#ifndef QTGSTREAMER_QGSTGLOBAL_H +#define QTGSTREAMER_QGSTGLOBAL_H namespace QtGstreamer { --- trunk/playground/network/kcall/libqtgstreamer/qgstmessage.h #1011663:1011664 @@ -14,8 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#ifndef _QTGSTREAMER_QGSTMESSAGE_H -#define _QTGSTREAMER_QGSTMESSAGE_H +#ifndef QTGSTREAMER_QGSTMESSAGE_H +#define QTGSTREAMER_QGSTMESSAGE_H #include "qgstminiobject.h" --- trunk/playground/network/kcall/libqtgstreamer/qgstminiobject.h #1011663:1011664 @@ -14,8 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#ifndef _QTGSTREAMER_QGSTMINIOBJECT_H -#define _QTGSTREAMER_QGSTMINIOBJECT_H +#ifndef QTGSTREAMER_QGSTMINIOBJECT_H +#define QTGSTREAMER_QGSTMINIOBJECT_H #include "qgstdeclarations.h" #include --- trunk/playground/network/kcall/libqtgstreamer/qgstobject.h #1011663:1011664 @@ -14,8 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#ifndef _QTGSTREAMER_QGSTOBJECT_H -#define _QTGSTREAMER_QGSTOBJECT_H +#ifndef QTGSTREAMER_QGSTOBJECT_H +#define QTGSTREAMER_QGSTOBJECT_H #include "qgstvalue.h" #include --- trunk/playground/network/kcall/libqtgstreamer/qgstpad.h #1011663:1011664 @@ -14,8 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#ifndef _QTGSTREAMER_QGSTPAD_H -#define _QTGSTREAMER_QGSTPAD_H +#ifndef QTGSTREAMER_QGSTPAD_H +#define QTGSTREAMER_QGSTPAD_H #include "qgstobject.h" --- trunk/playground/network/kcall/libqtgstreamer/qgstpipeline.h #1011663:1011664 @@ -14,8 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#ifndef _QTGSTREAMER_QGSTPIPELINE_H -#define _QTGSTREAMER_QGSTPIPELINE_H +#ifndef QTGSTREAMER_QGSTPIPELINE_H +#define QTGSTREAMER_QGSTPIPELINE_H #include "qgstbin.h" --- trunk/playground/network/kcall/libqtgstreamer/qgststructure.h #1011663:1011664 @@ -14,8 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#ifndef _QTGSTREAMER_QGSTSTRUCTURE_H -#define _QTGSTREAMER_QGSTSTRUCTURE_H +#ifndef QTGSTREAMER_QGSTSTRUCTURE_H +#define QTGSTREAMER_QGSTSTRUCTURE_H #include "qgstdeclarations.h" --- trunk/playground/network/kcall/libqtgstreamer/qgstvalue.h #1011663:1011664 @@ -14,8 +14,8 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#ifndef _QTGSTREAMER_QGSTVALUE_H -#define _QTGSTREAMER_QGSTVALUE_H +#ifndef QTGSTREAMER_QGSTVALUE_H +#define QTGSTREAMER_QGSTVALUE_H #include "qgstdeclarations.h" #include