Rename many classes and header files to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent 8d2687a8b6
commit bd8e03f773

@ -17,8 +17,8 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include <kaccel.h>
#include <kaction.h>
#include <tdeaccel.h>
#include <tdeaction.h>
#include <kcharsets.h>
#include <tdeconfig.h>
#include <tdeconfigdialog.h>
@ -36,7 +36,7 @@
#include <kstatusbar.h>
#include <ksplashscreen.h>
#include <kstandarddirs.h>
#include <kstdaccel.h>
#include <tdestdaccel.h>
#include <kstdaction.h>
#include <kurl.h>
#include <kurldrag.h>

@ -25,7 +25,7 @@
#endif
#include <kapplication.h>
#include <kmainwindow.h>
#include <tdemainwindow.h>
#include "bookwidget.h"

@ -162,6 +162,6 @@
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kfontrequester.h</includehint>
<includehint>tdefontrequester.h</includehint>
</includehints>
</UI>

Loading…
Cancel
Save