From 7e776c0027c19f1bb8e64dd68d3fd9ded0b5d896 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 2 Oct 2015 08:37:23 +0200 Subject: loplugin:unusedmethods Change-Id: I150baadc442e57ee604563bc52965daa9d2e41af --- vcl/inc/idlemgr.hxx | 3 --- vcl/inc/unx/gtk/gtkframe.hxx | 3 --- vcl/inc/unx/i18n_status.hxx | 3 --- vcl/inc/unx/saldisp.hxx | 1 - vcl/inc/unx/salunxtime.h | 17 ----------------- vcl/source/app/svdata.cxx | 20 -------------------- vcl/source/window/layout.cxx | 8 -------- vcl/unx/generic/app/i18n_status.cxx | 5 ----- vcl/unx/gtk/window/gtksalframe.cxx | 22 ---------------------- 9 files changed, 82 deletions(-) (limited to 'vcl') diff --git a/vcl/inc/idlemgr.hxx b/vcl/inc/idlemgr.hxx index 6d801531229d..e31fb2ce8e43 100644 --- a/vcl/inc/idlemgr.hxx +++ b/vcl/inc/idlemgr.hxx @@ -40,9 +40,6 @@ public: bool InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority ); void RemoveIdleHdl( const Link& rLink ); - void RestartIdler() - { if ( maTimer.IsActive() ) maTimer.Start(); } - // Timer* kann auch NULL sein DECL_LINK_TYPED(TimeoutHdl, Timer *, void); }; diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 102f894c64d4..e559f85b79f9 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -239,7 +239,6 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider static void signalStyleSet( GtkWidget*, GtkStyle* pPrevious, gpointer ); #if GTK_CHECK_VERSION(3,0,0) static gboolean signalDraw( GtkWidget*, cairo_t *cr, gpointer ); - static void signalFlagsChanged( GtkWidget*, GtkStateFlags, gpointer ); #if GTK_CHECK_VERSION(3,14,0) static void gestureSwipe(GtkGestureSwipe* gesture, gdouble velocity_x, gdouble velocity_y, gpointer frame); static void gestureLongPress(GtkGestureLongPress* gesture, gpointer frame); @@ -263,7 +262,6 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider void Center(); void SetDefaultSize(); void setAutoLock( bool bLock ); - void setScreenSaverTimeout( int nTimeout ); void doKeyCallback( guint state, guint keyval, @@ -322,7 +320,6 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider void updateWMClass(); void SetScreen( unsigned int nNewScreen, int eType, Rectangle *pSize = NULL ); - DECL_LINK( ImplDelayedFullScreenHdl, void* ); public: #if GTK_CHECK_VERSION(3,0,0) basebmp::BitmapDeviceSharedPtr m_aFrame; diff --git a/vcl/inc/unx/i18n_status.hxx b/vcl/inc/unx/i18n_status.hxx index ff954ceb37c4..223ab5479baa 100644 --- a/vcl/inc/unx/i18n_status.hxx +++ b/vcl/inc/unx/i18n_status.hxx @@ -85,9 +85,6 @@ public: const ::std::vector< ChoiceData >& getChoices() const { return m_aChoices; } - // for SwitchIMCallback - void changeIM( const OUString& ); - // External Control: /** Toggle the status window on or off. diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index bfe205311c20..8e209d607645 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -322,7 +322,6 @@ public: srv_vendor_t GetServerVendor() const { return meServerVendor; } void SetServerVendor() { meServerVendor = sal_GetServerVendor(pDisp_); } bool IsDisplay() const { return !!pXLib_; } - GC GetMonoGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aMonoGC; } GC GetCopyGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aCopyGC; } Pixmap GetInvert50( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_hInvert50; } const SalColormap& GetColormap( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aColormap; } diff --git a/vcl/inc/unx/salunxtime.h b/vcl/inc/unx/salunxtime.h index c20a1aa14651..e9b4b81af7f6 100644 --- a/vcl/inc/unx/salunxtime.h +++ b/vcl/inc/unx/salunxtime.h @@ -44,11 +44,6 @@ inline bool operator > ( const timeval &t1, const timeval &t2 ) return t1.tv_sec > t2.tv_sec; } -inline bool operator == ( const timeval &t1, const timeval &t2 ) -{ - return t1.tv_sec == t2.tv_sec && t1.tv_usec == t2.tv_usec; -} - inline timeval &operator -= ( timeval &t1, const timeval &t2 ) { if( t1.tv_usec < t2.tv_usec ) @@ -61,18 +56,6 @@ inline timeval &operator -= ( timeval &t1, const timeval &t2 ) return t1; } -inline timeval &operator += ( timeval &t1, const timeval &t2 ) -{ - t1.tv_sec += t2.tv_sec; - t1.tv_usec += t2.tv_usec; - if( t1.tv_usec > 1000000 ) - { - t1.tv_sec++; - t1.tv_usec -= 1000000; - } - return t1; -} - inline timeval &operator += ( timeval &t1, sal_uIntPtr t2 ) { t1.tv_sec += t2 / 1000; diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index 7b83ba7ce510..4cc145f9060c 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -282,26 +282,6 @@ bool ImplInitAccessBridge() } #endif -vcl::Window* ImplFindWindow( const SalFrame* pFrame, ::Point& rSalFramePos ) -{ - ImplSVData* pSVData = ImplGetSVData(); - vcl::Window* pFrameWindow = pSVData->maWinData.mpFirstFrame; - while ( pFrameWindow ) - { - if ( pFrameWindow->ImplGetFrame() == pFrame ) - { - vcl::Window* pWindow = pFrameWindow->ImplFindWindow( rSalFramePos ); - if ( !pWindow ) - pWindow = pFrameWindow->ImplGetWindow(); - rSalFramePos = pWindow->ImplFrameToOutput( rSalFramePos ); - return pWindow; - } - pFrameWindow = pFrameWindow->ImplGetFrameData()->mpNextFrame; - } - - return NULL; -} - void LocaleConfigurationListener::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 nHint ) { AllSettings::LocaleSettingsChanged( nHint ); diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 893640f8764d..7f8262402036 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -1275,14 +1275,6 @@ bool VclGrid::set_property(const OString &rKey, const OString &rValue) return true; } -void setGridAttach(vcl::Window &rWidget, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nWidth, sal_Int32 nHeight) -{ - rWidget.set_grid_left_attach(nLeft); - rWidget.set_grid_top_attach(nTop); - rWidget.set_grid_width(nWidth); - rWidget.set_grid_height(nHeight); -} - const vcl::Window *VclBin::get_child() const { const WindowImpl* pWindowImpl = ImplGetWindowImpl(); diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index c3ae8e0b9354..36561b611cdf 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -586,11 +586,6 @@ void I18NStatus::setStatusText( const OUString& rText ) } } -void I18NStatus::changeIM( const OUString& rIM ) -{ - m_aCurrentIM = rIM; -} - SalFrame* I18NStatus::getStatusFrame() const { SalFrame* pRet = NULL; diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 5b8189797aba..23735f77910a 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -1083,7 +1083,6 @@ void GtkSalFrame::InitCommon() m_aMouseSignalIds.push_back(g_signal_connect( G_OBJECT(pEventWidget), "button-release-event", G_CALLBACK(signalButton), this )); #if GTK_CHECK_VERSION(3,0,0) g_signal_connect( G_OBJECT(m_pFixedContainer), "draw", G_CALLBACK(signalDraw), this ); -// g_signal_connect( G_OBJECT(m_pWindow), "state-flags-changed", G_CALLBACK(signalFlagsChanged), this ); #if GTK_CHECK_VERSION(3,14,0) GtkGesture *pSwipe = gtk_gesture_swipe_new(pEventWidget); g_signal_connect(pSwipe, "swipe", G_CALLBACK(gestureSwipe), this); @@ -3498,27 +3497,6 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer return true; } -#if GTK_CHECK_VERSION(3,0,0) -void GtkSalFrame::signalFlagsChanged( GtkWidget* , GtkStateFlags state, gpointer frame ) -{ - //TO-DO: This isn't as helpful as I'd like it to be. The color selector puts the main - //windows into the backdrop, disabling everything, and the floating navigator window - //is also problematic. - GtkSalFrame* pThis = static_cast(frame); - - bool bOldBackDrop = state & GTK_STATE_FLAG_BACKDROP; - bool bNewBackDrop = (gtk_widget_get_state_flags(GTK_WIDGET(pThis->m_pWindow)) & GTK_STATE_FLAG_BACKDROP); - if (bNewBackDrop && !bOldBackDrop) - { - pThis->GetWindow()->Disable(); - } - else if (bOldBackDrop && !bNewBackDrop) - { - pThis->GetWindow()->Enable(); - } -} -#endif - gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame ) { GtkSalFrame* pThis = static_cast(frame); -- cgit v1.2.3