From 3b34e5cf56262c9f54a3bcf02ee5ad93ca0fb05b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 10:00:09 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit d6331f1b56eb6dca7a1950658b2932f208015da0. --- scripts/fixheaders | 2 +- scripts/kde-devel-emacs.el | 2 +- scripts/kde-devel-gdb | 4 ++-- scripts/kde-devel-vim.vim | 2 +- scripts/kde-emacs/kde-emacs-core.el | 2 +- scripts/kde-emacs/klaralv.el | 4 ++-- scripts/kde-spellcheck.pl | 4 ++-- scripts/tdesvn-build | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) (limited to 'scripts') diff --git a/scripts/fixheaders b/scripts/fixheaders index b1b0a15b..fd538d5c 100644 --- a/scripts/fixheaders +++ b/scripts/fixheaders @@ -53,7 +53,7 @@ $lastdir = '.'; 'variable `class QFile \S*\' has initializer but incomplete type' => "qfile", 'implicit declaration of function `int ICON\(\.\.\.\)' => "kiconloader", '`QMessageBox\' undeclared \(first use this function\)' => "qmessagebox", - 'no matching function for call to `QBoxLayout::QBoxLayout' => "qlayout", + 'no matching function for call to `QBoxLayout::QBoxLayout' => "qtqlayout", '`QUriDrag\' undeclared \(first use this function\)' => "qdragobject", '`kdDebug\' undeclared \(first use this function\)' => "kdebug", '`kdWarning\' undeclared \(first use this function\)' => "kdebug", diff --git a/scripts/kde-devel-emacs.el b/scripts/kde-devel-emacs.el index c63bb5c1..856595e6 100644 --- a/scripts/kde-devel-emacs.el +++ b/scripts/kde-devel-emacs.el @@ -1441,7 +1441,7 @@ With arg, to it arg times." ;; Please notify blackie@klaralvdalens-datakonsult.se with any modification to this variable! (defvar kdab-special-includes '( - (qlayout.h QHBoxLayout QVBoxLayout QGridLayout QBoxLayout) + (qtqlayout.h QHBoxLayout QVBoxLayout QGridLayout QBoxLayout) (qlistview.h QListViewItem QCheckListItem QListViewItemIterator) (qiconview.h QIconViewItem QIconDragItem QIconDrag) (qdragobject.h QTextDrag QStoredDrag QUriDag QColorDrag QImageDrag QDragManager) diff --git a/scripts/kde-devel-gdb b/scripts/kde-devel-gdb index 62a43aba..8284428b 100644 --- a/scripts/kde-devel-gdb +++ b/scripts/kde-devel-gdb @@ -25,7 +25,7 @@ define printqstringdata set $i=0 set $d = (QStringData *)$arg0 while $i < $d->len - printf "%c", (char)($d->unicode[$i++].ucs & 0xff) + printf "%c", (char)($d->tqunicode[$i++].ucs & 0xff) end printf "\n" end @@ -57,7 +57,7 @@ define printqstring_utf8 set $i=0 set $s = $arg0 while $i < $s.d->len - set $uc = (unsigned short) $s.d->unicode[$i++].ucs + set $uc = (unsigned short) $s.d->tqunicode[$i++].ucs if ( $uc < 0x80 ) printf "%c", (unsigned char)($uc & 0x7f) else diff --git a/scripts/kde-devel-vim.vim b/scripts/kde-devel-vim.vim index 581076fa..7b8961fe 100644 --- a/scripts/kde-devel-vim.vim +++ b/scripts/kde-devel-vim.vim @@ -174,7 +174,7 @@ endfunction function! MapIdentHeader( ident ) " Qt stuff if a:ident =~ 'Q.*Layout' - return '' + return '' elseif a:ident == 'QListViewItem' || \a:ident == 'QCheckListItem' || \a:ident == 'QListViewItemIterator' diff --git a/scripts/kde-emacs/kde-emacs-core.el b/scripts/kde-emacs/kde-emacs-core.el index eaa63a0c..37017413 100644 --- a/scripts/kde-emacs/kde-emacs-core.el +++ b/scripts/kde-emacs/kde-emacs-core.el @@ -199,7 +199,7 @@ This function does not do any hidden buffer changes." ;; throw it away due to the narrowing that might be done ;; by the function above. That means we must not do any ;; changes during the execution of this function, since - ;; `c-invalidate-state-cache' then would change this local + ;; `c-tqinvalidate-state-cache' then would change this local ;; variable and leave a bogus value in the global one. (c-state-cache (if inclass-p (c-whack-state-before (point-min) paren-state) diff --git a/scripts/kde-emacs/klaralv.el b/scripts/kde-emacs/klaralv.el index 01de447a..082f9bbb 100644 --- a/scripts/kde-emacs/klaralv.el +++ b/scripts/kde-emacs/klaralv.el @@ -52,7 +52,7 @@ ;; Please notify blackie@klaralvdalens-datakonsult.se with any modification to this variable! (defvar kdab-special-includes '( - (qlayout.h QHBoxLayout QVBoxLayout QGridLayout QBoxLayout) + (qtqlayout.h QHBoxLayout QVBoxLayout QGridLayout QBoxLayout) (qlistview.h QListViewItem QCheckListItem QListViewItemIterator) (qiconview.h QIconViewItem QIconDragItem QIconDrag) (qdragobject.h QTextDrag QStoredDrag QUriDag QColorDrag QImageDrag QDragManager) @@ -217,7 +217,7 @@ (palmtoprecord.h Record) (palmtopuidgen.h UidGen) (password.h Password) - (power.h PowerStatus PowerStatusManager ) + (power.h PowertqStatus PowerStatusManager ) (process.h Process) (qcopenvelope_qws.h QCopEnvelope) (qdawg.h QDawg) diff --git a/scripts/kde-spellcheck.pl b/scripts/kde-spellcheck.pl index 901fdf12..34ce47a0 100755 --- a/scripts/kde-spellcheck.pl +++ b/scripts/kde-spellcheck.pl @@ -373,7 +373,7 @@ Afganistan Afghanistan agressive aggressive Agressive Aggressive agressively aggressively -alignement alignment +alignement tqalignment alligned aligned Allignment Alignment allmost almost @@ -514,7 +514,7 @@ charakters characters charater character Chatacter Character chatwindow chat window -childs children +childs tqchildren choosed chose choosen chosen Choosen Chosen diff --git a/scripts/tdesvn-build b/scripts/tdesvn-build index 17efa128..73951a0f 100755 --- a/scripts/tdesvn-build +++ b/scripts/tdesvn-build @@ -3432,7 +3432,7 @@ sub update_module_environment my $path = join(':', "$qtdir/bin", "$tdedir/bin", get_option ($module, 'binpath')); my $libdir = join(':', "$qtdir/lib", "$tdedir/lib", get_option ($module, 'libpath')); - # Set up the children's environment. We use setenv since it + # Set up the tqchildren's environment. We use setenv since it # won't set an environment variable to nothing. (e.g, setting # QTDIR to a blank string might confuse Qt or KDE. -- cgit v1.2.1