TDE
/
thirdparty
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/thirdparty
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

Browse Source
r14.0.x
Timothy Pearson 11 years ago
parent 2715c65c51
commit d337ac3073
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File

10
libreoffice/3.3.2/patches/libreoffice-trinity.diff
Unescape View File

@ -7600,7 +7600,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ OSL_ENSURE(s_pTDEApplication == NULL, "TDEInit::Init: inconsistency in the application pointers!"); ++ OSL_ENSURE(s_pTDEApplication == NULL, "TDEInit::Init: inconsistency in the application pointers!");
++ ++
++ char *kabargs[1] = {(char*)"libkab1"}; ++ char *kabargs[1] = {(char*)"libkab1"};
++ KCmdLineArgs::init(1, kabargs, "KAddressBook", *kabargs, "Address Book driver", KAB_DRIVER_VERSION); ++ TDECmdLineArgs::init(1, kabargs, "KAddressBook", *kabargs, "Address Book driver", KAB_DRIVER_VERSION);
++ ++
++ s_pTDEApplication = new TDEApplication(false, false); ++ s_pTDEApplication = new TDEApplication(false, false);
++ } ++ }
@ -9038,15 +9038,15 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ ::std::cerr << "tdefilepicker, an implementation of TDE file dialog for OOo." << ::std::endl ++ ::std::cerr << "tdefilepicker, an implementation of TDE file dialog for OOo." << ::std::endl
++ << "Type 'exit' and press Enter to finish." << ::std::endl; ++ << "Type 'exit' and press Enter to finish." << ::std::endl;
++ ++
++ KCmdLineArgs::addCmdLineOptions( sOptions ); ++ TDECmdLineArgs::addCmdLineOptions( sOptions );
++ KCmdLineArgs::init( argc, argv, &qAboutData ); ++ TDECmdLineArgs::init( argc, argv, &qAboutData );
++ ++
++ KLocale::setMainCatalogue( "kdialog" ); ++ KLocale::setMainCatalogue( "kdialog" );
++ ++
++ TDEApplication kApplication; ++ TDEApplication kApplication;
++ ++
++ // Setup the modality ++ // Setup the modality
++ KCmdLineArgs *pArgs = KCmdLineArgs::parsedArgs(); ++ TDECmdLineArgs *pArgs = TDECmdLineArgs::parsedArgs();
++ long nWinId = atol( pArgs->getOption( "winid" ) ); ++ long nWinId = atol( pArgs->getOption( "winid" ) );
++ pArgs->clear(); ++ pArgs->clear();
++ ++
@ -15314,7 +15314,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ for( int i = 0; i < m_nFakeCmdLineArgs; i++ ) ++ for( int i = 0; i < m_nFakeCmdLineArgs; i++ )
++ m_pAppCmdLineArgs[i] = m_pFreeCmdLineArgs[i]; ++ m_pAppCmdLineArgs[i] = m_pFreeCmdLineArgs[i];
++ ++
++ KCmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData ); ++ TDECmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData );
++ ++
++ TDEApplication::disableAutoDcopRegistration(); ++ TDEApplication::disableAutoDcopRegistration();
++ m_pApplication = new VCLTDEApplication(); ++ m_pApplication = new VCLTDEApplication();

10
libreoffice/3.3.3/patches/libreoffice-trinity.diff
Unescape View File

@ -7600,7 +7600,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ OSL_ENSURE(s_pTDEApplication == NULL, "TDEInit::Init: inconsistency in the application pointers!"); ++ OSL_ENSURE(s_pTDEApplication == NULL, "TDEInit::Init: inconsistency in the application pointers!");
++ ++
++ char *kabargs[1] = {(char*)"libkab1"}; ++ char *kabargs[1] = {(char*)"libkab1"};
++ KCmdLineArgs::init(1, kabargs, "KAddressBook", *kabargs, "Address Book driver", KAB_DRIVER_VERSION); ++ TDECmdLineArgs::init(1, kabargs, "KAddressBook", *kabargs, "Address Book driver", KAB_DRIVER_VERSION);
++ ++
++ s_pTDEApplication = new TDEApplication(false, false); ++ s_pTDEApplication = new TDEApplication(false, false);
++ } ++ }
@ -9038,15 +9038,15 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ ::std::cerr << "tdefilepicker, an implementation of TDE file dialog for OOo." << ::std::endl ++ ::std::cerr << "tdefilepicker, an implementation of TDE file dialog for OOo." << ::std::endl
++ << "Type 'exit' and press Enter to finish." << ::std::endl; ++ << "Type 'exit' and press Enter to finish." << ::std::endl;
++ ++
++ KCmdLineArgs::addCmdLineOptions( sOptions ); ++ TDECmdLineArgs::addCmdLineOptions( sOptions );
++ KCmdLineArgs::init( argc, argv, &qAboutData ); ++ TDECmdLineArgs::init( argc, argv, &qAboutData );
++ ++
++ KLocale::setMainCatalogue( "kdialog" ); ++ KLocale::setMainCatalogue( "kdialog" );
++ ++
++ TDEApplication kApplication; ++ TDEApplication kApplication;
++ ++
++ // Setup the modality ++ // Setup the modality
++ KCmdLineArgs *pArgs = KCmdLineArgs::parsedArgs(); ++ TDECmdLineArgs *pArgs = TDECmdLineArgs::parsedArgs();
++ long nWinId = atol( pArgs->getOption( "winid" ) ); ++ long nWinId = atol( pArgs->getOption( "winid" ) );
++ pArgs->clear(); ++ pArgs->clear();
++ ++
@ -15314,7 +15314,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ for( int i = 0; i < m_nFakeCmdLineArgs; i++ ) ++ for( int i = 0; i < m_nFakeCmdLineArgs; i++ )
++ m_pAppCmdLineArgs[i] = m_pFreeCmdLineArgs[i]; ++ m_pAppCmdLineArgs[i] = m_pFreeCmdLineArgs[i];
++ ++
++ KCmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData ); ++ TDECmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData );
++ ++
++ TDEApplication::disableAutoDcopRegistration(); ++ TDEApplication::disableAutoDcopRegistration();
++ m_pApplication = new VCLTDEApplication(); ++ m_pApplication = new VCLTDEApplication();

