summaryrefslogtreecommitdiffstats
path: root/certmanager
diff options
context:
space:
mode:
Diffstat (limited to 'certmanager')
-rw-r--r--certmanager/CMakeLists.txt4
-rw-r--r--certmanager/Makefile.am2
-rw-r--r--certmanager/conf/Makefile.am2
-rw-r--r--certmanager/conf/appearanceconfigpage.cpp2
-rw-r--r--certmanager/conf/dirservconfigpage.cpp2
-rw-r--r--certmanager/conf/dnorderconfigpage.cpp2
-rw-r--r--certmanager/kwatchgnupg/Makefile.am2
-rw-r--r--certmanager/lib/CMakeLists.txt2
-rw-r--r--certmanager/lib/Makefile.am4
-rw-r--r--certmanager/lib/backends/chiasmus/CMakeLists.txt2
-rw-r--r--certmanager/lib/backends/chiasmus/Makefile.am2
-rw-r--r--certmanager/lib/backends/kpgp/Makefile.am2
-rw-r--r--certmanager/lib/backends/qgpgme/CMakeLists.txt2
-rw-r--r--certmanager/lib/backends/qgpgme/Makefile.am2
-rw-r--r--certmanager/lib/kleo/CMakeLists.txt2
-rw-r--r--certmanager/lib/kleo/Makefile.am2
-rw-r--r--certmanager/lib/tests/Makefile.am2
-rw-r--r--certmanager/lib/tests/test_cryptoconfig.cpp2
-rw-r--r--certmanager/lib/ui/CMakeLists.txt2
-rw-r--r--certmanager/lib/ui/Makefile.am2
-rw-r--r--certmanager/lib/ui/keyapprovaldialog.cpp2
-rw-r--r--certmanager/lib/ui/keyapprovaldialog.h2
-rw-r--r--certmanager/lib/ui/keyrequester.cpp2
-rw-r--r--certmanager/lib/ui/keyrequester.h2
-rw-r--r--certmanager/lib/ui/keyselectiondialog.cpp2
-rw-r--r--certmanager/lib/ui/keyselectiondialog.h2
-rw-r--r--certmanager/lib/ui/passphrasedialog.cpp2
-rw-r--r--certmanager/lib/ui/passphrasedialog.h2
28 files changed, 30 insertions, 30 deletions
diff --git a/certmanager/CMakeLists.txt b/certmanager/CMakeLists.txt
index 3f9b3595f..d98988bc3 100644
--- a/certmanager/CMakeLists.txt
+++ b/certmanager/CMakeLists.txt
@@ -13,7 +13,7 @@ project( certmanager )
include( ConfigureChecks.cmake )
-tde_import( libkdenetwork )
+tde_import( libtdenetwork )
add_subdirectory( lib )
add_subdirectory( conf )
@@ -26,7 +26,7 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/lib
${CMAKE_SOURCE_DIR}/libtdepim
- ${CMAKE_SOURCE_DIR}/libkdenetwork
+ ${CMAKE_SOURCE_DIR}/libtdenetwork
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
diff --git a/certmanager/Makefile.am b/certmanager/Makefile.am
index ed9b7ba26..8f7371162 100644
--- a/certmanager/Makefile.am
+++ b/certmanager/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = lib conf kwatchgnupg .
KDE_CXXFLAGS = -DLIBKLEOPATRA_NO_COMPAT
-INCLUDES = -I$(srcdir)/lib -I$(top_srcdir)/libkdenetwork $(GPGME_CFLAGS) $(all_includes)
+INCLUDES = -I$(srcdir)/lib -I$(top_srcdir)/libtdenetwork $(GPGME_CFLAGS) $(all_includes)
bin_PROGRAMS = kleopatra
diff --git a/certmanager/conf/Makefile.am b/certmanager/conf/Makefile.am
index de5be5747..f2c134a4f 100644
--- a/certmanager/conf/Makefile.am
+++ b/certmanager/conf/Makefile.am
@@ -1,5 +1,5 @@
AM_CPPFLAGS = -DLIBKLEOPATRA_NO_COMPAT -I$(srcdir)/../lib -I$(srcdir)/../lib/ui -I../lib/ui \
- -I$(top_srcdir)/libkdenetwork $(GPGME_CFLAGS) $(all_includes)
+ -I$(top_srcdir)/libtdenetwork $(GPGME_CFLAGS) $(all_includes)
METASOURCES = AUTO
diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp
index 4656ac641..9e5d0f74a 100644
--- a/certmanager/conf/appearanceconfigpage.cpp
+++ b/certmanager/conf/appearanceconfigpage.cpp
@@ -78,7 +78,7 @@ extern "C"
}
}
-// kdelibs-3.2 didn't have the changed signal in KCModule...
+// tdelibs-3.2 didn't have the changed signal in KCModule...
void AppearanceConfigurationPage::slotChanged()
{
emit changed(true);
diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp
index db8673464..436ef28ec 100644
--- a/certmanager/conf/dirservconfigpage.cpp
+++ b/certmanager/conf/dirservconfigpage.cpp
@@ -267,7 +267,7 @@ extern "C"
}
}
-// kdelibs-3.2 didn't have the changed signal in KCModule...
+// tdelibs-3.2 didn't have the changed signal in KCModule...
void DirectoryServicesConfigurationPage::slotChanged()
{
emit changed(true);
diff --git a/certmanager/conf/dnorderconfigpage.cpp b/certmanager/conf/dnorderconfigpage.cpp
index e9c300359..a224b6f7a 100644
--- a/certmanager/conf/dnorderconfigpage.cpp
+++ b/certmanager/conf/dnorderconfigpage.cpp
@@ -65,7 +65,7 @@ void DNOrderConfigPage::defaults() {
mWidget->defaults();
}
-// kdelibs-3.2 didn't have the changed signal in KCModule...
+// tdelibs-3.2 didn't have the changed signal in KCModule...
void DNOrderConfigPage::slotChanged() {
emit changed(true);
}
diff --git a/certmanager/kwatchgnupg/Makefile.am b/certmanager/kwatchgnupg/Makefile.am
index 02f0e3b4b..0c25605fa 100644
--- a/certmanager/kwatchgnupg/Makefile.am
+++ b/certmanager/kwatchgnupg/Makefile.am
@@ -1,6 +1,6 @@
KDE_CXXFLAGS = -DLIBKLEOPATRA_NO_COMPAT
-INCLUDES = -I$(top_srcdir)/certmanager/lib -I$(top_srcdir)/libkdenetwork $(GPGME_CFLAGS) $(all_includes)
+INCLUDES = -I$(top_srcdir)/certmanager/lib -I$(top_srcdir)/libtdenetwork $(GPGME_CFLAGS) $(all_includes)
bin_PROGRAMS = kwatchgnupg
diff --git a/certmanager/lib/CMakeLists.txt b/certmanager/lib/CMakeLists.txt
index e0e29b93e..79c729f33 100644
--- a/certmanager/lib/CMakeLists.txt
+++ b/certmanager/lib/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/libtdepim
- ${CMAKE_SOURCE_DIR}/libkdenetwork
+ ${CMAKE_SOURCE_DIR}/libtdenetwork
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${GPGME_INCLUDE_DIRS}
diff --git a/certmanager/lib/Makefile.am b/certmanager/lib/Makefile.am
index 57799827a..4512f42fe 100644
--- a/certmanager/lib/Makefile.am
+++ b/certmanager/lib/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/libkdenetwork $(GPGME_CFLAGS) $(all_includes)
+INCLUDES = -I$(top_srcdir)/libtdenetwork $(GPGME_CFLAGS) $(all_includes)
SUBDIRS = pics kleo backends ui . tests
@@ -16,7 +16,7 @@ libkleopatra_la_LIBADD = \
backends/chiasmus/libkleopatra_backend_chiasmus.la \
ui/libkleopatra_ui.la \
\
- $(top_builddir)/libkdenetwork/qgpgme/libqgpgme.la \
+ $(top_builddir)/libtdenetwork/qgpgme/libqgpgme.la \
$(LIB_KIO) $(LIB_TDEUI)
# Disabled for tdepim-3.3, see also kleo/cryptobackendfactory.cpp
diff --git a/certmanager/lib/backends/chiasmus/CMakeLists.txt b/certmanager/lib/backends/chiasmus/CMakeLists.txt
index 5822d658a..71ac855ca 100644
--- a/certmanager/lib/backends/chiasmus/CMakeLists.txt
+++ b/certmanager/lib/backends/chiasmus/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/certmanager/lib
${CMAKE_SOURCE_DIR}/libtdepim
- ${CMAKE_SOURCE_DIR}/libkdenetwork
+ ${CMAKE_SOURCE_DIR}/libtdenetwork
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
diff --git a/certmanager/lib/backends/chiasmus/Makefile.am b/certmanager/lib/backends/chiasmus/Makefile.am
index 8a5d85bd4..408405a1c 100644
--- a/certmanager/lib/backends/chiasmus/Makefile.am
+++ b/certmanager/lib/backends/chiasmus/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/certmanager/lib -I$(top_srcdir)/libkdenetwork $(GPGME_CFLAGS) $(all_includes)
+INCLUDES = -I$(top_srcdir)/certmanager/lib -I$(top_srcdir)/libtdenetwork $(GPGME_CFLAGS) $(all_includes)
KDE_CXXFLAGS = '-DGPG_ERR_SOURCE_DEFAULT=((gpg_err_source_t)176)'
diff --git a/certmanager/lib/backends/kpgp/Makefile.am b/certmanager/lib/backends/kpgp/Makefile.am
index ad350f22c..6cf33c6aa 100644
--- a/certmanager/lib/backends/kpgp/Makefile.am
+++ b/certmanager/lib/backends/kpgp/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/libkdenetwork \
+INCLUDES = -I$(top_srcdir)/libtdenetwork \
-I$(top_srcdir)/certmanager/lib \
-I$(top_srcdir)/libkpgp \
$(GPGME_CFLAGS) $(all_includes)
diff --git a/certmanager/lib/backends/qgpgme/CMakeLists.txt b/certmanager/lib/backends/qgpgme/CMakeLists.txt
index 1df57990a..1093399b5 100644
--- a/certmanager/lib/backends/qgpgme/CMakeLists.txt
+++ b/certmanager/lib/backends/qgpgme/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/certmanager/lib
- ${CMAKE_SOURCE_DIR}/libkdenetwork
+ ${CMAKE_SOURCE_DIR}/libtdenetwork
${CMAKE_SOURCE_DIR}/libtdepim
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
diff --git a/certmanager/lib/backends/qgpgme/Makefile.am b/certmanager/lib/backends/qgpgme/Makefile.am
index a7336a029..156671f7d 100644
--- a/certmanager/lib/backends/qgpgme/Makefile.am
+++ b/certmanager/lib/backends/qgpgme/Makefile.am
@@ -1,6 +1,6 @@
#KDE_OPTIONS = nofinal
-INCLUDES = -I$(top_srcdir)/libkdenetwork \
+INCLUDES = -I$(top_srcdir)/libtdenetwork \
-I$(top_srcdir)/certmanager/lib \
$(GPGME_CFLAGS) $(all_includes)
diff --git a/certmanager/lib/kleo/CMakeLists.txt b/certmanager/lib/kleo/CMakeLists.txt
index 21cc0cd8c..8f9da9470 100644
--- a/certmanager/lib/kleo/CMakeLists.txt
+++ b/certmanager/lib/kleo/CMakeLists.txt
@@ -14,7 +14,7 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/certmanager/lib
${CMAKE_SOURCE_DIR}/libtdepim
- ${CMAKE_SOURCE_DIR}/libkdenetwork
+ ${CMAKE_SOURCE_DIR}/libtdenetwork
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
diff --git a/certmanager/lib/kleo/Makefile.am b/certmanager/lib/kleo/Makefile.am
index 0465bb2da..ad9054d15 100644
--- a/certmanager/lib/kleo/Makefile.am
+++ b/certmanager/lib/kleo/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/libkdenetwork \
+INCLUDES = -I$(top_srcdir)/libtdenetwork \
-I$(top_srcdir)/certmanager/lib \
$(GPGME_CFLAGS) $(all_includes)
diff --git a/certmanager/lib/tests/Makefile.am b/certmanager/lib/tests/Makefile.am
index 3fa819f76..331d4d8e9 100644
--- a/certmanager/lib/tests/Makefile.am
+++ b/certmanager/lib/tests/Makefile.am
@@ -1,5 +1,5 @@
AM_CPPFLAGS = -I$(top_srcdir)/certmanager/lib \
- -I$(top_srcdir)/libkdenetwork \
+ -I$(top_srcdir)/libtdenetwork \
$(GPGME_CFLAGS) $(all_includes) -DKDESRCDIR=\"$(srcdir)\"
check_PROGRAMS = test_keylister test_keygen test_keyselectiondialog \
diff --git a/certmanager/lib/tests/test_cryptoconfig.cpp b/certmanager/lib/tests/test_cryptoconfig.cpp
index 6a8720703..f3c27d0ce 100644
--- a/certmanager/lib/tests/test_cryptoconfig.cpp
+++ b/certmanager/lib/tests/test_cryptoconfig.cpp
@@ -307,7 +307,7 @@ int main( int argc, char** argv ) {
// Test setting the option, sync'ing, then querying again
KURL::List lst;
- // We use non-empty paths to workaround a bug in KURL (kdelibs-3.2)
+ // We use non-empty paths to workaround a bug in KURL (tdelibs-3.2)
lst << KURL( "ldap://a:389/?b" );
// Test with query containing a litteral ':' (KURL supports this)
// and a ' ' (KURL will escape it, see issue119)
diff --git a/certmanager/lib/ui/CMakeLists.txt b/certmanager/lib/ui/CMakeLists.txt
index b276022de..dc02268e2 100644
--- a/certmanager/lib/ui/CMakeLists.txt
+++ b/certmanager/lib/ui/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/certmanager/lib
- ${CMAKE_SOURCE_DIR}/libkdenetwork
+ ${CMAKE_SOURCE_DIR}/libtdenetwork
${CMAKE_SOURCE_DIR}/libtdepim
${CMAKE_SOURCE_DIR}/libkpgp
${TDE_INCLUDE_DIR}
diff --git a/certmanager/lib/ui/Makefile.am b/certmanager/lib/ui/Makefile.am
index f381fb64d..0f13c47ea 100644
--- a/certmanager/lib/ui/Makefile.am
+++ b/certmanager/lib/ui/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = -I$(top_srcdir)/libkdenetwork \
+INCLUDES = -I$(top_srcdir)/libtdenetwork \
-I$(top_srcdir)/libkpgp \
-I$(top_srcdir)/certmanager/lib \
$(GPGME_CFLAGS) $(all_includes)
diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp
index 402235ddd..afad1fb8e 100644
--- a/certmanager/lib/ui/keyapprovaldialog.cpp
+++ b/certmanager/lib/ui/keyapprovaldialog.cpp
@@ -6,7 +6,7 @@
Based on kpgpui.h
Copyright (C) 2001,2002 the KPGP authors
- See file libkdenetwork/AUTHORS.kpgp for details
+ See file libtdenetwork/AUTHORS.kpgp for details
Libkleopatra is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/certmanager/lib/ui/keyapprovaldialog.h b/certmanager/lib/ui/keyapprovaldialog.h
index 5498e27ac..0b368635d 100644
--- a/certmanager/lib/ui/keyapprovaldialog.h
+++ b/certmanager/lib/ui/keyapprovaldialog.h
@@ -6,7 +6,7 @@
Based on kpgpui.h
Copyright (C) 2001,2002 the KPGP authors
- See file libkdenetwork/AUTHORS.kpgp for details
+ See file libtdenetwork/AUTHORS.kpgp for details
Libkleopatra is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp
index 01e6902f5..ebde2c163 100644
--- a/certmanager/lib/ui/keyrequester.cpp
+++ b/certmanager/lib/ui/keyrequester.cpp
@@ -32,7 +32,7 @@
Based on kpgpui.cpp
Copyright (C) 2001,2002 the KPGP authors
- See file libkdenetwork/AUTHORS.kpgp for details
+ See file libtdenetwork/AUTHORS.kpgp for details
This file is part of KPGP, the KDE PGP/GnuPG support library.
diff --git a/certmanager/lib/ui/keyrequester.h b/certmanager/lib/ui/keyrequester.h
index 7e23b4b69..5a3d53754 100644
--- a/certmanager/lib/ui/keyrequester.h
+++ b/certmanager/lib/ui/keyrequester.h
@@ -32,7 +32,7 @@
Based on kpgpui.h
Copyright (C) 2001,2002 the KPGP authors
- See file libkdenetwork/AUTHORS.kpgp for details
+ See file libtdenetwork/AUTHORS.kpgp for details
This file is part of KPGP, the KDE PGP/GnuPG support library.
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index bd4496485..f017f2024 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -6,7 +6,7 @@
Based on kpgpui.cpp
Copyright (C) 2001,2002 the KPGP authors
- See file libkdenetwork/AUTHORS.kpgp for details
+ See file libtdenetwork/AUTHORS.kpgp for details
Libkleopatra is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/certmanager/lib/ui/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h
index f4d369b1c..b638947ee 100644
--- a/certmanager/lib/ui/keyselectiondialog.h
+++ b/certmanager/lib/ui/keyselectiondialog.h
@@ -6,7 +6,7 @@
Based on kpgpui.h
Copyright (C) 2001,2002 the KPGP authors
- See file libkdenetwork/AUTHORS.kpgp for details
+ See file libtdenetwork/AUTHORS.kpgp for details
Libkleopatra is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp
index d88278878..c97493d31 100644
--- a/certmanager/lib/ui/passphrasedialog.cpp
+++ b/certmanager/lib/ui/passphrasedialog.cpp
@@ -32,7 +32,7 @@
Based on kpgpui.cpp
Copyright (C) 2001,2002 the KPGP authors
- See file libkdenetwork/AUTHORS.kpgp for details
+ See file libtdenetwork/AUTHORS.kpgp for details
This file is part of KPGP, the KDE PGP/GnuPG support library.
diff --git a/certmanager/lib/ui/passphrasedialog.h b/certmanager/lib/ui/passphrasedialog.h
index 15e6c132e..5b969a1ea 100644
--- a/certmanager/lib/ui/passphrasedialog.h
+++ b/certmanager/lib/ui/passphrasedialog.h
@@ -32,7 +32,7 @@
Based on kpgpui.h
Copyright (C) 2001,2002 the KPGP authors
- See file libkdenetwork/AUTHORS.kpgp for details
+ See file libtdenetwork/AUTHORS.kpgp for details
This file is part of KPGP, the KDE PGP/GnuPG support library.