[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase
From: Stephen Leaf <smileaf () smileaf ! org>
Date: 2007-06-06 19:28:14
Message-ID: 1181158094.787218.27426.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 672325 by smileaf:
EBN check #15 fixes
M +1 -1 runtime/kioclient/kioclient.cpp
M +7 -7 runtime/kioslave/smtp/test_commands.cc
M +1 -1 runtime/kioslave/trash/testtrash.cpp
M +1 -1 runtime/kioslave/trash/trashimpl.cpp
M +1 -1 runtime/solid/bluez/bluez-bluetoothinputdevice.cpp
M +1 -1 runtime/solid/bluez/bluez-bluetoothinterface.cpp
M +1 -1 runtime/solid/bluez/bluez-bluetoothmanager.cpp
M +1 -1 runtime/solid/bluez/bluez-bluetoothremotedevice.cpp
M +1 -1 workspace/kcontrol/background/bgdialog.cpp
M +1 -1 workspace/kcontrol/infocenter/usbview/usbdevices.cpp
M +1 -1 workspace/kcontrol/kfontinst/kio/KioFonts.cpp
M +2 -2 workspace/kdmlib/kgreet_winbind.cpp
M +5 -5 workspace/khotkeys/kcontrol/triggers_tab.cpp
M +8 -8 workspace/khotkeys/kcontrol/voicerecorder.cpp
M +10 -10 workspace/khotkeys/kcontrol/voicerecordpage.cpp
M +1 -1 workspace/khotkeys/shared/voices.cpp
M +6 -6 workspace/kicker/kicker/core/containerarea.cpp
M +1 -1 workspace/kicker/kicker/core/extensionmanager.cpp
M +3 -3 workspace/kicker/kicker/core/panelextension.cpp
M +1 -1 workspace/kicker/kicker/core/pluginmanager.cpp
--- trunk/KDE/kdebase/runtime/kioclient/kioclient.cpp #672324:672325
@@ -297,7 +297,7 @@
if (srcLst.count() == 0)
return m_ok;
QString dst =
- KFileDialog::getSaveFileName( (argc<2) ? (QString::null) : (args->url(1).fileName()) );
+ KFileDialog::getSaveFileName( (argc<2) ? (QString()) : (args->url(1).fileName()) );
if (dst.isEmpty()) // canceled
return m_ok; // AK - really okay?
KUrl dsturl;
--- trunk/KDE/kdebase/runtime/kioslave/smtp/test_commands.cc #672324:672325
@@ -36,7 +36,7 @@
startTLSReturnCode = 1;
usesSSL = usesTLS = false;
lastErrorCode = lastMessageBoxCode = 0;
- lastErrorMessage = QString::null ;
+ lastErrorMessage.clear();
lastMessageBoxText.clear();
nextData.resize( 0 );
nextDataReturnCode = -1;
@@ -175,7 +175,7 @@
assert( ehlo4.isComplete() );
assert( !ehlo4.needsResponse() );
assert( smtp.lastErrorCode == KIO::ERR_INTERNAL_SERVER );
-
+
//
// STARTTLS
//
@@ -205,7 +205,7 @@
assert( tls.processResponse( r, &ts ) == true );
assert( !tls.needsResponse() );
assert( smtp.lastErrorCode == 0 );
-
+
// dynamics 2: NAK from server
smtp.clear();
StartTLSCommand tls2( &smtp );
@@ -217,7 +217,7 @@
assert( tls2.processResponse( r, &ts ) == false );
assert( !tls2.needsResponse() );
assert( smtp.lastErrorCode == KIO::ERR_SERVICE_NOT_AVAILABLE );
-
+
// dynamics 3: ok from server, TLS negotiation unsuccessful
smtp.clear();
StartTLSCommand tls3( &smtp );
@@ -228,7 +228,7 @@
smtp.startTLSReturnCode = -1;
assert( tls.processResponse( r, &ts ) == false );
assert( !tls.needsResponse() );
-
+
//
// AUTH
//
@@ -275,7 +275,7 @@
assert( auth2.nextCommandLine( &ts ) == "dXNlcgB1c2VyAHBhc3M=\r\n" );
assert( auth2.isComplete() );
assert( auth2.needsResponse() );
-
+
// dynamics 3: LOGIN
smtp.clear();
smtp.metadata["sasl"] = "LOGIN";
@@ -430,7 +430,7 @@
r.clear();
r.parseLine( "530 5.7.1 Relaying not allowed!" );
rcpt3.processResponse( r, &ts );
-
+
rcpt4.nextCommandLine( &ts );
r.clear();
r.parseLine( "250 Ok" );
--- trunk/KDE/kdebase/runtime/kioslave/trash/testtrash.cpp #672324:672325
@@ -147,7 +147,7 @@
KFileItem fileItem( u, "inode/directory", KFileItem::Unknown );
KFileItemList fileItemList;
fileItemList.append( &fileItem );
- KIO::ChmodJob* chmodJob = KIO::chmod( fileItemList, 0200, 0200, QString::null, QString::null, \
true /*recursive*/, false /*showProgressInfo*/ ); + KIO::ChmodJob* chmodJob = KIO::chmod( \
fileItemList, 0200, 0200, QString(), QString::null, true /*recursive*/, false /*showProgressInfo*/ ); \
KIO::NetAccess::synchronousRun( chmodJob, 0 );
bool ok = KIO::NetAccess::del( u, 0 );
--- trunk/KDE/kdebase/runtime/kioslave/trash/trashimpl.cpp #672324:672325
@@ -516,7 +516,7 @@
KFileItem fileItem( url, "inode/directory", KFileItem::Unknown );
KFileItemList fileItemList;
fileItemList.append( &fileItem );
- KIO::ChmodJob* chmodJob = KIO::chmod( fileItemList, 0200, 0200, QString::null, QString::null, \
true /*recursive*/, false /*showProgressInfo*/ ); + KIO::ChmodJob* chmodJob = KIO::chmod( \
fileItemList, 0200, 0200, QString(), QString::null, true /*recursive*/, false /*showProgressInfo*/ ); \
connect( chmodJob, SIGNAL( result(KJob *) ), this, SLOT( jobFinished(KJob *) ) );
enterLoop();
--- trunk/KDE/kdebase/runtime/solid/bluez/bluez-bluetoothinputdevice.cpp #672324:672325
@@ -84,7 +84,7 @@
{
QDBusReply< QString > reply = device->call(method);
if (!reply.isValid())
- return QString::null;
+ return QString();
return reply.value();
}
--- trunk/KDE/kdebase/runtime/solid/bluez/bluez-bluetoothinterface.cpp #672324:672325
@@ -315,7 +315,7 @@
return reply.value();
}
- return QString::null;
+ return QString();
}
bool BluezBluetoothInterface::boolReply(const QString &method) const
--- trunk/KDE/kdebase/runtime/solid/bluez/bluez-bluetoothmanager.cpp #672324:672325
@@ -99,7 +99,7 @@
{
QDBusReply< QString > path = d->manager.call("DefaultAdapter");
if (!path.isValid())
- return QString::null;
+ return QString();
return path.value();
}
--- trunk/KDE/kdebase/runtime/solid/bluez/bluez-bluetoothremotedevice.cpp #672324:672325
@@ -200,7 +200,7 @@
{
QDBusReply< QString > reply = device->call(method, m_address);
if (!reply.isValid())
- return QString::null;
+ return QString();
return reply.value();
}
--- trunk/KDE/kdebase/workspace/kcontrol/background/bgdialog.cpp #672324:672325
@@ -640,7 +640,7 @@
void BGDialog::slotWallpaperSelection()
{
KUrl u;
- KFileDialog dlg( u, QString::null, this);
+ KFileDialog dlg( u, QString(), this);
KImageFilePreview* previewWidget = new KImageFilePreview(&dlg);
dlg.setPreviewWidget(previewWidget);
--- trunk/KDE/kdebase/workspace/kcontrol/infocenter/usbview/usbdevices.cpp #672324:672325
@@ -58,7 +58,7 @@
QString result;
int fd = ::open(QFile::encodeName(fname), O_RDONLY);
if (fd<0)
- return QString::null;
+ return QString();
if (fd >= 0)
{
--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/kio/KioFonts.cpp #672324:672325
@@ -580,7 +580,7 @@
bool operator==(const Path &p) const { return p.orig==orig; }
};
- KfiFont(const QString &n=QString::null, const QString &p=QString()) : name(n)
+ KfiFont(const QString &n=QString(), const QString &p=QString()) : name(n)
{ if(!p.isEmpty()) paths.append(Path(p)); }
QString name;
--- trunk/KDE/kdebase/workspace/kdmlib/kgreet_winbind.cpp #672324:672325
@@ -49,7 +49,7 @@
{
setPasswordMode(true);
}
- KDMPasswordEdit( int em , QWidget *parent ) : KLineEdit( parent )
+ KDMPasswordEdit( int em , QWidget *parent ) : KLineEdit( parent )
{
setEchoMode( (EchoMode)em );
}
@@ -569,7 +569,7 @@
domains << "<local>";
}
defaultDomain = getConf( ctx, "winbind.DefaultDomain", QVariant( domains.first() ) ).toString();
- QString sepstr = getConf( ctx, "winbind.Separator", QVariant( QString::null ) ).toString();
+ QString sepstr = getConf( ctx, "winbind.Separator", QVariant( QString() ) ).toString();
if (sepstr.isNull()) {
FILE *sepfile = popen( "wbinfo --separator 2>/dev/null", "r" );
if (sepfile) {
--- trunk/KDE/kdebase/workspace/khotkeys/kcontrol/triggers_tab.cpp #672324:672325
@@ -55,7 +55,7 @@
action = popup->addAction( i18n( "Window Trigger..." ) );
action->setData( TYPE_WINDOW_TRIGGER );
-
+
#ifdef HAVE_ARTS
if( haveArts())
{
@@ -148,7 +148,7 @@
0 )); // CHECKME NULL ?
break;
case TYPE_VOICE_TRIGGER: // Voice trigger
- dlg = new Voice_trigger_dialog( new \
Voice_trigger(NULL,QString::null,VoiceSignature(),VoiceSignature())); // CHECKME NULL ? + dlg = new \
Voice_trigger_dialog( new Voice_trigger(NULL,QString(),VoiceSignature(),VoiceSignature())); // CHECKME \
NULL ? break;
}
if( dlg != NULL )
@@ -358,7 +358,7 @@
: KDialog( ),
_trigger( trigger_P ), _page( NULL )
{
- setButtons( Ok | Cancel );
+ setButtons( Ok | Cancel );
// CHECKME caption
_page = new VoiceRecordPage( _trigger ? _trigger->voicecode() : QString::null , this);
_page->setObjectName("VoiceRecordPage");
@@ -373,14 +373,14 @@
if( exec())
return new Voice_trigger(NULL, _page->getVoiceId(),
(_page->isModifiedSignature(1) || !_trigger) ? _page->getVoiceSignature(1) : \
_trigger->voicesignature(1) ,
- (_page->isModifiedSignature(2) || !_trigger) ? _page->getVoiceSignature(2) : \
_trigger->voicesignature(2) ); + (_page->isModifiedSignature(2) || !_trigger) ? \
_page->getVoiceSignature(2) : _trigger->voicesignature(2) ); else
return NULL;
}
-
+
} // namespace KHotKeys
#include "triggers_tab.moc"
--- trunk/KDE/kdebase/workspace/khotkeys/kcontrol/voicerecorder.cpp #672324:672325
@@ -1,11 +1,11 @@
/****************************************************************************
KHotKeys
-
+
Copyright (C) 2005 Olivier Goffgart <ogoffart @ kde.org>
Distributed under the terms of the GNU General Public License version 2.
-
+
****************************************************************************/
#include <QtGui/QColor>
@@ -54,7 +54,7 @@
//if(voiceid_P.isEmpty())
emit recorded(false);
-
+
drawSound();
}
@@ -121,7 +121,7 @@
if(!vm.isNull())
{
KMessageBox::sorry (this, i18n("The word you recorded is too close to the existing reference '%1'. \
Please record another word.", vm) );
- //TODO: messagebox saying there are too much noise
+ //TODO: messagebox saying there are too much noise
correct=false;
}
}
@@ -129,7 +129,7 @@
{
KMessageBox::sorry (this, i18n("Unable to extract voice information from noise.\nIf this error occurs \
repeatedly, it suggests that there is either too much background noise, or the quality of your microphone \
is too poor.") ); }
-
+
_state=correct ? sModified : sIncorrect;
emit recorded(correct);
}
@@ -146,7 +146,7 @@
bool VoiceRecorder::drawSound()
{
- label->setText(QString::null);
+ label->setText(QString());
uint length=_sound.size();
if(length < 2)
@@ -161,9 +161,9 @@
p.setPen(QPen(QColor("green"),1));
p.drawLine(0,height/2,width,height/2);
-
+
p.setPen(QPen(QColor("red"),1));
-
+
uint lx=0;
uint ly=height/2;
--- trunk/KDE/kdebase/workspace/khotkeys/kcontrol/voicerecordpage.cpp #672324:672325
@@ -1,11 +1,11 @@
/****************************************************************************
KHotKeys
-
+
Copyright (C) 2005 Olivier Goffart < ogoffart @ kde.org >
Distributed under the terms of the GNU General Public License version 2.
-
+
****************************************************************************/
#include <QtGui/QWidget>
@@ -34,19 +34,19 @@
_label->setObjectName("label");
/* _label->setAlignment(QLabel::AlignLeft | QLabel::WordBreak |
QLabel::AlignVCenter);*/
-
+
_lineEdit = new KLineEdit( this );
_lineEdit->setText(voiceid_P);
-
+
Sound s;
- if(voiceid_P!=QString::null)
+ if(voiceid_P!=QString())
{
QString fileName = KStandardDirs::locateLocal( "data", "khotkeys/" + voiceid_P + "1.wav" );
s.load(fileName);
}
_recorder1 = new VoiceRecorder(s, voiceid_P, this, "recorder");
- if(voiceid_P!=QString::null)
+ if(voiceid_P!=QString())
{
QString fileName = KStandardDirs::locateLocal( "data", "khotkeys/" + voiceid_P + "2.wav" );
s.load(fileName);
@@ -92,10 +92,10 @@
}
if( voiceCodeOK )
_label->setText(_message);
-
+
emit voiceRecorded( voiceCodeOK &&
- ( ( (_recorder1->state()==VoiceRecorder::sModified || _recorder2->state()==VoiceRecorder::sModified \
|| _lineEdit->text() != _original_voiceId)
- && !_original_voiceId.isEmpty())
+ ( ( (_recorder1->state()==VoiceRecorder::sModified || _recorder2->state()==VoiceRecorder::sModified \
|| _lineEdit->text() != _original_voiceId) + && !_original_voiceId.isEmpty())
|| (_recorder1->state()==VoiceRecorder::sModified && _recorder2->state()==VoiceRecorder::sModified \
) ) ); }
@@ -112,7 +112,7 @@
s.save(fileName);
return VoiceSignature(s);
}
-
+
bool VoiceRecordPage::isModifiedSignature(int ech) const
{
VoiceRecorder *recorder= (ech==1) ? _recorder1 : _recorder2 ;
--- trunk/KDE/kdebase/workspace/khotkeys/shared/voices.cpp #672324:672325
@@ -273,7 +273,7 @@
kDebug(1217) << k_funcinfo << "**** " << trig->voicecode() << " : " << minimum << endl;
bool selected=trig && ((got_count==1 && minimum < REJECT_FACTOR_DIFF*0.7 ) || ( minimum < \
REJECT_FACTOR_DIFF && trig==sec_trig ) );
- return selected ? trig->voicecode() : QString::null;
+ return selected ? trig->voicecode() : QString();
}
bool Voice::doesVoiceCodeExists(const QString &vc)
--- trunk/KDE/kdebase/workspace/kicker/kicker/core/containerarea.cpp #672324:672325
@@ -255,7 +255,7 @@
// system tray applet
#ifdef __GNUC__
#warning "once qxembed is back and system tray works again, renable this"
-#endif
+#endif
/* a = manager->createAppletContainer(
"systemtrayapplet.desktop",
true,
@@ -591,8 +591,8 @@
return 0;
}
- PanelExeDialog dlg( QString::null, QString::null, QString::null,
- QString::null, QString::null, false, 0 );
+ PanelExeDialog dlg( QString(), QString(), QString(),
+ QString(), QString(), false, 0 );
if ( dlg.exec() == QDialog::Accepted )
{
@@ -1290,8 +1290,8 @@
// K3Icon::DefaultState, &pixmapFile);
QString iconName = KMimeType::iconNameForUrl(url);
KIconLoader::global()->loadIcon(iconName, K3Icon::Panel, 0, K3Icon::DefaultState, \
&pixmapFile );
- PanelExeDialog dlg(QString::null, QString::null, url.path(),
- pixmapFile, QString::null, false, 0);
+ PanelExeDialog dlg(QString(), QString(), url.path(),
+ pixmapFile, QString(), false, 0);
if (dlg.exec() == QDialog::Accepted)
{
// KIconloader returns a full path, we only want the name
@@ -1640,7 +1640,7 @@
}
#ifdef __GNUC__
#warning FIX THIS
-#endif
+#endif
//int x, y;
//viewportToContents(b->pos().x(), b->pos().y(), x, y);
//ensureVisible(x, y);
--- trunk/KDE/kdebase/workspace/kicker/kicker/core/extensionmanager.cpp #672324:672325
@@ -189,7 +189,7 @@
if (duringInit)
{
- AppletInfo menubarInfo("menuapplet.desktop", QString::null, AppletInfo::Applet);
+ AppletInfo menubarInfo("menuapplet.desktop", QString(), AppletInfo::Applet);
if (PluginManager::self()->hasInstance(menubarInfo))
{
// it's already there, in the main panel!
--- trunk/KDE/kdebase/workspace/kicker/kicker/core/panelextension.cpp #672324:672325
@@ -113,7 +113,7 @@
{
#ifdef __GNUC__
#warning "kde4 port it"
-#endif
+#endif
//setObjId("Panel");
_containerArea->initialize(true);
}
@@ -257,7 +257,7 @@
void PanelExtension::addApplet(const QString &desktopFile)
{
- _containerArea->addApplet(AppletInfo(desktopFile, QString::null, AppletInfo::Applet));
+ _containerArea->addApplet(AppletInfo(desktopFile, QString(), AppletInfo::Applet));
}
void PanelExtension::slotBuildOpMenu()
@@ -389,7 +389,7 @@
if (!m_menubar)
{
m_menubar = _containerArea->addApplet(AppletInfo("menuapplet.desktop",
- QString::null,
+ QString(),
AppletInfo::Applet));
}
--- trunk/KDE/kdebase/workspace/kicker/kicker/core/pluginmanager.cpp #672324:672325
@@ -100,7 +100,7 @@
for (QStringList::ConstIterator it = desktopFiles.constBegin();
it != desktopFiles.constEnd(); ++it)
{
- AppletInfo info(*it, QString::null, type);
+ AppletInfo info(*it, QString(), type);
if (!info.isHidden())
{
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic