kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed some EBN issues

Browse source 
svn path=/trunk/KDE/kdebase/konqueror/; revision=546993
This commit is contained in:
Thorsten Roeder 2006-05-31 16:23:36 +00:00
parent 21c489bdc5
commit 60074c9a0d
20 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kdepasswd/kcm/chfacedlg.cpp
View file

@ -107,7 +107,7 @@ ChFaceDlg::ChFaceDlg(const QString& picsdir, QWidget *parent, const char *name,
{
QStringList picslist = facesDir.entryList( QDir::Files );
for ( QStringList::Iterator it = picslist.begin(); it != picslist.end(); ++it )
new Q3IconViewItem( m_FacesWidget, "/"+(*it) == KCFGUserAccount::customFaceFile() ?
new Q3IconViewItem( m_FacesWidget, '/'+(*it) == KCFGUserAccount::customFaceFile() ?
i18n("(Custom)") : (*it).section(".",0,0),
QPixmap( KCFGUserAccount::userFaceDir() + *it ) );
}
@ -145,9 +145,9 @@ void ChFaceDlg::addCustomPixmap( QString imPath, bool saveCopy )
userfaces.mkdir( userfaces.absolutePath() );
pix.save( userfaces.absolutePath() + "/.userinfo-tmp" , "PNG" );
KonqOperations::copy( this, KonqOperations::COPY, KUrl::List( KUrl( userfaces.absolutePath() + "/.userinfo-tmp" ) ), KUrl( userfaces.absolutePath() + "/" + QFileInfo(imPath).fileName().section(".",0,0) ) );
KonqOperations::copy( this, KonqOperations::COPY, KUrl::List( KUrl( userfaces.absolutePath() + "/.userinfo-tmp" ) ), KUrl( userfaces.absolutePath() + '/' + QFileInfo(imPath).fileName().section(".",0,0) ) );
#if 0
if ( !pix.save( userfaces.absolutePath() + "/" + imPath , "PNG" ) )
if ( !pix.save( userfaces.absolutePath() + '/' + imPath , "PNG" ) )
KMessageBox::sorry(this, i18n("There was an error saving the image:\n%1", userfaces.absolutePath() ) );
#endif
}

8
kdepasswd/passwd.cpp
View file

@ -131,7 +131,7 @@ int PasswdProcess::ConversePasswd(const char *oldpass, const char *newpass,
{
case 0:
// Eat garbage, wait for prompt
m_Error += line+"\n";
m_Error += line+'\n';
if (isPrompt(line, "password"))
{
WaitSlave();
@ -197,7 +197,7 @@ int PasswdProcess::ConversePasswd(const char *oldpass, const char *newpass,
// Warning or error about the new password
if (m_bTerminal)
fputs(line, stdout);
m_Error = line + "\n";
m_Error = line + '\n';
state++;
break;
@ -219,7 +219,7 @@ int PasswdProcess::ConversePasswd(const char *oldpass, const char *newpass,
}
if (m_bTerminal)
fputs(line, stdout);
m_Error += line + "\n";
m_Error += line + '\n';
break;
}
}
@ -242,7 +242,7 @@ int PasswdProcess::ConversePasswd(const char *oldpass, const char *newpass,
waitForChild();
return PasswordNotGood;
}
m_Error += line + "\n"; // Collect error message
m_Error += line + '\n'; // Collect error message
}
kDebug(1512) << k_lineinfo << "Conversation ended successfully.\n";

10
kdialog/kdialog.cpp
View file

@ -476,7 +476,7 @@ static int directCommand(KCmdLineArgs *args)
return 0;
}
}
return 1; // cancelled
return 1; // canceled
}
@ -519,7 +519,7 @@ static int directCommand(KCmdLineArgs *args)
return 0;
}
}
return 1; // cancelled
return 1; // canceled
}
// getexistingdirectory [startDir]
@ -550,7 +550,7 @@ static int directCommand(KCmdLineArgs *args)
cout << result.toLocal8Bit().data() << endl;
return 0;
}
return 1; // cancelled
return 1; // canceled
}
// getopenurl [startDir] [filter]
@ -587,7 +587,7 @@ static int directCommand(KCmdLineArgs *args)
return 0;
}
}
return 1; // cancelled
return 1; // canceled
}
// geticon [group] [context]
@ -636,7 +636,7 @@ static int directCommand(KCmdLineArgs *args)
cout << result.toLocal8Bit().data() << endl;
return 0;
}
return 1; // cancelled
return 1; // canceled
}
// --progressbar text totalsteps

