diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-29 10:48:29 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-29 14:59:30 +0000 |
| commit | e82d011ede2b7cb9bb53d463c3f0f397a0dd57fd (patch) | |
| tree | 56e0982fce56d9caed51af9c3c9d7582263c25c3 | |
| parent | f09bcddfa9bd5b2944d70014efe9bc95cfa65047 (diff) | |
gtk3: presumably XrmInitialize can be dropped now
Change-Id: Ib3e87d8a07f4e38f8dcb6e1226f91920df53c81c
| -rw-r--r-- | vcl/inc/unx/gtk/gtkdata.hxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkdata.cxx | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx index a3d85a1578c1..037d213c5716 100644 --- a/vcl/inc/unx/gtk/gtkdata.hxx +++ b/vcl/inc/unx/gtk/gtkdata.hxx @@ -97,7 +97,7 @@ public: class GtkData : public SalGenericData { - GSource * m_pUserEvent; + GSource* m_pUserEvent; osl::Mutex m_aDispatchMutex; oslCondition m_aDispatchCondition; bool blockIdleTimeout; diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx index 75a476e4f9ef..27cf00e58df0 100644 --- a/vcl/unx/gtk3/gtk3gtkdata.cxx +++ b/vcl/unx/gtk3/gtk3gtkdata.cxx @@ -494,9 +494,7 @@ SalYieldResult GtkData::Yield( bool bWait, bool bHandleAllCurrentEvents ) void GtkData::Init() { - int i; SAL_INFO( "vcl.gtk", "GtkMainloop::Init()" ); - XrmInitialize(); /* * open connection to X11 Display @@ -517,7 +515,7 @@ void GtkData::Init() osl_getExecutableFile( &aParam.pData ); osl_getSystemPathFromFileURL( aParam.pData, &aBin.pData ); pCmdLineAry[0] = g_strdup( OUStringToOString( aBin, aEnc ).getStr() ); - for (i=0; i<nParams; i++) + for (int i = 0; i < nParams; ++i) { osl_getCommandArg(i, &aParam.pData ); OString aBParam( OUStringToOString( aParam, aEnc ) ); @@ -548,7 +546,7 @@ void GtkData::Init() gtk_init_check( &nParams, &pCmdLineAry ); gdk_error_trap_push(); - for (i = 0; i < nParams; i++ ) + for (int i = 0; i < nParams; ++i) g_free( pCmdLineAry[i] ); delete [] pCmdLineAry; |