From 10308be19ef7fa44699562cc75946e7ea1fdf6b9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 03:45:53 +0000 Subject: Revert automated changes Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kate/plugins/autobookmarker/autobookmarker.cpp | 54 +++++++++++----------- kate/plugins/autobookmarker/autobookmarker.h | 4 +- .../autobookmarker/ktexteditor_autobookmarkerrc | 12 ++--- kate/plugins/isearch/ktexteditor_isearchui.rc | 4 +- kate/plugins/kdatatool/kate_kdatatool.cpp | 10 ++-- kate/plugins/wordcompletion/docwordcompletion.cpp | 12 ++--- kate/plugins/wordcompletion/docwordcompletion.h | 4 +- .../ktexteditor_docwordcompletion.desktop | 2 +- 8 files changed, 51 insertions(+), 51 deletions(-) (limited to 'kate/plugins') diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp index 833aa629c..c03fcefe0 100644 --- a/kate/plugins/autobookmarker/autobookmarker.cpp +++ b/kate/plugins/autobookmarker/autobookmarker.cpp @@ -124,7 +124,7 @@ void AutoBookmarker::slotCompleted() fileName = document()->url().fileName(); ABEntityList *l = ABGlobal::self()->entities(); - // for each item, if either tqmask matches + // for each item, if either mask matches // * apply if onLoad is true ABEntityListIterator it( *l ); int n( 0 ); @@ -132,11 +132,11 @@ void AutoBookmarker::slotCompleted() AutoBookmarkEnt *e; while ( ( e = it.current() ) != 0 ) { - found = ( !e->mimetqmask.count() && !e->filetqmask.count() ); // no preferences + found = ( !e->mimemask.count() && !e->filemask.count() ); // no preferences if ( ! found ) - found = ( ! mt.isEmpty() && e->mimetqmask.tqcontains( mt ) ); + found = ( ! mt.isEmpty() && e->mimemask.contains( mt ) ); if ( ! found ) - for( TQStringList::Iterator it1 = e->filetqmask.begin(); it1 != e->filetqmask.end(); ++it1 ) + for( TQStringList::Iterator it1 = e->filemask.begin(); it1 != e->filemask.end(); ++it1 ) { TQRegExp re(*it1, true, true); if ( ( found = ( ( re.search( fileName ) > -1 ) && ( re.matchedLength() == (int)fileName.length() ) ) ) ) @@ -206,13 +206,13 @@ void ABGlobal::readConfig() while ( config->hasGroup( TQString("autobookmark%1").arg( n ) ) ) { config->setGroup( TQString("autobookmark%1").arg( n ) ); - TQStringList filetqmask = config->readListEntry( "filetqmask", ';' ); - TQStringList mimetqmask = config->readListEntry( "mimetqmask", ';' ); + TQStringList filemask = config->readListEntry( "filemask", ';' ); + TQStringList mimemask = config->readListEntry( "mimemask", ';' ); int flags = config->readNumEntry( "flags", 1 ); AutoBookmarkEnt *e = new AutoBookmarkEnt( config->readEntry( "pattern", "" ), - filetqmask, - mimetqmask, + filemask, + mimemask, flags ); @@ -239,8 +239,8 @@ void ABGlobal::writeConfig() AutoBookmarkEnt *e = m_ents->at( i ); config->setGroup( TQString("autobookmark%1").arg( i ) ); config->writeEntry( "pattern", e->pattern ); - config->writeEntry( "filetqmask", e->filetqmask, ';' ); - config->writeEntry( "mimetqmask", e->mimetqmask, ';' ); + config->writeEntry( "filemask", e->filemask, ';' ); + config->writeEntry( "mimemask", e->mimemask, ';' ); config->writeEntry( "flags", e->flags ); } @@ -264,8 +264,8 @@ class AutoBookmarkEntItem : public QListViewItem void redo() { setText( 0, ent->pattern ); - setText( 1, ent->mimetqmask.join("; ") ); - setText( 2, ent->filetqmask.join("; ") ); + setText( 1, ent->mimemask.join("; ") ); + setText( 2, ent->filemask.join("; ") ); } AutoBookmarkEnt *ent; }; @@ -274,7 +274,7 @@ class AutoBookmarkEntItem : public QListViewItem //BEGIN AutoBookmarkerEntEditor // Dialog for editing a single autobookmark entity // * edit the pattern -// * set the file/mime type tqmasks +// * set the file/mime type masks AutoBookmarkerEntEditor::AutoBookmarkerEntEditor( TQWidget *parent, AutoBookmarkEnt *e ) : KDialogBase( parent, "autobookmark_ent_editor", true, i18n("Edit Entry"), @@ -310,19 +310,19 @@ AutoBookmarkerEntEditor::AutoBookmarkerEntEditor( TQWidget *parent, AutoBookmark "do not know what that is, please read the appendix on regular expressions " "in the kate manual.

