-rw-r--r-- | noncore/apps/tinykate/libkate/document/katedocument.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/noncore/apps/tinykate/libkate/document/katedocument.cpp b/noncore/apps/tinykate/libkate/document/katedocument.cpp index 0d84bcf..10bc976 100644 --- a/noncore/apps/tinykate/libkate/document/katedocument.cpp +++ b/noncore/apps/tinykate/libkate/document/katedocument.cpp | |||
@@ -279,72 +279,72 @@ void KateDocument::doPreHighlight() | |||
279 | 279 | ||
280 | KateDocument::~KateDocument() | 280 | KateDocument::~KateDocument() |
281 | { | 281 | { |
282 | m_highlight->release(); | 282 | m_highlight->release(); |
283 | 283 | ||
284 | if ( !m_bSingleViewMode ) | 284 | if ( !m_bSingleViewMode ) |
285 | { | 285 | { |
286 | m_views.setAutoDelete( true ); | 286 | m_views.setAutoDelete( true ); |
287 | m_views.clear(); | 287 | m_views.clear(); |
288 | m_views.setAutoDelete( false ); | 288 | m_views.setAutoDelete( false ); |
289 | } | 289 | } |
290 | delete_d(this); | 290 | delete_d(this); |
291 | } | 291 | } |
292 | 292 | ||
293 | void KateDocument::openURL(const QString &filename) | 293 | void KateDocument::openURL(const QString &filename) |
294 | { | 294 | { |
295 | 295 | ||
296 | m_file=filename; | 296 | m_file=filename; |
297 | fileInfo->setFile (m_file); | 297 | fileInfo->setFile (m_file); |
298 | setMTime(); | 298 | setMTime(); |
299 | 299 | ||
300 | if (!fileInfo->exists() || !fileInfo->isReadable()) | 300 | if (!fileInfo->exists() || !fileInfo->isReadable()) |
301 | { | 301 | { |
302 | qDebug("File doesn't exit or couldn't be read"); | 302 | qDebug("File doesn't exit or couldn't be read"); |
303 | return false; | 303 | return ; |
304 | } | 304 | } |
305 | 305 | ||
306 | buffer->clear(); | 306 | buffer->clear(); |
307 | #warning fixme | 307 | #warning fixme |
308 | // buffer->insertFile(0, m_file, KGlobal::charsets()->codecForName(myEncoding)); | 308 | // buffer->insertFile(0, m_file, KGlobal::charsets()->codecForName(myEncoding)); |
309 | qDebug("Telling buffer to open file"); | 309 | qDebug("Telling buffer to open file"); |
310 | buffer->insertFile(0, m_file, QTextCodec::codecForLocale()); | 310 | buffer->insertFile(0, m_file, QTextCodec::codecForLocale()); |
311 | 311 | ||
312 | setMTime(); | 312 | setMTime(); |
313 | 313 | ||
314 | if (myWordWrap) | 314 | if (myWordWrap) |
315 | wrapText (myWordWrapAt); | 315 | wrapText (myWordWrapAt); |
316 | 316 | ||
317 | int hl = hlManager->wildcardFind( m_file ); | 317 | int hl = hlManager->wildcardFind( m_file ); |
318 | 318 | ||
319 | setHighlight(hl); | 319 | setHighlight(hl); |
320 | 320 | ||
321 | updateLines(); | 321 | updateLines(); |
322 | updateViews(); | 322 | updateViews(); |
323 | 323 | ||
324 | emit fileNameChanged(); | 324 | emit fileNameChanged(); |
325 | 325 | ||
326 | return true; | 326 | return ; |
327 | } | 327 | } |
328 | 328 | ||
329 | bool KateDocument::saveFile() | 329 | bool KateDocument::saveFile() |
330 | { | 330 | { |
331 | QFile f( m_file ); | 331 | QFile f( m_file ); |
332 | if ( !f.open( IO_WriteOnly ) ) | 332 | if ( !f.open( IO_WriteOnly ) ) |
333 | return false; // Error | 333 | return false; // Error |
334 | 334 | ||
335 | QTextStream stream(&f); | 335 | QTextStream stream(&f); |
336 | 336 | ||
337 | stream.setEncoding(QTextStream::RawUnicode); // disable Unicode headers | 337 | stream.setEncoding(QTextStream::RawUnicode); // disable Unicode headers |
338 | #warning fixme | 338 | #warning fixme |
339 | // stream.setCodec(KGlobal::charsets()->codecForName(myEncoding)); | 339 | // stream.setCodec(KGlobal::charsets()->codecForName(myEncoding)); |
340 | stream.setCodec(QTextCodec::codecForLocale()); // this line sets the mapper to the correct codec | 340 | stream.setCodec(QTextCodec::codecForLocale()); // this line sets the mapper to the correct codec |
341 | 341 | ||
342 | int maxLine = numLines(); | 342 | int maxLine = numLines(); |
343 | int line = 0; | 343 | int line = 0; |
344 | while(true) | 344 | while(true) |
345 | { | 345 | { |
346 | stream << getTextLine(line)->getString(); | 346 | stream << getTextLine(line)->getString(); |
347 | line++; | 347 | line++; |
348 | if (line >= maxLine) break; | 348 | if (line >= maxLine) break; |
349 | 349 | ||
350 | if (eolMode == KateDocument::eolUnix) stream << "\n"; | 350 | if (eolMode == KateDocument::eolUnix) stream << "\n"; |
@@ -372,49 +372,49 @@ KTextEditor::View *KateDocument::createView( QWidget *parent, const char *name ) | |||
372 | return new KateView( this, parent, name); | 372 | return new KateView( this, parent, name); |
373 | } | 373 | } |
374 | 374 | ||
375 | QString KateDocument::textLine( int line ) const | 375 | QString KateDocument::textLine( int line ) const |
376 | { | 376 | { |
377 | TextLine::Ptr l = getTextLine( line ); | 377 | TextLine::Ptr l = getTextLine( line ); |
378 | if ( !l ) | 378 | if ( !l ) |
379 | return QString(); | 379 | return QString(); |
380 | 380 | ||
381 | return l->getString(); | 381 | return l->getString(); |
382 | } | 382 | } |
383 | 383 | ||
384 | void KateDocument::replaceLine(const QString& s,int line) | 384 | void KateDocument::replaceLine(const QString& s,int line) |
385 | { | 385 | { |
386 | remove_Line(line,false); | 386 | remove_Line(line,false); |
387 | insert_Line(s,line,true); | 387 | insert_Line(s,line,true); |
388 | } | 388 | } |
389 | 389 | ||
390 | void KateDocument::insertLine( const QString &str, int l ) { | 390 | void KateDocument::insertLine( const QString &str, int l ) { |
391 | insert_Line(str,l,true); | 391 | insert_Line(str,l,true); |
392 | } | 392 | } |
393 | 393 | ||
394 | void KateDocument::insert_Line(const QString& s,int line, bool update) | 394 | void KateDocument::insert_Line(const QString& s,int line, bool update) |
395 | { | 395 | { |
396 | kdDebug(13020)<<"KateDocument::insertLine "<<s<<QString("%1").arg(line)<<endl; | 396 | kdDebug(13020)<<"KateDocument::insertLine "<<s<<QString(" %1").arg(line)<<endl; |
397 | TextLine::Ptr TL=new TextLine(); | 397 | TextLine::Ptr TL=new TextLine(); |
398 | TL->append(s.unicode(),s.length()); | 398 | TL->append(s.unicode(),s.length()); |
399 | buffer->insertLine(line,TL); | 399 | buffer->insertLine(line,TL); |
400 | if (update) | 400 | if (update) |
401 | { | 401 | { |
402 | newDocGeometry=true; | 402 | newDocGeometry=true; |
403 | updateLines(line); | 403 | updateLines(line); |
404 | updateViews(); | 404 | updateViews(); |
405 | } | 405 | } |
406 | } | 406 | } |
407 | 407 | ||
408 | void KateDocument::insertAt( const QString &s, int line, int col, bool ) | 408 | void KateDocument::insertAt( const QString &s, int line, int col, bool ) |
409 | { | 409 | { |
410 | VConfig c; | 410 | VConfig c; |
411 | c.view = 0; // ### FIXME | 411 | c.view = 0; // ### FIXME |
412 | c.cursor.x = col; | 412 | c.cursor.x = col; |
413 | c.cursor.y = line; | 413 | c.cursor.y = line; |
414 | c.cXPos = 0; // ### FIXME | 414 | c.cXPos = 0; // ### FIXME |
415 | c.flags = 0; // ### FIXME | 415 | c.flags = 0; // ### FIXME |
416 | insert( c, s ); | 416 | insert( c, s ); |
417 | } | 417 | } |
418 | 418 | ||
419 | void KateDocument::removeLine( int line ) { | 419 | void KateDocument::removeLine( int line ) { |
420 | remove_Line(line,true); | 420 | remove_Line(line,true); |