summaryrefslogtreecommitdiffstats
path: root/smb4k
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-09-03 19:58:25 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-09-03 20:17:22 +0200
commit2ac88a7a3c150497a9820f5f40dd4177cd561d76 (patch)
treed913b9cfeb5dd2f363e67ba942ec00b744e52dd8 /smb4k
parent8cb5f9f190626fb3f1f1a383c17b9612c320775d (diff)
downloadsmb4k-2ac88a7a3c150497a9820f5f40dd4177cd561d76.tar.gz
smb4k-2ac88a7a3c150497a9820f5f40dd4177cd561d76.zip
Additional k => tde renaming and fixes
Diffstat (limited to 'smb4k')
-rw-r--r--smb4k/Makefile.am4
-rw-r--r--smb4k/browser/Makefile.am2
-rw-r--r--smb4k/configdlg/smb4tdeconfigdialog.h4
-rw-r--r--smb4k/configdlg/smb4tdersyncoptions.h4
-rw-r--r--smb4k/core/Makefile.am2
-rw-r--r--smb4k/core/smb4kcore.cpp2
-rw-r--r--smb4k/core/smb4tdeglobal.h4
-rw-r--r--smb4k/iconview/Makefile.am2
-rw-r--r--smb4k/listview/Makefile.am2
-rw-r--r--smb4k/searchdlg/Makefile.am2
10 files changed, 14 insertions, 14 deletions
diff --git a/smb4k/Makefile.am b/smb4k/Makefile.am
index 2d803ba..3f6f582 100644
--- a/smb4k/Makefile.am
+++ b/smb4k/Makefile.am
@@ -8,8 +8,8 @@ bin_PROGRAMS = smb4k
smb4k_SOURCES = main.cpp smb4k.cpp smb4ksystemtray.cpp
smb4k_LDADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
- $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIB_KPARTS) $(LIB_QT)
-smb4k_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+ $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_QT)
+smb4k_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
KDE_ICON = smb4k
diff --git a/smb4k/browser/Makefile.am b/smb4k/browser/Makefile.am
index a10c4f7..e013c44 100644
--- a/smb4k/browser/Makefile.am
+++ b/smb4k/browser/Makefile.am
@@ -8,7 +8,7 @@ libsmb4knetworkbrowser_la_SOURCES = smb4knetworkbrowser_part.cpp \
smb4knetworkbrowsertooltip.cpp
libsmb4knetworkbrowser_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
$(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDECORE) \
- $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_KPARTS) $(LIB_QT)
+ $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_QT)
libsmb4knetworkbrowser_la_LDFLAGS = -module -no-undefined $(all_libraries)
partrcdir = $(kde_datadir)/smb4knetworkbrowserpart
diff --git a/smb4k/configdlg/smb4tdeconfigdialog.h b/smb4k/configdlg/smb4tdeconfigdialog.h
index 6af3773..3a95405 100644
--- a/smb4k/configdlg/smb4tdeconfigdialog.h
+++ b/smb4k/configdlg/smb4tdeconfigdialog.h
@@ -23,8 +23,8 @@
* MA 02110-1301 USA *
***************************************************************************/
-#ifndef SMB4KCONFIGDIALOG_H
-#define SMB4KCONFIGDIALOG_H
+#ifndef SMB4TDECONFIGDIALOG_H
+#define SMB4TDECONFIGDIALOG_H
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/smb4k/configdlg/smb4tdersyncoptions.h b/smb4k/configdlg/smb4tdersyncoptions.h
index 2d7a2e2..7a9bc13 100644
--- a/smb4k/configdlg/smb4tdersyncoptions.h
+++ b/smb4k/configdlg/smb4tdersyncoptions.h
@@ -23,8 +23,8 @@
* MA 02110-1301 USA *
***************************************************************************/
-#ifndef SMB4KRSYNCOPTIONS_H
-#define SMB4KRSYNCOPTIONS_H
+#ifndef SMB4TDERSYNCOPTIONS_H
+#define SMB4TDERSYNCOPTIONS_H
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/smb4k/core/Makefile.am b/smb4k/core/Makefile.am
index 821daba..5af77dd 100644
--- a/smb4k/core/Makefile.am
+++ b/smb4k/core/Makefile.am
@@ -18,7 +18,7 @@ libsmb4kcore_la_SOURCES = smb4kauthinfo.cpp smb4kbookmark.cpp \
smb4kprint.cpp smb4kprintinfo.cpp smb4ksambaoptionshandler.cpp \
smb4ksambaoptionsinfo.cpp smb4kscanner.cpp smb4kscanner_p.cpp smb4ksettings.kcfgc smb4kshare.cpp \
smb4ksynchronizationinfo.cpp smb4ksynchronizer.cpp
-libsmb4kcore_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_QT)
+libsmb4kcore_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_QT)
kde_kcfg_DATA = smb4k.kcfg
diff --git a/smb4k/core/smb4kcore.cpp b/smb4k/core/smb4kcore.cpp
index 91e92ab..8319ff4 100644
--- a/smb4k/core/smb4kcore.cpp
+++ b/smb4k/core/smb4kcore.cpp
@@ -245,7 +245,7 @@ void Smb4KCore::open( Smb4KShare *share, int openWith )
if ( TQString::compare( share->filesystem(), "cifs" ) == 0 )
{
- if( KMessageBox::warningContinueCancel( (TQWidget *)this, i18n( "Up to KDE 3.3.x, KIO and Konqueror cannot handle CIFS shares. Konqueror will hang if you try to access it.\nDo you want to continue?" ) ) == KMessageBox::Cancel )
+ if( KMessageBox::warningContinueCancel( (TQWidget *)this, i18n( "Up to KDE 3.3.x, TDEIO and Konqueror cannot handle CIFS shares. Konqueror will hang if you try to access it.\nDo you want to continue?" ) ) == KMessageBox::Cancel )
{
return;
}
diff --git a/smb4k/core/smb4tdeglobal.h b/smb4k/core/smb4tdeglobal.h
index c6da2a4..b173d1b 100644
--- a/smb4k/core/smb4tdeglobal.h
+++ b/smb4k/core/smb4tdeglobal.h
@@ -23,8 +23,8 @@
* MA 02110-1301 USA *
***************************************************************************/
-#ifndef SMB4KGLOBAL_H
-#define SMB4KGLOBAL_H
+#ifndef SMB4TDEGLOBAL_H
+#define SMB4TDEGLOBAL_H
#include <tqstring.h>
#include <tqtimer.h>
diff --git a/smb4k/iconview/Makefile.am b/smb4k/iconview/Makefile.am
index 6c03d0c..f3b05ff 100644
--- a/smb4k/iconview/Makefile.am
+++ b/smb4k/iconview/Makefile.am
@@ -9,7 +9,7 @@ libsmb4ksharesiconview_la_LDFLAGS = -module -no-undefined $(all_libraries)
noinst_HEADERS = smb4ksharesiconview.h smb4ksharesiconview_part.h \
smb4ksharesiconviewitem.h smb4ksharesiconviewtooltip.h
libsmb4ksharesiconview_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
- $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_KIO) $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_KPARTS) \
+ $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) \
$(LIB_QT)
partrcdir = $(kde_datadir)/smb4ksharesiconviewpart
diff --git a/smb4k/listview/Makefile.am b/smb4k/listview/Makefile.am
index 8fb182b..0d87334 100644
--- a/smb4k/listview/Makefile.am
+++ b/smb4k/listview/Makefile.am
@@ -3,7 +3,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = libsmb4kshareslistview.la
libsmb4kshareslistview_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
- $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_KIO) $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_KPARTS) \
+ $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) \
$(LIB_QT)
libsmb4kshareslistview_la_LDFLAGS = -module -no-undefined $(all_libraries)
diff --git a/smb4k/searchdlg/Makefile.am b/smb4k/searchdlg/Makefile.am
index bef68fc..2ff442a 100644
--- a/smb4k/searchdlg/Makefile.am
+++ b/smb4k/searchdlg/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = $(all_includes)
METASOURCES = AUTO
kde_module_LTLIBRARIES = libsmb4ksearchdialog.la
libsmb4ksearchdialog_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
- $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_KPARTS) $(LIB_QT)
+ $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_QT)
noinst_HEADERS = smb4ksearchdialog.h smb4ksearchdialog_part.h \
smb4ksearchdialogitem.h
libsmb4ksearchdialog_la_SOURCES = smb4ksearchdialog.cpp \