summaryrefslogtreecommitdiffstats
path: root/lanbrowsing
diff options
context:
space:
mode:
Diffstat (limited to 'lanbrowsing')
-rw-r--r--lanbrowsing/CMakeLists.txt2
-rw-r--r--lanbrowsing/Makefile.am2
-rw-r--r--lanbrowsing/kcmlisa/CMakeLists.txt4
-rw-r--r--lanbrowsing/kcmlisa/Makefile.am4
-rw-r--r--lanbrowsing/kcmlisa/kcmreslisa.cpp8
-rw-r--r--lanbrowsing/kcmlisa/kcmreslisa.h2
-rw-r--r--lanbrowsing/kcmlisa/kcmtdeiolan.cpp (renamed from lanbrowsing/kcmlisa/kcmkiolan.cpp)6
-rw-r--r--lanbrowsing/kcmlisa/kcmtdeiolan.desktop (renamed from lanbrowsing/kcmlisa/kcmkiolan.desktop)0
-rw-r--r--lanbrowsing/kcmlisa/kcmtdeiolan.h (renamed from lanbrowsing/kcmlisa/kcmkiolan.h)6
-rw-r--r--lanbrowsing/kcmlisa/main.cpp8
-rw-r--r--lanbrowsing/kcmlisa/setupwizard.h4
-rw-r--r--lanbrowsing/kio_lan/CMakeLists.txt6
-rw-r--r--lanbrowsing/kio_lan/Makefile.am10
-rw-r--r--lanbrowsing/kio_lan/kio_lan.cpp6
-rw-r--r--lanbrowsing/kio_lan/lan.protocol2
-rw-r--r--lanbrowsing/kio_lan/lisa.desktop2
-rw-r--r--lanbrowsing/kio_lan/rlan.protocol2
17 files changed, 37 insertions, 37 deletions
diff --git a/lanbrowsing/CMakeLists.txt b/lanbrowsing/CMakeLists.txt
index 146cdefe..8dee0d1e 100644
--- a/lanbrowsing/CMakeLists.txt
+++ b/lanbrowsing/CMakeLists.txt
@@ -11,4 +11,4 @@
add_subdirectory( lisa )
add_subdirectory( kcmlisa )
-add_subdirectory( kio_lan )
+add_subdirectory( tdeio_lan )
diff --git a/lanbrowsing/Makefile.am b/lanbrowsing/Makefile.am
index 4fc6aa8a..326f9322 100644
--- a/lanbrowsing/Makefile.am
+++ b/lanbrowsing/Makefile.am
@@ -1 +1 @@
-SUBDIRS = lisa kcmlisa kio_lan
+SUBDIRS = lisa kcmlisa tdeio_lan
diff --git a/lanbrowsing/kcmlisa/CMakeLists.txt b/lanbrowsing/kcmlisa/CMakeLists.txt
index 12072365..24446a44 100644
--- a/lanbrowsing/kcmlisa/CMakeLists.txt
+++ b/lanbrowsing/kcmlisa/CMakeLists.txt
@@ -24,7 +24,7 @@ link_directories(
##### other data ################################
install( FILES
- kcmkiolan.desktop kcmlisa.desktop kcmreslisa.desktop
+ kcmtdeiolan.desktop kcmlisa.desktop kcmreslisa.desktop
DESTINATION ${APPS_INSTALL_DIR}/.hidden )
@@ -32,7 +32,7 @@ install( FILES
tde_add_kpart( kcm_lanbrowser AUTOMOC
SOURCES
- main.cpp setupwizard.cpp kcmlisa.cpp kcmreslisa.cpp kcmkiolan.cpp
+ main.cpp setupwizard.cpp kcmlisa.cpp kcmreslisa.cpp kcmtdeiolan.cpp
portsettingsbar.cpp findnic.cpp
LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/lanbrowsing/kcmlisa/Makefile.am b/lanbrowsing/kcmlisa/Makefile.am
index 4d05704b..978d4968 100644
--- a/lanbrowsing/kcmlisa/Makefile.am
+++ b/lanbrowsing/kcmlisa/Makefile.am
@@ -1,6 +1,6 @@
kde_module_LTLIBRARIES = kcm_lanbrowser.la
-kcm_lanbrowser_la_SOURCES = main.cpp setupwizard.cpp kcmlisa.cpp kcmreslisa.cpp kcmkiolan.cpp portsettingsbar.cpp findnic.cpp
+kcm_lanbrowser_la_SOURCES = main.cpp setupwizard.cpp kcmlisa.cpp kcmreslisa.cpp kcmtdeiolan.cpp portsettingsbar.cpp findnic.cpp
kcm_lanbrowser_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kcm_lanbrowser_la_LIBADD = -ltdeui
@@ -14,5 +14,5 @@ kcm_lanbrowser_la_METASOURCES = AUTO
messages:
$(XGETTEXT) $(kcm_lanbrowser_la_SOURCES) -o $(podir)/kcmlanbrowser.pot
-apps_DATA = kcmkiolan.desktop kcmlisa.desktop kcmreslisa.desktop
+apps_DATA = kcmtdeiolan.desktop kcmlisa.desktop kcmreslisa.desktop
appsdir = $(kde_appsdir)/.hidden
diff --git a/lanbrowsing/kcmlisa/kcmreslisa.cpp b/lanbrowsing/kcmlisa/kcmreslisa.cpp
index 6b946608..252beadf 100644
--- a/lanbrowsing/kcmlisa/kcmreslisa.cpp
+++ b/lanbrowsing/kcmlisa/kcmreslisa.cpp
@@ -39,7 +39,7 @@
ResLisaSettings::ResLisaSettings(const TQString& config, TQWidget *parent)
: TDECModule(parent)
,m_config(config,false,true)
-,m_kiolanConfig("kio_lanrc",false,true)
+,m_tdeiolanConfig("tdeio_lanrc",false,true)
,m_advancedSettingsButton(0)
,m_suggestSettings(0)
,m_useNmblookup(0)
@@ -168,7 +168,7 @@ void ResLisaSettings::load()
m_pingNames->clear();
m_pingNames->insertStringList(m_config.readListEntry("PingNames",';'));
- m_rlanSidebar->setChecked(m_kiolanConfig.readEntry("sidebarURL", "lan:/") == "rlan:/" ? true : false );
+ m_rlanSidebar->setChecked(m_tdeiolanConfig.readEntry("sidebarURL", "lan:/") == "rlan:/" ? true : false );
}
void ResLisaSettings::save()
@@ -200,8 +200,8 @@ void ResLisaSettings::save()
m_config.sync();
- m_kiolanConfig.writeEntry("sidebarURL", m_rlanSidebar->isChecked() ? "rlan:/" : "lan:/");
- m_kiolanConfig.sync();
+ m_tdeiolanConfig.writeEntry("sidebarURL", m_rlanSidebar->isChecked() ? "rlan:/" : "lan:/");
+ m_tdeiolanConfig.sync();
}
diff --git a/lanbrowsing/kcmlisa/kcmreslisa.h b/lanbrowsing/kcmlisa/kcmreslisa.h
index 69f226db..e395b0ba 100644
--- a/lanbrowsing/kcmlisa/kcmreslisa.h
+++ b/lanbrowsing/kcmlisa/kcmreslisa.h
@@ -47,7 +47,7 @@ class ResLisaSettings:public TDECModule
void suggestSettings();
protected:
TDEConfig m_config;
- TDEConfig m_kiolanConfig;
+ TDEConfig m_tdeiolanConfig;
TQPushButton* m_advancedSettingsButton;
TQPushButton* m_suggestSettings;
TQCheckBox* m_useNmblookup;
diff --git a/lanbrowsing/kcmlisa/kcmkiolan.cpp b/lanbrowsing/kcmlisa/kcmtdeiolan.cpp
index fa3188fc..68e01989 100644
--- a/lanbrowsing/kcmlisa/kcmkiolan.cpp
+++ b/lanbrowsing/kcmlisa/kcmtdeiolan.cpp
@@ -1,5 +1,5 @@
/*
- * kcmkiolan.cpp
+ * kcmtdeiolan.cpp
*
* Copyright (c) 2000 Alexander Neundorf <neundorf@kde.org>
*
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "kcmkiolan.h"
+#include "kcmtdeiolan.h"
#include <tqcheckbox.h>
#include <tqlayout.h>
@@ -99,5 +99,5 @@ void IOSlaveSettings::save()
m_config.sync();
}
-#include "kcmkiolan.moc"
+#include "kcmtdeiolan.moc"
diff --git a/lanbrowsing/kcmlisa/kcmkiolan.desktop b/lanbrowsing/kcmlisa/kcmtdeiolan.desktop
index 78279de8..78279de8 100644
--- a/lanbrowsing/kcmlisa/kcmkiolan.desktop
+++ b/lanbrowsing/kcmlisa/kcmtdeiolan.desktop
diff --git a/lanbrowsing/kcmlisa/kcmkiolan.h b/lanbrowsing/kcmlisa/kcmtdeiolan.h
index 86dd0fa4..fc94e06a 100644
--- a/lanbrowsing/kcmlisa/kcmkiolan.h
+++ b/lanbrowsing/kcmlisa/kcmtdeiolan.h
@@ -1,5 +1,5 @@
/*
- * kcmkiolan.h
+ * kcmtdeiolan.h
*
* Copyright (c) 2000 Alexander Neundorf <neundorf@kde.org>
*
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef KCMKIOLAN_H
-#define KCMKIOLAN_H
+#ifndef KCMTDEIOLAN_H
+#define KCMTDEIOLAN_H
#include "portsettingsbar.h"
#include <tdecmodule.h>
diff --git a/lanbrowsing/kcmlisa/main.cpp b/lanbrowsing/kcmlisa/main.cpp
index 03d5d045..b7d12c39 100644
--- a/lanbrowsing/kcmlisa/main.cpp
+++ b/lanbrowsing/kcmlisa/main.cpp
@@ -1,5 +1,5 @@
/*
- * main.cpp for lisa,reslisa,kio_lan and kio_rlan kcm module
+ * main.cpp for lisa,reslisa,tdeio_lan and tdeio_rlan kcm module
*
* Copyright (C) 2000,2001,2005 Alexander Neundorf <neundorf@kde.org>
*
@@ -29,7 +29,7 @@
#include "kcmlisa.h"
#include "kcmreslisa.h"
-#include "kcmkiolan.h"
+#include "kcmtdeiolan.h"
extern "C"
{
@@ -41,9 +41,9 @@ extern "C"
{
return new ResLisaSettings(TQDir::homeDirPath()+"/.reslisarc", parent);
}
- KDE_EXPORT TDECModule *create_kiolan(TQWidget *parent, const char *)
+ KDE_EXPORT TDECModule *create_tdeiolan(TQWidget *parent, const char *)
{
- return new IOSlaveSettings("kio_lanrc", parent);
+ return new IOSlaveSettings("tdeio_lanrc", parent);
}
}
diff --git a/lanbrowsing/kcmlisa/setupwizard.h b/lanbrowsing/kcmlisa/setupwizard.h
index 87e87064..81b7e45b 100644
--- a/lanbrowsing/kcmlisa/setupwizard.h
+++ b/lanbrowsing/kcmlisa/setupwizard.h
@@ -1,5 +1,5 @@
/*
- * main.cpp for lisa,reslisa,kio_lan and kio_rlan kcm module
+ * main.cpp for lisa,reslisa,tdeio_lan and tdeio_rlan kcm module
*
* Copyright (C) 2000 Alexander Neundorf <neundorf@kde.org>
*
@@ -23,7 +23,7 @@
#include "kcmlisa.h"
#include "kcmreslisa.h"
-#include "kcmkiolan.h"
+#include "kcmtdeiolan.h"
#include "findnic.h"
diff --git a/lanbrowsing/kio_lan/CMakeLists.txt b/lanbrowsing/kio_lan/CMakeLists.txt
index d2fb242f..50794770 100644
--- a/lanbrowsing/kio_lan/CMakeLists.txt
+++ b/lanbrowsing/kio_lan/CMakeLists.txt
@@ -39,10 +39,10 @@ install( FILES
DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/services )
-##### kio_lan (module) ##########################
+##### tdeio_lan (module) ##########################
-tde_add_kpart( kio_lan
- SOURCES kio_lan.cpp
+tde_add_kpart( tdeio_lan
+ SOURCES tdeio_lan.cpp
LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/lanbrowsing/kio_lan/Makefile.am b/lanbrowsing/kio_lan/Makefile.am
index 90eaec15..df87f09d 100644
--- a/lanbrowsing/kio_lan/Makefile.am
+++ b/lanbrowsing/kio_lan/Makefile.am
@@ -4,13 +4,13 @@ INCLUDES= $(all_includes)
####### Files
-kde_module_LTLIBRARIES = kio_lan.la
+kde_module_LTLIBRARIES = tdeio_lan.la
-kio_lan_la_SOURCES = kio_lan.cpp
-kio_lan_la_LIBADD = $(LIB_KIO)
-kio_lan_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_RPATH)
+tdeio_lan_la_SOURCES = tdeio_lan.cpp
+tdeio_lan_la_LIBADD = $(LIB_KIO)
+tdeio_lan_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_RPATH)
-noinst_HEADERS = kio_lan.h
+noinst_HEADERS = tdeio_lan.h
kdelnk_DATA = lan.protocol rlan.protocol
kdelnkdir = $(kde_servicesdir)
diff --git a/lanbrowsing/kio_lan/kio_lan.cpp b/lanbrowsing/kio_lan/kio_lan.cpp
index 4e7040ac..e573f7ea 100644
--- a/lanbrowsing/kio_lan/kio_lan.cpp
+++ b/lanbrowsing/kio_lan/kio_lan.cpp
@@ -46,7 +46,7 @@
#include <time.h>
#include <pwd.h>
-#include "kio_lan.h"
+#include "tdeio_lan.h"
#ifndef AF_LOCAL
#define AF_LOCAL AF_UNIX
@@ -66,11 +66,11 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
int kdemain( int argc, char **argv )
{
- TDEInstance instance( "kio_lan" );
+ TDEInstance instance( "tdeio_lan" );
if (argc != 4)
{
- fprintf(stderr, "Usage: kio_lan protocol domain-socket1 domain-socket2\n");
+ fprintf(stderr, "Usage: tdeio_lan protocol domain-socket1 domain-socket2\n");
exit(-1);
}
int isLanIoslave=(strcmp("lan",argv[1])==0);
diff --git a/lanbrowsing/kio_lan/lan.protocol b/lanbrowsing/kio_lan/lan.protocol
index 59c72062..a4101a0e 100644
--- a/lanbrowsing/kio_lan/lan.protocol
+++ b/lanbrowsing/kio_lan/lan.protocol
@@ -1,5 +1,5 @@
[Protocol]
-exec=kio_lan
+exec=tdeio_lan
protocol=lan
input=none
output=filesystem
diff --git a/lanbrowsing/kio_lan/lisa.desktop b/lanbrowsing/kio_lan/lisa.desktop
index 231606b9..b4807d94 100644
--- a/lanbrowsing/kio_lan/lisa.desktop
+++ b/lanbrowsing/kio_lan/lisa.desktop
@@ -63,4 +63,4 @@ Name[zu]=Umbheki zincwadi ze LAN
Open=false
X-TDE-TreeModule=Directory
X-TDE-KonqSidebarModule=konqsidebar_tree
-X-TDE-ConfiguredURL=kio_lanrc:noGroup:sidebarURL
+X-TDE-ConfiguredURL=tdeio_lanrc:noGroup:sidebarURL
diff --git a/lanbrowsing/kio_lan/rlan.protocol b/lanbrowsing/kio_lan/rlan.protocol
index 79fe3c3c..f41507e7 100644
--- a/lanbrowsing/kio_lan/rlan.protocol
+++ b/lanbrowsing/kio_lan/rlan.protocol
@@ -1,5 +1,5 @@
[Protocol]
-exec=kio_lan
+exec=tdeio_lan
protocol=rlan
input=none
output=filesystem