diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:45:35 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:45:35 -0600 |
| commit | 3f72026be22b42e127b839806d938f71ac1aa6c3 (patch) | |
| tree | 3f8b413b1bd1d90a2aa65f674c97794bc9194f41 | |
| parent | dfd8cf12a2d6044256a1e3876470fa553bf7ca52 (diff) | |
| download | kchmviewer-3f72026be22b42e127b839806d938f71ac1aa6c3.tar.gz kchmviewer-3f72026be22b42e127b839806d938f71ac1aa6c3.zip | |
Rename additional header files to avoid conflicts with KDE4
| -rw-r--r-- | am_edit | 2 | ||||
| -rw-r--r-- | src/kde-qt.h | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -1112,7 +1112,7 @@ sub tag_UIFILES () $dep_lines .= "$source.$cxxsuffix: $sourcedir$source.ui $source.h $source.moc\n"; $dep_lines .= "\trm -f $source.$cxxsuffix\n"; if (!$kdeopts{"qtonly"}) { - $dep_lines .= "\techo '#include <klocale.h>' > $source.$cxxsuffix\n"; + $dep_lines .= "\techo '#include <tdelocale.h>' > $source.$cxxsuffix\n"; my ($mangled_source) = $source; $mangled_source =~ s/[^A-Za-z0-9]/_/g; # get rid of garbage $dep_lines .= "\t\$(UIC) -tr \${UIC_TR} -i $source.h $sourcedir$source.ui | sed -e \"s,\${UIC_TR}( \\\"\\\" ),QString::null,g\" | sed -e \"s,\${UIC_TR}( \\\"\\\"\\, \\\"\\\" ),QString::null,g\" | sed -e \"s,image\\([0-9][0-9]*\\)_data,img\\1_" . $mangled_source . ",g\" >> $source.$cxxsuffix || rm -f $source.$cxxsuffix\n"; diff --git a/src/kde-qt.h b/src/kde-qt.h index 447df1c..6028439 100644 --- a/src/kde-qt.h +++ b/src/kde-qt.h @@ -34,15 +34,15 @@ #include <tdeapplication.h> #include <tdemainwindow.h> #include <kstatusbar.h> - #include <kmenubar.h> + #include <tdemenubar.h> #include <tdecmdlineargs.h> - #include <klocale.h> + #include <tdelocale.h> #include <tdelistview.h> #include <tdefiledialog.h> #include <tdehtml_part.h> #include <ktabwidget.h> #include <tdepopupmenu.h> - #include <kmessagebox.h> + #include <tdemessagebox.h> #include <kprogress.h> #include <krun.h> |