") ); - l = new TQLabel( i18n("&File tqmask:"), w ); - leFileMask = new TQLineEdit( e->filetqmask.join( "; " ), w ); + l = new TQLabel( i18n("&File mask:"), w ); + leFileMask = new TQLineEdit( e->filemask.join( "; " ), w ); l->setBuddy( leFileMask ); lo->addWidget( l, 3, 0 ); lo->addMultiCellWidget( leFileMask, 3, 3, 1, 2 ); TQWhatsThis::add( leFileMask, i18n( - "

A list of filename tqmasks, separated by semicolons. This can be used " + "

A list of filename masks, separated by semicolons. This can be used " "to limit the usage of this entity to files with matching names.

" "

Use the wizard button to the right of the mimetype entry below to " "easily fill out both lists.

" ) ); l = new TQLabel( i18n("MIME &types:"), w ); - leMimeTypes = new TQLineEdit( e->mimetqmask.join( "; " ), w ); + leMimeTypes = new TQLineEdit( e->mimemask.join( "; " ), w ); l->setBuddy( leMimeTypes ); lo->addWidget( l, 4, 0 ); lo->addWidget( leMimeTypes, 4, 1 ); @@ -330,7 +330,7 @@ AutoBookmarkerEntEditor::AutoBookmarkerEntEditor( TQWidget *parent, AutoBookmark "

A list of mime types, separated by semicolon. This can be used to " "limit the usage of this entity to files with matching mime types.

" "

Use the wizard button on the right to get a list of existing file " - "types to choose from, using it will fill in the file tqmasks as well.

" ) ); + "types to choose from, using it will fill in the file masks as well.

" ) ); TQToolButton *btnMTW = new TQToolButton(w); lo->addWidget( btnMTW, 4, 2 ); @@ -338,8 +338,8 @@ AutoBookmarkerEntEditor::AutoBookmarkerEntEditor( TQWidget *parent, AutoBookmark connect(btnMTW, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMTDlg())); TQWhatsThis::add( btnMTW, i18n( "

Click this button to display a checkable list of mimetypes available " - "on your system. When used, the file tqmasks entry above will be filled in " - "with the corresponding tqmasks.

") ); + "on your system. When used, the file masks entry above will be filled in " + "with the corresponding masks.

") ); slotPatternChanged( lePattern->text() ); } @@ -353,8 +353,8 @@ void AutoBookmarkerEntEditor::apply() if ( lePattern->text().isEmpty() ) return; e->pattern = lePattern->text(); - e->filetqmask = TQStringList::split( TQRegExp("\\s*;\\s*"), leFileMask->text() ); - e->mimetqmask = TQStringList::split( TQRegExp("\\s*;\\s*"), leMimeTypes->text() ); + e->filemask = TQStringList::split( TQRegExp("\\s*;\\s*"), leFileMask->text() ); + e->mimemask = TQStringList::split( TQRegExp("\\s*;\\s*"), leMimeTypes->text() ); e->flags = 0; if ( cbCS->isOn() ) e->flags |= AutoBookmarkEnt::CaseSensitive; if ( cbMM->isOn() ) e->flags |= AutoBookmarkEnt::MinimalMatching; @@ -394,7 +394,7 @@ AutoBookmarkerConfigPage::AutoBookmarkerConfigPage( TQWidget *parent, const char "

