diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:37 -0600 |
| commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
| tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /ksmserver/startupdlg.cpp | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'ksmserver/startupdlg.cpp')
| -rw-r--r-- | ksmserver/startupdlg.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ksmserver/startupdlg.cpp b/ksmserver/startupdlg.cpp index 585d437ad..812ebc5cb 100644 --- a/ksmserver/startupdlg.cpp +++ b/ksmserver/startupdlg.cpp @@ -28,7 +28,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> #include <tqregexp.h> #include <tqeventloop.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <kdebug.h> @@ -36,7 +36,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> #include <kstdguiitem.h> #include <kguiitem.h> #include <kiconloader.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <twin.h> #include <kuser.h> #include <kpixmap.h> |