diff --git a/CMakeLists.txt b/CMakeLists.txt index 73bda65..d147a18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ cmake_minimum_required( VERSION 2.8.12 ) ##### general package setup ##################### project( ksshaskpass ) -set( VERSION 3.5.13.3 ) +set( VERSION 14.0.11 ) ##### include essential cmake modules ########### diff --git a/README b/README index 6f820b5..5d0115c 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - Ksshaskpass - a TDE version of ssh-askpass with KWallet support + Ksshaskpass - a TDE version of ssh-askpass with TDEWallet support Ksshaskpass is a TDE version of ssh-askpass. The usual TDE dialog box is diff --git a/doc/man/ksshaskpass.1 b/doc/man/ksshaskpass.1 index 4eece41..e9dfcaf 100644 --- a/doc/man/ksshaskpass.1 +++ b/doc/man/ksshaskpass.1 @@ -1,11 +1,11 @@ .TH KSSHASKPASS 1 .SH NAME -ksshaskpass \- prompts a user for a passphrase using KDE +ksshaskpass \- prompts a user for a passphrase using TDE .SH SYNOPSIS -.B kdesshaskpass +.B ksshaskpass .SH DESCRIPTION -.B kshaskpass -is a KDE-based passphrase dialog for use with OpenSSH. +.B ksshaskpass +is a TDE-based passphrase dialog for use with OpenSSH. It is intended to be called by the .BR ssh\-add (1) program and not invoked directly. @@ -17,7 +17,7 @@ This happens automatically in the case where .B ssh\-add is invoked from one's .B ~/.xsession -or as one of the KDE startup programs, for example. +or as one of the TDE startup programs, for example. .PP In order to be called automatically by .BR ssh\-add , diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7e4ca6c..0c49fbb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -19,8 +19,8 @@ tde_add_executable( ${PROJECT_NAME} AUTOMOC SOURCES ksshaskpass.cpp LINK - kdeui-shared - kio-shared + tdeui-shared + tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/src/ksshaskpass.cpp b/src/ksshaskpass.cpp index bad94c1..036b3dc 100644 --- a/src/ksshaskpass.cpp +++ b/src/ksshaskpass.cpp @@ -19,28 +19,28 @@ #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[dialog]", I18N_NOOP( "Dialog message. Leave undefined for default message" ), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char **argv) { - KAboutData about ( + TDEAboutData about ( "Ksshaskpass", // appName I18N_NOOP("Ksshaskpass"), // programName "0.4.1", // version - I18N_NOOP("KDE version of ssh-askpass"), // shortDescription - KAboutData::License_GPL, // licenseType + I18N_NOOP("TDE version of ssh-askpass"), // shortDescription + TDEAboutData::License_GPL, // licenseType "(c) 2006 Hans van Leeuwen\n(c) 2008 Armin Berres", // copyrightStatement statement I18N_NOOP("Ksshaskpass allows you to interactively prompt users for a passphrase for ssh-add"), // text "http://www.kde-apps.org/content/edit.php?content=50971", // homePageAddress @@ -49,11 +49,11 @@ int main(int argc, char **argv) about.addAuthor("Armin Berres", 0, "trigger@space-based.de"); about.addAuthor("Hans van Leeuwen", 0, "hanz@hanz.nl"); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions( options ); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); - KApplication app; + TDEApplication app; // Disable Session Management and DCOP. We don't need it. @@ -76,8 +76,8 @@ int main(int argc, char **argv) args->clear(); - // Open KWallet to see if a password was previously stored. - KWallet::Wallet *wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), 0 ); + // Open TDEWallet to see if a password was previously stored. + TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), 0 ); if ( wallet && wallet->hasFolder(walletFolder) ) { wallet->setFolder(walletFolder); @@ -108,7 +108,7 @@ int main(int argc, char **argv) password = kpd->password(); } - // If "Enable Keep" is enabled, open/create a folder in KWallet and store the password. + // If "Enable Keep" is enabled, open/create a folder in TDEWallet and store the password. if (!password.isNull() && wallet && kpd->keep()) { if ( !wallet->hasFolder( walletFolder ) ) { @@ -123,7 +123,7 @@ int main(int argc, char **argv) // Close the wallet if it is opened. if (wallet) { - KWallet::Wallet::closeWallet( KWallet::Wallet::NetworkWallet(), false ); + TDEWallet::Wallet::closeWallet( TDEWallet::Wallet::NetworkWallet(), false ); } // Finally return the password if one has been entered diff --git a/translations/messages/ksshaskpass.pot b/translations/messages/ksshaskpass.pot index beac6b7..34ba65c 100644 --- a/translations/messages/ksshaskpass.pot +++ b/translations/messages/ksshaskpass.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2021-08-26 03:28+0200\n" +"POT-Creation-Date: 2021-08-26 03:48+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -36,7 +36,7 @@ msgid "Ksshaskpass" msgstr "" #: ksshaskpass.cpp:42 -msgid "KDE version of ssh-askpass" +msgid "TDE version of ssh-askpass" msgstr "" #: ksshaskpass.cpp:45