add qt2/xforms to guilib + simple ws changes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4039 a592a061-630c-0410-9148-cb99ea01b6c8

ChangeLog

@@ -1,3 +1,7 @@
+2002-04-22  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+	* configure.in (FRONTEND_GUILIB): add qt2/xforms/*.lo for qt2  
+
 2002-04-16  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
 	* UPGRADING: updates

configure.in

@@ -224,7 +224,7 @@ dnl Ensure gnome-config is available...
 	LYX_PATH_XFORMS
     QT2_DO_IT_ALL
     FRONTEND="qt2"
-    FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo"
+    FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo qt2/xforms/*.lo"
     FRONTEND_LDFLAGS="\$(QT2_LDFLAGS)"
     FRONTEND_INCLUDES="-I\${srcdir}/qt2 -I\${top_srcdir}/src/frontends/xforms \$(QT2_INCLUDES)"
     FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ \$(QT2_LIBS)";;

src/insets/insettabular.C

@@ -2828,7 +2828,7 @@ bool InsetTabular::insertAsciiString(BufferView * bv, string const & buf,
 {
 	if (buf.length() <= 0)
 		return true;
-	
+
 	int cols = 1;
 	int rows = 1;
 	int maxCols = 1;

src/insets/insettext.C

@@ -2739,7 +2739,7 @@ void InsetText::collapseParagraphs(BufferView * bv) const
 {
 	BufferParams const & bparams = bv->buffer()->params;
 	LyXText * llt = getLyXText(bv);
-	
+
 	while(par->next()) {
 		if (par->size() && par->next()->size() &&
 			!par->isSeparator(par->size()-1))

src/lyxfunc.C

@@ -949,7 +949,7 @@ string const LyXFunc::dispatch(kb_action action, string argument)
 						TEXT()->cursor.irow()->baseline() +
 						TEXT()->cursor.irow()->height() + 1);
 					TEXT()->cursor.x_fix(TEXT()->cursor.x());
-#else					
+#else
 					TEXT()->cursorDown(owner->view());
 #endif
 				} else {

src/mathed/formulabase.C

@@ -161,7 +161,7 @@ void InsetFormulaBase::edit(BufferView * bv, int x, int y, unsigned int)
 	metrics(bv);
 	mathcursor->setPos(x, y);
 	//lyxerr << "setting pos to " << x << "," << y << "\n";
-	
+
 	// if that is removed, we won't get the magenta box when entering an
 	// inset for the first time
 	bv->updateInset(this, false);
@@ -629,7 +629,7 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
 			ls = '(';
 		if (rs.empty())
 			rs = ')';
-		
+
 		bv->lockedInsetStoreUndo(Undo::EDIT);
 		mathcursor->handleDelim(ls, rs);
 		updateLocal(bv, true);
@@ -963,7 +963,7 @@ void mathDispatchInsertMath(BufferView * bv, string const & arg)
 			InsetFormula * f = new InsetFormula(arg);
 			if (!bv->insertInset(f))
 				delete f;
-			else if (!mathcursor) // hotfix 
+			else if (!mathcursor) // hotfix
 				bv->getLyXText()->cursorRight(bv);
 		} else {
 			mathDispatchMathMode(bv, arg);

src/mathed/math_cursor.C

@@ -144,13 +144,13 @@ struct Selection
 				}
 				// append the left over horizontal cells to the last column
 				idx_type i = p->index(row + p->row(idx), p->ncols() - 1);
-				for (col_type col = numcols; col < data_.ncols(); ++col) 
+				for (col_type col = numcols; col < data_.ncols(); ++col)
 					p->cell(i).push_back(data_.cell(data_.index(row, col)));
 			}
 			// append the left over vertical cells to the last _cell_
 			idx_type i = p->nargs() - 1;
-			for (row_type row = numrows; row < data_.nrows(); ++row) 
-				for (col_type col = 0; col < data_.ncols(); ++col) 
+			for (row_type row = numrows; row < data_.nrows(); ++row)
+				for (col_type col = 0; col < data_.ncols(); ++col)
 					p->cell(i).push_back(data_.cell(data_.index(row, col)));
 		}
 	}
@@ -1253,7 +1253,7 @@ bool MathCursor::goUpDown(bool up)
 					up ? yo - 4 : formula()->yhigh()
 				);
 		}
-		
+
 		// any improvement so far?
 		int xnew, ynew;
 		getPos(xnew, ynew);
@@ -1462,7 +1462,7 @@ bool MathCursor::interpret(char c)
 		if (name == "\\") {
 			// remove the '\\'
 			backspace();
-			if (c == '\\') 
+			if (c == '\\')
 				interpret("\\backslash");
 			else
 				interpret(string("\\") + c);

src/mathed/math_parser.C

@@ -745,13 +745,13 @@ bool Parser::parse_macro(string & name)
 		string pars;
 		while (good() && nextToken().cat() != catBegin)
 			pars += getToken().cs();
-	
+
 		if (!good()) {
 			lyxerr << "bad stream in parse_macro\n";
 			dump();
 			return false;
 		}
-			
+
 		//lyxerr << "read \\def parameter list '" << pars << "'\n";
 		if (!pars.empty()) {
 			lyxerr << "can't handle non-empty parameter lists\n";
@@ -780,7 +780,7 @@ bool Parser::parse_macro(string & name)
 		if (!arg.empty())
 			nargs = atoi(arg.c_str());
 
-	} else { 
+	} else {
 		lyxerr << "\\newcommand or \\def  expected\n";
 		return false;
 	}

src/text2.C

@@ -2119,7 +2119,7 @@ float LyXText::getCursorX(BufferView * bview, Row * row,
 	float fill_label_hfill;
 	// This call HAS to be here because of the BidiTables!!!
 	prepareToPrint(bview, row, x, fill_separator, fill_hfill,
-	               fill_label_hfill);
+		       fill_label_hfill);
 
 	if (last < row->pos())
 		cursor_vpos = row->pos();