summaryrefslogtreecommitdiff
path: root/noncore
authorkergoth <kergoth>2003-01-26 04:34:14 (UTC)
committer kergoth <kergoth>2003-01-26 04:34:14 (UTC)
commitc3347d556ea8caf355c17a169070a4c052f266de (patch) (side-by-side diff)
tree4a13ff90baeed8e03a9149e4524a52a5d02624d3 /noncore
parent2b0f00c32cb051f8cf074747e26387620f541ca0 (diff)
downloadopie-c3347d556ea8caf355c17a169070a4c052f266de.zip
opie-c3347d556ea8caf355c17a169070a4c052f266de.tar.gz
opie-c3347d556ea8caf355c17a169070a4c052f266de.tar.bz2
Strip newlines from the fortune.
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/todayplugins/fortune/fortunepluginwidget.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/noncore/todayplugins/fortune/fortunepluginwidget.cpp b/noncore/todayplugins/fortune/fortunepluginwidget.cpp
index 583bf0b..b210fa9 100644
--- a/noncore/todayplugins/fortune/fortunepluginwidget.cpp
+++ b/noncore/todayplugins/fortune/fortunepluginwidget.cpp
@@ -33,51 +33,52 @@ FortunePluginWidget::FortunePluginWidget( QWidget *parent, const char* name )
: QWidget( parent, name )
{
fortune = NULL;
getFortune();
}
FortunePluginWidget::~FortunePluginWidget() {
if( fortuneProcess ){
delete fortuneProcess;
}
}
/**
* Get the fortunes
*/
void FortunePluginWidget::getFortune() {
QVBoxLayout* layoutFortune = new QVBoxLayout( this );
if ( fortune ) {
delete fortune;
}
fortune = new OTicker( this );
// fortune->setReadOnly( TRUE );
// fortune->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ) );
fortune->setText( QString("Obtaining fortune...") );
layoutFortune->addWidget( fortune );
fortuneProcess = new OProcess();
*fortuneProcess << "fortune";
connect(fortuneProcess, SIGNAL(receivedStdout(OProcess*, char*, int ) ),
this, SLOT(slotStdOut(OProcess*, char*, int) ) );
if(!fortuneProcess->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
qWarning("could not start :(");
fortune->setText( QString("Failed to obtain fortune.") );
delete fortuneProcess;
fortuneProcess = 0;
}
}
void FortunePluginWidget::slotStdOut( OProcess* proc, char* buf, int len )
{
- QCString cstring( buf, len );
- fortune->setText( cstring );
+ QCString s( buf, len );
+ s.replace( QRegExp("\n"), "" );
+ fortune->setText( s );
}