diff options
author | Timothy Pearson <[email protected]> | 2013-01-19 23:57:47 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-19 23:57:47 -0600 |
commit | 6ec5cc8d82b29c330def669cf20534cadd2cf29e (patch) | |
tree | 7e66b929b5455837f22ea54ed91fc9af6f64f7bf /lib/kofficeui | |
parent | 68a4fdfd2c2b70a7c22c4c6d6c916e604a0efac2 (diff) | |
download | koffice-6ec5cc8d82b29c330def669cf20534cadd2cf29e.tar.gz koffice-6ec5cc8d82b29c330def669cf20534cadd2cf29e.zip |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'lib/kofficeui')
-rw-r--r-- | lib/kofficeui/KoKoolBar.cpp | 2 | ||||
-rw-r--r-- | lib/kofficeui/tests/coloraction_test.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/kofficeui/KoKoolBar.cpp b/lib/kofficeui/KoKoolBar.cpp index 1db0ee9b..ce848874 100644 --- a/lib/kofficeui/KoKoolBar.cpp +++ b/lib/kofficeui/KoKoolBar.cpp @@ -462,7 +462,7 @@ void KoKoolBarItem::press() int main( int argc, char **argv ) { - KApplication app( argc, argv ); + TDEApplication app( argc, argv ); KoKoolBar bar; int file = bar.insertGroup("File"); TQPixmap pix; diff --git a/lib/kofficeui/tests/coloraction_test.cpp b/lib/kofficeui/tests/coloraction_test.cpp index 9dfd066c..3e9c146a 100644 --- a/lib/kofficeui/tests/coloraction_test.cpp +++ b/lib/kofficeui/tests/coloraction_test.cpp @@ -102,7 +102,7 @@ int main( int argc, char ** argv ) { srand( time( 0 ) ); - KApplication a( argc, argv, "KColorAction Test" ); + TDEApplication a( argc, argv, "KColorAction Test" ); TopLevel *toplevel = new TopLevel( 0, "coloractiontest" ); a.setMainWidget( toplevel ); toplevel->show(); |