diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
| commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
| tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /kicker/applets/systemtray | |
| parent | 936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff) | |
| download | tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kicker/applets/systemtray')
| -rw-r--r-- | kicker/applets/systemtray/Makefile.am | 2 | ||||
| -rw-r--r-- | kicker/applets/systemtray/systemtrayapplet.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kicker/applets/systemtray/Makefile.am b/kicker/applets/systemtray/Makefile.am index 2749c7391..3ba76ca5c 100644 --- a/kicker/applets/systemtray/Makefile.am +++ b/kicker/applets/systemtray/Makefile.am @@ -21,4 +21,4 @@ messages: $(XGETTEXT) *.cpp *.h -o $(podir)/ksystemtrayapplet.pot srcdoc: - kdoc -a -p -H -d $$HOME/web/src/ksystemtrayapplet ksystemtrayapplet *.h -lqt -ltdecore -ltdeui -lkfile + kdoc -a -p -H -d $$HOME/web/src/ksystemtrayapplet ksystemtrayapplet *.h -lqt -ltdecore -ltdeui -ltdefile diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 02f13df2b..835174f92 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <dcopclient.h> #include <kapplication.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> #include <krun.h> |