From d337ac30737f8bc19e55bbafbb9fe1fdc3c08d86 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 21 Jan 2013 18:57:32 -0600 Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff') 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 ); -- cgit v1.2.3