Rename KStartup for enhanced compatibility with KDE4

r14.0.x
Timothy Pearson 11 years ago
parent 0233a7aae0
commit ec18d4e99f

@ -15342,10 +15342,10 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++{ ++{
++ if( ! m_bStartupDone ) ++ if( ! m_bStartupDone )
++ { ++ {
++ KStartupInfo::appStarted(); ++ TDEStartupInfo::appStarted();
++ m_bStartupDone = true; ++ m_bStartupDone = true;
++ #if OSL_DEBUG_LEVEL > 1 ++ #if OSL_DEBUG_LEVEL > 1
++ fprintf( stderr, "called KStartupInfo::appStarted()\n" ); ++ fprintf( stderr, "called TDEStartupInfo::appStarted()\n" );
++ #endif ++ #endif
++ } ++ }
++} ++}

@ -15342,10 +15342,10 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++{ ++{
++ if( ! m_bStartupDone ) ++ if( ! m_bStartupDone )
++ { ++ {
++ KStartupInfo::appStarted(); ++ TDEStartupInfo::appStarted();
++ m_bStartupDone = true; ++ m_bStartupDone = true;
++ #if OSL_DEBUG_LEVEL > 1 ++ #if OSL_DEBUG_LEVEL > 1
++ fprintf( stderr, "called KStartupInfo::appStarted()\n" ); ++ fprintf( stderr, "called TDEStartupInfo::appStarted()\n" );
++ #endif ++ #endif
++ } ++ }
++} ++}

@ -16096,10 +16096,10 @@ index 0000000..adeb628
+{ +{
+ if( ! m_bStartupDone ) + if( ! m_bStartupDone )
+ { + {
+ KStartupInfo::appStarted(); + TDEStartupInfo::appStarted();
+ m_bStartupDone = true; + m_bStartupDone = true;
+ #if OSL_DEBUG_LEVEL > 1 + #if OSL_DEBUG_LEVEL > 1
+ fprintf( stderr, "called KStartupInfo::appStarted()\n" ); + fprintf( stderr, "called TDEStartupInfo::appStarted()\n" );
+ #endif + #endif
+ } + }
+} +}

Loading…
Cancel
Save