summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-21 18:57:32 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-21 18:57:32 -0600
commitd337ac30737f8bc19e55bbafbb9fe1fdc3c08d86 (patch)
tree3492b723de40a6a3bdc719f9b4096a393d291c05
parent2715c65c510713f1a6c9ae83298e0cfb885f5475 (diff)
downloadthirdparty-d337ac30737f8bc19e55bbafbb9fe1fdc3c08d86.tar.gz
thirdparty-d337ac30737f8bc19e55bbafbb9fe1fdc3c08d86.zip
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
-rw-r--r--libreoffice/3.3.2/patches/libreoffice-trinity.diff10
-rw-r--r--libreoffice/3.3.3/patches/libreoffice-trinity.diff10
-rw-r--r--libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff2
-rw-r--r--libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff10
4 files changed, 16 insertions, 16 deletions
diff --git a/libreoffice/3.3.2/patches/libreoffice-trinity.diff b/libreoffice/3.3.2/patches/libreoffice-trinity.diff
index cf08c26..505915f 100644
--- a/libreoffice/3.3.2/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.3.2/patches/libreoffice-trinity.diff
@@ -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!");
++
++ 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);
++ }
@@ -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
++ << "Type 'exit' and press Enter to finish." << ::std::endl;
++
-++ KCmdLineArgs::addCmdLineOptions( sOptions );
-++ KCmdLineArgs::init( argc, argv, &qAboutData );
+++ TDECmdLineArgs::addCmdLineOptions( sOptions );
+++ TDECmdLineArgs::init( argc, argv, &qAboutData );
++
++ KLocale::setMainCatalogue( "kdialog" );
++
++ TDEApplication kApplication;
++
++ // Setup the modality
-++ KCmdLineArgs *pArgs = KCmdLineArgs::parsedArgs();
+++ TDECmdLineArgs *pArgs = TDECmdLineArgs::parsedArgs();
++ long nWinId = atol( pArgs->getOption( "winid" ) );
++ 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++ )
++ m_pAppCmdLineArgs[i] = m_pFreeCmdLineArgs[i];
++
-++ KCmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData );
+++ TDECmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData );
++
++ TDEApplication::disableAutoDcopRegistration();
++ m_pApplication = new VCLTDEApplication();
diff --git a/libreoffice/3.3.3/patches/libreoffice-trinity.diff b/libreoffice/3.3.3/patches/libreoffice-trinity.diff
index f5ee02d..b79bf96 100644
--- a/libreoffice/3.3.3/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.3.3/patches/libreoffice-trinity.diff
@@ -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!");
++
++ 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);
++ }
@@ -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
++ << "Type 'exit' and press Enter to finish." << ::std::endl;
++
-++ KCmdLineArgs::addCmdLineOptions( sOptions );
-++ KCmdLineArgs::init( argc, argv, &qAboutData );
+++ TDECmdLineArgs::addCmdLineOptions( sOptions );
+++ TDECmdLineArgs::init( argc, argv, &qAboutData );
++
++ KLocale::setMainCatalogue( "kdialog" );
++
++ TDEApplication kApplication;
++
++ // Setup the modality
-++ KCmdLineArgs *pArgs = KCmdLineArgs::parsedArgs();
+++ TDECmdLineArgs *pArgs = TDECmdLineArgs::parsedArgs();
++ long nWinId = atol( pArgs->getOption( "winid" ) );
++ 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++ )
++ m_pAppCmdLineArgs[i] = m_pFreeCmdLineArgs[i];
++
-++ KCmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData );
+++ TDECmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData );
++
++ TDEApplication::disableAutoDcopRegistration();
++ m_pApplication = new VCLTDEApplication();
diff --git a/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff b/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff
index 01f481f..d3f995d 100644
--- a/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff
+++ b/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff
@@ -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
<< "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[] )
KDEModalityFilter qModalityFilter( nWinId );
diff --git a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
index 81b9141..f397150 100644
--- a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
+++ b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
@@ -6655,7 +6655,7 @@ index 0000000..375b158
+ OSL_ENSURE(s_pTDEApplication == NULL, "TDEInit::Init: inconsistency in the application pointers!");
+
+ 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);
+ }
@@ -9365,15 +9365,15 @@ index 0000000..eb20aa3
+ ::std::cerr << "tdefilepicker, an implementation of TDE file dialog for OOo." << ::std::endl
+ << "Type 'exit' and press Enter to finish." << ::std::endl;
+
-+ KCmdLineArgs::addCmdLineOptions( sOptions );
-+ KCmdLineArgs::init( argc, argv, &qAboutData );
++ TDECmdLineArgs::addCmdLineOptions( sOptions );
++ TDECmdLineArgs::init( argc, argv, &qAboutData );
+
+ KLocale::setMainCatalogue( "kdialog" );
+
+ TDEApplication kApplication;
+
+ // Setup the modality
-+ KCmdLineArgs *pArgs = KCmdLineArgs::parsedArgs();
++ TDECmdLineArgs *pArgs = TDECmdLineArgs::parsedArgs();
+ long nWinId = atol( pArgs->getOption( "winid" ) );
+ pArgs->clear();
+
@@ -16078,7 +16078,7 @@ index 0000000..adeb628
+ for( int i = 0; i < m_nFakeCmdLineArgs; i++ )
+ m_pAppCmdLineArgs[i] = m_pFreeCmdLineArgs[i];
+
-+ KCmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData );
++ TDECmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData );
+
+ TDEApplication::disableAutoDcopRegistration();
+ m_pApplication = new VCLTDEApplication();