diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:11:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:11:02 -0600 |
| commit | 533c3127e1498430584d456034fe2558101d99cb (patch) | |
| tree | c65bb79b9fe98e34fbdca81ae843289fd47d14f0 /src/optiondialog.cpp | |
| parent | 821dbb340f650965ff257f4dec7b31ed7458c6e1 (diff) | |
| download | kdiff3-533c3127e1498430584d456034fe2558101d99cb.tar.gz kdiff3-533c3127e1498430584d456034fe2558101d99cb.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src/optiondialog.cpp')
| -rw-r--r-- | src/optiondialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp index f4448fa..e463b38 100644 --- a/src/optiondialog.cpp +++ b/src/optiondialog.cpp @@ -35,12 +35,12 @@ #include <kapplication.h> #include <kcolorbtn.h> -#include <kfontdialog.h> // For TDEFontChooser +#include <tdefontdialog.h> // For TDEFontChooser #include <kiconloader.h> #include <klocale.h> #include <tdeconfig.h> #include <kmessagebox.h> -#include <kmainwindow.h> //For ktoolbar.h +#include <tdemainwindow.h> //For tdetoolbar.h //#include <kkeydialog.h> #include <map> |