[Libreoffice-commits] core.git: vcl/unx

[Jan-Marek Glogowski]

 vcl/unx/kde4/KDE4FilePicker.hxx |   11 -----------
 vcl/unx/kde4/KDEXLib.cxx        |    6 +++---
 vcl/unx/kde4/KDEXLib.hxx        |    4 ++--
 3 files changed, 5 insertions(+), 16 deletions(-)

New commits:
commit 2e6a17ac88e89d4db8491605ac4dd6ea249b5d01
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Thu Nov 14 11:24:59 2013 +0100

    Use Q_* macros.
    
    This way we won't conflict with boosts signals and slots.
    
    Change-Id: Ia92b283a5b47b7bc8c2bec2c6be664c9b7f1bed8
    Reviewed-on: https://gerrit.libreoffice.org/6682
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
index 5ac37d0..41d3cd2 100644
--- a/vcl/unx/kde4/KDE4FilePicker.hxx
+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
@@ -87,17 +87,14 @@ public:
     virtual ~KDE4FilePicker();
 
     // XFilePickerNotifier
-
     virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException );
 
     // XExecutableDialog functions
-
     virtual void SAL_CALL setTitle( const OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException );
     virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException );
 
     // XFilePicker functions
-
     virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL setDefaultName( const OUString &rName ) throw( ::com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException );
@@ -105,17 +102,14 @@ public:
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException );
 
     // XFilterManager functions
-
     virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
     virtual OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException );
 
     // XFilterGroupManager functions
-
     virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
 
     // XFilePickerControlAccess functions
-
     virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException );
@@ -134,25 +128,20 @@ public:
     */
 
     // XFilePicker2 functions
-
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles()
             throw (::com::sun::star::uno::RuntimeException);
 
     // XInitialization
-
     virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > &rArguments ) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException );
 
     // XCancellable
-
     virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException );
 
     // XEventListener
-
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject &rEvent ) throw( ::com::sun::star::uno::RuntimeException );
     using cppu::WeakComponentImplHelperBase::disposing;
 
     // XServiceInfo
-
     virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
     virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) throw( ::com::sun::star::uno::RuntimeException );
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 0e5a88b..21b7939 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -304,7 +304,7 @@ void KDEXLib::Yield( bool bWait, bool bHandleAllCurrentEvents )
     else
     { // if this deadlocks, event processing needs to go into a separate thread
       // or some other solution needs to be found
-        emit processYieldSignal( bWait, bHandleAllCurrentEvents );
+        Q_EMIT processYieldSignal( bWait, bHandleAllCurrentEvents );
     }
 }
 
@@ -334,7 +334,7 @@ void KDEXLib::StartTimer( sal_uLong nMS )
     if( qApp->thread() == QThread::currentThread())
         startTimeoutTimer();
     else
-        emit startTimeoutTimerSignal();
+        Q_EMIT startTimeoutTimerSignal();
 }
 
 void KDEXLib::startTimeoutTimer()
@@ -370,7 +370,7 @@ void KDEXLib::PostUserEvent()
     if( qApp->thread() == QThread::currentThread())
         startUserEventTimer();
     else
-        emit startUserEventTimerSignal();
+        Q_EMIT startUserEventTimerSignal();
 }
 
 void KDEXLib::startUserEventTimer()
diff --git a/vcl/unx/kde4/KDEXLib.hxx b/vcl/unx/kde4/KDEXLib.hxx
index 07ff1f0..1e1a9db 100644
--- a/vcl/unx/kde4/KDEXLib.hxx
+++ b/vcl/unx/kde4/KDEXLib.hxx
@@ -54,14 +54,14 @@ class KDEXLib : public QObject, public SalXLib
     private:
         void setupEventLoop();
 
-    private slots:
+    private Q_SLOTS:
         void socketNotifierActivated( int fd );
         void timeoutActivated();
         void userEventActivated();
         void startTimeoutTimer();
         void startUserEventTimer();
         bool processYield( bool bWait, bool bHandleAllCurrentEvents );
-    signals:
+    Q_SIGNALS:
         void startTimeoutTimerSignal();
         void startUserEventTimerSignal();
         void processYieldSignal( bool bWait, bool bHandleAllCurrentEvents );