This list shows your configured autobookmark entities. When a document " "is opened, each entity is used in the following way: " "

    " - "
  1. The entity is dismissed, if a mime and/or filename tqmask is defined, " + "
  2. The entity is dismissed, if a mime and/or filename mask is defined, " "and neither matches the document.
    3. " "
  3. Otherwise each line of the document is tried against the pattern, " "and a bookmark is set on matching lines.
    4. " @@ -430,7 +430,7 @@ AutoBookmarkerConfigPage::AutoBookmarkerConfigPage( TQWidget *parent, const char reset(); } -// tqreplace the global list with the new one +// replace the global list with the new one void AutoBookmarkerConfigPage::apply() { ABGlobal::self()->entities()->clear(); @@ -490,7 +490,7 @@ void AutoBookmarkerConfigPage::slotNew() void AutoBookmarkerConfigPage::slotDel() { AutoBookmarkEntItem *i = (AutoBookmarkEntItem*)lvPatterns->currentItem(); - int idx = m_ents->tqfindRef( i->ent ); + int idx = m_ents->findRef( i->ent ); m_ents->remove( idx ); delete i; } @@ -511,8 +511,8 @@ void AutoBookmarkerConfigPage::slotEdit() //BEGIN AutoBookmarkEnt AutoBookmarkEnt::AutoBookmarkEnt( const TQString &p, const TQStringList &f, const TQStringList &m, int fl ) : pattern( p ), - filetqmask( f ), - mimetqmask( m ), + filemask( f ), + mimemask( m ), flags( fl ) {; } diff --git a/kate/plugins/autobookmarker/autobookmarker.h b/kate/plugins/autobookmarker/autobookmarker.h index 4fe8b44dd..bdeb2abcf 100644 --- a/kate/plugins/autobookmarker/autobookmarker.h +++ b/kate/plugins/autobookmarker/autobookmarker.h @@ -41,8 +41,8 @@ class AutoBookmarkEnt int flags=1 ); ~AutoBookmarkEnt(){}; TQString pattern; - TQStringList filetqmask; - TQStringList mimetqmask; + TQStringList filemask; + TQStringList mimemask; int flags; }; diff --git a/kate/plugins/autobookmarker/ktexteditor_autobookmarkerrc b/kate/plugins/autobookmarker/ktexteditor_autobookmarkerrc index c79ade799..3ed8fe8c5 100644 --- a/kate/plugins/autobookmarker/ktexteditor_autobookmarkerrc +++ b/kate/plugins/autobookmarker/ktexteditor_autobookmarkerrc @@ -1,18 +1,18 @@ [autobookmark0] -filetqmask=*.pl;*.pm +filemask=*.pl;*.pm flags=1 -mimetqmask=text/x-perl +mimemask=text/x-perl pattern=sub \\w+ [autobookmark1] -filetqmask=*.hh;*.h +filemask=*.hh;*.h flags=1 -mimetqmask=text/x-c++hdr +mimemask=text/x-c++hdr pattern=^class\\s+[^;]+$ [autobookmark2] -filetqmask=*.js;*.html;*.HTML;*.htm;*.HTM;*.xhtml;*.asp +filemask=*.js;*.html;*.HTML;*.htm;*.HTM;*.xhtml;*.asp flags=1 -mimetqmask=application/x-javascript;text/html +mimemask=application/x-javascript;text/html pattern=\\s*function\\s+\\w+ diff --git a/kate/plugins/isearch/ktexteditor_isearchui.rc b/kate/plugins/isearch/ktexteditor_isearchui.rc index a65d270ef..d8fc6b5dd 100644 --- a/kate/plugins/isearch/ktexteditor_isearchui.rc +++ b/kate/plugins/isearch/ktexteditor_isearchui.rc @@ -2,8 +2,8 @@ &Edit - - + +