Browse Source

Rename a number of libraries and executables to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
5ff32d08eb
4 changed files with 7 additions and 7 deletions
  1. 1
    1
      kdialogd3/CMakeLists.txt
  2. 2
    2
      kdialogd3/kdialogd.cpp
  3. 3
    3
      kdialogd3/kdialogd.h
  4. 1
    1
      kgtk-wrapper

+ 1
- 1
kdialogd3/CMakeLists.txt View File

@@ -35,6 +35,6 @@ set( ${target}_SRCS

tde_add_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
LINK tdecore-shared tdeui-shared kio-shared
LINK tdecore-shared tdeui-shared tdeio-shared
DESTINATION ${BIN_INSTALL_DIR}
)

+ 2
- 2
kdialogd3/kdialogd.cpp View File

@@ -5,10 +5,10 @@
#include <kdiroperator.h>
#include <kuniqueapplication.h>
#include <tqsocketnotifier.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kurlcombobox.h>
#ifdef USE_KWIN
#include <twin.h>

+ 3
- 3
kdialogd3/kdialogd.h View File

@@ -1,9 +1,9 @@
#ifndef __KDIALOGD_H__
#define __KDIALOGD_H__

#include <kfile.h>
#include <kfiledialog.h>
#include <kfiledialog.h>
#include <tdefile.h>
#include <tdefiledialog.h>
#include <tdefiledialog.h>
#include <kdirselectdialog.h>
#include "common.h"
#include "config.h"

+ 1
- 1
kgtk-wrapper View File

@@ -72,7 +72,7 @@ if [ "$toolkit" = "" ] && [ ! -z "$realApp" ] ; then
fi

if [ "$toolkit" = "qt3" ] || [ "$toolkit" = "qt4" ] ; then
if [ "0" != "`echo $libs | grep libkio | wc -l`" ] ; then
if [ "0" != "`echo $libs | grep libtdeio | wc -l`" ] ; then
toolkit=""
fi
fi

Loading…
Cancel
Save