diff --git a/cervisia/cvsservice/DESIGN b/cervisia/cvsservice/DESIGN index 15c3eff4..20bd3a36 100644 --- a/cervisia/cvsservice/DESIGN +++ b/cervisia/cvsservice/DESIGN @@ -16,7 +16,7 @@ The cvs DCOP service consists of the following three parts: 3. CvsJob - This class represents a cvs job. You can execute and cancel it, and you can retrieve the output of the cvs client by either - connecting to the proper DCOP Q_SIGNALS or by using the output() + connecting to the proper DCOP signals or by using the output() method. There are two types of jobs. First the non-concurrent job which has to run alone, like cvs update or import. Second the jobs which can run concurrently like cvs log or annotate. @@ -45,7 +45,7 @@ How-to use this service in C++ applications: // call "cvs log" for cervisiapart.h DCOPRef job = cvsService.log("cervisiapart.h"); - // connect to Q_SIGNALS to get output + // connect to signals to get output connectDCOPSignal(job.app(), job.obj(), "jobExited(bool, int)", [MY SLOT]); connectDCOPSignal(job.app(), job.obj(), "receivedStdout(TQString)", [MY SLOT]); diff --git a/kbabel/catalogmanager/validateprogresswidget.ui b/kbabel/catalogmanager/validateprogresswidget.ui index fc2741e4..96179dc6 100644 --- a/kbabel/catalogmanager/validateprogresswidget.ui +++ b/kbabel/catalogmanager/validateprogresswidget.ui @@ -113,12 +113,12 @@ validateprogresswidget.ui.h - + setValidationProgressBar(int) - - + + setupFileProgressBar( TQString text, int maxvalue ) - + kprogress.h diff --git a/kbabel/commonui/tdelisteditor.ui b/kbabel/commonui/tdelisteditor.ui index a3130a1f..e0a7de23 100644 --- a/kbabel/commonui/tdelisteditor.ui +++ b/kbabel/commonui/tdelisteditor.ui @@ -242,10 +242,10 @@ tdelisteditor.ui.h - + itemsChanged() - - + + addToList() downInList() removeFromList() @@ -256,6 +256,6 @@ editChanged( const TQString & s ) setTitle( const TQString & s ) list() - + diff --git a/kbabel/kbabel/editorpreferences.ui b/kbabel/kbabel/editorpreferences.ui index e0f4a612..3215a696 100644 --- a/kbabel/kbabel/editorpreferences.ui +++ b/kbabel/kbabel/editorpreferences.ui @@ -342,9 +342,9 @@ activated, you will still see a message in the statusbar. kcolorbutton.h editorpreferences.ui.h - + ledWarning( bool show ) toggleOther( bool other ) - + diff --git a/kbabel/kbabel/fontpreferences.ui b/kbabel/kbabel/fontpreferences.ui index 404f0580..a6998eb7 100644 --- a/kbabel/kbabel/fontpreferences.ui +++ b/kbabel/kbabel/fontpreferences.ui @@ -57,8 +57,8 @@ fontpreferences.ui.h tdefontdialog.h - + showOnlyFixedFonts( bool on ) - + diff --git a/kompare/DESIGN b/kompare/DESIGN index 9f1ddafd..fde8a5c9 100644 --- a/kompare/DESIGN +++ b/kompare/DESIGN @@ -10,7 +10,7 @@ The diffmodel is comparable to a document and the view part is comparable to the view and the komparemodellist is comparable to a documentmanager. The navtree can be viewed as a document view manager. The model is fully separated from the view and all communication goes -through Q_SIGNALS and Q_SLOTS. The view gets a model that contains all differences +through signals and slots. The view gets a model that contains all differences for the compared files A and B. The view gets this model from the modellist, the central entity in the part. diff --git a/poxml/lauri.po b/poxml/lauri.po index d212f69a..9dd0d025 100644 --- a/poxml/lauri.po +++ b/poxml/lauri.po @@ -407,7 +407,7 @@ msgid "" "-> int penWidth()\n" "-> { return pen.width(); }\n" "\n" -" public Q_SLOTS:\n" +" public slots:\n" " void updateAllViews(KScribbleView *sender);\n" " \n" " protected:\n" @@ -429,7 +429,7 @@ msgstr "" " \n" "-> int penWidth()\n" "-> { return pen.width(); }\n" -" public Q_SLOTS:\n" +" public slots:\n" " void updateAllViews(KScribbleView *sender);\n" " \n" " protected:\n" diff --git a/poxml/lauri.xml b/poxml/lauri.xml index 18a1e08a..27715981 100644 --- a/poxml/lauri.xml +++ b/poxml/lauri.xml @@ -221,7 +221,7 @@ Send ppp -> int penWidth() -> { return pen.width(); } - public Q_SLOTS: + public slots: void updateAllViews(KScribbleView *sender); protected: diff --git a/scripts/completions/zsh/_tdekillall b/scripts/completions/zsh/_tdekillall index bff071af..77700f31 100644 --- a/scripts/completions/zsh/_tdekillall +++ b/scripts/completions/zsh/_tdekillall @@ -4,5 +4,5 @@ local progs progs=(`ps x | grep tdeinit: | grep -v Running | grep -v grep | sed 's,.*tdeinit: ,,' | sed 's, .*,,'`) _alternative \ - 'Q_SIGNALS:: _Q_SIGNALS -p' \ + 'signals:: _signals -p' \ 'compadd $progs' diff --git a/scripts/kde-devel-emacs.el b/scripts/kde-devel-emacs.el index ad3cebe0..ef7188f5 100644 --- a/scripts/kde-devel-emacs.el +++ b/scripts/kde-devel-emacs.el @@ -98,7 +98,7 @@ With arg, to it arg times." indent-tabs-mode nil fume-auto-rescan-buffer-p nil c-basic-offset 4 - c-access-key "\\<\\(Q_SIGNALS\\|k_dcop\\|\\(public\\|protected\\|private\\)\\([ ]+Q_SLOTS\\)?\\)\\>:" + c-access-key "\\<\\(signals\\|k_dcop\\|\\(public\\|protected\\|private\\)\\([ ]+slots\\)?\\)\\>:" c-hanging-comment-ender-p nil c-offsets-alist (append '((case-label . 0) (access-label . -) @@ -758,7 +758,7 @@ With arg, to it arg times." (save-excursion (c-safe (progn (c-backward-sexp 1) t)) ;; agulbrahack 2 - (and (looking-at "Q_SLOTS:") + (and (looking-at "slots:") (c-backward-sexp 1)) (looking-at c-access-key))) (c-backward-sexp 1) diff --git a/scripts/kde-emacs/kde-emacs-core.el b/scripts/kde-emacs/kde-emacs-core.el index 030ffd39..5b09f95c 100644 --- a/scripts/kde-emacs/kde-emacs-core.el +++ b/scripts/kde-emacs/kde-emacs-core.el @@ -151,10 +151,10 @@ With arg, do it arg times." (define-key c++-mode-map "\ef" 'c-forward-into-nomenclature) (define-key c++-mode-map "\ed" 'agulbra-delete-into-nomenclature) (define-key c++-mode-map "\eb" 'c-backward-into-nomenclature) - ;; fontify "public|protected|private Q_SLOTS" with one and the same face :) + ;; fontify "public|protected|private slots" with one and the same face :) ;; NOTE: write face-at-point function to fontify those just like other ;; access specifiers - (font-lock-add-keywords nil '(("\\<\\(\\(public\\|protected\\|private\\) Q_SLOTS\\)\\>" + (font-lock-add-keywords nil '(("\\<\\(\\(public\\|protected\\|private\\) slots\\)\\>" . font-lock-reference-face))) ;; Add (set magic-keys-mode nil) to your .emacs (before loading this file) ;; to disable the magic keys in C++ mode. @@ -866,7 +866,7 @@ This function does not do any hidden buffer changes." (not (bobp)) (save-excursion (c-safe (progn (c-backward-sexp 1) t)) - (and (looking-at "Q_SLOTS:") + (and (looking-at "slots:") (c-backward-sexp 1)) (looking-at c-opt-access-key))) (c-backward-sexp 1) @@ -2116,7 +2116,7 @@ This function does not do any hidden buffer changes." (not (bobp)) (save-excursion (c-safe (progn (c-backward-sexp 1) t)) - (and (looking-at "Q_SLOTS:") + (and (looking-at "slots:") (c-backward-sexp 1)) (looking-at c-opt-access-key))) (c-backward-sexp 1) @@ -3172,7 +3172,7 @@ This function does not do any hidden buffer changes." (save-excursion (c-safe (progn (c-backward-sexp 1) t)) ;; agulbrahack 2 - (and (looking-at "Q_SLOTS:") + (and (looking-at "slots:") (c-backward-sexp 1)) (looking-at c-access-key))) (c-backward-sexp 1) diff --git a/scripts/kde-emacs/kde-emacs-semantic.el b/scripts/kde-emacs/kde-emacs-semantic.el index 5e5c156b..57db7f75 100644 --- a/scripts/kde-emacs/kde-emacs-semantic.el +++ b/scripts/kde-emacs/kde-emacs-semantic.el @@ -148,12 +148,12 @@ token and TOKENS have to be a list of functions from buffer." ret )) -(defmacro kde-label-Q_SIGNALS (pt) - "Returns none-nil if the current access label == \"Q_SIGNALS\"" +(defmacro kde-label-signals (pt) + "Returns none-nil if the current access label == \"signals\"" `(save-excursion (goto-char ,pt) (if (looking-at ":") - (re-search-backward "Q_SIGNALS" (point-at-bol) t) + (re-search-backward "signals" (point-at-bol) t) ) )) @@ -171,13 +171,13 @@ token and TOKENS have to be a list of functions from buffer." ) )) -(defmacro kde-label-Q_SLOTS (pt) - "Return none-nil if at PT there's Q_SLOTS access specifier." +(defmacro kde-label-slots (pt) + "Return none-nil if at PT there's slots access specifier." `(save-excursion (goto-char ,pt) (if (looking-at ":") ;; export this regex to a kde-emacs-vars defvar - (re-search-backward "\\(public\\|protected\\|private\\)[ \t]+Q_SLOTS" (point-at-bol) t)) + (re-search-backward "\\(public\\|protected\\|private\\)[ \t]+slots" (point-at-bol) t)) )) (defmacro kde-is-constructor (function) @@ -304,7 +304,7 @@ class-token has to be a token representing either a class or a struct." (stringp cur-token-name)) (set aslot nil asignal nil) - ;;LABEL - unsets both Q_SIGNALS and Q_SLOTS + ;;LABEL - unsets both signals and slots ) ((and (eq cur-token 'variable) @@ -313,8 +313,8 @@ class-token has to be a token representing either a class or a struct." ) ((not (stringp cur-token-name)) (cond - ((kde-label-Q_SIGNALS (car (semantic-token-extent elt))) - ;;SIGNALS - next prototypes belong to Q_SIGNALS and we don't want to + ((kde-label-signals (car (semantic-token-extent elt))) + ;;SIGNALS - next prototypes belong to signals and we don't want to ;; expand those (set asignal t aslot nil) @@ -324,8 +324,8 @@ class-token has to be a token representing either a class or a struct." ;; so we do ;) (set namespace (kde-label-namespace (car (semantic-token-extent elt)))) ) - ((kde-label-Q_SLOTS (car (semantic-token-extent elt))) - ;;SLOTS - for now just unset Q_SIGNALS + ((kde-label-slots (car (semantic-token-extent elt))) + ;;SLOTS - for now just unset signals (set aslot t asignal nil) ) diff --git a/scripts/kde-emacs/kde-emacs-vars.el b/scripts/kde-emacs/kde-emacs-vars.el index b2333b30..216e64f5 100644 --- a/scripts/kde-emacs/kde-emacs-vars.el +++ b/scripts/kde-emacs/kde-emacs-vars.el @@ -39,7 +39,7 @@ ;*---------------------------------------------------------------------*/ (defconst kde-access-labels - "\\<\\(Q_SIGNALS\\|k_dcop\\|\\(public\\|protected\\|private\\)\\([ ]+Q_SLOTS\\)?\\)\\>:" + "\\<\\(signals\\|k_dcop\\|\\(public\\|protected\\|private\\)\\([ ]+slots\\)?\\)\\>:" "KDE specific access labels regexp.") (defconst kde-source-files '("cpp" "cc" "cxx" "CC" "C" "c") diff --git a/tdeunittest/testerwidget.ui b/tdeunittest/testerwidget.ui index e6e92e1c..52ac9917 100644 --- a/tdeunittest/testerwidget.ui +++ b/tdeunittest/testerwidget.ui @@ -182,9 +182,9 @@ testerwidget.ui.h - + run() - + init() resultList() diff --git a/umbrello/umbrello/autolayout/newautolayoutdialog.ui b/umbrello/umbrello/autolayout/newautolayoutdialog.ui index 6255904c..fcde379b 100644 --- a/umbrello/umbrello/autolayout/newautolayoutdialog.ui +++ b/umbrello/umbrello/autolayout/newautolayoutdialog.ui @@ -528,7 +528,7 @@ slotSelectAlgorithm(const TQString&) - + slotDoAutolayout() slotSaveSettings() slotReloadSettings() @@ -543,6 +543,6 @@ slotSetCenterDiagram(bool b) slotSetShapeSeparation(int i) slotSelectAlgorithm(const TQString&) - + diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui index 86af506a..81590f46 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui +++ b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui @@ -470,9 +470,9 @@ browseClicked() - + browseClicked() - + kcombobox.h diff --git a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui index da39750a..9dc76260 100644 --- a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui +++ b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui @@ -521,10 +521,10 @@ is empty activeLanguageChanged(int) - + browseClicked() activeLanguageChanged(int id) - + knuminput.h diff --git a/umbrello/umbrello/dialogs/codegenerationpolicybase.ui b/umbrello/umbrello/dialogs/codegenerationpolicybase.ui index 620af610..fe11dc6d 100644 --- a/umbrello/umbrello/dialogs/codegenerationpolicybase.ui +++ b/umbrello/umbrello/dialogs/codegenerationpolicybase.ui @@ -32,8 +32,8 @@ - + apply() - + diff --git a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui index fdd59c2c..fe36e538 100644 --- a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui +++ b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui @@ -300,10 +300,10 @@ for in the right hand side list class UMLClassifier - + selectClass() deselectClass() classGenerated( UMLClassifier * /* c */ ) - + diff --git a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui index 1a283200..cdd46c43 100644 --- a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui +++ b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui @@ -106,8 +106,8 @@ close() - + changeHighlighting(int) - +