diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-21 18:57:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-21 18:57:32 -0600 |
| commit | d337ac30737f8bc19e55bbafbb9fe1fdc3c08d86 (patch) | |
| tree | 3492b723de40a6a3bdc719f9b4096a393d291c05 /libreoffice/git_05_11_2012 | |
| parent | 2715c65c510713f1a6c9ae83298e0cfb885f5475 (diff) | |
| download | thirdparty-d337ac30737f8bc19e55bbafbb9fe1fdc3c08d86.tar.gz thirdparty-d337ac30737f8bc19e55bbafbb9fe1fdc3c08d86.zip | |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'libreoffice/git_05_11_2012')
| -rw-r--r-- | libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff | 2 |
1 files changed, 1 insertions, 1 deletions
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 ); |