diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:18:35 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:18:35 -0600 |
| commit | f71394031a5e1c3b315081a98000f242b461ca8c (patch) | |
| tree | 54081035a0fdae2cadbf9d7df74a9a4e4cd46925 /kview/kviewcanvas | |
| parent | e5ce3b4175f2e72788b49b9ed46c722784218dad (diff) | |
| download | tdegraphics-f71394031a5e1c3b315081a98000f242b461ca8c.tar.gz tdegraphics-f71394031a5e1c3b315081a98000f242b461ca8c.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kview/kviewcanvas')
| -rw-r--r-- | kview/kviewcanvas/ChangeLog | 2 | ||||
| -rw-r--r-- | kview/kviewcanvas/test/main.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kview/kviewcanvas/ChangeLog b/kview/kviewcanvas/ChangeLog index 1edb3529..9ec3ee84 100644 --- a/kview/kviewcanvas/ChangeLog +++ b/kview/kviewcanvas/ChangeLog @@ -10,7 +10,7 @@ * kimagecanvas.cpp: Fix checkBounds() to always keep the aspect ratio. - Create the factory with it's own KInstance. + Create the factory with it's own TDEInstance. * kimagecanvas.{h,cpp}: New method boundImageTo( QSize ). Fits the image into the requested width and height. diff --git a/kview/kviewcanvas/test/main.cpp b/kview/kviewcanvas/test/main.cpp index bd78c8fb..4c6fa3f7 100644 --- a/kview/kviewcanvas/test/main.cpp +++ b/kview/kviewcanvas/test/main.cpp @@ -17,7 +17,7 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("kimageviewertest", I18N_NOOP("KImageViewerTest"), version, description, KAboutData::License_GPL, "(C) 2001 Matthias Kretz", 0, 0, "kretz@kde.org"); + TDEAboutData about("kimageviewertest", I18N_NOOP("KImageViewerTest"), version, description, TDEAboutData::License_GPL, "(C) 2001 Matthias Kretz", 0, 0, "kretz@kde.org"); about.addAuthor( "Matthias Kretz", 0, "kretz@kde.org" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); |