diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 | 
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 | 
| commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
| tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /kicker/applets/clock/clock.cpp | |
| 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 'kicker/applets/clock/clock.cpp')
| -rw-r--r-- | kicker/applets/clock/clock.cpp | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index 92420e652..58f6d9da1 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -45,10 +45,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  #include <kapplication.h>  #include <kprocess.h>  #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h>  #include <kstringhandler.h>  #include <tdefiledialog.h> -#include <kfontrequester.h> +#include <tdefontrequester.h>  #include <kglobalsettings.h>  #include <tdeconfigdialogmanager.h>  #include <kcalendarsystem.h> | 
