[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase (silent)
From: Holger Freyther <freyther () gmx ! net>
Date: 2007-01-02 9:19:00
Message-ID: 1167729540.300226.6705.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 618827 by zecke:
SVN_SILENT make it compile
M +2 -2 apps/konsole/konsole/konsole.cpp
M +3 -3 konqueror/konq_mainwindow.cc
M +2 -2 konqueror/sidebar/sidebar_widget.cpp
M +3 -3 libkonq/knewmenu.cpp
M +2 -2 libkonq/konq_operations.cc
M +2 -2 runtime/kioclient/kioclient.cpp
M +1 -1 runtime/kioslave/fish/fish.cpp
M +2 -2 runtime/kioslave/ldap/kio_ldap.cpp
M +1 -1 runtime/kioslave/nntp/nntp.cpp
M +3 -4 runtime/kioslave/pop3/pop3.cc
M +2 -2 runtime/kioslave/sftp/kio_sftp.cpp
M +2 -2 runtime/kioslave/trash/trashimpl.cpp
--- trunk/KDE/kdebase/apps/konsole/konsole/konsole.cpp #618826:618827
@@ -107,7 +107,7 @@
#include <ktoggleaction.h>
#include <ktogglefullscreenaction.h>
#include <ktoolinvocation.h>
-#include <kurlrequesterdlg.h>
+#include <kurlrequesterdialog.h>
#include <netwm.h>
#include <knotifyconfigwidget.h>
#include <kwinmodule.h>
@@ -4097,7 +4097,7 @@
"<p>You may wish to install the 'rzsz' or 'lrzsz' package.\n"));
return;
}
- KUrlRequesterDlg dlg(KGlobalSettings::documentPath(),
+ KUrlRequesterDialog dlg(KGlobalSettings::documentPath(),
i18n("A ZModem file transfer attempt has been detected.\n"
"Please specify the folder you want to store the file(s):"),
this);
--- trunk/KDE/kdebase/konqueror/konq_mainwindow.cc #618826:618827
@@ -104,7 +104,7 @@
#include <ksycoca.h>
#include <ktemporaryfile.h>
#include <ktoolbarpopupaction.h>
-#include <kurlrequesterdlg.h>
+#include <kurlrequesterdialog.h>
#include <kurlrequester.h>
#include <kmimetypetrader.h>
#include <kwin.h>
@@ -1420,7 +1420,7 @@
// Don't pre-fill the url, as it is auto-selected and thus overwrites the
// X clipboard, making it impossible to paste in the url you really wanted.
// Another example of why the X clipboard sux
- KUrlRequesterDlg dlg( QString::null, this );
+ KUrlRequesterDialog dlg( QString::null, this );
dlg.setCaption( i18n("Open Location") );
// Set current directory for relative paths.
// Testcase: konqueror www.kde.org; Ctrl+O; file in $HOME; would open http://$file
@@ -2844,7 +2844,7 @@
{
const KUrl initialUrl = (viewCount()==2) ? otherView(m_currentView)->url() : m_currentView->url();
QString label = text.subs( m_currentView->url().pathOrUrl() ).toString();
- KUrlRequesterDlg dlg(initialUrl.pathOrUrl(), label, this);
+ KUrlRequesterDialog dlg(initialUrl.pathOrUrl(), label, this);
dlg.setCaption(i18n("Enter Target"));
dlg.urlRequester()->setMode( KFile::File | KFile::ExistingOnly | KFile::Directory );
if (dlg.exec())
--- trunk/KDE/kdebase/konqueror/sidebar/sidebar_widget.cpp #618826:618827
@@ -38,7 +38,7 @@
#include <kio/netaccess.h>
#include <kmenu.h>
#include <kprocess.h>
-#include <kurlrequesterdlg.h>
+#include <kurlrequesterdialog.h>
#include <kinputdialog.h>
#include <kfiledialog.h>
#include <kdesktopfile.h>
@@ -491,7 +491,7 @@
void Sidebar_Widget::slotSetURL( )
{
- KUrlRequesterDlg dlg( m_currentButton->URL, i18n("Enter a URL:"), this );
+ KUrlRequesterDialog dlg( m_currentButton->URL, i18n("Enter a URL:"), this );
dlg.fileDialog()->setMode( KFile::Directory );
if (dlg.exec())
{
--- trunk/KDE/kdebase/libkonq/knewmenu.cpp #618826:618827
@@ -40,7 +40,7 @@
#include <kseparatoraction.h>
#include <kio/job.h>
#include <kio/jobuidelegate.h>
-#include <kio/renamedlg.h>
+#include <kio/renamedialog.h>
#include <kpropertiesdialog.h>
#include "konq_operations.h"
@@ -460,7 +460,7 @@
KUrl defaultFile( *it );
defaultFile.addPath( KIO::encodeFileName( text ) );
if ( defaultFile.isLocalFile() && QFile::exists( defaultFile.path() ) )
- text = KIO::RenameDlg::suggestName( *it, text);
+ text = KIO::RenameDialog::suggestName( *it, text);
KUrl templateURL;
templateURL.setPath( entry.templatePath );
@@ -481,7 +481,7 @@
KUrl defaultFile( *(d->popupFiles.begin()) );
defaultFile.addPath( KIO::encodeFileName( text ) );
if ( defaultFile.isLocalFile() && QFile::exists( defaultFile.path() ) )
- text = KIO::RenameDlg::suggestName( *(d->popupFiles.begin()), text);
+ text = KIO::RenameDialog::suggestName( *(d->popupFiles.begin()), text);
name = KInputDialog::getText( QString(), entry.comment,
text, &ok, d->m_parentWidget );
--- trunk/KDE/kdebase/libkonq/konq_operations.cc #618826:618827
@@ -36,7 +36,7 @@
#include <kio/jobuidelegate.h>
#include <kio/jobclasses.h>
#include <kio/paste.h>
-#include <kio/renamedlg.h>
+#include <kio/renamedialog.h>
#include <kdirnotify.h>
// For doDrop
@@ -730,7 +730,7 @@
bool ok;
QString name = i18n( "New Folder" );
if ( baseUrl.isLocalFile() && QFileInfo( baseUrl.path( KUrl::AddTrailingSlash ) + name ).exists() )
- name = KIO::RenameDlg::suggestName( baseUrl, i18n( "New Folder" ) );
+ name = KIO::RenameDialog::suggestName( baseUrl, i18n( "New Folder" ) );
name = KInputDialog::getText ( i18n( "New Folder" ),
i18n( "Enter folder name:" ), name, &ok, parent );
--- trunk/KDE/kdebase/runtime/kioclient/kioclient.cpp #618826:618827
@@ -25,7 +25,7 @@
#include <kpropertiesdialog.h>
#include <klocale.h>
#include <kstandarddirs.h>
-#include <kurlrequesterdlg.h>
+#include <kurlrequesterdialog.h>
#include <kmessagebox.h>
#include <kmimetypetrader.h>
#include <kfiledialog.h>
@@ -279,7 +279,7 @@
KUrl::List srcLst;
if (argc == 1) {
while(true) {
- KUrl src = KUrlRequesterDlg::getUrl();
+ KUrl src = KUrlRequesterDialog::getUrl();
if (!src.isEmpty()) {
if (!src.isValid()) {
KMessageBox::error(0, i18n("Unable to download from an invalid URL."));
--- trunk/KDE/kdebase/runtime/kioslave/fish/fish.cpp #618826:618827
@@ -590,7 +590,7 @@
connectionAuth.caption = i18n("SSH Authorization");
if ((!firstLogin || !checkCachedAuthentication(connectionAuth))) {
connectionAuth.password.clear(); // don't prefill
- if ( !openPassDlg(connectionAuth)) {
+ if ( !openPasswordDialog(connectionAuth)) {
error(ERR_USER_CANCELED,connectionHost);
shutdownConnection();
return -1;
--- trunk/KDE/kdebase/runtime/kioslave/ldap/kio_ldap.cpp #618826:618827
@@ -321,8 +321,8 @@
cached = false;
} else {
bool ok = firstauth ?
- openPassDlg( info ) :
- openPassDlg( info, i18n("Invalid authorization information.") );
+ openPasswordDialog( info ) :
+ openPasswordDialog( info, i18n("Invalid authorization information.") );
if ( !ok ) {
error( ERR_USER_CANCELED, i18n("LDAP connection canceled.") );
closeConnection();
--- trunk/KDE/kdebase/runtime/kioslave/nntp/nntp.cpp #618826:618827
@@ -805,7 +805,7 @@
KIO::AuthInfo authInfo;
authInfo.username = mUser;
authInfo.password = mPass;
- if ( openPassDlg( authInfo ) ) {
+ if ( openPasswordDialog( authInfo ) ) {
mUser = authInfo.username;
mPass = authInfo.password;
}
--- trunk/KDE/kdebase/runtime/kioslave/pop3/pop3.cc #618826:618827
@@ -59,7 +59,6 @@
#include <kio/connection.h>
#include <kio/slaveinterface.h>
-#include <kio/passdlg.h>
#include "pop3.h"
#define GREETING_BUF_LEN 1024
@@ -346,7 +345,7 @@
QString apop_string = QString::fromLatin1("APOP ");
if (m_sUser.isEmpty() || m_sPass.isEmpty()) {
// Prompt for usernames
- if (!openPassDlg(ai)) {
+ if (!openPasswordDialog(ai)) {
error(ERR_ABORTED, i18n("No authentication details supplied."));
closeConnection();
return -1;
@@ -405,7 +404,7 @@
interact->id == SASL_CB_PASS ) {
if (m_sUser.isEmpty() || m_sPass.isEmpty()) {
- if (!openPassDlg(ai)) {
+ if (!openPasswordDialog(ai)) {
error(ERR_ABORTED, i18n("No authentication details supplied."));
return false;
}
@@ -596,7 +595,7 @@
if (m_sUser.isEmpty() || m_sPass.isEmpty()) {
// Prompt for usernames
- if (!openPassDlg(ai)) {
+ if (!openPasswordDialog(ai)) {
error(ERR_ABORTED, i18n("No authentication details supplied."));
closeConnection();
return false;
--- trunk/KDE/kdebase/runtime/kioslave/sftp/kio_sftp.cpp #618826:618827
@@ -636,9 +636,9 @@
<< ", info.url = " << info.url.prettyUrl() << endl;
if( firstTime )
- dlgResult = openPassDlg(info);
+ dlgResult = openPasswordDialog(info);
else
- dlgResult = openPassDlg(info, i18n("Incorrect username or password"));
+ dlgResult = openPasswordDialog(info, i18n("Incorrect username or password"));
if( dlgResult ) {
if( info.username.isEmpty() || info.password.isEmpty() ) {
--- trunk/KDE/kdebase/runtime/kioslave/trash/trashimpl.cpp #618826:618827
@@ -21,7 +21,7 @@
#include <klocale.h>
#include <kde_file.h>
#include <kio/global.h>
-#include <kio/renamedlg.h>
+#include <kio/renamedialog.h>
#include <kio/job.h>
#include <kdebug.h>
#include <kurl.h>
@@ -232,7 +232,7 @@
fd = ::open( QFile::encodeName( url.path() ), O_WRONLY | O_CREAT | O_EXCL, 0600 );
if ( fd < 0 ) {
if ( errno == EEXIST ) {
- url.setFileName( KIO::RenameDlg::suggestName( baseDirectory, url.fileName() ) );
+ url.setFileName( KIO::RenameDialog::suggestName( baseDirectory, url.fileName() ) );
// and try again on the next iteration
} else {
error( KIO::ERR_COULD_NOT_WRITE, url.path() );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic