diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:02 -0600 |
| commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
| tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /kcontrol/ioslaveinfo | |
| 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 'kcontrol/ioslaveinfo')
| -rw-r--r-- | kcontrol/ioslaveinfo/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kcontrol/ioslaveinfo/ioslaveinfo.desktop | 2 | ||||
| -rw-r--r-- | kcontrol/ioslaveinfo/kcmioslaveinfo.cpp | 8 | ||||
| -rw-r--r-- | kcontrol/ioslaveinfo/kcmioslaveinfo.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/kcontrol/ioslaveinfo/CMakeLists.txt b/kcontrol/ioslaveinfo/CMakeLists.txt index e0811d998..5a8a72d59 100644 --- a/kcontrol/ioslaveinfo/CMakeLists.txt +++ b/kcontrol/ioslaveinfo/CMakeLists.txt @@ -29,6 +29,6 @@ tde_install_empty_directory( ${DATA_INSTALL_DIR}/Settings/Information ) tde_add_kpart( kcm_ioslaveinfo AUTOMOC SOURCES kcmioslaveinfo.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/ioslaveinfo/ioslaveinfo.desktop b/kcontrol/ioslaveinfo/ioslaveinfo.desktop index 1dee413d3..451ded7f4 100644 --- a/kcontrol/ioslaveinfo/ioslaveinfo.desktop +++ b/kcontrol/ioslaveinfo/ioslaveinfo.desktop @@ -78,7 +78,7 @@ Comment[zh_CN]=可用协议的信息 Comment[zh_TW]=可用協定的資訊 Comment[zu]=Ulwazi mayelana nemithetho elandelwayo ekhona DocPath=kinfocenter/protocols/index.html -Exec=kcmshell ioslaveinfo +Exec=tdecmshell ioslaveinfo Icon=history Keywords=Protocol,IO slaves,Slaves,Network,Information,Timeout Keywords[ar]=الميفاق,IO Slaves,Slaves,الشبكة,معلومات نفاذ الوقت diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp index 9ee3d93f9..b0ae6866d 100644 --- a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp +++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp @@ -32,13 +32,13 @@ #include <tqvbox.h> #include <tqwhatsthis.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kdialog.h> #include <kgenericfactory.h> #include <kglobal.h> #include <kiconloader.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <klocale.h> #include <kprotocolinfo.h> #include <kstandarddirs.h> @@ -118,7 +118,7 @@ void KCMIOSlaveInfo::slotResult(TDEIO::Job *) void KCMIOSlaveInfo::showInfo(const TQString& protocol) { - TQString file = TQString("kioslave/%1.docbook").arg( protocol ); + TQString file = TQString("tdeioslave/%1.docbook").arg( protocol ); file = TDEGlobal::locale()->langLookup( file ); if (m_tfj) { @@ -129,7 +129,7 @@ void KCMIOSlaveInfo::showInfo(const TQString& protocol) if (!file.isEmpty()) { helpData.truncate( 0 ); - m_tfj = TDEIO::get( KURL( TQString("help:/kioslave/%1.html").arg( protocol ) ), true, false ); + m_tfj = TDEIO::get( KURL( TQString("help:/tdeioslave/%1.html").arg( protocol ) ), true, false ); connect( m_tfj, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQT_SLOT( slaveHelp( TDEIO::Job *, const TQByteArray &) ) ); connect( m_tfj, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotResult( TDEIO::Job * ) ) ); return; diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.h b/kcontrol/ioslaveinfo/kcmioslaveinfo.h index 04db54566..f2df0e1e4 100644 --- a/kcontrol/ioslaveinfo/kcmioslaveinfo.h +++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.h @@ -29,7 +29,7 @@ #include <kaboutdata.h> #include <tdecmodule.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <klistbox.h> #include <ktextbrowser.h> |