diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:19:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:19:22 -0600 |
| commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
| tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /kcontrol/fonts | |
| parent | eba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff) | |
| download | tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/fonts')
| -rw-r--r-- | kcontrol/fonts/fonts.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/fonts/fonts.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp index e450629f1..96fbc7d68 100644 --- a/kcontrol/fonts/fonts.cpp +++ b/kcontrol/fonts/fonts.cpp @@ -22,7 +22,7 @@ #include <dcopclient.h> -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> #include <kapplication.h> #include <kgenericfactory.h> #include <kipc.h> diff --git a/kcontrol/fonts/fonts.h b/kcontrol/fonts/fonts.h index db933d8a0..cd9f52e02 100644 --- a/kcontrol/fonts/fonts.h +++ b/kcontrol/fonts/fonts.h @@ -12,8 +12,8 @@ #include <tdecmodule.h> #include <kdialogbase.h> -#include <kfontdialog.h> -#include <kfontrequester.h> +#include <tdefontdialog.h> +#include <tdefontrequester.h> #include "kxftconfig.h" |