diff --git a/doc/classref/tdecore/KGlobal.html b/doc/classref/tdecore/KGlobal.html index 2573572..2fb3601 100644 --- a/doc/classref/tdecore/KGlobal.html +++ b/doc/classref/tdecore/KGlobal.html @@ -86,14 +86,14 @@ In versions KDE 3.2.0 and above only static
-
  • staticTQString (str) +
  • staticQString (str)
    returns (TQString)
    static
    ArgumentTypeDefault
    strchar
    • -
  • staticTQString (str) +
  • staticQString (str)
    returns (TQString)
    static
    diff --git a/doc/classref/tdecore/KKey.html b/doc/classref/tdecore/KKey.html index 52907fd..ba9cec4 100644 --- a/doc/classref/tdecore/KKey.html +++ b/doc/classref/tdecore/KKey.html @@ -36,9 +36,9 @@
    ArgumentTypeDefault

    enums

    • (anonymous) = {MOD_FLAG_COUNT -}
    • (anonymous) = {TQtWIN -}
    • (anonymous) = {TQtWIN -}
    • (anonymous) = {TQtWIN +}
    • (anonymous) = {QtWIN +}
    • (anonymous) = {QtWIN +}
    • (anonymous) = {QtWIN }
    • ModFlag = {SHIFT, CTRL, ALT, WIN }

    methods

      @@ -137,7 +137,7 @@
    • isValidTQt ()
      Not Implemented
      • -
    • keyCodeTQt () +
    • keyCodeQt ()
      returns (int)
    • modFlagLabel (f) diff --git a/doc/classref/tdecore/KKeyNative.html b/doc/classref/tdecore/KKeyNative.html index 168222c..4ccc4f7 100644 --- a/doc/classref/tdecore/KKeyNative.html +++ b/doc/classref/tdecore/KKeyNative.html @@ -98,7 +98,7 @@
    • key ()
      returns (KKey)
      • -
    • keyCodeTQt () +
    • keyCodeQt ()
      returns (int)
    • keyboardHasWinKey () diff --git a/doc/classref/tdecore/KKeySequence.html b/doc/classref/tdecore/KKeySequence.html index 8a82da6..3a10d97 100644 --- a/doc/classref/tdecore/KKeySequence.html +++ b/doc/classref/tdecore/KKeySequence.html @@ -119,7 +119,7 @@
    iuint
    • -
  • keyCodeTQt () +
  • keyCodeQt ()
    returns (int)
  • null () diff --git a/doc/classref/tdecore/KKeyServer.Key.html b/doc/classref/tdecore/KKeyServer.Key.html index 97838c9..8ab79c1 100644 --- a/doc/classref/tdecore/KKeyServer.Key.html +++ b/doc/classref/tdecore/KKeyServer.Key.html @@ -60,7 +60,7 @@
  • key ()
    returns (KKey)
    • -
  • keyCodeTQt () +
  • keyCodeQt ()
    returns (int)
  • mod () diff --git a/doc/classref/tdecore/KLocale.html b/doc/classref/tdecore/KLocale.html index 62a8628..cbe6154 100644 --- a/doc/classref/tdecore/KLocale.html +++ b/doc/classref/tdecore/KLocale.html @@ -538,7 +538,7 @@ nulong
    • -
  • translateTQt (context, sourceText, message) +
  • translateQt (context, sourceText, message)
    returns (TQString)
    diff --git a/doc/classref/tdecore/KShortcut.html b/doc/classref/tdecore/KShortcut.html index 6d4ccec..4e01389 100644 --- a/doc/classref/tdecore/KShortcut.html +++ b/doc/classref/tdecore/KShortcut.html @@ -35,7 +35,7 @@
    ArgumentTypeDefault
    contextchar

    enums

      -
    • (anonymous) = {MAX_SETQUENCES +
    • (anonymous) = {MAX_SEQUENCES }

    methods

    • KShortcut () @@ -172,7 +172,7 @@
    • isNull ()
      returns (bool)
      • -
    • keyCodeTQt () +
    • keyCodeQt ()
      returns (int)
    • null () diff --git a/doc/classref/tdeprint/KPrinter.html b/doc/classref/tdeprint/KPrinter.html index a349fda..3293a38 100644 --- a/doc/classref/tdeprint/KPrinter.html +++ b/doc/classref/tdeprint/KPrinter.html @@ -484,7 +484,7 @@
    • toPage ()
      returns (int)
      • -
    • translateTQtOptions () +
    • translateQtOptions ()
      returns nothing
    diff --git a/extra/kde300/kkeyserver_x11.h b/extra/kde300/kkeyserver_x11.h index c6250b2..f72a2df 100644 --- a/extra/kde300/kkeyserver_x11.h +++ b/extra/kde300/kkeyserver_x11.h @@ -54,7 +54,7 @@ namespace KKeyServer uint code() const { return m_code; } uint mod() const { return m_mod; } uint sym() const { return m_sym; } - int keyCodeTQt() const { return (int) m_sym; } + int keyCodeQt() const { return (int) m_sym; } void setKeycodeTQt( int keyTQt ) { m_code = CODE_FOR_QT; m_sym = keyTQt; } diff --git a/extra/kde301/kkeyserver_x11.h b/extra/kde301/kkeyserver_x11.h index c6250b2..f72a2df 100644 --- a/extra/kde301/kkeyserver_x11.h +++ b/extra/kde301/kkeyserver_x11.h @@ -54,7 +54,7 @@ namespace KKeyServer uint code() const { return m_code; } uint mod() const { return m_mod; } uint sym() const { return m_sym; } - int keyCodeTQt() const { return (int) m_sym; } + int keyCodeQt() const { return (int) m_sym; } void setKeycodeTQt( int keyTQt ) { m_code = CODE_FOR_QT; m_sym = keyTQt; } diff --git a/extra/kde303/kkeyserver_x11.h b/extra/kde303/kkeyserver_x11.h index c6250b2..f72a2df 100644 --- a/extra/kde303/kkeyserver_x11.h +++ b/extra/kde303/kkeyserver_x11.h @@ -54,7 +54,7 @@ namespace KKeyServer uint code() const { return m_code; } uint mod() const { return m_mod; } uint sym() const { return m_sym; } - int keyCodeTQt() const { return (int) m_sym; } + int keyCodeQt() const { return (int) m_sym; } void setKeycodeTQt( int keyTQt ) { m_code = CODE_FOR_QT; m_sym = keyTQt; } diff --git a/extra/kde310/kkeyserver_x11.h b/extra/kde310/kkeyserver_x11.h index 14f3494..090b55b 100644 --- a/extra/kde310/kkeyserver_x11.h +++ b/extra/kde310/kkeyserver_x11.h @@ -169,7 +169,7 @@ namespace KKeyServer * Returns the qt key code. * @return the qt key code */ - int keyCodeTQt() const { return (int) m_sym; } + int keyCodeQt() const { return (int) m_sym; } /** * Sets the qt key code. diff --git a/extra/kde311/kkeyserver_x11.h b/extra/kde311/kkeyserver_x11.h index 14f3494..090b55b 100644 --- a/extra/kde311/kkeyserver_x11.h +++ b/extra/kde311/kkeyserver_x11.h @@ -169,7 +169,7 @@ namespace KKeyServer * Returns the qt key code. * @return the qt key code */ - int keyCodeTQt() const { return (int) m_sym; } + int keyCodeQt() const { return (int) m_sym; } /** * Sets the qt key code. diff --git a/extra/kde312/kkeyserver_x11.h b/extra/kde312/kkeyserver_x11.h index 14f3494..090b55b 100644 --- a/extra/kde312/kkeyserver_x11.h +++ b/extra/kde312/kkeyserver_x11.h @@ -169,7 +169,7 @@ namespace KKeyServer * Returns the qt key code. * @return the qt key code */ - int keyCodeTQt() const { return (int) m_sym; } + int keyCodeQt() const { return (int) m_sym; } /** * Sets the qt key code. diff --git a/extra/kde313/kkeyserver_x11.h b/extra/kde313/kkeyserver_x11.h index 14f3494..090b55b 100644 --- a/extra/kde313/kkeyserver_x11.h +++ b/extra/kde313/kkeyserver_x11.h @@ -169,7 +169,7 @@ namespace KKeyServer * Returns the qt key code. * @return the qt key code */ - int keyCodeTQt() const { return (int) m_sym; } + int keyCodeQt() const { return (int) m_sym; } /** * Sets the qt key code. diff --git a/extra/kde314/kkeyserver_x11.h b/extra/kde314/kkeyserver_x11.h index 8dda931..193fe06 100644 --- a/extra/kde314/kkeyserver_x11.h +++ b/extra/kde314/kkeyserver_x11.h @@ -169,7 +169,7 @@ namespace KKeyServer * Returns the qt key code. * @return the qt key code */ - int keyCodeTQt() const { return (int) m_sym; } + int keyCodeQt() const { return (int) m_sym; } /** * Sets the qt key code. diff --git a/extra/kde315/kkeyserver_x11.h b/extra/kde315/kkeyserver_x11.h index 8dda931..193fe06 100644 --- a/extra/kde315/kkeyserver_x11.h +++ b/extra/kde315/kkeyserver_x11.h @@ -169,7 +169,7 @@ namespace KKeyServer * Returns the qt key code. * @return the qt key code */ - int keyCodeTQt() const { return (int) m_sym; } + int keyCodeQt() const { return (int) m_sym; } /** * Sets the qt key code. diff --git a/extra/kde320/kkeyserver_x11.h b/extra/kde320/kkeyserver_x11.h index 076cdb1..b05db49 100644 --- a/extra/kde320/kkeyserver_x11.h +++ b/extra/kde320/kkeyserver_x11.h @@ -167,7 +167,7 @@ namespace KKeyServer * Returns the qt key code. * @return the qt key code */ - int keyCodeTQt() const { return (int) m_sym; } + int keyCodeQt() const { return (int) m_sym; } /** * Sets the qt key code. diff --git a/extra/kde321/kkeyserver_x11.h b/extra/kde321/kkeyserver_x11.h index 076cdb1..b05db49 100644 --- a/extra/kde321/kkeyserver_x11.h +++ b/extra/kde321/kkeyserver_x11.h @@ -167,7 +167,7 @@ namespace KKeyServer * Returns the qt key code. * @return the qt key code */ - int keyCodeTQt() const { return (int) m_sym; } + int keyCodeQt() const { return (int) m_sym; } /** * Sets the qt key code. diff --git a/extra/kde322/kkeyserver_x11.h b/extra/kde322/kkeyserver_x11.h index 076cdb1..b05db49 100644 --- a/extra/kde322/kkeyserver_x11.h +++ b/extra/kde322/kkeyserver_x11.h @@ -167,7 +167,7 @@ namespace KKeyServer * Returns the qt key code. * @return the qt key code */ - int keyCodeTQt() const { return (int) m_sym; } + int keyCodeQt() const { return (int) m_sym; } /** * Sets the qt key code. diff --git a/extra/kde323/kkeyserver_x11.h b/extra/kde323/kkeyserver_x11.h index 076cdb1..b05db49 100644 --- a/extra/kde323/kkeyserver_x11.h +++ b/extra/kde323/kkeyserver_x11.h @@ -167,7 +167,7 @@ namespace KKeyServer * Returns the qt key code. * @return the qt key code */ - int keyCodeTQt() const { return (int) m_sym; } + int keyCodeQt() const { return (int) m_sym; } /** * Sets the qt key code. diff --git a/extra/kde330/kkeyserver_x11.h b/extra/kde330/kkeyserver_x11.h index 076cdb1..b05db49 100644 --- a/extra/kde330/kkeyserver_x11.h +++ b/extra/kde330/kkeyserver_x11.h @@ -167,7 +167,7 @@ namespace KKeyServer * Returns the qt key code. * @return the qt key code */ - int keyCodeTQt() const { return (int) m_sym; } + int keyCodeQt() const { return (int) m_sym; } /** * Sets the qt key code. diff --git a/extra/kde331/kkeyserver_x11.h b/extra/kde331/kkeyserver_x11.h index 076cdb1..b05db49 100644 --- a/extra/kde331/kkeyserver_x11.h +++ b/extra/kde331/kkeyserver_x11.h @@ -167,7 +167,7 @@ namespace KKeyServer * Returns the qt key code. * @return the qt key code */ - int keyCodeTQt() const { return (int) m_sym; } + int keyCodeQt() const { return (int) m_sym; } /** * Sets the qt key code. diff --git a/extra/kde332/kkeyserver_x11.h b/extra/kde332/kkeyserver_x11.h index 076cdb1..b05db49 100644 --- a/extra/kde332/kkeyserver_x11.h +++ b/extra/kde332/kkeyserver_x11.h @@ -167,7 +167,7 @@ namespace KKeyServer * Returns the qt key code. * @return the qt key code */ - int keyCodeTQt() const { return (int) m_sym; } + int keyCodeQt() const { return (int) m_sym; } /** * Sets the qt key code. diff --git a/extra/kde340/kkeyserver_x11.h b/extra/kde340/kkeyserver_x11.h index a8d18ef..e29ca44 100644 --- a/extra/kde340/kkeyserver_x11.h +++ b/extra/kde340/kkeyserver_x11.h @@ -189,7 +189,7 @@ namespace KKeyServer * Returns the qt key code. * @return the qt key code */ - int keyCodeTQt() const { return (int) m_sym; } + int keyCodeQt() const { return (int) m_sym; } /** * Sets the qt key code. diff --git a/extra/kde341/kkeyserver_x11.h b/extra/kde341/kkeyserver_x11.h index a8d18ef..e29ca44 100644 --- a/extra/kde341/kkeyserver_x11.h +++ b/extra/kde341/kkeyserver_x11.h @@ -189,7 +189,7 @@ namespace KKeyServer * Returns the qt key code. * @return the qt key code */ - int keyCodeTQt() const { return (int) m_sym; } + int keyCodeQt() const { return (int) m_sym; } /** * Sets the qt key code. diff --git a/extra/kde342/kkeyserver_x11.h b/extra/kde342/kkeyserver_x11.h index e9b9f58..ecc9576 100644 --- a/extra/kde342/kkeyserver_x11.h +++ b/extra/kde342/kkeyserver_x11.h @@ -189,7 +189,7 @@ namespace KKeyServer * Returns the qt key code. * @return the qt key code */ - int keyCodeTQt() const { return (int) m_sym; } + int keyCodeQt() const { return (int) m_sym; } /** * Sets the qt key code. diff --git a/extra/kde343/kkeyserver_x11.h b/extra/kde343/kkeyserver_x11.h index e9b9f58..ecc9576 100644 --- a/extra/kde343/kkeyserver_x11.h +++ b/extra/kde343/kkeyserver_x11.h @@ -189,7 +189,7 @@ namespace KKeyServer * Returns the qt key code. * @return the qt key code */ - int keyCodeTQt() const { return (int) m_sym; } + int keyCodeQt() const { return (int) m_sym; } /** * Sets the qt key code. diff --git a/extra/kde350/kkeyserver_x11.h b/extra/kde350/kkeyserver_x11.h index d03553b..eaf4508 100644 --- a/extra/kde350/kkeyserver_x11.h +++ b/extra/kde350/kkeyserver_x11.h @@ -189,7 +189,7 @@ namespace KKeyServer * Returns the qt key code. * @return the qt key code */ - int keyCodeTQt() const { return (int) m_sym; } + int keyCodeQt() const { return (int) m_sym; } /** * Sets the qt key code. diff --git a/extra/kde351/kkeyserver_x11.h b/extra/kde351/kkeyserver_x11.h index d03553b..eaf4508 100644 --- a/extra/kde351/kkeyserver_x11.h +++ b/extra/kde351/kkeyserver_x11.h @@ -189,7 +189,7 @@ namespace KKeyServer * Returns the qt key code. * @return the qt key code */ - int keyCodeTQt() const { return (int) m_sym; } + int keyCodeQt() const { return (int) m_sym; } /** * Sets the qt key code. diff --git a/extra/kde352/kkeyserver_x11.h b/extra/kde352/kkeyserver_x11.h index d03553b..eaf4508 100644 --- a/extra/kde352/kkeyserver_x11.h +++ b/extra/kde352/kkeyserver_x11.h @@ -189,7 +189,7 @@ namespace KKeyServer * Returns the qt key code. * @return the qt key code */ - int keyCodeTQt() const { return (int) m_sym; } + int keyCodeQt() const { return (int) m_sym; } /** * Sets the qt key code. diff --git a/extra/kde353/kkeyserver_x11.h b/extra/kde353/kkeyserver_x11.h index d03553b..eaf4508 100644 --- a/extra/kde353/kkeyserver_x11.h +++ b/extra/kde353/kkeyserver_x11.h @@ -189,7 +189,7 @@ namespace KKeyServer * Returns the qt key code. * @return the qt key code */ - int keyCodeTQt() const { return (int) m_sym; } + int keyCodeQt() const { return (int) m_sym; } /** * Sets the qt key code. diff --git a/sip/tdecore/kglobal.sip b/sip/tdecore/kglobal.sip index b2b2cb9..849bb07 100644 --- a/sip/tdecore/kglobal.sip +++ b/sip/tdecore/kglobal.sip @@ -43,8 +43,8 @@ public: static KIconLoader* iconLoader (); static KLocale* locale (); static KCharsets* charsets (); - static const TQString& staticTQString (const char*); - static const TQString& staticTQString (const TQString&); + static const TQString& staticQString (const char*); + static const TQString& staticQString (const TQString&); static void registerStaticDeleter (KStaticDeleterBase*); static void unregisterStaticDeleter (KStaticDeleterBase*); static void deleteStaticDeleters (); diff --git a/sip/tdecore/kkeynative.sip b/sip/tdecore/kkeynative.sip index 31686fb..55af059 100644 --- a/sip/tdecore/kkeynative.sip +++ b/sip/tdecore/kkeynative.sip @@ -41,7 +41,7 @@ public: //ig bool init (const XEvent*); bool init (const KKey&); bool init (const KKeyNative&); - int keyCodeTQt () const; + int keyCodeQt () const; KKey key () const; %If ( KDE_3_1_4 - ) diff --git a/sip/tdecore/kkeyserver_x11.sip b/sip/tdecore/kkeyserver_x11.sip index 55c5849..17946cf 100644 --- a/sip/tdecore/kkeyserver_x11.sip +++ b/sip/tdecore/kkeyserver_x11.sip @@ -90,7 +90,7 @@ public: uint code () const; uint mod () const; uint sym () const; - int keyCodeTQt () const; + int keyCodeQt () const; void setKeycodeTQt (int); int compare (const KKeyServer::Key&) const; diff --git a/sip/tdecore/klocale.sip b/sip/tdecore/klocale.sip index 238c9a7..a951a67 100644 --- a/sip/tdecore/klocale.sip +++ b/sip/tdecore/klocale.sip @@ -199,7 +199,7 @@ public: void insertCatalogue (const TQString&); void removeCatalogue (const TQString&); void setActiveCatalogue (const TQString&); - TQString translateTQt (const char*, const char*, const char*) const; + TQString translateQt (const char*, const char*, const char*) const; %If ( KDE_3_1_0 - ) TQStringList allLanguagesTwoAlpha () const; diff --git a/sip/tdecore/kshortcut.sip b/sip/tdecore/kshortcut.sip index 9e7c745..4f7ca1c 100644 --- a/sip/tdecore/kshortcut.sip +++ b/sip/tdecore/kshortcut.sip @@ -43,7 +43,7 @@ public: enum { - TQtWIN + QtWIN }; %End @@ -82,7 +82,7 @@ public: bool operator < (const KKey&) const; %End - int keyCodeTQt () const; + int keyCodeQt () const; TQString toString () const; TQString toStringInternal () const; void simplify (); @@ -103,7 +103,7 @@ public: enum { - TQtWIN + QtWIN }; %End @@ -115,7 +115,7 @@ public: enum { - TQtWIN + QtWIN }; %End @@ -165,7 +165,7 @@ public: %End TQKeySequence qt () const; - int keyCodeTQt () const; + int keyCodeQt () const; TQString toString () const; TQString toStringInternal () const; static KKeySequence& null (); @@ -193,7 +193,7 @@ public: enum { - MAX_SETQUENCES + MAX_SEQUENCES }; KShortcut (); @@ -213,7 +213,7 @@ public: bool init (const TQString&); uint count () const; const KKeySequence& seq (uint) const; - int keyCodeTQt () const; + int keyCodeQt () const; bool isNull () const; int compare (const KShortcut&) const; diff --git a/sip/tdeprint/kprinter.sip b/sip/tdeprint/kprinter.sip index 7de8f97..fa2243b 100644 --- a/sip/tdeprint/kprinter.sip +++ b/sip/tdeprint/kprinter.sip @@ -230,7 +230,7 @@ public: protected: //ig virtual bool cmd (int, TQPainter*, TQPDevCmdParam*); virtual int metric (int) const; - void translateTQtOptions (); + void translateQtOptions (); void loadSettings (); void saveSettings (); void preparePrinting (); diff --git a/templates/basic/menuapp1.py b/templates/basic/menuapp1.py index 863a521..8312c7c 100644 --- a/templates/basic/menuapp1.py +++ b/templates/basic/menuapp1.py @@ -70,31 +70,31 @@ class MainWin (KMainWindow): fileMenu = TQPopupMenu (self) # "File" menu items - fileMenu.insertItem (i18n ("New"), self.slotNew, KStdAccel.openNew ().keyCodeTQt ()) - fileMenu.insertItem (i18n ("Open"), self.slotOpen, KStdAccel.open ().keyCodeTQt ()) + fileMenu.insertItem (i18n ("New"), self.slotNew, KStdAccel.openNew ().keyCodeQt ()) + fileMenu.insertItem (i18n ("Open"), self.slotOpen, KStdAccel.open ().keyCodeQt ()) fileMenu.insertSeparator (); - fileMenu.insertItem (i18n ("Save"), self.slotSave, KStdAccel.save ().keyCodeTQt ()) + fileMenu.insertItem (i18n ("Save"), self.slotSave, KStdAccel.save ().keyCodeQt ()) fileMenu.insertItem (i18n ("SaveAs"), self.slotSaveAs) fileMenu.insertSeparator (); - fileMenu.insertItem (i18n ("Print"), self.slotPrint, KStdAccel.print_ ().keyCodeTQt ()) + fileMenu.insertItem (i18n ("Print"), self.slotPrint, KStdAccel.print_ ().keyCodeQt ()) fileMenu.insertSeparator (); - fileMenu.insertItem (i18n ("&Quit"), self.slotQuit, KStdAccel.quit ().keyCodeTQt ()); + fileMenu.insertItem (i18n ("&Quit"), self.slotQuit, KStdAccel.quit ().keyCodeQt ()); self.menuBar ().insertItem (i18n ("&File"), fileMenu) editMenu = TQPopupMenu (self) # "Edit" menu items - editMenu.insertItem (i18n ("Undo"), self.slotUndo, KStdAccel.undo ().keyCodeTQt ()) - editMenu.insertItem (i18n ("Redo"), self.slotRedo, KStdAccel.redo ().keyCodeTQt ()) + editMenu.insertItem (i18n ("Undo"), self.slotUndo, KStdAccel.undo ().keyCodeQt ()) + editMenu.insertItem (i18n ("Redo"), self.slotRedo, KStdAccel.redo ().keyCodeQt ()) editMenu.insertSeparator (); - editMenu.insertItem (i18n ("Cut"), self.slotCut, KStdAccel.cut ().keyCodeTQt ()) - editMenu.insertItem (i18n ("Copy"), self.slotCopy, KStdAccel.copy ().keyCodeTQt ()) - editMenu.insertItem (i18n ("Paste"), self.slotPaste, KStdAccel.paste ().keyCodeTQt ()) + editMenu.insertItem (i18n ("Cut"), self.slotCut, KStdAccel.cut ().keyCodeQt ()) + editMenu.insertItem (i18n ("Copy"), self.slotCopy, KStdAccel.copy ().keyCodeQt ()) + editMenu.insertItem (i18n ("Paste"), self.slotPaste, KStdAccel.paste ().keyCodeQt ()) editMenu.insertSeparator (); - editMenu.insertItem (i18n ("Find"), self.slotFind, KStdAccel.find ().keyCodeTQt ()) - editMenu.insertItem (i18n ("Find Next"), self.slotFindNext, KStdAccel.findNext ().keyCodeTQt ()) - editMenu.insertItem (i18n ("Replace"), self.slotReplace, KStdAccel.replace ().keyCodeTQt ()) + editMenu.insertItem (i18n ("Find"), self.slotFind, KStdAccel.find ().keyCodeQt ()) + editMenu.insertItem (i18n ("Find Next"), self.slotFindNext, KStdAccel.findNext ().keyCodeQt ()) + editMenu.insertItem (i18n ("Replace"), self.slotReplace, KStdAccel.replace ().keyCodeQt ()) self.menuBar ().insertItem (i18n ("&Edit"), editMenu)