2
keditbookmarks/bookmarkmodel.cpp
View file

@ -227,7 +227,7 @@ bool BookmarkModel::setData(const QModelIndex &index, const QVariant &value, int
{
if(index.isValid() && role == Qt::EditRole)
{
//FIXME don't create a commmand if still the same
//FIXME don't create a command if still the same
// and ignore if name column is empty
QString addr = static_cast<TreeItem *>(index.internalPointer())->bookmark().address();
CmdHistory::self()->addCommand(new EditCommand( addr, index.column(), value.toString()) );

2
keditbookmarks/dcop.cpp
View file

@ -51,7 +51,7 @@ void KBookmarkEditorIface::slotDcopUpdatedAccessMetadata(QString filename, QStri
// without caring about our modified state like normal
// and thusly there is no need to the bkmgr to do a "save"
// TODO - i'm not sure this is really true :)
// TODO - I'm not sure this is really true :)
if (/*KEBApp::self()->modified() &&*/ filename == CurrentMgr::self()->path()) {
kDebug() << "slotDcopUpdatedAccessMetadata(" << url << ")" << endl;

2
keditbookmarks/main.cpp
View file

@ -87,7 +87,7 @@ static int askUser(KApplication &app, QString filename, bool &readonly) {
DCOPCString requestedName("keditbookmarks");
if (!filename.isEmpty())
requestedName += "-" + filename.toUtf8();
requestedName += '-' + filename.toUtf8();
if (app.dcopClient()->registerAs(requestedName, false) == requestedName)
return true;

4
keditbookmarks/toplevel.cpp
View file

@ -335,8 +335,8 @@ bool lessAddress(QString a, QString b)
if(b == error)
return true;
a += "/";
b += "/";
a += '/';
b += '/';
uint aLast = 0;
uint bLast = 0;

6
kfind/kfinddlg.cpp
View file

@ -131,7 +131,7 @@ void KfindDlg::startSearch()
// There are 3 problems:
// 1) addDir() keeps looping on recursive symlinks
// 2) addDir() scans all subdirectories, so it basically does the same as the process that
// is started by KQuery but in-process, undoing the advantages of using a seperate find process
// is started by KQuery but in-process, undoing the advantages of using a separate find process
// A solution could be to let KQuery emit all the directories it has searched in.
// Either way, putting dirwatchers on a whole file system is probably just too much.
// 3) FAM has a tendency to deadlock with so many files (See BR77854) This has hopefully
@ -286,8 +286,8 @@ QStringList KfindDlg::getAllSubdirs(QDir d)
{
if((*it==".")||(*it==".."))
continue;
subdirs.append(d.path()+"/"+*it);
subdirs+=getAllSubdirs(d.path()+"/"+*it);
subdirs.append(d.path()+'/'+*it);
subdirs+=getAllSubdirs(d.path()+'/'+*it);
}
return subdirs;
}

2
konqueror/client/kfmclient.cc
View file

@ -610,7 +610,7 @@ bool clientApp::doIt()
return m_ok;
QString dst =
KFileDialog::getSaveFileName( (argc<2) ? (QString::null) : (args->url(1).fileName()) );
if (dst.isEmpty()) // cancelled
if (dst.isEmpty()) // canceled
return m_ok; // AK - really okay?
KUrl dsturl;
dsturl.setPath( dst );

4
konqueror/konq_combo.cc
View file

@ -232,7 +232,7 @@ void KonqCombo::applyPermanent()
{
if ( m_permanent && !temporaryItem().isEmpty() ) {
// Remove as many items as needed to honour maxCount()
// Remove as many items as needed to honor maxCount()
int index = count();
while ( count() >= maxCount() )
removeItem( --index );
@ -269,7 +269,7 @@ void KonqCombo::updateItem( const QPixmap& pix, const QString& t, int index, con
// kDebug(1202) << "KonqCombo::updateItem: item='" << t << "', index='"
// << index << "'" << endl;
// QComboBox::changeItem() doesn't honour the pixmap when
// QComboBox::changeItem() doesn't honor the pixmap when
// using an editable combobox, so we just remove and insert
// ### use QComboBox::changeItem(), once that finally works
// Well lets try it now as it seems to work fine for me. We

2
konqueror/konq_mainwindow.cc
View file

@ -5607,7 +5607,7 @@ void KonqMainWindow::setPreloadedFlag( bool preloaded )
s_preloaded = preloaded;
if( s_preloaded )
{
kapp->disableSessionManagement(); // dont restore preloaded konqy's
kapp->disableSessionManagement(); // don't restore preloaded konqy's
return; // was registered before calling this
}
delete s_preloadedWindow; // preloaded state was abandoned without reusing the window

2
konqueror/konq_misc.h
View file

@ -80,7 +80,7 @@ public:
/**
* Create a new window from the profile defined by @p filename and @p path.
* @param url an optionnal URL to open in this profile.
* @param url an optional URL to open in this profile.
* @param forbidUseHTML internal. True when called by "Find Files"
* @param openURL If false no url is opened
*/

2
konqueror/konq_run.h
View file

@ -34,7 +34,7 @@ class KonqRun : public KParts::BrowserRun
public:
/**
* Create a KonqRun instance, associated to the main view and an
* optionnal child view.
* optional child view.
*/
KonqRun( KonqMainWindow* mainWindow, KonqView *childView,
const KUrl &url, const KonqOpenURLRequest & req = KonqOpenURLRequest(),

2
konqueror/konq_view.h
View file

@ -319,7 +319,7 @@ public:
void setActiveInstance();
// Called before reloading this view. Sets args.reload to true, and offers to repost form data.
// Returns false in case the reload must be cancelled.
// Returns false in case the reload must be canceled.
bool prepareReload( KParts::URLArgs& args );
// overload for the QString version

2
konqueror/konq_viewmgr.cc
View file

@ -1350,7 +1350,7 @@ void KonqViewManager::setActivePart( KParts::Part *part, bool immediate )
// Otherwise, when e.g. dragging icons, the mouse pointer can already
// be very far from where it was...
// TODO: use a QTimer member var, so that if two conflicting calls to
// setActivePart(part,immediate=false) happen, the 1st one gets cancelled.
// setActivePart(part,immediate=false) happen, the 1st one gets canceled.
QTimer::singleShot( 0, this, SLOT( emitActivePartChanged() ) );
// This is not done with right-clicking so that the part is activated before the
// popup appears (#75201)

2
konqueror/listview/konq_treeviewitem.h
View file

@ -54,7 +54,7 @@ public:
virtual void setOpen( bool _open );
/**
* Called by setOpen, called when opening the directoy via restoreState and called
* Called by setOpen, called when opening the directory via restoreState and called
* when the user presses "Reload".
* Checks whether its contents are known (@see #setComplete) or whether
* to reload the directory.

2
konqueror/listview/konq_treeviewwidget.cc
View file

@ -64,7 +64,7 @@ bool KonqTreeViewWidget::openURL( const KUrl &url )
if ( it.current()->isOpen() )
m_urlsToReload.append( it.current()->url( KUrl::RemoveTrailingSlash ) );
// Someone could press reload while the listing is still in progess
// Someone could press reload while the listing is still in progress
// -> move the items that are not opened yet to m_urlsToReload.
// We don't need to check for doubled items since remove() removes
// all occurrences.

2
konqueror/settings/konqhtml/policydlg.h
View file

@ -43,7 +43,7 @@ public:
/** constructor
* @param policies policies object this dialog will write the settings
* into. Note that it always reflects the current settings,
* even if the dialog has been cancelled.
* even if the dialog has been canceled.
* @param parent parent widget this belongs to
* @param name internal name
*/

2
konqueror/sidebar/trees/bookmark_module/bookmark_item.cpp
View file

@ -36,7 +36,7 @@ KonqSidebarBookmarkItem::KonqSidebarBookmarkItem( KonqSidebarTreeItem *parentIte
bool KonqSidebarBookmarkItem::populateMimeData( QMimeData* mimeData, bool move )
{
m_bk.populateMimeData( mimeData );
// TODO honour bool move ?
// TODO honor bool move ?
Q_UNUSED( move );
return true;
}

4
kwrite/kwritemain.cpp
View file

@ -131,7 +131,7 @@ KWrite::KWrite (KTextEditor::Document *doc)
// install a working kate part popup dialog thingy
m_view->setContextMenu ((QMenu*)(factory()->container("ktexteditor_popup", this)) );
// init with more usefull size, stolen from konq :)
// init with more useful size, stolen from konq :)
if (!initialGeometrySet())
resize( QSize(700, 480).expandedTo(minimumSizeHint()));
@ -739,7 +739,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
do
{
line = input.readLine();
text.append( line + "\n" );
text.append( line + '\n' );
} while( !line.isNull() );