2
libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff
Unescape View File

@ -2804,7 +2804,7 @@ index be40226..558c01b 100644
+ ::std::cerr << "kdefilepicker, an implementation of a " THIS_DESKENV_NAME_CAP " file dialog for OOo." << ::std::endl + ::std::cerr << "kdefilepicker, an implementation of a " THIS_DESKENV_NAME_CAP " file dialog for OOo." << ::std::endl
<< "Type 'exit' and press Enter to finish." << ::std::endl; << "Type 'exit' and press Enter to finish." << ::std::endl;
KCmdLineArgs::addCmdLineOptions( sOptions ); TDECmdLineArgs::addCmdLineOptions( sOptions );
@@ -77,7 +85,7 @@ int main( int argc, char* argv[] ) @@ -77,7 +85,7 @@ int main( int argc, char* argv[] )
KDEModalityFilter qModalityFilter( nWinId ); KDEModalityFilter qModalityFilter( nWinId );

10
libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
Unescape View File

@ -6655,7 +6655,7 @@ index 0000000..375b158
+ OSL_ENSURE(s_pTDEApplication == NULL, "TDEInit::Init: inconsistency in the application pointers!"); + OSL_ENSURE(s_pTDEApplication == NULL, "TDEInit::Init: inconsistency in the application pointers!");
+ +
+ char *kabargs[1] = {(char*)"libkab1"}; + char *kabargs[1] = {(char*)"libkab1"};
+ KCmdLineArgs::init(1, kabargs, "KAddressBook", *kabargs, "Address Book driver", KAB_DRIVER_VERSION); + TDECmdLineArgs::init(1, kabargs, "KAddressBook", *kabargs, "Address Book driver", KAB_DRIVER_VERSION);
+ +
+ s_pTDEApplication = new TDEApplication(false, false); + s_pTDEApplication = new TDEApplication(false, false);
+ } + }
@ -9365,15 +9365,15 @@ index 0000000..eb20aa3
+ ::std::cerr << "tdefilepicker, an implementation of TDE file dialog for OOo." << ::std::endl + ::std::cerr << "tdefilepicker, an implementation of TDE file dialog for OOo." << ::std::endl
+ << "Type 'exit' and press Enter to finish." << ::std::endl; + << "Type 'exit' and press Enter to finish." << ::std::endl;
+ +
+ KCmdLineArgs::addCmdLineOptions( sOptions ); + TDECmdLineArgs::addCmdLineOptions( sOptions );
+ KCmdLineArgs::init( argc, argv, &qAboutData ); + TDECmdLineArgs::init( argc, argv, &qAboutData );
+ +
+ KLocale::setMainCatalogue( "kdialog" ); + KLocale::setMainCatalogue( "kdialog" );
+ +
+ TDEApplication kApplication; + TDEApplication kApplication;
+ +
+ // Setup the modality + // Setup the modality
+ KCmdLineArgs *pArgs = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *pArgs = TDECmdLineArgs::parsedArgs();
+ long nWinId = atol( pArgs->getOption( "winid" ) ); + long nWinId = atol( pArgs->getOption( "winid" ) );
+ pArgs->clear(); + pArgs->clear();
+ +
@ -16078,7 +16078,7 @@ index 0000000..adeb628
+ for( int i = 0; i < m_nFakeCmdLineArgs; i++ ) + for( int i = 0; i < m_nFakeCmdLineArgs; i++ )
+ m_pAppCmdLineArgs[i] = m_pFreeCmdLineArgs[i]; + m_pAppCmdLineArgs[i] = m_pFreeCmdLineArgs[i];
+ +
+ KCmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData ); + TDECmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData );
+ +
+ TDEApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration();
+ m_pApplication = new VCLTDEApplication(); + m_pApplication = new VCLTDEApplication();

Write Preview
Loading…
Cancel
Save