1.1 --- a/texteditor.cpp	Thu Jul 06 14:47:01 2006 +0000
     1.2 +++ b/texteditor.cpp	Thu Jul 06 15:39:54 2006 +0000
     1.3 @@ -314,17 +314,21 @@
     1.4  	actionEditDeleteAll=a;
     1.5  
     1.6  	a = new QAction(QPixmap(), tr( "&Convert Paragraphs" ),this);
     1.7 +	/* FIXME not needed any longer? remove also from docu...
     1.8  	a->setStatusTip(tr( "Convert paragraphs to linebreaks" )); 
     1.9  	a->setShortcut( Qt::ALT + Qt::Key_P );
    1.10      connect( a, SIGNAL( activated() ), this, SLOT( textConvertPar() ) );
    1.11  	editMenu->addAction (a);
    1.12 +	*/
    1.13  	actionEditConvertPar=a;
    1.14  
    1.15  	a = new QAction( QPixmap(), tr( "&Join lines" ), this);
    1.16 +	/* FIXME not needed any longer? remove also from docu...
    1.17  	a->setStatusTip(tr( "Join all lines of a paragraph" ) ); 
    1.18  	a->setShortcut(Qt::ALT + Qt::Key_J );
    1.19      connect( a, SIGNAL( activated() ), this, SLOT( textJoinLines() ) );
    1.20  	editMenu->addAction (a);
    1.21 +	*/
    1.22  	actionEditJoinLines=a;
    1.23  }
    1.24  
    1.25 @@ -659,9 +663,6 @@
    1.26  	// which is not always wanted
    1.27  	// This function replaces paragraphs by linebreaks.
    1.28  
    1.29 -	e->setBackgroundRole (QPalette::Text);
    1.30 -	cout << "dark\n";
    1.31 -
    1.32  	QString t;
    1.33  	t=e->text();
    1.34  	QRegExp re("<p.*>");
    1.35 @@ -700,9 +701,6 @@
    1.36  
    1.37  void TextEditor::textJoinLines()
    1.38  {
    1.39 -	e->setBackgroundRole (QPalette::Light);
    1.40 -	cout << "light\n";
    1.41 -
    1.42  /* FIXME QT3
    1.43  	int parFrom, parTo, indFrom, indTo;
    1.44  	e->getSelection (&parFrom,&indFrom,&parTo,&indTo);