diff options
1300 files changed, 10400 insertions, 24561 deletions
diff --git a/.gitmodules b/.gitmodules index ee64d062..30a10a14 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "admin"] path = admin url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin -[submodule "cmake"] - path = cmake - url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake [submodule "parts/appwizard/common/admin"] path = parts/appwizard/common/admin url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin diff --git a/CMakeL10n.txt b/CMakeL10n.txt index 4f41ba43..47f3ce7d 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -9,12 +9,15 @@ # ################################################# -cmake_minimum_required( VERSION 2.8 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) ##### include our cmake modules ################# -set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) include( TDEL10n ) diff --git a/CMakeLists.txt b/CMakeLists.txt index 95dd0c58..9be5a56c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,13 +9,17 @@ # ################################################# -cmake_minimum_required( VERSION 2.8.12 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) +tde_set_project_version( ) ##### general package setup ##################### project( tdevelop ) -set( VERSION R14.1.0 ) ##### include essential cmake modules ########### @@ -32,7 +36,6 @@ include( FindPkgConfig ) ##### include our cmake modules ################# -set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) include( TDEMacros ) @@ -44,13 +47,36 @@ tde_setup_paths( ) ##### add apidox targets ############ -add_custom_target(apidox - COMMAND "./generate_apidox" "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${HTML_INSTALL_DIR}" "/usr/share/tqt3/doc/html" - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/cmake/") +add_custom_target( apidox + COMMAND ${CMAKE_COMMAND} -E env + "TQTDOCDIR=/usr/share/tqt3/doc/html" + "DOXDATA=${HTML_INSTALL_DIR}/en/common" + ${CMAKE_SOURCE_DIR}/admin/doxygen.sh + --no-modulename + ${CMAKE_SOURCE_DIR} + COMMAND + find ${CMAKE_BINARY_DIR}/apidocs -name '*.html' | + xargs -r sed -i 's|${CMAKE_BINARY_DIR}/apidocs|${HTML_INSTALL_DIR}/en/${PROJECT_NAME}-apidocs|g' + COMMAND + find ${CMAKE_BINARY_DIR}/apidocs -name '*.tag' | + xargs -r sed -i 's|${CMAKE_SOURCE_DIR}/|${PROJECT_NAME}/|g' + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} +) + +add_custom_target( install-apidox + COMMAND ${CMAKE_COMMAND} -E echo Apidox installed in ${HTML_INSTALL_DIR}/en/${PROJECT_NAME}-apidocs +) -add_custom_target(install-apidox - COMMAND "./install_apidox" "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${HTML_INSTALL_DIR}" "${CMAKE_INSTALL_PREFIX}" - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/cmake/") +install( CODE " + if( EXISTS ${CMAKE_BINARY_DIR}/apidocs ) + file( + INSTALL ${CMAKE_BINARY_DIR}/apidocs/ + DESTINATION ${HTML_INSTALL_DIR}/en/${PROJECT_NAME}-apidocs + PATTERN doxygen_sqlite3.db EXCLUDE + PATTERN installdox-slow EXCLUDE + ) + endif()" +) ##### build tools ############################### @@ -139,7 +165,7 @@ endif( NOT DEFINED FULL_MAKE_COMMAND ) if( NOT DEFINED MAKE_COMMAND ) - GET_FILENAME_COMPONENT( MAKE_COMMAND "${FULL_MAKE_COMMAND}" NAME ) + get_filename_component( MAKE_COMMAND "${FULL_MAKE_COMMAND}" NAME ) endif( NOT DEFINED MAKE_COMMAND ) diff --git a/admin b/admin -Subproject 8c7e0d40de084fe5d54e173918756639e0d4d63 +Subproject 59a8bf7c09f87fbccd6dc2987145c7216e043e7 diff --git a/buildtools/ada/adaglobaloptionsdlg.h b/buildtools/ada/adaglobaloptionsdlg.h index 39e2e354..1b3d75cf 100644 --- a/buildtools/ada/adaglobaloptionsdlg.h +++ b/buildtools/ada/adaglobaloptionsdlg.h @@ -19,7 +19,7 @@ class AdaProjectPart; class AdaGlobalOptionsDlg : public AdaProjectOptionsDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/ada/adaproject_optionsdlgbase.ui b/buildtools/ada/adaproject_optionsdlgbase.ui index b98bc1a3..35774d19 100644 --- a/buildtools/ada/adaproject_optionsdlgbase.ui +++ b/buildtools/ada/adaproject_optionsdlgbase.ui @@ -447,7 +447,7 @@ <tabstop>addconfig_button</tabstop> <tabstop>removeconfig_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">compiler_box_activated(const TQString&)</slot> <slot access="protected">addconfig_button_clicked()</slot> <slot access="protected">configRemoved()</slot> @@ -457,7 +457,7 @@ <slot access="protected">configAdded()</slot> <slot access="protected">setDirty()</slot> <slot access="protected">setDefaultOptions()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp index f778c9b2..4cd401a5 100644 --- a/buildtools/ada/adaproject_part.cpp +++ b/buildtools/ada/adaproject_part.cpp @@ -54,17 +54,17 @@ AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStrin TDEAction *action; action = new TDEAction( i18n("&Build Project"), "make_tdevelop", Key_F8, - this, TQT_SLOT(slotBuild()), + this, TQ_SLOT(slotBuild()), actionCollection(), "build_build" ); action = new TDEAction( i18n("Execute Program"), "application-x-executable", 0, - this, TQT_SLOT(slotExecute()), + this, TQ_SLOT(slotExecute()), actionCollection(), "build_execute" ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), - this, TQT_SLOT(configWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), + this, TQ_SLOT(configWidget(KDialogBase*)) ); // m_widget = new AdaProjectWidget(this); @@ -374,8 +374,8 @@ void AdaProjectPart::projectConfigWidget( KDialogBase * dlg ) TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Ada Compiler")); AdaProjectOptionsDlg *w = new AdaProjectOptionsDlg(this, vbox); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); - connect( dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(loadProjectConfig()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(loadProjectConfig()) ); } void AdaProjectPart::loadProjectConfig( ) @@ -405,7 +405,7 @@ void AdaProjectPart::configWidget( KDialogBase * dlg ) TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Ada Compiler")); AdaGlobalOptionsDlg *w = new AdaGlobalOptionsDlg(this, vbox); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name) diff --git a/buildtools/ada/adaproject_part.h b/buildtools/ada/adaproject_part.h index 5511da78..a1415344 100644 --- a/buildtools/ada/adaproject_part.h +++ b/buildtools/ada/adaproject_part.h @@ -19,7 +19,7 @@ class KDevCompilerOptions; class AdaProjectPart : public KDevBuildTool { - Q_OBJECT + TQ_OBJECT public: AdaProjectPart(TQObject *parent, const char *name, const TQStringList &); diff --git a/buildtools/ada/adaproject_widget.h b/buildtools/ada/adaproject_widget.h index 6bbab369..f1bb5e2b 100644 --- a/buildtools/ada/adaproject_widget.h +++ b/buildtools/ada/adaproject_widget.h @@ -9,7 +9,7 @@ class AdaProjectPart; class AdaProjectWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/ada/adaprojectoptionsdlg.cpp b/buildtools/ada/adaprojectoptionsdlg.cpp index 28549efc..3a0624cb 100644 --- a/buildtools/ada/adaprojectoptionsdlg.cpp +++ b/buildtools/ada/adaprojectoptionsdlg.cpp @@ -27,7 +27,7 @@ AdaProjectOptionsDlg::AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* parent, const char* name, WFlags fl) : AdaProjectOptionsDlgBase(parent,name, fl), m_part(part) { - config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this))); + config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this)); offers = TDETrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Ada'"); diff --git a/buildtools/ada/adaprojectoptionsdlg.h b/buildtools/ada/adaprojectoptionsdlg.h index 569f06c9..655b2310 100644 --- a/buildtools/ada/adaprojectoptionsdlg.h +++ b/buildtools/ada/adaprojectoptionsdlg.h @@ -18,7 +18,7 @@ class KDevCompilerOptions; class AdaProjectOptionsDlg : public AdaProjectOptionsDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp index f53357da..3c71e490 100644 --- a/buildtools/ant/antprojectpart.cpp +++ b/buildtools/ant/antprojectpart.cpp @@ -53,7 +53,7 @@ AntProjectPart::AntProjectPart(TQObject *parent, const char *name, const TQStrin setXMLFile("kdevantproject.rc"); m_buildProjectAction = new TDEAction(i18n("&Build Project"), "make_tdevelop", Key_F8, - this, TQT_SLOT(slotBuild()), + this, TQ_SLOT(slotBuild()), actionCollection(), "build_build" ); m_buildProjectAction->setToolTip(i18n("Build project")); m_buildProjectAction->setWhatsThis(i18n("<b>Build project</b><p>Executes <b>ant dist</b> command to build the project.")); @@ -65,9 +65,9 @@ AntProjectPart::AntProjectPart(TQObject *parent, const char *name, const TQStrin m_targetMenu = menu->popupMenu(); - connect(m_targetMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotTargetMenuActivated(int))); - connect(core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*))); - connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(m_targetMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotTargetMenuActivated(int))); + connect(core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQ_SLOT(projectConfigWidget(KDialogBase*))); + connect(core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); m_antOptionsWidget = 0; } @@ -497,7 +497,7 @@ void AntProjectPart::projectConfigWidget(KDialogBase *dlg) ++i; } - connect(dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(optionsAccepted())); + connect(dlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(optionsAccepted())); vbox = dlg->addVBoxPage(i18n("Classpath")); m_classPathWidget = new ClassPathWidget(vbox); @@ -563,13 +563,13 @@ void AntProjectPart::contextMenu(TQPopupMenu *popup, const Context *context) if (inProject) { int id = popup->insertItem( i18n("Remove %1 From Project").arg(popupstr), - this, TQT_SLOT(slotRemoveFromProject()) ); + this, TQ_SLOT(slotRemoveFromProject()) ); popup->setWhatsThis(id, i18n("<b>Remove from project</b><p>Removes current file from the project.")); } else { int id = popup->insertItem( i18n("Add %1 to Project").arg(popupstr), - this, TQT_SLOT(slotAddToProject()) ); + this, TQ_SLOT(slotAddToProject()) ); popup->setWhatsThis(id, i18n("<b>Add to project</b><p>Adds current file from the project.")); } } diff --git a/buildtools/ant/antprojectpart.h b/buildtools/ant/antprojectpart.h index e3b325d2..aecd7838 100644 --- a/buildtools/ant/antprojectpart.h +++ b/buildtools/ant/antprojectpart.h @@ -42,7 +42,7 @@ public: class AntProjectPart : public KDevBuildTool { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/addapplicationdlg.h b/buildtools/autotools/addapplicationdlg.h index 285a4d77..b36adafd 100644 --- a/buildtools/autotools/addapplicationdlg.h +++ b/buildtools/autotools/addapplicationdlg.h @@ -21,7 +21,7 @@ class TargetItem; class AddApplicationDialog : public AddApplicationDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/addapplicationdlgbase.ui b/buildtools/autotools/addapplicationdlgbase.ui index e7495907..61e0d105 100644 --- a/buildtools/autotools/addapplicationdlgbase.ui +++ b/buildtools/autotools/addapplicationdlgbase.ui @@ -539,11 +539,11 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">addTypeClicked()</slot> <slot access="protected">iconClicked()</slot> <slot access="protected">removeTypeClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp index efdff38f..b98b0edb 100644 --- a/buildtools/autotools/addexistingdirectoriesdlg.cpp +++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp @@ -87,14 +87,14 @@ void AddExistingDirectoriesDialog::init() importView->setMode ( TDEIconView::Select ); importView->setItemsMovable ( false ); - connect ( okButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotOk () ) ); + connect ( okButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotOk () ) ); - connect ( addSelectedButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddSelected() ) ); - connect ( addAllButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddAll() ) ); - connect ( removeSelectedButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRemoveSelected() ) ); - connect ( removeAllButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRemoveAll() ) ); + connect ( addSelectedButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotAddSelected() ) ); + connect ( addAllButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotAddAll() ) ); + connect ( removeSelectedButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotRemoveSelected() ) ); + connect ( removeAllButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotRemoveAll() ) ); - connect ( importView, TQT_SIGNAL ( dropped( TQDropEvent* ) ), this, TQT_SLOT ( slotDropped ( TQDropEvent* ) ) ); + connect ( importView, TQ_SIGNAL ( dropped( TQDropEvent* ) ), this, TQ_SLOT ( slotDropped ( TQDropEvent* ) ) ); importView->setSelectionMode ( KFile::Multi ); diff --git a/buildtools/autotools/addexistingdirectoriesdlg.h b/buildtools/autotools/addexistingdirectoriesdlg.h index 521ddd35..c68e8113 100644 --- a/buildtools/autotools/addexistingdirectoriesdlg.h +++ b/buildtools/autotools/addexistingdirectoriesdlg.h @@ -35,7 +35,7 @@ class KImportIconView; class AddExistingDirectoriesDialog : public AddExistingDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/addexistingfilesdlg.cpp b/buildtools/autotools/addexistingfilesdlg.cpp index 20dbf41b..ade9121d 100644 --- a/buildtools/autotools/addexistingfilesdlg.cpp +++ b/buildtools/autotools/addexistingfilesdlg.cpp @@ -128,14 +128,14 @@ void AddExistingFilesDialog::init() importView->setMode ( TDEIconView::Select ); importView->setItemsMovable ( false ); - connect ( okButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotOk () ) ); + connect ( okButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotOk () ) ); - connect ( addSelectedButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddSelected() ) ); - connect ( addAllButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddAll() ) ); - connect ( removeSelectedButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRemoveSelected() ) ); - connect ( removeAllButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRemoveAll() ) ); + connect ( addSelectedButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotAddSelected() ) ); + connect ( addAllButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotAddAll() ) ); + connect ( removeSelectedButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotRemoveSelected() ) ); + connect ( removeAllButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotRemoveAll() ) ); - connect ( importView, TQT_SIGNAL ( dropped( TQDropEvent* ) ), this, TQT_SLOT ( slotDropped ( TQDropEvent* ) ) ); + connect ( importView, TQ_SIGNAL ( dropped( TQDropEvent* ) ), this, TQ_SLOT ( slotDropped ( TQDropEvent* ) ) ); importView->setSelectionMode ( KFile::Multi ); diff --git a/buildtools/autotools/addexistingfilesdlg.h b/buildtools/autotools/addexistingfilesdlg.h index 467307f7..3d9fed36 100644 --- a/buildtools/autotools/addexistingfilesdlg.h +++ b/buildtools/autotools/addexistingfilesdlg.h @@ -38,7 +38,7 @@ class KFileItem; class AddExistingFilesDialog : public AddExistingDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/addfiledlg.cpp b/buildtools/autotools/addfiledlg.cpp index d3f71637..0840eca5 100644 --- a/buildtools/autotools/addfiledlg.cpp +++ b/buildtools/autotools/addfiledlg.cpp @@ -43,8 +43,8 @@ AddFileDialog::AddFileDialog(AutoProjectPart *part, AutoProjectWidget *widget, TQWidget *parent, const char *name) : AddFileDlgBase(parent, name, true) { - connect ( createButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( accept() ) ); - connect ( cancelButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( reject() ) ); + connect ( createButton, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( accept() ) ); + connect ( cancelButton, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( reject() ) ); directoryLabel->setText ( spitem->path ); if ( item->name.isEmpty() ) diff --git a/buildtools/autotools/addfiledlg.h b/buildtools/autotools/addfiledlg.h index d3e41b49..dbd87b4e 100644 --- a/buildtools/autotools/addfiledlg.h +++ b/buildtools/autotools/addfiledlg.h @@ -26,7 +26,7 @@ class TargetItem; class AddFileDialog : public AddFileDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/addicondlg.h b/buildtools/autotools/addicondlg.h index 89507b68..b11925f0 100644 --- a/buildtools/autotools/addicondlg.h +++ b/buildtools/autotools/addicondlg.h @@ -22,7 +22,7 @@ class TargetItem; class AddIconDialog : public AddIconDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/addicondlgbase.ui b/buildtools/autotools/addicondlgbase.ui index 354a8f88..7d65613d 100644 --- a/buildtools/autotools/addicondlgbase.ui +++ b/buildtools/autotools/addicondlgbase.ui @@ -260,9 +260,9 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>somethingChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/autotools/addprefixdlg.cpp b/buildtools/autotools/addprefixdlg.cpp index 85f6f0fd..f7e13956 100644 --- a/buildtools/autotools/addprefixdlg.cpp +++ b/buildtools/autotools/addprefixdlg.cpp @@ -30,14 +30,14 @@ AddPrefixDialog::AddPrefixDialog( const TQString& nameEdit, const TQString& path name_edit = new KLineEdit(nameEdit, this); name_edit->setFocus(); name_label->setBuddy(name_edit); - connect( name_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotPrefixChanged() ) ); + connect( name_edit, TQ_SIGNAL( textChanged ( const TQString & ) ), TQ_SLOT( slotPrefixChanged() ) ); TQLabel *path_label = new TQLabel(i18n("&Path:"), this); path_edit = new KLineEdit(pathEdit, this); path_label->setBuddy(path_edit); TQFontMetrics fm(path_edit->fontMetrics()); path_edit->setMinimumWidth(fm.width('X')*35); - connect( path_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotPrefixChanged() ) ); + connect( path_edit, TQ_SIGNAL( textChanged ( const TQString & ) ), TQ_SLOT( slotPrefixChanged() ) ); TQVBoxLayout *layout = new TQVBoxLayout(this, 10); @@ -57,8 +57,8 @@ AddPrefixDialog::AddPrefixDialog( const TQString& nameEdit, const TQString& path m_pOk = buttonbox->addButton(KStdGuiItem::ok()); TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); m_pOk->setDefault(true); - connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); - connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); + connect( m_pOk, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); + connect( cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) ); buttonbox->layout(); layout->addWidget(buttonbox, 0); slotPrefixChanged(); diff --git a/buildtools/autotools/addprefixdlg.h b/buildtools/autotools/addprefixdlg.h index 794241f6..c2e80532 100644 --- a/buildtools/autotools/addprefixdlg.h +++ b/buildtools/autotools/addprefixdlg.h @@ -18,7 +18,7 @@ class TQPushButton; class AddPrefixDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/addservicedlg.h b/buildtools/autotools/addservicedlg.h index 70d004e4..203dedf9 100644 --- a/buildtools/autotools/addservicedlg.h +++ b/buildtools/autotools/addservicedlg.h @@ -21,7 +21,7 @@ class TargetItem; class AddServiceDialog : public AddServiceDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/addservicedlgbase.ui b/buildtools/autotools/addservicedlgbase.ui index ad8e1b49..a921195e 100644 --- a/buildtools/autotools/addservicedlgbase.ui +++ b/buildtools/autotools/addservicedlgbase.ui @@ -530,12 +530,12 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">iconClicked()</slot> <slot access="protected">addTypeClicked()</slot> <slot access="protected">propertyExecuted(TQListViewItem*)</slot> <slot access="protected">removeTypeClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp index 59cebc53..4ad97fd6 100644 --- a/buildtools/autotools/addsubprojectdlg.cpp +++ b/buildtools/autotools/addsubprojectdlg.cpp @@ -37,8 +37,8 @@ AddSubprojectDialog::AddSubprojectDialog(AutoProjectPart *part, AutoSubprojectVi { setIcon(SmallIcon("folder_new.png")); - connect( createButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); - connect( cancelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); + connect( createButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); + connect( cancelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) ); m_subProject = item; m_subprojectView = view; diff --git a/buildtools/autotools/addsubprojectdlg.h b/buildtools/autotools/addsubprojectdlg.h index 897558ef..d2964561 100644 --- a/buildtools/autotools/addsubprojectdlg.h +++ b/buildtools/autotools/addsubprojectdlg.h @@ -24,7 +24,7 @@ class SubprojectItem; class AddSubprojectDialog : public AddSubprojectDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/addtargetdlg.cpp b/buildtools/autotools/addtargetdlg.cpp index 92cc834c..e9ce04d8 100644 --- a/buildtools/autotools/addtargetdlg.cpp +++ b/buildtools/autotools/addtargetdlg.cpp @@ -50,7 +50,7 @@ AddTargetDialog::AddTargetDialog(AutoProjectWidget *widget, SubprojectItem *item if (widget->kdeMode()) ldflagsother_edit->setText("$(all_libraries)"); - connect( filename_edit, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( slotFileNameChanged (const TQString&) ) ); + connect( filename_edit, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( slotFileNameChanged (const TQString&) ) ); setIcon ( SmallIcon ( "targetnew_tdevelop.png" ) ); diff --git a/buildtools/autotools/addtargetdlg.h b/buildtools/autotools/addtargetdlg.h index 0be9aa0a..0663a3e2 100644 --- a/buildtools/autotools/addtargetdlg.h +++ b/buildtools/autotools/addtargetdlg.h @@ -21,7 +21,7 @@ class SubprojectItem; class AddTargetDialog : public AddTargetDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/addtargetdlgbase.ui b/buildtools/autotools/addtargetdlgbase.ui index 77bb8adc..b7b48d36 100644 --- a/buildtools/autotools/addtargetdlgbase.ui +++ b/buildtools/autotools/addtargetdlgbase.ui @@ -334,9 +334,9 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">primaryChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/autotools/addtranslationdlg.cpp b/buildtools/autotools/addtranslationdlg.cpp index fe7de2a3..d745de2a 100644 --- a/buildtools/autotools/addtranslationdlg.cpp +++ b/buildtools/autotools/addtranslationdlg.cpp @@ -54,8 +54,8 @@ AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, TQWidget *pare TQPushButton *ok_button = buttonbox->addButton(KStdGuiItem::ok()); TQPushButton *cancel_button = buttonbox->addButton(KStdGuiItem::cancel()); ok_button->setDefault(true); - connect( ok_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); - connect( cancel_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); + connect( ok_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); + connect( cancel_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) ); buttonbox->layout(); layout->addWidget(buttonbox, 0); diff --git a/buildtools/autotools/addtranslationdlg.h b/buildtools/autotools/addtranslationdlg.h index 2754a65b..e8932562 100644 --- a/buildtools/autotools/addtranslationdlg.h +++ b/buildtools/autotools/addtranslationdlg.h @@ -20,7 +20,7 @@ class AutoProjectPart; class AddTranslationDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp index 936f7eb1..3c4ae477 100644 --- a/buildtools/autotools/autodetailsview.cpp +++ b/buildtools/autotools/autodetailsview.cpp @@ -79,10 +79,10 @@ AutoDetailsView::AutoDetailsView(AutoProjectWidget* widget, AutoProjectPart* par buildTargetAction->setEnabled( false ); executeTargetAction->setEnabled( false ); removeDetailAction->setEnabled(false); - connect( m_listView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); - connect( m_listView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged( ) ) ); + connect( m_listView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); + connect( m_listView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged( ) ) ); } @@ -177,7 +177,7 @@ void AutoDetailsView::initActions() TDEActionCollection * actions = new TDEActionCollection( this ); targetOptionsAction = new AutoToolsAction( i18n( "Options..." ), "configure", 0, - TQT_TQOBJECT(this), TQT_SLOT( slotTargetOptions() ), actions, + this, TQ_SLOT( slotTargetOptions() ), actions, "target options" ); targetOptionsAction->setWhatsThis(i18n("<b>Options</b><p>Target options dialog that " "provides settings for linker flags and lists " @@ -188,7 +188,7 @@ void AutoDetailsView::initActions() TQToolTip::add( m_button1, tr2i18n( "Create New File..." ) ); addNewFileAction = new AutoToolsAction( i18n( "Create New File..." ), "document-new", 0, - TQT_TQOBJECT(this), TQT_SLOT( slotAddNewFile() ), actions, + this, TQ_SLOT( slotAddNewFile() ), actions, "add new file" ); addNewFileAction->setWhatsThis(i18n("<b>Create new file</b><p>Creates a new file and " "adds it to a currently selected target.")); @@ -197,7 +197,7 @@ void AutoDetailsView::initActions() TQToolTip::add( m_button2, tr2i18n( "Add Existing Files..." ) ); addExistingFileAction = new AutoToolsAction( i18n( "Add Existing Files..." ), "fileimport", 0, - TQT_TQOBJECT(this), TQT_SLOT( slotAddExistingFile() ), actions, + this, TQ_SLOT( slotAddExistingFile() ), actions, "add existing file" ); addExistingFileAction->setWhatsThis(i18n("<b>Add existing files</b><p>Adds existing " "file to a currently selected target. Header " @@ -208,12 +208,12 @@ void AutoDetailsView::initActions() addExistingFileAction->setEnabled( false ); addIconAction = new TDEAction( i18n( "Add Icon..." ), "iconadd_tdevelop", 0, - TQT_TQOBJECT(this), TQT_SLOT( slotAddIcon() ), actions, "add icon" ); + this, TQ_SLOT( slotAddIcon() ), actions, "add icon" ); addIconAction->setWhatsThis(i18n("<b>Add icon</b><p>Adds an icon to a KDEICON target.")); TQToolTip::add( m_button4, tr2i18n( "Build Target")); buildTargetAction = new AutoToolsAction( i18n( "Build Target..." ), "launch", 0, - TQT_TQOBJECT(this), TQT_SLOT( slotBuildTarget() ), actions, + this, TQ_SLOT( slotBuildTarget() ), actions, "build target" ); buildTargetAction->setWhatsThis(i18n("<b>Build target</b><p>Constructs a series of " "make commands to build the selected target. " @@ -223,7 +223,7 @@ void AutoDetailsView::initActions() TQToolTip::add( m_button5, tr2i18n( "Execute Target...")); executeTargetAction = new AutoToolsAction( i18n( "Execute Target..." ), "application-x-executable", 0, - TQT_TQOBJECT(this), TQT_SLOT( slotExecuteTarget() ), actions, + this, TQ_SLOT( slotExecuteTarget() ), actions, "execute target" ); executeTargetAction->setWhatsThis(i18n("<b>Execute target</b><p>Executes the target " "and tries to build in case it is not built.")); @@ -231,7 +231,7 @@ void AutoDetailsView::initActions() executeTargetAction->setEnabled( false ); setActiveTargetAction = new TDEAction( i18n( "Make Target Active" ), "", 0, - TQT_TQOBJECT(this), TQT_SLOT( slotSetActiveTarget() ), actions, + this, TQ_SLOT( slotSetActiveTarget() ), actions, "set active target" ); setActiveTargetAction->setWhatsThis(i18n("<b>Make target active</b><p>Marks the " "currently selected target as 'active'. New " @@ -241,8 +241,8 @@ void AutoDetailsView::initActions() "command builds it.")); TQToolTip::add( m_button3, tr2i18n( "Remove")); - removeDetailAction = new AutoToolsAction( i18n( "Remove" ), "edit-delete", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotRemoveDetail() ), actions, + removeDetailAction = new AutoToolsAction( i18n( "Remove" ), "edit-delete", 0, this, + TQ_SLOT( slotRemoveDetail() ), actions, "remove detail" ); removeDetailAction->setWhatsThis(i18n("<b>Remove</b><p>Shows a list of targets " "dependent on the selected target or file and " @@ -251,12 +251,12 @@ void AutoDetailsView::initActions() removeDetailAction->plug( m_button3 ); removeDetailAction->setEnabled( false ); - connect( m_listView, TQT_SIGNAL( executed( TQListViewItem* ) ), - this, TQT_SLOT( slotDetailsExecuted( TQListViewItem* ) ) ); - connect( m_listView, TQT_SIGNAL( returnPressed( TQListViewItem* ) ), - this, TQT_SLOT( slotDetailsExecuted( TQListViewItem* ) ) ); - connect( m_listView, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( slotDetailsContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( m_listView, TQ_SIGNAL( executed( TQListViewItem* ) ), + this, TQ_SLOT( slotDetailsExecuted( TQListViewItem* ) ) ); + connect( m_listView, TQ_SIGNAL( returnPressed( TQListViewItem* ) ), + this, TQ_SLOT( slotDetailsExecuted( TQListViewItem* ) ) ); + connect( m_listView, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQ_SLOT( slotDetailsContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); } TQString AutoDetailsView::getUiFileLink(const TQString& relpath, const TQString& filename) diff --git a/buildtools/autotools/autodetailsview.h b/buildtools/autotools/autodetailsview.h index 081842ee..5c2eab6f 100644 --- a/buildtools/autotools/autodetailsview.h +++ b/buildtools/autotools/autodetailsview.h @@ -31,7 +31,7 @@ class AutoDetailsView : protected AutoProjectViewBase { friend class RemoveFileDialog; friend class FileItem; - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp index c1008072..8646fc8c 100644 --- a/buildtools/autotools/autoprojectpart.cpp +++ b/buildtools/autotools/autoprojectpart.cpp @@ -91,7 +91,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr TDEAction *action; action = new TDEAction( i18n("Add Translation..."), 0, - this, TQT_SLOT(slotAddTranslation()), + this, TQ_SLOT(slotAddTranslation()), actionCollection(), "project_addtranslation" ); action->setToolTip(i18n("Add translation")); action->setWhatsThis(i18n("<b>Add translation</b><p>Creates .po file for the selected language.")); @@ -102,7 +102,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr action->setEnabled(false); action = new TDEAction( i18n("&Build Project"), "make_tdevelop", Key_F8, - this, TQT_SLOT(slotBuild()), + this, TQ_SLOT(slotBuild()), actionCollection(), "build_build" ); action->setToolTip(i18n("Build project")); action->setWhatsThis(i18n("<b>Build project</b><p>Runs <b>make</b> from the project directory.<br>" @@ -111,7 +111,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr action->setGroup("autotools"); action = new TDEAction( i18n("Build &Active Target"), "make_tdevelop", Key_F7, - this, TQT_SLOT(slotBuildActiveTarget()), + this, TQ_SLOT(slotBuildActiveTarget()), actionCollection(), "build_buildactivetarget" ); action->setToolTip(i18n("Build active target")); action->setWhatsThis(i18n("<b>Build active target</b><p>Constructs a series of make commands to build an active target. " @@ -121,7 +121,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr action->setGroup("autotools"); action = new TDEAction( i18n("Compile &File"), "make_tdevelop", - this, TQT_SLOT(slotCompileFile()), + this, TQ_SLOT(slotCompileFile()), actionCollection(), "build_compilefile" ); action->setToolTip(i18n("Compile file")); action->setWhatsThis(i18n("<b>Compile file</b><p>Runs <b>make filename.o</b> command from the directory where 'filename' is the name of currently opened file.<br>" @@ -130,7 +130,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr action->setGroup("autotools"); action = new TDEAction( i18n("Run Configure"), 0, - this, TQT_SLOT(slotConfigure()), + this, TQ_SLOT(slotConfigure()), actionCollection(), "build_configure" ); action->setToolTip(i18n("Run configure")); action->setWhatsThis(i18n("<b>Run configure</b><p>Executes <b>configure</b> with flags, arguments " @@ -139,21 +139,21 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr action->setGroup("autotools"); action = new TDEAction( i18n("Run automake && friends"), 0, - this, TQT_SLOT(slotMakefilecvs()), + this, TQ_SLOT(slotMakefilecvs()), actionCollection(), "build_makefilecvs" ); action->setToolTip(i18n("Run automake && friends")); action->setWhatsThis(i18n("<b>Run automake && friends</b><p>Executes<br><b>make -f Makefile.cvs</b><br><b>./configure</b><br>commands from the project directory.")); action->setGroup("autotools"); action = new TDEAction( i18n("Update admin module"), 0, - this, TQT_SLOT(slotUpdateAdminDirectory()), + this, TQ_SLOT(slotUpdateAdminDirectory()), actionCollection(), "build_updateadmin" ); action->setToolTip(i18n("Update admin module")); action->setWhatsThis(i18n("<b>Update admin module</b><p>Recreates the project admin directory using the version present on the local system.")); action->setGroup("autotools"); action = new TDEAction( i18n("Install"), 0, - this, TQT_SLOT(slotInstall()), + this, TQ_SLOT(slotInstall()), actionCollection(), "build_install" ); action->setToolTip(i18n("Install")); action->setWhatsThis(i18n("<b>Install</b><p>Runs <b>make install</b> command from the project directory.<br>" @@ -162,7 +162,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr action->setGroup("autotools"); action = new TDEAction( i18n("Install (as root user)"), 0, - this, TQT_SLOT(slotInstallWithKdesu()), + this, TQ_SLOT(slotInstallWithKdesu()), actionCollection(), "build_install_tdesu" ); action->setToolTip(i18n("Install as root user")); action->setWhatsThis(i18n("<b>Install</b><p>Runs <b>make install</b> command from the project directory with root privileges.<br>" @@ -172,7 +172,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr action->setGroup("autotools"); action = new TDEAction( i18n("&Clean Project"), 0, - this, TQT_SLOT(slotClean()), + this, TQ_SLOT(slotClean()), actionCollection(), "build_clean" ); action->setToolTip(i18n("Clean project")); action->setWhatsThis(i18n("<b>Clean project</b><p>Runs <b>make clean</b> command from the project directory.<br>" @@ -181,7 +181,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr action->setGroup("autotools"); action = new TDEAction( i18n("&Distclean"), 0, - this, TQT_SLOT(slotDistClean()), + this, TQ_SLOT(slotDistClean()), actionCollection(), "build_distclean" ); action->setToolTip(i18n("Distclean")); action->setWhatsThis(i18n("<b>Distclean</b><p>Runs <b>make distclean</b> command from the project directory.<br>" @@ -190,7 +190,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr action->setGroup("autotools"); action = new TDEAction( i18n("Make Messages && Merge"), 0, - this, TQT_SLOT(slotMakeMessages()), + this, TQ_SLOT(slotMakeMessages()), actionCollection(), "build_messages" ); action->setToolTip(i18n("Make messages && merge")); action->setWhatsThis(i18n("<b>Make messages && merge</b><p>Runs <b>make package-messages</b> command from the project directory.<br>" @@ -214,32 +214,32 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr if (!DomUtil::readBoolEntry(dom, "/kdevautoproject/run/disable_default")) { //ok we handle the execute in this kpart action = new TDEAction( i18n("Execute Program"), "application-x-executable", SHIFT+Key_F9, - this, TQT_SLOT(slotExecute()), + this, TQ_SLOT(slotExecute()), actionCollection(), "build_execute" ); action->setToolTip(i18n("Execute program")); action->setWhatsThis(i18n("<b>Execute program</b><p>Executes the currently active target or the main program specified in project settings, <b>Run Options</b> tab.")); action->setGroup("autotools"); } - connect( buildConfigAction, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotBuildConfigChanged(const TQString&)) ); - connect( buildConfigAction->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotBuildConfigAboutToShow()) ); + connect( buildConfigAction, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotBuildConfigChanged(const TQString&)) ); + connect( buildConfigAction->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotBuildConfigAboutToShow()) ); -// connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); +// connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("Configure Options"), CONFIGURE_OPTIONS, info()->icon() ); _configProxy->createProjectConfigPage( i18n("Run Options"), RUN_OPTIONS, info()->icon() ); _configProxy->createProjectConfigPage( i18n("Make Options"), MAKE_OPTIONS, info()->icon() ); - connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - connect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)), - this, TQT_SLOT(slotCommandFinished(const TQString&)) ); - connect( makeFrontend(), TQT_SIGNAL(commandFailed(const TQString&)), - this, TQT_SLOT(slotCommandFailed(const TQString&)) ); + connect( makeFrontend(), TQ_SIGNAL(commandFinished(const TQString&)), + this, TQ_SLOT(slotCommandFinished(const TQString&)) ); + connect( makeFrontend(), TQ_SIGNAL(commandFailed(const TQString&)), + this, TQ_SLOT(slotCommandFailed(const TQString&)) ); setWantautotools(); @@ -265,7 +265,7 @@ void AutoProjectPart::insertConfigWidget( const KDialogBase* dlg, TQWidget * pag case CONFIGURE_OPTIONS: { ConfigureOptionsWidget *w2 = new ConfigureOptionsWidget(this, page ); - connect( dlg, TQT_SIGNAL(okClicked()), w2, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w2, TQ_SLOT(accept()) ); } break; @@ -276,7 +276,7 @@ void AutoProjectPart::insertConfigWidget( const KDialogBase* dlg, TQWidget * pag { //ok we handle the execute in this kpart RunOptionsWidget *w3 = new RunOptionsWidget(*projectDom(), "/kdevautoproject", buildDirectory(), page ); - connect( dlg, TQT_SIGNAL(okClicked()), w3, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w3, TQ_SLOT(accept()) ); } } break; @@ -284,7 +284,7 @@ void AutoProjectPart::insertConfigWidget( const KDialogBase* dlg, TQWidget * pag case MAKE_OPTIONS: { MakeOptionsWidget *w4 = new MakeOptionsWidget(*projectDom(), "/kdevautoproject", page ); - connect( dlg, TQT_SIGNAL(okClicked()), w4, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w4, TQ_SLOT(accept()) ); } break; } @@ -1197,7 +1197,7 @@ void AutoProjectPart::slotExecute() if (appFrontend()->isRunning()) { if (KMessageBox::questionYesNo(m_widget, i18n("Your application is currently running. Do you want to restart it?"), i18n("Application Already Running"), i18n("&Restart Application"), i18n("Do &Nothing")) == KMessageBox::No) return; - connect(appFrontend(), TQT_SIGNAL(processExited()), TQT_SLOT(slotExecute2())); + connect(appFrontend(), TQ_SIGNAL(processExited()), TQ_SLOT(slotExecute2())); appFrontend()->stopApplication(); return; } @@ -1221,8 +1221,8 @@ void AutoProjectPart::executeTarget(const TQDir& dir, const TargetItem* titem) if( DomUtil::readBoolEntry(*projectDom(), "/kdevautoproject/run/autocompile", true) && is_dirty ) { - connect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)), this, TQT_SLOT(slotExecuteTargetAfterBuild(const TQString&)) ); - connect( makeFrontend(), TQT_SIGNAL(commandFailed(const TQString&)), this, TQT_SLOT(slotNotExecuteTargetAfterBuildFailed(const TQString&)) ); + connect( makeFrontend(), TQ_SIGNAL(commandFinished(const TQString&)), this, TQ_SLOT(slotExecuteTargetAfterBuild(const TQString&)) ); + connect( makeFrontend(), TQ_SIGNAL(commandFailed(const TQString&)), this, TQ_SLOT(slotNotExecuteTargetAfterBuildFailed(const TQString&)) ); m_runProg=titem->name; m_executeTargetAfterBuild.first = dir; @@ -1268,8 +1268,8 @@ void AutoProjectPart::slotExecuteTargetAfterBuild(const TQString& command) kdDebug(9020) << "slotExecuteTargetAfterBuild " << command << endl; if ( m_executeAfterBuild && constructMakeCommandLine(m_executeTargetAfterBuild.first.path(), m_executeTargetAfterBuild.second->name) == command ) { - disconnect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)), this, TQT_SLOT(slotExecuteAfterTargetBuild()) ); - disconnect( makeFrontend(), TQT_SIGNAL(commandFailed(const TQString&)), this, TQT_SLOT(slotExecuteAfterTargetBuildFailed()) ); + disconnect( makeFrontend(), TQ_SIGNAL(commandFinished(const TQString&)), this, TQ_SLOT(slotExecuteAfterTargetBuild()) ); + disconnect( makeFrontend(), TQ_SIGNAL(commandFailed(const TQString&)), this, TQ_SLOT(slotExecuteAfterTargetBuildFailed()) ); kdDebug(9020) << "slotExecuteTargetAfterBuild " << endl; executeTarget(m_executeTargetAfterBuild.first, m_executeTargetAfterBuild.second); } @@ -1282,8 +1282,8 @@ void AutoProjectPart::slotNotExecuteTargetAfterBuildFailed(const TQString& comma if ( constructMakeCommandLine(m_executeTargetAfterBuild.first.path(), m_executeTargetAfterBuild.second->name) == command ) { m_executeAfterBuild=false; - disconnect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)), this, TQT_SLOT(slotExecuteTargetAfterBuild()) ); - disconnect( makeFrontend(), TQT_SIGNAL(commandFailed(const TQString&)), this, TQT_SLOT(slotNotExecuteTargetAfterBuildFailed()) ); + disconnect( makeFrontend(), TQ_SIGNAL(commandFinished(const TQString&)), this, TQ_SLOT(slotExecuteTargetAfterBuild()) ); + disconnect( makeFrontend(), TQ_SIGNAL(commandFailed(const TQString&)), this, TQ_SLOT(slotNotExecuteTargetAfterBuildFailed()) ); } } @@ -1312,7 +1312,7 @@ TQString AutoProjectPart::environString() const */ void AutoProjectPart::slotExecute2() { - disconnect(appFrontend(), TQT_SIGNAL(processExited()), this, TQT_SLOT(slotExecute2())); + disconnect(appFrontend(), TQ_SIGNAL(processExited()), this, TQ_SLOT(slotExecute2())); if (m_runProg.isEmpty()){ // Do not execute non executable targets diff --git a/buildtools/autotools/autoprojectpart.h b/buildtools/autotools/autoprojectpart.h index c4a9949b..bee4f9ae 100644 --- a/buildtools/autotools/autoprojectpart.h +++ b/buildtools/autotools/autoprojectpart.h @@ -33,7 +33,7 @@ class ConfigWidgetProxy; class AutoProjectPart : public KDevBuildTool { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp index 2c98ed35..1b732dde 100644 --- a/buildtools/autotools/autoprojectwidget.cpp +++ b/buildtools/autotools/autoprojectwidget.cpp @@ -87,7 +87,7 @@ AutoProjectWidget::AutoProjectWidget( AutoProjectPart *part, bool kde ) m_choosenTarget = 0; m_makefileHandler = new MakefileHandler(); - TQSplitter *splitter = new TQSplitter(Qt::Vertical, this); + TQSplitter *splitter = new TQSplitter(TQt::Vertical, this); initOverview ( splitter ); initDetailview ( splitter ); @@ -113,8 +113,8 @@ void AutoProjectWidget::initDetailview ( TQWidget* parent ) void AutoProjectWidget::initActions() { - connect( m_subprojectView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( slotOverviewSelectionChanged( TQListViewItem* ) ) ); + connect( m_subprojectView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( slotOverviewSelectionChanged( TQListViewItem* ) ) ); } AutoSubprojectView* AutoProjectWidget::getSubprojectView () diff --git a/buildtools/autotools/autoprojectwidget.h b/buildtools/autotools/autoprojectwidget.h index df392c59..2b0e546d 100644 --- a/buildtools/autotools/autoprojectwidget.h +++ b/buildtools/autotools/autoprojectwidget.h @@ -47,7 +47,7 @@ class MakefileHandler; class AutoProjectWidget : public TQVBox { - Q_OBJECT + TQ_OBJECT friend class RemoveFileDialog; friend class TargetOptionsDialog; // to access projectDom() via m_part->projectDom() diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp index 6d6b6c01..439a79fd 100644 --- a/buildtools/autotools/autosubprojectview.cpp +++ b/buildtools/autotools/autosubprojectview.cpp @@ -118,8 +118,8 @@ AutoSubprojectView::AutoSubprojectView(AutoProjectWidget* widget, AutoProjectPar m_listView->header()->hide(); m_listView->addColumn( TQString() ); - connect( m_listView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); + connect( m_listView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); initActions(); } @@ -173,7 +173,7 @@ void AutoSubprojectView::initActions() TDEActionCollection * actions = new TDEActionCollection( this ); subProjectOptionsAction = new AutoToolsAction( i18n( "Options..." ), "configure", 0, - TQT_TQOBJECT(this), TQT_SLOT( slotSubprojectOptions() ), actions, "subproject options" ); + this, TQ_SLOT( slotSubprojectOptions() ), actions, "subproject options" ); subProjectOptionsAction->setWhatsThis(i18n("<qt><b>Options</b><p>Shows subproject options dialog " "that provides settings for compiler, include paths, " "prefixes and build order.</qt>")); @@ -181,24 +181,24 @@ void AutoSubprojectView::initActions() TQToolTip::add( m_button1, tr2i18n( "Add new subproject...")); addSubprojectAction = new AutoToolsAction( i18n( "Add new subproject..." ), "folder-new", 0, - TQT_TQOBJECT(this), TQT_SLOT( slotAddSubproject() ), actions, "add subproject" ); + this, TQ_SLOT( slotAddSubproject() ), actions, "add subproject" ); addSubprojectAction->setWhatsThis(i18n("<qt><b>Add new subproject</b><p>Creates a new " "subproject in currently selected subproject.</qt>")); addSubprojectAction->plug( m_button1 ); removeSubprojectAction = new TDEAction( i18n( "Remove Subproject..." ), "remove_subdir", 0, - TQT_TQOBJECT(this), TQT_SLOT( slotRemoveSubproject() ), actions, "remove subproject" ); + this, TQ_SLOT( slotRemoveSubproject() ), actions, "remove subproject" ); removeSubprojectAction->setWhatsThis(i18n("<qt><b>Remove subproject</b><p>Removes the subproject. Asks if the " "subproject should be also removed from disk. Only subprojects " "which do not hold other subprojects can be removed.</qt>")); addExistingSubprojectAction = new TDEAction( i18n( "Add Existing Subprojects..." ), "fileimport", 0, - TQT_TQOBJECT(this), TQT_SLOT( slotAddExistingSubproject() ), actions, "add existing subproject" ); + this, TQ_SLOT( slotAddExistingSubproject() ), actions, "add existing subproject" ); addExistingSubprojectAction->setWhatsThis(i18n("<qt><b>Add existing subprojects</b><p>Imports existing " "subprojects containing Makefile.am.</qt>")); TQToolTip::add( m_button2, tr2i18n( "Add Target...")); addTargetAction = new AutoToolsAction( i18n( "Add Target..." ), "targetnew_tdevelop", 0, - TQT_TQOBJECT(this), TQT_SLOT( slotAddTarget() ), actions, "add target" ); + this, TQ_SLOT( slotAddTarget() ), actions, "add target" ); addTargetAction->setWhatsThis(i18n( "<qt><b>Add target</b><p>Adds a new target to " "the currently selected subproject. Target can be a " "binary program, library, script, also a collection of " @@ -206,28 +206,28 @@ void AutoSubprojectView::initActions() addTargetAction->plug( m_button2 ); TQToolTip::add( m_button3, tr2i18n( "Add Service...")); - addServiceAction = new AutoToolsAction( i18n( "Add Service..." ), "servicenew_tdevelop", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotAddService() ), actions, "add service" ); + addServiceAction = new AutoToolsAction( i18n( "Add Service..." ), "servicenew_tdevelop", 0, this, + TQ_SLOT( slotAddService() ), actions, "add service" ); addServiceAction->setWhatsThis(i18n("<qt><b>Add service</b><p>Creates a .desktop file describing the service.</qt>")); addServiceAction->plug( m_button3 ); TQToolTip::add( m_button4, tr2i18n( "Add Application...")); - addApplicationAction = new AutoToolsAction( i18n( "Add Application..." ), "window-new", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotAddApplication() ), actions, "add application" ); + addApplicationAction = new AutoToolsAction( i18n( "Add Application..." ), "window-new", 0, this, + TQ_SLOT( slotAddApplication() ), actions, "add application" ); addApplicationAction->setWhatsThis(i18n("<qt><b>Add application</b><p>Creates an application .desktop file.</qt>")); addApplicationAction->plug( m_button4 ); TQToolTip::add( m_button5, tr2i18n( "Build")); - buildSubprojectAction = new AutoToolsAction( i18n( "Build" ), "launch", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotBuildSubproject() ), actions, "build subproject" ); + buildSubprojectAction = new AutoToolsAction( i18n( "Build" ), "launch", 0, this, + TQ_SLOT( slotBuildSubproject() ), actions, "build subproject" ); buildSubprojectAction->setWhatsThis(i18n("<qt><b>Build</b><p>Runs <b>make</b> from the directory of " "the selected subproject.<br> Environment variables and " "make arguments can be specified in the project settings " "dialog, <b>Make Options</b> tab.</qt>")); buildSubprojectAction->plug( m_button5 ); - forceReeditSubprojectAction = new TDEAction( i18n( "Force Reedit" ), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT( slotForceReeditSubproject() ), actions, "force-reedit subproject" ); + forceReeditSubprojectAction = new TDEAction( i18n( "Force Reedit" ), 0, 0, this, + TQ_SLOT( slotForceReeditSubproject() ), actions, "force-reedit subproject" ); forceReeditSubprojectAction->setWhatsThis(i18n("<qt><b>Force Reedit</b><p>Runs <b>make force-reedit</b> " "from the directory of the selected subproject.<br>This " "recreates makefile (tip: and solves most of .moc related " @@ -238,21 +238,21 @@ void AutoSubprojectView::initActions() if (!m_part->isKDE()) forceReeditSubprojectAction->setEnabled(false); - cleanSubprojectAction = new TDEAction( i18n( "Clean" ), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT( slotCleanSubproject() ), actions, "clean subproject" ); + cleanSubprojectAction = new TDEAction( i18n( "Clean" ), 0, 0, this, + TQ_SLOT( slotCleanSubproject() ), actions, "clean subproject" ); cleanSubprojectAction->setWhatsThis(i18n("<qt><b>Clean</b><p>Runs <b>make clean</b> from the directory of " "the selected subproject.<br> Environment variables and make " "arguments can be specified in the project settings dialog, " "<b>Make Options</b> tab.</qt>")); - installSubprojectAction = new TDEAction( i18n( "Install" ), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT( slotInstallSubproject() ), actions, "install subproject" ); + installSubprojectAction = new TDEAction( i18n( "Install" ), 0, 0, this, + TQ_SLOT( slotInstallSubproject() ), actions, "install subproject" ); installSubprojectAction->setWhatsThis(i18n("<qt><b>Install</b><p>Runs <b>make install</b> from the directory " "of the selected subproject.<br> Environment variables and " "make arguments can be specified in the project settings " "dialog, <b>Make Options</b> tab.</qt>")); installSuSubprojectAction = new TDEAction( i18n( "Install (as root user)" ), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT( slotInstallSuSubproject() ), actions, "install subproject as root" ); + this, TQ_SLOT( slotInstallSuSubproject() ), actions, "install subproject as root" ); installSuSubprojectAction->setWhatsThis(i18n("<qt><b>Install as root user</b><p>Runs <b>make install</b> " "command from the directory of the selected subproject " "with root privileges.<br> It is executed via tdesu " @@ -260,19 +260,19 @@ void AutoSubprojectView::initActions() "can be specified in the project settings dialog, " "<b>Make Options</b> tab.</qt>")); - expandAction = new TDEAction( i18n( "Expand Subtree" ), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(slotExpandTree()), actions, "expandAction" ); - collapseAction = new TDEAction( i18n( "Collapse Subtree" ), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(slotCollapseTree()), actions, "collapseAction" ); + expandAction = new TDEAction( i18n( "Expand Subtree" ), 0, 0, this, + TQ_SLOT(slotExpandTree()), actions, "expandAction" ); + collapseAction = new TDEAction( i18n( "Collapse Subtree" ), 0, 0, this, + TQ_SLOT(slotCollapseTree()), actions, "collapseAction" ); - otherAction = new TDEAction( i18n( "Manage Custom Commands..." ), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT( slotManageBuildCommands() ), actions, "manage custom commands" ); + otherAction = new TDEAction( i18n( "Manage Custom Commands..." ), 0, 0, this, + TQ_SLOT( slotManageBuildCommands() ), actions, "manage custom commands" ); otherAction->setWhatsThis(i18n("<qt><b>Manage custom commands</b><p>Allows to create, edit and " "delete custom build commands which appears in the subproject " "context menu.<br></qt>")); - connect( m_listView, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( m_listView, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQ_SLOT( slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); } void AutoSubprojectView::slotContextMenu( TDEListView *, TQListViewItem *item, const TQPoint &p ) @@ -315,7 +315,7 @@ void AutoSubprojectView::slotContextMenu( TDEListView *, TQListViewItem *item, c popup.insertSeparator(); separate = false; } - int id = popup.insertItem(it.key(), this, TQT_SLOT(slotCustomBuildCommand(int))); + int id = popup.insertItem(it.key(), this, TQ_SLOT(slotCustomBuildCommand(int))); m_commandList.append(it.data()); popup.setItemParameter(id, m_commandList.findIndex(it.data())); } diff --git a/buildtools/autotools/autosubprojectview.h b/buildtools/autotools/autosubprojectview.h index 5f6f10b3..27e0c55b 100644 --- a/buildtools/autotools/autosubprojectview.h +++ b/buildtools/autotools/autosubprojectview.h @@ -40,7 +40,7 @@ namespace AutoProjectPrivate //so in order to be able to compile this file I made the inheritance public again, Alex class AutoSubprojectView : public AutoProjectViewBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/autotoolsaction.cpp b/buildtools/autotools/autotoolsaction.cpp index 820c4bd9..fbaf91a8 100644 --- a/buildtools/autotools/autotoolsaction.cpp +++ b/buildtools/autotools/autotoolsaction.cpp @@ -107,10 +107,10 @@ int AutoToolsAction::plug( TQWidget* w, int index ) if (kapp && !kapp->authorizeTDEAction(name())) return -1; - if ( ::tqqt_cast<TQToolButton*>( w ) ) + if ( ::tqt_cast<TQToolButton*>( w ) ) { TQToolButton* tb = static_cast<TQToolButton*>( w ); - connect( tb, TQT_SIGNAL( clicked() ), this, TQT_SLOT( activate() ) ); + connect( tb, TQ_SIGNAL( clicked() ), this, TQ_SLOT( activate() ) ); int id = getToolButtonID(); if ( !icon().isEmpty() ) @@ -145,7 +145,7 @@ void AutoToolsAction::updateEnabled( int i ) { TQWidget* w = container( i ); - if ( ::tqqt_cast<TQToolButton*>( w ) ) + if ( ::tqt_cast<TQToolButton*>( w ) ) static_cast<TQToolButton*>( w )->setEnabled( isEnabled() ); else TDEAction::updateEnabled( i ) ; diff --git a/buildtools/autotools/choosetargetdialog.cpp b/buildtools/autotools/choosetargetdialog.cpp index fc67a82e..1bb58e15 100644 --- a/buildtools/autotools/choosetargetdialog.cpp +++ b/buildtools/autotools/choosetargetdialog.cpp @@ -138,10 +138,10 @@ ChooseTargetDialog::ChooseTargetDialog ( AutoProjectWidget* widget, AutoProjectP d->baseUI->newFileList->insertItem( new TQListViewItem( d->baseUI->newFileList, fileName ) ); } - connect ( d->baseUI->subprojectComboBox, TQT_SIGNAL ( activated ( const TQString& ) ), - this, TQT_SLOT( slotSubprojectChanged ( const TQString& ) ) ); - connect ( d->baseUI->targetComboBox, TQT_SIGNAL ( activated ( const TQString& ) ), - this, TQT_SLOT( slotTargetChanged ( const TQString& ) ) ); + connect ( d->baseUI->subprojectComboBox, TQ_SIGNAL ( activated ( const TQString& ) ), + this, TQ_SLOT( slotSubprojectChanged ( const TQString& ) ) ); + connect ( d->baseUI->targetComboBox, TQ_SIGNAL ( activated ( const TQString& ) ), + this, TQ_SLOT( slotTargetChanged ( const TQString& ) ) ); } diff --git a/buildtools/autotools/choosetargetdialog.h b/buildtools/autotools/choosetargetdialog.h index bcc3ba64..ec9e2799 100644 --- a/buildtools/autotools/choosetargetdialog.h +++ b/buildtools/autotools/choosetargetdialog.h @@ -28,7 +28,7 @@ class TQWidget; class ChooseTargetDialog : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: ChooseTargetDialog( AutoProjectWidget* widget, AutoProjectPart* part, diff --git a/buildtools/autotools/choosetargetdlgbase.ui b/buildtools/autotools/choosetargetdlgbase.ui index 9bcddff0..9747faca 100644 --- a/buildtools/autotools/choosetargetdlgbase.ui +++ b/buildtools/autotools/choosetargetdlgbase.ui @@ -202,12 +202,12 @@ <tabstop>newFileList</tabstop> <tabstop>neverAskAgainCheckbox</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">slotActiveTargetToggled(bool)</slot> <slot access="protected">slotChooseTargetToggled(bool)</slot> <slot access="private">slotSubprojectChanged(const TQString&)</slot> <slot access="private">slotTargetChanged(const TQString&)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp index cc39aa07..33c280f4 100644 --- a/buildtools/autotools/configureoptionswidget.cpp +++ b/buildtools/autotools/configureoptionswidget.cpp @@ -72,10 +72,10 @@ public: ConfigureOptionsWidget::ConfigureOptionsWidget(AutoProjectPart *part, TQWidget *parent, const char *name) : ConfigureOptionsWidgetBase(parent, name) { - config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this))); + config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this)); m_part = part; - env_groupBox->setColumnLayout( 1, Qt::Vertical ); + env_groupBox->setColumnLayout( 1, TQt::Vertical ); TQDomDocument &dom = *part->projectDom(); m_environmentVariablesWidget = new EnvironmentVariablesWidget(dom, "/kdevautoproject/general/envvars", env_groupBox); @@ -237,7 +237,7 @@ void ConfigureOptionsWidget::saveSettings(const TQString &config) DomUtil::writeEntry(dom, prefix + "f77flags", f77flags_edit->text()); if (KMessageBox::questionYesNo(this, i18n("Re-run configure for %1 now?").arg(config), TQString(), i18n("Rerun"), i18n("Do Not Run")) == KMessageBox::Yes) - TQTimer::singleShot(0, m_part, TQT_SLOT(slotConfigure())); + TQTimer::singleShot(0, m_part, TQ_SLOT(slotConfigure())); } @@ -405,7 +405,7 @@ KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQStrin if (prop.isValid()) args = TQStringList::split(" ", prop.toString()); - TQObject *obj = factory->create(TQT_TQOBJECT(this), service->name().latin1(), + TQObject *obj = factory->create(this, service->name().latin1(), "KDevCompilerOptions", args); if (!obj->inherits("KDevCompilerOptions")) { diff --git a/buildtools/autotools/configureoptionswidget.h b/buildtools/autotools/configureoptionswidget.h index dc4f7ffa..42f6d931 100644 --- a/buildtools/autotools/configureoptionswidget.h +++ b/buildtools/autotools/configureoptionswidget.h @@ -24,7 +24,7 @@ class EnvironmentVariablesWidget; class ConfigureOptionsWidget : public ConfigureOptionsWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/configureoptionswidgetbase.ui b/buildtools/autotools/configureoptionswidgetbase.ui index a8821504..3392c6a5 100644 --- a/buildtools/autotools/configureoptionswidgetbase.ui +++ b/buildtools/autotools/configureoptionswidgetbase.ui @@ -1014,7 +1014,7 @@ headers in a nonstandard directory <include dir></string> <tabstop>f77flags_edit</tabstop> <tabstop>f77flags_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">builddirClicked()</slot> <slot access="protected">cflagsClicked()</slot> <slot access="protected">configAdded()</slot> @@ -1028,7 +1028,7 @@ headers in a nonstandard directory <include dir></string> <slot access="protected">f77serviceChanged()</slot> <slot access="protected">setDirty()</slot> <slot access="protected">topsourcedirClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp index 85bb32c0..b4bc9e39 100644 --- a/buildtools/autotools/fileselectorwidget.cpp +++ b/buildtools/autotools/fileselectorwidget.cpp @@ -119,20 +119,20 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, lo->addWidget(filterBox); // slots and signals - connect( filter, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( slotFilterChanged(const TQString&) ) ); - connect( filter, TQT_SIGNAL( activated(const TQString&) ), TQT_SLOT( slotFilterChanged(const TQString&) ) ); - connect( filter, TQT_SIGNAL( returnPressed(const TQString&) ), TQT_SLOT( filterReturnPressed(const TQString&) ) ); + connect( filter, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( slotFilterChanged(const TQString&) ) ); + connect( filter, TQ_SIGNAL( activated(const TQString&) ), TQ_SLOT( slotFilterChanged(const TQString&) ) ); + connect( filter, TQ_SIGNAL( returnPressed(const TQString&) ), TQ_SLOT( filterReturnPressed(const TQString&) ) ); - connect( home, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( home() ) ); - connect( up, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( cdUp() ) ); - connect( back, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( back() ) ); - connect( forward, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( forward() ) ); + connect( home, TQ_SIGNAL( clicked() ), dir, TQ_SLOT( home() ) ); + connect( up, TQ_SIGNAL( clicked() ), dir, TQ_SLOT( cdUp() ) ); + connect( back, TQ_SIGNAL( clicked() ), dir, TQ_SLOT( back() ) ); + connect( forward, TQ_SIGNAL( clicked() ), dir, TQ_SLOT( forward() ) ); - connect( cmbPath, TQT_SIGNAL( urlActivated( const KURL& )), this, TQT_SLOT( cmbPathActivated( const KURL& ) )); - //connect( cmbPath, TQT_SIGNAL( returnPressed( const TQString& )), this, TQT_SLOT( cmbPathReturnPressed( const TQString& ) )); - connect( dir, TQT_SIGNAL(urlEntered(const KURL&)), this, TQT_SLOT(dirUrlEntered(const KURL&)) ); + connect( cmbPath, TQ_SIGNAL( urlActivated( const KURL& )), this, TQ_SLOT( cmbPathActivated( const KURL& ) )); + //connect( cmbPath, TQ_SIGNAL( returnPressed( const TQString& )), this, TQ_SLOT( cmbPathReturnPressed( const TQString& ) )); + connect( dir, TQ_SIGNAL(urlEntered(const KURL&)), this, TQ_SLOT(dirUrlEntered(const KURL&)) ); - connect( dir, TQT_SIGNAL(finishedLoading()), this, TQT_SLOT(dirFinishedLoading()) ); + connect( dir, TQ_SIGNAL(finishedLoading()), this, TQ_SLOT(dirFinishedLoading()) ); // dirUrlEntered( dir->url() ); diff --git a/buildtools/autotools/fileselectorwidget.h b/buildtools/autotools/fileselectorwidget.h index 0de3f189..b4dbcf00 100644 --- a/buildtools/autotools/fileselectorwidget.h +++ b/buildtools/autotools/fileselectorwidget.h @@ -39,7 +39,7 @@ class KFile; class KDnDDirOperator : public KDirOperator { - Q_OBJECT + TQ_OBJECT public: @@ -51,7 +51,7 @@ protected: class FileSelectorWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/kimporticonview.h b/buildtools/autotools/kimporticonview.h index 26ec4d96..cf8880e0 100644 --- a/buildtools/autotools/kimporticonview.h +++ b/buildtools/autotools/kimporticonview.h @@ -23,7 +23,7 @@ class KImportIconView : public KFileDnDIconView { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/managecustomcommand.h b/buildtools/autotools/managecustomcommand.h index ad3ea250..a9a30dae 100644 --- a/buildtools/autotools/managecustomcommand.h +++ b/buildtools/autotools/managecustomcommand.h @@ -23,7 +23,7 @@ class ManageCustomCommand: public ManageCustomBuildCommandsBase { - Q_OBJECT + TQ_OBJECT public: ManageCustomCommand( TQWidget *parent = 0, const char *name = 0 ); diff --git a/buildtools/autotools/managecustomcommandsbase.ui b/buildtools/autotools/managecustomcommandsbase.ui index eab430e9..9088ba07 100644 --- a/buildtools/autotools/managecustomcommandsbase.ui +++ b/buildtools/autotools/managecustomcommandsbase.ui @@ -117,9 +117,9 @@ <tabstop>addButton</tabstop> <tabstop>removeButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>addButton_clicked()</slot> <slot>removeButton_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/buildtools/autotools/misc.cpp b/buildtools/autotools/misc.cpp index 6c4bac8c..a18fbf5d 100644 --- a/buildtools/autotools/misc.cpp +++ b/buildtools/autotools/misc.cpp @@ -72,7 +72,7 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec TQString AutoProjectTool::execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *parent ) { - KDevCompilerOptions * plugin = createCompilerOptions( compiler, TQT_TQOBJECT(parent) ); + KDevCompilerOptions * plugin = createCompilerOptions( compiler, parent ); if ( plugin ) { diff --git a/buildtools/autotools/removefiledlg.cpp b/buildtools/autotools/removefiledlg.cpp index e265a969..5b173a54 100644 --- a/buildtools/autotools/removefiledlg.cpp +++ b/buildtools/autotools/removefiledlg.cpp @@ -75,8 +75,8 @@ RemoveFileDialog::RemoveFileDialog(AutoProjectWidget *widget, AutoProjectPart* p else targetLabel->setText ( item->name ); - connect ( removeButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( accept() ) ); - connect ( cancelButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( reject() ) ); + connect ( removeButton, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( accept() ) ); + connect ( cancelButton, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( reject() ) ); setIcon ( SmallIcon ( "editdelete.png" ) ); diff --git a/buildtools/autotools/removefiledlg.h b/buildtools/autotools/removefiledlg.h index 138f9ad5..bb3fd1cc 100644 --- a/buildtools/autotools/removefiledlg.h +++ b/buildtools/autotools/removefiledlg.h @@ -25,7 +25,7 @@ class TargetItem; class RemoveFileDialog : public RemoveFileDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/removetargetdlg.cpp b/buildtools/autotools/removetargetdlg.cpp index c9068ec8..fc88c913 100644 --- a/buildtools/autotools/removetargetdlg.cpp +++ b/buildtools/autotools/removetargetdlg.cpp @@ -53,8 +53,8 @@ RemoveTargetDialog::RemoveTargetDialog( AutoProjectWidget *widget, AutoProjectPa else targetLabel->setText ( titem->name ); - connect ( removeButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( accept() ) ); - connect ( cancelButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( reject() ) ); + connect ( removeButton, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( accept() ) ); + connect ( cancelButton, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( reject() ) ); setIcon ( SmallIcon ( "edit-delete" ) ); diff --git a/buildtools/autotools/subprojectoptionsdlg.cpp b/buildtools/autotools/subprojectoptionsdlg.cpp index bff524bb..1a12453f 100644 --- a/buildtools/autotools/subprojectoptionsdlg.cpp +++ b/buildtools/autotools/subprojectoptionsdlg.cpp @@ -79,7 +79,7 @@ SubprojectOptionsDialog::SubprojectOptionsDialog(AutoProjectPart *part, AutoProj prefix_listview->setSorting(-1); buildorder_listview->setSorting(-1); - connect( prefix_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( editPrefixClicked() ) ); + connect( prefix_listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), this, TQ_SLOT( editPrefixClicked() ) ); // Insert all subdirectories as possible include directories TQStringList l = widget->allSubprojects(); diff --git a/buildtools/autotools/subprojectoptionsdlg.h b/buildtools/autotools/subprojectoptionsdlg.h index d53b34c1..113db5ff 100644 --- a/buildtools/autotools/subprojectoptionsdlg.h +++ b/buildtools/autotools/subprojectoptionsdlg.h @@ -21,7 +21,7 @@ class SubprojectItem; class SubprojectOptionsDialog : public SubprojectOptionsDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/subprojectoptionsdlgbase.ui b/buildtools/autotools/subprojectoptionsdlgbase.ui index d417e73b..90059f0a 100644 --- a/buildtools/autotools/subprojectoptionsdlgbase.ui +++ b/buildtools/autotools/subprojectoptionsdlgbase.ui @@ -964,7 +964,7 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">buildorderMoveDownClicked()</slot> <slot access="protected">cflagsClicked()</slot> <slot access="protected">cxxFlagsClicked()</slot> @@ -980,7 +980,7 @@ <slot access="protected">removePrefixClicked()</slot> <slot access="private">addPrefixClicked()</slot> <slot access="private">editPrefixClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/autotools/targetoptionsdlg.h b/buildtools/autotools/targetoptionsdlg.h index 205086c9..1e44d565 100644 --- a/buildtools/autotools/targetoptionsdlg.h +++ b/buildtools/autotools/targetoptionsdlg.h @@ -20,7 +20,7 @@ class TargetItem; class TargetOptionsDialog : public TargetOptionsDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/autotools/targetoptionsdlgbase.ui b/buildtools/autotools/targetoptionsdlgbase.ui index 2fad9db1..ea5d4738 100644 --- a/buildtools/autotools/targetoptionsdlgbase.ui +++ b/buildtools/autotools/targetoptionsdlgbase.ui @@ -700,7 +700,7 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">insideMoveDownClicked()</slot> <slot access="protected">insideMoveUpClicked()</slot> <slot access="protected">outsideAddClicked()</slot> @@ -708,7 +708,7 @@ <slot access="protected">outsideMoveDownClicked()</slot> <slot access="protected">outsideMoveUpClicked()</slot> <slot access="protected">outsideRemoveClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/autotools/tdefilednddetailview.cpp b/buildtools/autotools/tdefilednddetailview.cpp index c4b4f504..fc8ab08a 100644 --- a/buildtools/autotools/tdefilednddetailview.cpp +++ b/buildtools/autotools/tdefilednddetailview.cpp @@ -191,9 +191,9 @@ void KFileDnDDetailView::setAutoOpenTime( const int& time ){ void KFileDnDDetailView::useAutoOpenTimer( bool use ){ m_useAutoOpenTimer = use; if( use ) - connect( &m_autoOpenTimer, TQT_SIGNAL( timeout() ),this, TQT_SLOT( slotOpenFolder() ) ); + connect( &m_autoOpenTimer, TQ_SIGNAL( timeout() ),this, TQ_SLOT( slotOpenFolder() ) ); else { - disconnect( &m_autoOpenTimer, TQT_SIGNAL( timeout() ),this, TQT_SLOT( slotOpenFolder() ) ); + disconnect( &m_autoOpenTimer, TQ_SIGNAL( timeout() ),this, TQ_SLOT( slotOpenFolder() ) ); m_dropItem = 0L; m_autoOpenTimer.stop(); } diff --git a/buildtools/autotools/tdefilednddetailview.h b/buildtools/autotools/tdefilednddetailview.h index bb65d40f..8af26cf0 100644 --- a/buildtools/autotools/tdefilednddetailview.h +++ b/buildtools/autotools/tdefilednddetailview.h @@ -39,7 +39,7 @@ class KFileDnDDetailView : public KFileDetailView { - Q_OBJECT + TQ_OBJECT public: /** */ diff --git a/buildtools/autotools/tdefiledndiconview.cpp b/buildtools/autotools/tdefiledndiconview.cpp index f1f9afae..5109f2c8 100644 --- a/buildtools/autotools/tdefiledndiconview.cpp +++ b/buildtools/autotools/tdefiledndiconview.cpp @@ -168,9 +168,9 @@ void KFileDnDIconView::setAutoOpenTime( const int& time ){ void KFileDnDIconView::useAutoOpenTimer( bool use ){ m_useAutoOpenTimer = use; if ( use ) - connect( &m_autoOpenTimer, TQT_SIGNAL( timeout() ),this, TQT_SLOT( slotOpenFolder() ) ); + connect( &m_autoOpenTimer, TQ_SIGNAL( timeout() ),this, TQ_SLOT( slotOpenFolder() ) ); else { - disconnect( &m_autoOpenTimer, TQT_SIGNAL( timeout() ),this, TQT_SLOT( slotOpenFolder() ) ); + disconnect( &m_autoOpenTimer, TQ_SIGNAL( timeout() ),this, TQ_SLOT( slotOpenFolder() ) ); m_dropItem = 0L; m_autoOpenTimer.stop(); } diff --git a/buildtools/autotools/tdefiledndiconview.h b/buildtools/autotools/tdefiledndiconview.h index 8bd36d51..b18cf486 100644 --- a/buildtools/autotools/tdefiledndiconview.h +++ b/buildtools/autotools/tdefiledndiconview.h @@ -34,7 +34,7 @@ class KFileDnDIconView : public KFileIconView { - Q_OBJECT + TQ_OBJECT public: // Public methods diff --git a/buildtools/custommakefiles/custombuildoptionswidget.cpp b/buildtools/custommakefiles/custombuildoptionswidget.cpp index 74c0d08f..f36dc78a 100644 --- a/buildtools/custommakefiles/custombuildoptionswidget.cpp +++ b/buildtools/custommakefiles/custombuildoptionswidget.cpp @@ -44,10 +44,10 @@ CustomBuildOptionsWidget::CustomBuildOptionsWidget(TQDomDocument &dom, // This connection must not be made before the ant->setChecked() line, // because at this time makeToggled() would crash - connect( make_button, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(makeToggled(bool)) ); - connect( other_button, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(otherToggled(bool)) ); + connect( make_button, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(makeToggled(bool)) ); + connect( other_button, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(otherToggled(bool)) ); } diff --git a/buildtools/custommakefiles/custombuildoptionswidget.h b/buildtools/custommakefiles/custombuildoptionswidget.h index 7295a7e9..3308aa47 100644 --- a/buildtools/custommakefiles/custombuildoptionswidget.h +++ b/buildtools/custommakefiles/custombuildoptionswidget.h @@ -20,7 +20,7 @@ class TQTabWidget; class CustomBuildOptionsWidget : public CustomBuildOptionsWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui index bea1e872..0e1658ea 100644 --- a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui +++ b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui @@ -56,9 +56,6 @@ <property name="text"> <string>Other</string> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>other custom build tool, e.g. script</string> </property> @@ -147,10 +144,10 @@ </spacer> </vbox> </widget> -<Q_SLOTS> +<slots> <slot access="protected">makeToggled(bool)</slot> <slot access="protected">otherToggled(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/custommakefiles/custommakeconfigwidget.cpp b/buildtools/custommakefiles/custommakeconfigwidget.cpp index 6a12cdfb..10855e60 100644 --- a/buildtools/custommakefiles/custommakeconfigwidget.cpp +++ b/buildtools/custommakefiles/custommakeconfigwidget.cpp @@ -43,10 +43,10 @@ CustomMakeConfigWidget::CustomMakeConfigWidget(CustomProjectPart* part, const TQ defaultTarget_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/make/defaulttarget")); makeoptions_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/make/makeoptions")); - envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D[^\\s]*"), TQT_TQOBJECT(this))); + envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D[^\\s]*"), this)); m_allEnvironments = m_part->allMakeEnvironments(); m_currentEnvironment = m_part->currentMakeEnvironment(); - env_var_group->setColumnLayout( 1, Qt::Vertical ); + env_var_group->setColumnLayout( 1, TQt::Vertical ); m_envWidget = new EnvironmentVariablesWidget(m_dom, m_configGroup + "/make/environments/" + m_currentEnvironment, env_var_group); envs_combo->insertStringList(m_allEnvironments); envs_combo->setEditText(m_currentEnvironment); diff --git a/buildtools/custommakefiles/custommakeconfigwidget.h b/buildtools/custommakefiles/custommakeconfigwidget.h index 9ace95e0..d3369b1d 100644 --- a/buildtools/custommakefiles/custommakeconfigwidget.h +++ b/buildtools/custommakefiles/custommakeconfigwidget.h @@ -23,7 +23,7 @@ class EnvironmentVariablesWidget; */ class CustomMakeConfigWidget : public CustomMakeConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui index cae0a6e0..47d23c9b 100644 --- a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui +++ b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui @@ -375,13 +375,13 @@ <tabstop>copyenvs_button</tabstop> <tabstop>removeenvs_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">envNameChanged(const TQString &)</slot> <slot access="protected">envChanged(const TQString&)</slot> <slot access="protected">envAdded()</slot> <slot access="protected">envRemoved()</slot> <slot access="protected">envCopied()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/custommakefiles/custommanagerwidget.cpp b/buildtools/custommakefiles/custommanagerwidget.cpp index 9dfad3e5..1500995d 100644 --- a/buildtools/custommakefiles/custommanagerwidget.cpp +++ b/buildtools/custommakefiles/custommanagerwidget.cpp @@ -44,7 +44,7 @@ CustomManagerWidget::CustomManagerWidget( CustomProjectPart* part, TQWidget* par m_blacklistBox->setButtons( KEditListBox::Add | KEditListBox::Remove ); m_blacklistBox->insertStringList( DomUtil::readListEntry( m_dom, "kdevcustomproject/blacklist","path") ); grid->addWidget( m_blacklistBox, 0, 1 ); - connect(m_blacklistBox, TQT_SIGNAL(added(const TQString&)), this, TQT_SLOT(checkUrl(const TQString&))); + connect(m_blacklistBox, TQ_SIGNAL(added(const TQString&)), this, TQ_SLOT(checkUrl(const TQString&))); } void CustomManagerWidget::checkUrl(const TQString& url) diff --git a/buildtools/custommakefiles/custommanagerwidget.h b/buildtools/custommakefiles/custommanagerwidget.h index 655e0447..6ce029e2 100644 --- a/buildtools/custommakefiles/custommanagerwidget.h +++ b/buildtools/custommakefiles/custommanagerwidget.h @@ -22,7 +22,7 @@ class KEditListBox; class CustomManagerWidget : public CustomManagerWidgetBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/buildtools/custommakefiles/customotherconfigwidget.cpp b/buildtools/custommakefiles/customotherconfigwidget.cpp index 8049d37a..012dfd36 100644 --- a/buildtools/custommakefiles/customotherconfigwidget.cpp +++ b/buildtools/custommakefiles/customotherconfigwidget.cpp @@ -38,10 +38,10 @@ CustomOtherConfigWidget::CustomOtherConfigWidget(CustomProjectPart* part, const defaultTarget_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/other/defaulttarget")); makeoptions_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/other/otheroptions")); - envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this))); + envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this)); m_allEnvironments = m_part->allMakeEnvironments(); m_currentEnvironment = m_part->currentMakeEnvironment(); - env_var_group->setColumnLayout( 1, Qt::Vertical ); + env_var_group->setColumnLayout( 1, TQt::Vertical ); m_envWidget = new EnvironmentVariablesWidget(m_dom, m_configGroup + "/other/environments/" + m_currentEnvironment, env_var_group); envs_combo->insertStringList(m_allEnvironments); envs_combo->setEditText(m_currentEnvironment); diff --git a/buildtools/custommakefiles/customotherconfigwidget.h b/buildtools/custommakefiles/customotherconfigwidget.h index a92d816d..ee9c31a7 100644 --- a/buildtools/custommakefiles/customotherconfigwidget.h +++ b/buildtools/custommakefiles/customotherconfigwidget.h @@ -23,7 +23,7 @@ class EnvironmentVariablesWidget; */ class CustomOtherConfigWidget : public CustomOtherConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/custommakefiles/customotherconfigwidgetbase.ui b/buildtools/custommakefiles/customotherconfigwidgetbase.ui index 3f7290af..60f4adbc 100644 --- a/buildtools/custommakefiles/customotherconfigwidgetbase.ui +++ b/buildtools/custommakefiles/customotherconfigwidgetbase.ui @@ -276,13 +276,13 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">envNameChanged(const TQString &)</slot> <slot access="protected">envChanged(const TQString&)</slot> <slot access="protected">envAdded()</slot> <slot access="protected">envRemoved()</slot> <slot access="protected">envCopied()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp index cbbb4315..746e9fe4 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -76,12 +76,12 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const TDEAction *action; - action = new TDEAction( i18n( "Re-Populate Project" ), 0, this, TQT_SLOT( populateProject() ), actionCollection(), "repopulate_project" ); + action = new TDEAction( i18n( "Re-Populate Project" ), 0, this, TQ_SLOT( populateProject() ), actionCollection(), "repopulate_project" ); action->setToolTip( i18n( "Re-Populate Project" ) ); action->setWhatsThis( i18n( "<b>Re-Populate Project</b><p>Re-Populates the project, searching through the project directory and adding all files that match one of the wildcards set in the custom manager options of the project filelist." ) ); action = new TDEAction( i18n( "&Build Project" ), "make_tdevelop", Key_F8, - this, TQT_SLOT( slotBuild() ), + this, TQ_SLOT( slotBuild() ), actionCollection(), "build_build" ); action->setToolTip( i18n( "Build project" ) ); action->setWhatsThis( i18n( "<b>Build project</b><p>Runs <b>make</b> from the project directory.<br>" @@ -89,7 +89,7 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const "in the project settings dialog, <b>Build Options</b> tab." ) ); action = new TDEAction( i18n( "&Build Active Directory" ), "make_tdevelop", Key_F7, - this, TQT_SLOT( slotBuildActiveDir() ), + this, TQ_SLOT( slotBuildActiveDir() ), actionCollection(), "build_buildactivetarget" ); action->setToolTip( i18n( "Build active directory" ) ); action->setWhatsThis( i18n( "<b>Build active directory</b><p>Constructs a series of make commands to build the active directory. " @@ -97,7 +97,7 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const "in the project settings dialog, <b>Make Options</b> tab." ) ); action = new TDEAction( i18n( "Compile &File" ), "make_tdevelop", - this, TQT_SLOT( slotCompileFile() ), + this, TQ_SLOT( slotCompileFile() ), actionCollection(), "build_compilefile" ); action->setToolTip( i18n( "Compile file" ) ); action->setWhatsThis( i18n( "<b>Compile file</b><p>Runs <b>make filename.o</b> command from the directory where 'filename' is the name of currently opened file.<br>" @@ -105,7 +105,7 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const "in the project settings dialog, <b>Build Options</b> tab." ) ); action = new TDEAction( i18n( "Install" ), 0, - this, TQT_SLOT( slotInstall() ), + this, TQ_SLOT( slotInstall() ), actionCollection(), "build_install" ); action->setToolTip( i18n( "Install" ) ); action->setWhatsThis( i18n( "<b>Install</b><p>Runs <b>make install</b> command from the project directory.<br>" @@ -113,7 +113,7 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const "in the project settings dialog, <b>Make Options</b> tab." ) ); action = new TDEAction( i18n( "Install Active Directory" ), 0, - this, TQT_SLOT( slotInstallActiveDir() ), + this, TQ_SLOT( slotInstallActiveDir() ), actionCollection(), "build_installactivetarget" ); action->setToolTip( i18n( "Install active directory" ) ); action->setWhatsThis( i18n( "<b>Install active directory</b><p>Runs <b>make install</b> command from the active directory.<br>" @@ -121,7 +121,7 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const "in the project settings dialog, <b>Make Options</b> tab." ) ); action = new TDEAction( i18n( "Install (as root user)" ), 0, - this, TQT_SLOT( slotInstallWithKdesu() ), + this, TQ_SLOT( slotInstallWithKdesu() ), actionCollection(), "build_install_tdesu" ); action->setToolTip( i18n( "Install as root user" ) ); action->setWhatsThis( i18n( "<b>Install</b><p>Runs <b>make install</b> command from the project directory with root privileges.<br>" @@ -130,7 +130,7 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const "in the project settings dialog, <b>Make Options</b> tab." ) ); action = new TDEAction( i18n( "&Clean Project" ), 0, - this, TQT_SLOT( slotClean() ), + this, TQ_SLOT( slotClean() ), actionCollection(), "build_clean" ); action->setToolTip( i18n( "Clean project" ) ); action->setWhatsThis( i18n( "<b>Clean project</b><p>Runs <b>make clean</b> command from the project directory.<br>" @@ -138,7 +138,7 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const "in the project settings dialog, <b>Build Options</b> tab." ) ); action = new TDEAction( i18n( "Execute Program" ), "application-x-executable", 0, - this, TQT_SLOT( slotExecute() ), + this, TQ_SLOT( slotExecute() ), actionCollection(), "build_execute" ); action->setToolTip( i18n( "Execute program" ) ); action->setWhatsThis( i18n( "<b>Execute program</b><p>Executes the main program specified in project settings, <b>Run Options</b> tab. " @@ -162,27 +162,27 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const "Environment variables can be specified in the project " "settings dialog, <b>Build Options</b> tab." ) ); - connect( m_targetMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( updateTargetMenu() ) ); - connect( m_targetMenu, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( targetMenuActivated( int ) ) ); - connect( m_targetObjectFilesMenu, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( targetObjectFilesMenuActivated( int ) ) ); - connect( m_targetOtherFilesMenu, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( targetOtherFilesMenuActivated( int ) ) ); - connect( m_makeEnvironmentsSelector->popupMenu(), TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( updateMakeEnvironmentsMenu() ) ); - connect( m_makeEnvironmentsSelector->popupMenu(), TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( makeEnvironmentsMenuActivated( int ) ) ); - connect( core(), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), - this, TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); - connect( core(), TQT_SIGNAL( contextMenu( TQPopupMenu *, const Context * ) ), - this, TQT_SLOT( contextMenu( TQPopupMenu *, const Context * ) ) ); - - connect( makeFrontend(), TQT_SIGNAL( commandFinished( const TQString& ) ), - this, TQT_SLOT( slotCommandFinished( const TQString& ) ) ); - connect( makeFrontend(), TQT_SIGNAL( commandFailed( const TQString& ) ), - this, TQT_SLOT( slotCommandFailed( const TQString& ) ) ); + connect( m_targetMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( updateTargetMenu() ) ); + connect( m_targetMenu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( targetMenuActivated( int ) ) ); + connect( m_targetObjectFilesMenu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( targetObjectFilesMenuActivated( int ) ) ); + connect( m_targetOtherFilesMenu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( targetOtherFilesMenuActivated( int ) ) ); + connect( m_makeEnvironmentsSelector->popupMenu(), TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( updateMakeEnvironmentsMenu() ) ); + connect( m_makeEnvironmentsSelector->popupMenu(), TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( makeEnvironmentsMenuActivated( int ) ) ); + connect( core(), TQ_SIGNAL( projectConfigWidget( KDialogBase* ) ), + this, TQ_SLOT( projectConfigWidget( KDialogBase* ) ) ); + connect( core(), TQ_SIGNAL( contextMenu( TQPopupMenu *, const Context * ) ), + this, TQ_SLOT( contextMenu( TQPopupMenu *, const Context * ) ) ); + + connect( makeFrontend(), TQ_SIGNAL( commandFinished( const TQString& ) ), + this, TQ_SLOT( slotCommandFinished( const TQString& ) ) ); + connect( makeFrontend(), TQ_SIGNAL( commandFailed( const TQString& ) ), + this, TQ_SLOT( slotCommandFailed( const TQString& ) ) ); } @@ -195,26 +195,26 @@ void CustomProjectPart::projectConfigWidget( KDialogBase *dlg ) TQVBox *vbox; vbox = dlg->addVBoxPage( i18n( "Custom Manager" ), i18n( "Custom Manager" ), BarIcon( "text-x-makefile", TDEIcon::SizeMedium ) ); CustomManagerWidget *w0 = new CustomManagerWidget( this, vbox ); - connect( dlg, TQT_SIGNAL( okClicked() ), w0, TQT_SLOT( accept() ) ); + connect( dlg, TQ_SIGNAL( okClicked() ), w0, TQ_SLOT( accept() ) ); vbox = dlg->addVBoxPage( i18n( "Run Options" ), i18n( "Run Options" ), BarIcon( "text-x-makefile", TDEIcon::SizeMedium ) ); RunOptionsWidget *w1 = new RunOptionsWidget( *projectDom(), "/kdevcustomproject", buildDirectory(), vbox ); - connect( dlg, TQT_SIGNAL( okClicked() ), w1, TQT_SLOT( accept() ) ); + connect( dlg, TQ_SIGNAL( okClicked() ), w1, TQ_SLOT( accept() ) ); vbox = dlg->addVBoxPage( i18n( "Build Options" ), i18n( "Build Options" ), BarIcon( "text-x-makefile", TDEIcon::SizeMedium ) ); TQTabWidget *buildtab = new TQTabWidget( vbox ); CustomBuildOptionsWidget *w2 = new CustomBuildOptionsWidget( *projectDom(), buildtab ); - connect( dlg, TQT_SIGNAL( okClicked() ), w2, TQT_SLOT( accept() ) ); + connect( dlg, TQ_SIGNAL( okClicked() ), w2, TQ_SLOT( accept() ) ); buildtab->addTab( w2, i18n( "&Build" ) ); CustomOtherConfigWidget *w4 = new CustomOtherConfigWidget( this, "/kdevcustomproject", buildtab ); - connect( dlg, TQT_SIGNAL( okClicked() ), w4, TQT_SLOT( accept() ) ); + connect( dlg, TQ_SIGNAL( okClicked() ), w4, TQ_SLOT( accept() ) ); buildtab->addTab( w4, i18n( "&Other" ) ); CustomMakeConfigWidget *w3 = new CustomMakeConfigWidget( this, "/kdevcustomproject", buildtab ); buildtab->addTab( w3, i18n( "Ma&ke" ) ); w2->setMakeOptionsWidget( buildtab, w3, w4 ); - connect( dlg, TQT_SIGNAL( okClicked() ), w3, TQT_SLOT( accept() ) ); + connect( dlg, TQ_SIGNAL( okClicked() ), w3, TQ_SLOT( accept() ) ); } @@ -241,7 +241,7 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context m_contextDirName = fcontext->urls().first().path(); m_contextDirName = m_contextDirName.mid( project()->projectDirectory().length() + 1 ); int id = popup->insertItem( i18n( "Make Active Directory" ), - this, TQT_SLOT( slotChooseActiveDirectory() ) ); + this, TQ_SLOT( slotChooseActiveDirectory() ) ); popup->setWhatsThis( id, i18n( "<b>Make active directory</b><p>" "Chooses this directory as the destination for new files created using wizards " "like the <i>New Class</i> wizard." ) ); @@ -257,7 +257,7 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context if ( isInBlacklist( m_contextDirName ) ) { id = popup->insertItem( i18n( "Remove from blacklist" ), - this, TQT_SLOT( slotChangeBlacklist() ) ); + this, TQ_SLOT( slotChangeBlacklist() ) ); popup->setWhatsThis( id, i18n( "<b>Remove from blacklist</b><p>" "Removes the given file or directory from the " "blacklist if it is already in it.<br>The blacklist contains files and" @@ -267,7 +267,7 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context else { id = popup->insertItem( i18n( "Add to blacklist" ), - this, TQT_SLOT( slotChangeBlacklist() ) ); + this, TQ_SLOT( slotChangeBlacklist() ) ); popup->setWhatsThis( id, i18n( "<b>Add to blacklist</b><p>" "Adds the given file or directory to the blacklist.<br>The blacklist contains files and" " directories that should be ignored even if they match a project filetype " @@ -317,13 +317,13 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context if ( m_contextAddFiles.size() > 0 ) { int id = popup->insertItem( i18n( "Add Selected File/Dir(s) to Project" ), - this, TQT_SLOT( slotAddToProject() ) ); + this, TQ_SLOT( slotAddToProject() ) ); popup->setWhatsThis( id, i18n( "<b>Add to project</b><p>Adds selected file/dir(s) to the list of files in the project. " "Note that the files should be manually added to the corresponding makefile or build.xml." ) ); if ( dirAddRecursive ) { int id = popup->insertItem( i18n( "Add Selected Dir(s) to Project (recursive)" ), - this, TQT_SLOT( slotAddToProjectRecursive() ) ); + this, TQ_SLOT( slotAddToProjectRecursive() ) ); popup->setWhatsThis( id, i18n( "<b>Add to project</b><p>Recursively adds selected dir(s) to the list of files in the project. " "Note that the files should be manually added to the corresponding makefile or build.xml." ) ); } @@ -332,14 +332,14 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context if ( m_contextRemoveFiles.size() > 0 ) { int id = popup->insertItem( i18n( "Remove Selected File/Dir(s) From Project" ), - this, TQT_SLOT( slotRemoveFromProject() ) ); + this, TQ_SLOT( slotRemoveFromProject() ) ); popup->setWhatsThis( id, i18n( "<b>Remove from project</b><p>Removes selected file/dir(s) from the list of files in the project. " "Note that the files should be manually excluded from the corresponding makefile or build.xml." ) ); if ( dirDelRecursive ) { int id = popup->insertItem( i18n( "Remove Selected Dir(s) From Project (recursive)" ), - this, TQT_SLOT( slotRemoveFromProjectRecursive() ) ); + this, TQ_SLOT( slotRemoveFromProjectRecursive() ) ); popup->setWhatsThis( id, i18n( "<b>Remove from project</b><p>Recursively removes selected dir(s) from the list of files in the project. " "Note that the files should be manually excluded from the corresponding makefile or build.xml." ) ); } diff --git a/buildtools/custommakefiles/customprojectpart.h b/buildtools/custommakefiles/customprojectpart.h index b6cb6fe5..b505847c 100644 --- a/buildtools/custommakefiles/customprojectpart.h +++ b/buildtools/custommakefiles/customprojectpart.h @@ -32,7 +32,7 @@ class TDESelectAction; class CustomProjectPart : public KDevBuildTool { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/custommakefiles/selectnewfilesdialog.h b/buildtools/custommakefiles/selectnewfilesdialog.h index 446936ac..5c226f41 100644 --- a/buildtools/custommakefiles/selectnewfilesdialog.h +++ b/buildtools/custommakefiles/selectnewfilesdialog.h @@ -20,7 +20,7 @@ class SelectNewFilesDialogBase; class SelectNewFilesDialog : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/buildtools/lib/parsers/autotools/autotools.yy b/buildtools/lib/parsers/autotools/autotools.yy index d76cc5fe..c40e9c5b 100644 --- a/buildtools/lib/parsers/autotools/autotools.yy +++ b/buildtools/lib/parsers/autotools/autotools.yy @@ -49,7 +49,7 @@ struct Result { Result(): node(0) {} /**Type of semantic value for simple grammar rules.*/ - QString value; + TQString value; /**Type of semantic value for grammar rules which are parts of AST.*/ AST *node; /**Type of semantic value for "multiline_values" grammar rule. diff --git a/buildtools/lib/parsers/autotools/tests/viewer.h b/buildtools/lib/parsers/autotools/tests/viewer.h index ea300158..bb4a1a2a 100644 --- a/buildtools/lib/parsers/autotools/tests/viewer.h +++ b/buildtools/lib/parsers/autotools/tests/viewer.h @@ -29,7 +29,7 @@ namespace AutoTools { class ProjectAST; } class TQListViewItem; class Viewer: public ViewerBase { -Q_OBJECT +TQ_OBJECT public: Viewer(TQWidget *parent = 0, const char *name = 0); diff --git a/buildtools/lib/parsers/autotools/tests/viewerbase.ui b/buildtools/lib/parsers/autotools/tests/viewerbase.ui index 3fb32462..139f1908 100644 --- a/buildtools/lib/parsers/autotools/tests/viewerbase.ui +++ b/buildtools/lib/parsers/autotools/tests/viewerbase.ui @@ -210,11 +210,11 @@ <slot>tabWidget2_selected(const TQString&)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>addAll_clicked()</slot> <slot>choose_clicked()</slot> <slot>files_currentChanged(TQListBoxItem*)</slot> <slot>tabWidget2_selected(const TQString&)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/buildtools/lib/parsers/qmake/qmake.ll b/buildtools/lib/parsers/qmake/qmake.ll index a0289f6e..14d5e777 100644 --- a/buildtools/lib/parsers/qmake/qmake.ll +++ b/buildtools/lib/parsers/qmake/qmake.ll @@ -81,29 +81,29 @@ cont \\{ws}*{newline} <INITIAL>{ws} {} <vallist>{ws} { - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::LIST_WS; } <vallist,INITIAL>{cont} { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::CONT; } <vallist,INITIAL>{comment_cont} { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::COMMENT_CONT; } {id_simple} { - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return (Parser::token::token::ID_SIMPLE); } <funcargs>{id_args} { - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); mylval->value = mylval->value.mid(0, mylval->value.length()-1); unput(')'); BEGIN(INITIAL); @@ -112,43 +112,43 @@ cont \\{ws}*{newline} <vallist>{var_value} { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::VARIABLE_VALUE; } <vallist>{quoted_var_value} { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::QUOTED_VARIABLE_VALUE; } "=" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::EQ; } "+=" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::PLUSEQ; } "-=" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::MINUSEQ; } "*=" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::STAREQ; } "~=" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::TILDEEQ; } @@ -175,28 +175,28 @@ cont \\{ws}*{newline} } ":" { - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::COLON; } <vallist>{ws}{newline} { BEGIN(INITIAL); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); setLineEndingFromString( mylval->value ); return Parser::token::token::NEWLINE; } <vallist,INITIAL>{newline} { BEGIN(INITIAL); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); setLineEndingFromString( mylval->value ); return Parser::token::token::NEWLINE; } <vallist,INITIAL>{comment} { BEGIN(INITIAL); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return (Parser::token::token::COMMENT); } @@ -214,7 +214,7 @@ namespace QMake return yylex(); } - void Lexer::setLineEndingFromString( const QString& str ) + void Lexer::setLineEndingFromString( const TQString& str ) { if( str.endsWith("\r\n") && m_lineEnding == None ) m_lineEnding = Windows; diff --git a/buildtools/lib/parsers/qmake/qmake.yy b/buildtools/lib/parsers/qmake/qmake.yy index 2c3e866d..83cb60c8 100644 --- a/buildtools/lib/parsers/qmake/qmake.yy +++ b/buildtools/lib/parsers/qmake/qmake.yy @@ -51,7 +51,7 @@ struct Result { Result(): node(0) {} /**Type of semantic value for simple grammar rules.*/ - QString value; + TQString value; /**Type of semantic value for grammar rules which are parts of AST.*/ AST *node; /**Type of semantic value for "multiline_values" grammar rule. @@ -71,7 +71,7 @@ struct Result { </pre> */ QStringList values; - QString indent; + TQString indent; }; #define YYSTYPE Result @@ -310,8 +310,8 @@ listws: LIST_WS } | { - $<value>$ = QString(); - $<indent>$ = QString(); + $<value>$ = TQString(); + $<indent>$ = TQString(); } ; operator : EQ diff --git a/buildtools/lib/parsers/qmake/tests/viewer.h b/buildtools/lib/parsers/qmake/tests/viewer.h index 86fe70fe..996b8f46 100644 --- a/buildtools/lib/parsers/qmake/tests/viewer.h +++ b/buildtools/lib/parsers/qmake/tests/viewer.h @@ -31,7 +31,7 @@ class ProjectAST; class TQListViewItem; class Viewer: public ViewerBase { -Q_OBJECT +TQ_OBJECT public: Viewer(TQWidget *parent = 0, const char *name = 0); diff --git a/buildtools/lib/parsers/qmake/tests/viewerbase.ui b/buildtools/lib/parsers/qmake/tests/viewerbase.ui index ad580b4c..970f6ee8 100644 --- a/buildtools/lib/parsers/qmake/tests/viewerbase.ui +++ b/buildtools/lib/parsers/qmake/tests/viewerbase.ui @@ -240,11 +240,11 @@ <slot>tabWidget2_selected(const TQString&)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>addAll_clicked()</slot> <slot>choose_clicked()</slot> <slot>files_currentChanged( TQListBoxItem * )</slot> <slot>tabWidget2_selected( const TQString & )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/buildtools/lib/widgets/addenvvardlg.cpp b/buildtools/lib/widgets/addenvvardlg.cpp index 8681e0d7..9e7c08b6 100644 --- a/buildtools/lib/widgets/addenvvardlg.cpp +++ b/buildtools/lib/widgets/addenvvardlg.cpp @@ -38,13 +38,13 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name) varname_edit->setFocus(); varname_label->setBuddy(varname_edit); - connect( varname_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) ); + connect( varname_edit, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotTextChanged() ) ); TQLabel *value_label = new TQLabel(i18n("&Value:"), this); value_edit = new KLineEdit(this); value_label->setBuddy(value_edit); TQFontMetrics fm(value_edit->fontMetrics()); value_edit->setMinimumWidth(fm.width('X')*35); - connect( value_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) ); + connect( value_edit, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotTextChanged() ) ); TQVBoxLayout *layout = new TQVBoxLayout(this, 10); @@ -65,8 +65,8 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name) m_pOk = buttonbox->addButton( KStdGuiItem::ok()); TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); m_pOk->setDefault(true); - connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); - connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); + connect( m_pOk, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); + connect( cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) ); buttonbox->layout(); layout->addWidget(buttonbox, 0); slotTextChanged(); diff --git a/buildtools/lib/widgets/addenvvardlg.h b/buildtools/lib/widgets/addenvvardlg.h index 9069f493..d4afadf6 100644 --- a/buildtools/lib/widgets/addenvvardlg.h +++ b/buildtools/lib/widgets/addenvvardlg.h @@ -29,7 +29,7 @@ Dialog to add environment variables. */ class AddEnvvarDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/lib/widgets/addfilesdialog.cpp b/buildtools/lib/widgets/addfilesdialog.cpp index f02d5b56..64bb9471 100644 --- a/buildtools/lib/widgets/addfilesdialog.cpp +++ b/buildtools/lib/widgets/addfilesdialog.cpp @@ -36,7 +36,7 @@ AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter, m_extraWidget->insertItem(i18n("Create Symbolic Link(s)"), 1); m_extraWidget->insertItem(i18n("Add Relative Path(s)"), 2); m_extraWidget->setCurrentItem(config->readNumEntry("Mode")); - connect(m_extraWidget, TQT_SIGNAL(activated(int)), this, TQT_SLOT(storePreferred(int))); + connect(m_extraWidget, TQ_SIGNAL(activated(int)), this, TQ_SLOT(storePreferred(int))); setPreviewWidget(m_extraWidget); @@ -55,7 +55,7 @@ AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter, m_extraWidget->insertItem(i18n("Create Symbolic Link(s)"), 1); m_extraWidget->insertItem(i18n("Add Relative Path(s)"), 2); m_extraWidget->setCurrentItem(config->readNumEntry("Mode")); - connect(m_extraWidget, TQT_SIGNAL(activated(int)), this, TQT_SLOT(storePreferred(int))); + connect(m_extraWidget, TQ_SIGNAL(activated(int)), this, TQ_SLOT(storePreferred(int))); setOperationMode(Opening); } diff --git a/buildtools/lib/widgets/addfilesdialog.h b/buildtools/lib/widgets/addfilesdialog.h index 8a7ed5c9..e2b8b5cd 100644 --- a/buildtools/lib/widgets/addfilesdialog.h +++ b/buildtools/lib/widgets/addfilesdialog.h @@ -33,7 +33,7 @@ with the relative path (e.g. ../../dir/filename) */ class AddFilesDialog : public KFileDialog { - Q_OBJECT + TQ_OBJECT public: enum Mode { Copy, Link, Relative }; diff --git a/buildtools/lib/widgets/environmentdisplaydialog.h b/buildtools/lib/widgets/environmentdisplaydialog.h index 28af5c6a..46b4bdb8 100644 --- a/buildtools/lib/widgets/environmentdisplaydialog.h +++ b/buildtools/lib/widgets/environmentdisplaydialog.h @@ -25,7 +25,7 @@ class EnvironmentDisplayDialog : public EnvironmentDisplayDialogBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/buildtools/lib/widgets/environmentvariableswidget.cpp b/buildtools/lib/widgets/environmentvariableswidget.cpp index 3c3e448f..cf06d012 100644 --- a/buildtools/lib/widgets/environmentvariableswidget.cpp +++ b/buildtools/lib/widgets/environmentvariableswidget.cpp @@ -72,7 +72,7 @@ EnvironmentVariablesWidget::EnvironmentVariablesWidget(TQDomDocument &dom, const m_dom(dom), m_configGroup(configGroup) { readEnvironment(dom, configGroup); - connect( listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( editVarClicked() ) ); + connect( listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), this, TQ_SLOT( editVarClicked() ) ); } diff --git a/buildtools/lib/widgets/environmentvariableswidget.h b/buildtools/lib/widgets/environmentvariableswidget.h index c49badc3..c9c9946e 100644 --- a/buildtools/lib/widgets/environmentvariableswidget.h +++ b/buildtools/lib/widgets/environmentvariableswidget.h @@ -30,7 +30,7 @@ Environment variables widget. */ class EnvironmentVariablesWidget : public EnvironmentVariablesWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/lib/widgets/environmentvariableswidgetbase.ui b/buildtools/lib/widgets/environmentvariableswidgetbase.ui index e7246de3..53605001 100644 --- a/buildtools/lib/widgets/environmentvariableswidgetbase.ui +++ b/buildtools/lib/widgets/environmentvariableswidgetbase.ui @@ -189,12 +189,12 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot>addVarClicked()</slot> <slot>removeVarClicked()</slot> <slot>editVarClicked()</slot> <slot>environmentClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/buildtools/lib/widgets/makeoptionswidget.cpp b/buildtools/lib/widgets/makeoptionswidget.cpp index ef901cc8..c15b5a7a 100644 --- a/buildtools/lib/widgets/makeoptionswidget.cpp +++ b/buildtools/lib/widgets/makeoptionswidget.cpp @@ -33,7 +33,7 @@ MakeOptionsWidget::MakeOptionsWidget(TQDomDocument &dom, const TQString &configG : MakeOptionsWidgetBase(parent, name), m_dom(dom), m_configGroup(configGroup) { - env_var_group->setColumnLayout( 1, Qt::Vertical ); + env_var_group->setColumnLayout( 1, TQt::Vertical ); m_environmentVariablesWidget = new EnvironmentVariablesWidget( dom, configGroup + "/make/envvars", env_var_group ); abort_box->setChecked(DomUtil::readBoolEntry(dom, configGroup + "/make/abortonerror", true )); diff --git a/buildtools/lib/widgets/makeoptionswidget.h b/buildtools/lib/widgets/makeoptionswidget.h index bc4f8878..4a44c437 100644 --- a/buildtools/lib/widgets/makeoptionswidget.h +++ b/buildtools/lib/widgets/makeoptionswidget.h @@ -31,7 +31,7 @@ Make options widget. */ class MakeOptionsWidget : public MakeOptionsWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/lib/widgets/removesubprojectdialog.h b/buildtools/lib/widgets/removesubprojectdialog.h index 89426eb8..7de20af3 100644 --- a/buildtools/lib/widgets/removesubprojectdialog.h +++ b/buildtools/lib/widgets/removesubprojectdialog.h @@ -27,7 +27,7 @@ Subproject removal dialog. */ class RemoveSubprojectDialog : public RemoveSubprojectDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/lib/widgets/removesubprojectdlgbase.ui b/buildtools/lib/widgets/removesubprojectdlgbase.ui index d5206ac6..c9300c18 100644 --- a/buildtools/lib/widgets/removesubprojectdlgbase.ui +++ b/buildtools/lib/widgets/removesubprojectdlgbase.ui @@ -145,10 +145,10 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot>accept()</slot> <slot>reject()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/buildtools/lib/widgets/runoptionswidget.cpp b/buildtools/lib/widgets/runoptionswidget.cpp index 6836ee77..717e9573 100644 --- a/buildtools/lib/widgets/runoptionswidget.cpp +++ b/buildtools/lib/widgets/runoptionswidget.cpp @@ -44,7 +44,7 @@ RunOptionsWidget::RunOptionsWidget(TQDomDocument &dom, const TQString &configGro m_dom(dom), m_configGroup(configGroup) { // Create the "Environment Variables" GUI - env_var_group->setColumnLayout( 1, Qt::Vertical ); + env_var_group->setColumnLayout( 1, TQt::Vertical ); m_environmentVariablesWidget = new EnvironmentVariablesWidget( dom, configGroup + "/run/envvars", env_var_group ); mainprogram_edit->completionObject()->setMode(KURLCompletion::FileCompletion); diff --git a/buildtools/lib/widgets/runoptionswidget.h b/buildtools/lib/widgets/runoptionswidget.h index f38c4a9e..2eaa8740 100644 --- a/buildtools/lib/widgets/runoptionswidget.h +++ b/buildtools/lib/widgets/runoptionswidget.h @@ -32,7 +32,7 @@ Run options widget. */ class RunOptionsWidget : public RunOptionsWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/lib/widgets/runoptionswidgetbase.ui b/buildtools/lib/widgets/runoptionswidgetbase.ui index 404af030..27ce6736 100644 --- a/buildtools/lib/widgets/runoptionswidgetbase.ui +++ b/buildtools/lib/widgets/runoptionswidgetbase.ui @@ -235,9 +235,9 @@ <tabstop>startinterminal_box</tabstop> <tabstop>autocompile_box</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>mainProgramChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/lib/widgets/subclassesdlg.h b/buildtools/lib/widgets/subclassesdlg.h index 373ce267..75ced25b 100644 --- a/buildtools/lib/widgets/subclassesdlg.h +++ b/buildtools/lib/widgets/subclassesdlg.h @@ -27,7 +27,7 @@ Subclass creation dialog. */ class SubclassesDlg : public SubclassesDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/lib/widgets/subclassesdlgbase.ui b/buildtools/lib/widgets/subclassesdlgbase.ui index a87cbd34..22873790 100644 --- a/buildtools/lib/widgets/subclassesdlgbase.ui +++ b/buildtools/lib/widgets/subclassesdlgbase.ui @@ -205,12 +205,12 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">changeCurrentURL(const TQString &str)</slot> <slot access="protected">removeRelation()</slot> <slot access="protected">newRelation()</slot> <slot access="protected">currentRelationChanged(TQListBoxItem *item)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/pascal/pascalglobaloptionsdlg.h b/buildtools/pascal/pascalglobaloptionsdlg.h index 5e6e3d23..18be3ebc 100644 --- a/buildtools/pascal/pascalglobaloptionsdlg.h +++ b/buildtools/pascal/pascalglobaloptionsdlg.h @@ -21,7 +21,7 @@ class PascalProjectPart; class PascalGlobalOptionsDlg : public PascalProjectOptionsDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/pascal/pascalproject_optionsdlgbase.ui b/buildtools/pascal/pascalproject_optionsdlgbase.ui index a6f9321c..3ec7662d 100644 --- a/buildtools/pascal/pascalproject_optionsdlgbase.ui +++ b/buildtools/pascal/pascalproject_optionsdlgbase.ui @@ -450,7 +450,7 @@ <tabstop>addconfig_button</tabstop> <tabstop>removeconfig_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">compiler_box_activated(const TQString&)</slot> <slot access="protected">addconfig_button_clicked()</slot> <slot access="protected">configRemoved()</slot> @@ -460,7 +460,7 @@ <slot access="protected">configAdded()</slot> <slot access="protected">setDirty()</slot> <slot access="protected">setDefaultOptions()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp index d4670adb..63f5e42d 100644 --- a/buildtools/pascal/pascalproject_part.cpp +++ b/buildtools/pascal/pascalproject_part.cpp @@ -60,23 +60,23 @@ PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const T TDEAction *action; action = new TDEAction( i18n("&Build Project"), "make_tdevelop", Key_F8, - this, TQT_SLOT(slotBuild()), + this, TQ_SLOT(slotBuild()), actionCollection(), "build_build" ); action->setToolTip(i18n("Build project")); action->setWhatsThis(i18n("<b>Build project</b><p>Runs the compiler on a main source file of the project. " "The compiler and the main source file can be set in project settings, <b>Pascal Compiler</b> tab.")); action = new TDEAction( i18n("Execute Program"), "application-x-executable", 0, - this, TQT_SLOT(slotExecute()), + this, TQ_SLOT(slotExecute()), actionCollection(), "build_execute" ); action->setToolTip(i18n("Execute program")); action->setWhatsThis(i18n("<b>Execute program</b><p>Executes the main program specified in project settings, <b>Run options</b> tab. " "If nothing is set, the binary file with the same name as the main source file name is executed.")); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), - this, TQT_SLOT(configWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), + this, TQ_SLOT(configWidget(KDialogBase*)) ); // m_widget = new PascalProjectWidget(this); @@ -397,12 +397,12 @@ void PascalProjectPart::projectConfigWidget( KDialogBase * dlg ) TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Pascal Compiler")); PascalProjectOptionsDlg *w = new PascalProjectOptionsDlg(this, vbox); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); - connect( dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(loadProjectConfig()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(loadProjectConfig()) ); vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "text-x-makefile", TDEIcon::SizeMedium )); RunOptionsWidget *w3 = new RunOptionsWidget(*projectDom(), "/kdevpascalproject", buildDirectory(), vbox); - connect( dlg, TQT_SIGNAL(okClicked()), w3, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w3, TQ_SLOT(accept()) ); } @@ -433,7 +433,7 @@ void PascalProjectPart::configWidget( KDialogBase * dlg ) TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Pascal Compiler")); PascalGlobalOptionsDlg *w = new PascalGlobalOptionsDlg(this, vbox); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &name) diff --git a/buildtools/pascal/pascalproject_part.h b/buildtools/pascal/pascalproject_part.h index 54d09b2e..55d98c96 100644 --- a/buildtools/pascal/pascalproject_part.h +++ b/buildtools/pascal/pascalproject_part.h @@ -21,7 +21,7 @@ class KDevCompilerOptions; class PascalProjectPart : public KDevBuildTool { - Q_OBJECT + TQ_OBJECT public: PascalProjectPart(TQObject *parent, const char *name, const TQStringList &); diff --git a/buildtools/pascal/pascalproject_widget.h b/buildtools/pascal/pascalproject_widget.h index 252c7500..1d94652a 100644 --- a/buildtools/pascal/pascalproject_widget.h +++ b/buildtools/pascal/pascalproject_widget.h @@ -12,7 +12,7 @@ class PascalProjectPart; class PascalProjectWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/pascal/pascalprojectoptionsdlg.cpp b/buildtools/pascal/pascalprojectoptionsdlg.cpp index 9c7c2518..1b96d072 100644 --- a/buildtools/pascal/pascalprojectoptionsdlg.cpp +++ b/buildtools/pascal/pascalprojectoptionsdlg.cpp @@ -29,7 +29,7 @@ PascalProjectOptionsDlg::PascalProjectOptionsDlg(PascalProjectPart *part, TQWidget* parent, const char* name, WFlags fl) : PascalProjectOptionsDlgBase(parent,name, fl), m_part(part) { - config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this))); + config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this)); offers = TDETrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Pascal'"); diff --git a/buildtools/pascal/pascalprojectoptionsdlg.h b/buildtools/pascal/pascalprojectoptionsdlg.h index acedb14d..78698a45 100644 --- a/buildtools/pascal/pascalprojectoptionsdlg.h +++ b/buildtools/pascal/pascalprojectoptionsdlg.h @@ -20,7 +20,7 @@ class KDevCompilerOptions; class PascalProjectOptionsDlg : public PascalProjectOptionsDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/qmake/choosesubprojectdlg.cpp b/buildtools/qmake/choosesubprojectdlg.cpp index 22388b2d..f61caaf6 100644 --- a/buildtools/qmake/choosesubprojectdlg.cpp +++ b/buildtools/qmake/choosesubprojectdlg.cpp @@ -18,7 +18,7 @@ ChooseSubprojectDlg::ChooseSubprojectDlg(TrollProjectWidget *widget, TQWidget* parent, const char* name, bool modal, WFlags fl) : ChooseSubprojectDlgBase(parent,name, modal,fl), m_widget(widget) { - connect(subprojects_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(itemSelected(TQListViewItem *))); + connect(subprojects_view, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(itemSelected(TQListViewItem *))); if( m_widget->m_rootSubproject) { ChooseItem *it = new ChooseItem(m_widget->m_rootSubproject, subprojects_view, m_widget->m_rootSubproject->text(0)); diff --git a/buildtools/qmake/choosesubprojectdlg.h b/buildtools/qmake/choosesubprojectdlg.h index d2759adb..e9daf2e1 100644 --- a/buildtools/qmake/choosesubprojectdlg.h +++ b/buildtools/qmake/choosesubprojectdlg.h @@ -33,7 +33,7 @@ private: class ChooseSubprojectDlg : public ChooseSubprojectDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/qmake/choosesubprojectdlgbase.ui b/buildtools/qmake/choosesubprojectdlgbase.ui index 854966b3..cd595be1 100644 --- a/buildtools/qmake/choosesubprojectdlgbase.ui +++ b/buildtools/qmake/choosesubprojectdlgbase.ui @@ -60,9 +60,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -77,9 +74,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/buildtools/qmake/createscopedlg.h b/buildtools/qmake/createscopedlg.h index bac4ded6..30f72b59 100644 --- a/buildtools/qmake/createscopedlg.h +++ b/buildtools/qmake/createscopedlg.h @@ -19,7 +19,7 @@ class TrollProjectWigdet; class CreateScopeDlg : public CreateScopeDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/qmake/disablesubprojectdlg.h b/buildtools/qmake/disablesubprojectdlg.h index 0dec8e94..aa876866 100644 --- a/buildtools/qmake/disablesubprojectdlg.h +++ b/buildtools/qmake/disablesubprojectdlg.h @@ -16,7 +16,7 @@ class DisableSubprojectDlg : public DisableSubprojectDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/qmake/disablesubprojectdlgbase.ui b/buildtools/qmake/disablesubprojectdlgbase.ui index 2adc1544..1d522c84 100644 --- a/buildtools/qmake/disablesubprojectdlgbase.ui +++ b/buildtools/qmake/disablesubprojectdlgbase.ui @@ -90,9 +90,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/buildtools/qmake/newwidgetdlgbase.ui b/buildtools/qmake/newwidgetdlgbase.ui index 84d552b2..fde51b13 100644 --- a/buildtools/qmake/newwidgetdlgbase.ui +++ b/buildtools/qmake/newwidgetdlgbase.ui @@ -216,10 +216,10 @@ <tabstop>okayButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>subclassingPressed()</slot> <slot>templateSelChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/qmake/projectconfigurationdlg.cpp b/buildtools/qmake/projectconfigurationdlg.cpp index fec743cb..dd86a06a 100644 --- a/buildtools/qmake/projectconfigurationdlg.cpp +++ b/buildtools/qmake/projectconfigurationdlg.cpp @@ -106,7 +106,7 @@ ProjectConfigurationDlg::ProjectConfigurationDlg( TQListView *_prjList, TrollPro prjWidget = _prjWidget; // m_projectConfiguration = conf; m_targetLibraryVersion->setValidator( new TQRegExpValidator( - TQRegExp( "\\d+(\\.\\d+)?(\\.\\d+)" ), TQT_TQOBJECT(this) ) ); + TQRegExp( "\\d+(\\.\\d+)?(\\.\\d+)" ), this ) ); customVariables->setSortColumn(0); customVariables->setSortOrder(TQt::Ascending); mocdir_url->completionObject()->setMode(KURLCompletion::DirCompletion); @@ -327,89 +327,6 @@ void ProjectConfigurationDlg::updateProjectConfiguration() else myProjectItem->removeValue( "CONFIG", "windows" ); - //TQt4 libs - if ( prjWidget->m_part->isTQt4Project() ) - { - if ( checkDebugReleaseMode->isChecked() ) - myProjectItem->addValue( "CONFIG", "debug_and_release" ); - else - myProjectItem->removeValue( "CONFIG", "debug_and_release" ); - - if ( checkTestlib->isChecked() ) - myProjectItem->addValue( "CONFIG", "qtestlib" ); - else - myProjectItem->removeValue( "CONFIG", "qtestlib" ); - if ( checkAssistant->isChecked() ) - myProjectItem->addValue( "CONFIG", "assistant" ); - else - myProjectItem->removeValue( "CONFIG", "assistant" ); - if ( checkUiTools->isChecked() ) - myProjectItem->addValue( "CONFIG", "uitools" ); - else - myProjectItem->removeValue( "CONFIG", "uitools" ); - if ( checkQDBus->isChecked() ) - myProjectItem->addValue( "CONFIG", "dbus" ); - else - myProjectItem->removeValue( "CONFIG", "dbus" ); - if ( checkBuildAll->isChecked() ) - myProjectItem->addValue( "CONFIG", "build_all" ); - else - myProjectItem->removeValue( "CONFIG", "build_all" ); - if ( checkQtHelp->isChecked() ) - myProjectItem->addValue( "CONFIG", "help" ); - else - myProjectItem->removeValue( "CONFIG", "help" ); - - if ( checkQt4Core->isChecked() ) - myProjectItem->addValue( "QT", "core" ); - else - myProjectItem->removeValue( "QT", "core" ); - if ( checkQt4Gui->isChecked() ) - myProjectItem->addValue( "QT", "gui" ); - else - myProjectItem->removeValue( "QT", "gui" ); - if ( checkQt4SQL->isChecked() ) - myProjectItem->addValue( "QT", "sql" ); - else - myProjectItem->removeValue( "QT", "sql" ); - if ( checkQt4SVG->isChecked() ) - myProjectItem->addValue( "QT", "svg" ); - else - myProjectItem->removeValue( "QT", "svg" ); - if ( checkQt4XML->isChecked() ) - myProjectItem->addValue( "QT", "xml" ); - else - myProjectItem->removeValue( "QT", "xml" ); - if ( checkQt4Network->isChecked() ) - myProjectItem->addValue( "QT", "network" ); - else - myProjectItem->removeValue( "QT", "network" ); - if ( checkQt3Support->isChecked() ) - myProjectItem->addValue( "QT", "qt3support" ); - else - myProjectItem->removeValue( "QT", "qt3support" ); - if ( checkQt4OpenGL->isChecked() ) - myProjectItem->addValue( "QT", "opengl" ); - else - myProjectItem->removeValue( "QT", "opengl" ); - if ( checkQtScript->isChecked() ) - myProjectItem->addValue( "QT", "script" ); - else - myProjectItem->removeValue( "QT", "script" ); - if ( checkQtWebKit->isChecked() ) - myProjectItem->addValue( "QT", "webkit" ); - else - myProjectItem->removeValue( "QT", "webkit" ); - if ( checkQtXmlPatterns->isChecked() ) - myProjectItem->addValue( "QT", "xmlpatterns" ); - else - myProjectItem->removeValue( "QT", "xmlpatterns" ); - if ( checkPhonon->isChecked() ) - myProjectItem->addValue( "QT", "phonon" ); - else - myProjectItem->removeValue( "QT", "phonon" ); - } - TQStringList confValues = myProjectItem->scope->variableValues( "CONFIG" ); TQStringList extraValues = TQStringList::split( " ", editConfigExtra->text() ); for ( TQStringList::iterator it = confValues.begin() ; it != confValues.end() ; ++it ) @@ -667,8 +584,6 @@ void ProjectConfigurationDlg::updateControls() { sharedRadio->setChecked( true ); checkPlugin->setEnabled( true ); - if( prjWidget->m_part->isTQt4Project() ) - checkDesigner->setEnabled( true ); m_targetLibraryVersion->setText( myProjectItem->scope->variableValues( "VERSION" ).front() ); } else @@ -805,92 +720,6 @@ void ProjectConfigurationDlg::updateControls() else checkWindows->setChecked( false ); - //TQt4 libs - if ( prjWidget->m_part->isTQt4Project() ) - { - - if ( configValues.findIndex( "assistant" ) != -1 ) - checkAssistant->setChecked( true ); - else - checkAssistant->setChecked( false ); - if ( configValues.findIndex( "qtestlib" ) != -1 ) - checkTestlib->setChecked( true ); - else - checkTestlib->setChecked( false ); - if ( configValues.findIndex( "uitools" ) != -1 ) - checkUiTools->setChecked( true ); - else - checkUiTools->setChecked( false ); - if ( configValues.findIndex( "dbus" ) != -1 ) - checkQDBus->setChecked( true ); - else - checkQDBus->setChecked( false ); - if ( configValues.findIndex( "build_all" ) != -1 ) - checkBuildAll->setChecked( true ); - else - checkBuildAll->setChecked( false ); - if ( configValues.findIndex( "help" ) != -1 ) - checkQtHelp->setChecked( true ); - else - checkQtHelp->setChecked( false ); - - TQStringList qtLibs = myProjectItem->scope->variableValues( "QT" ); - if ( qtLibs.findIndex( "core" ) != -1 ) - checkQt4Core->setChecked( true ); - else - checkQt4Core->setChecked( false ); - if ( qtLibs.findIndex( "gui" ) != -1 ) - checkQt4Gui->setChecked( true ); - else - checkQt4Gui->setChecked( false ); - if ( qtLibs.findIndex( "sql" ) != -1 ) - checkQt4SQL->setChecked( true ); - else - checkQt4SQL->setChecked( false ); - if ( qtLibs.findIndex( "xml" ) != -1 ) - checkQt4XML->setChecked( true ); - else - checkQt4XML->setChecked( false ); - if ( qtLibs.findIndex( "network" ) != -1 ) - checkQt4Network->setChecked( true ); - else - checkQt4Network->setChecked( false ); - if ( qtLibs.findIndex( "svg" ) != -1 ) - checkQt4SVG->setChecked( true ); - else - checkQt4SVG->setChecked( false ); - if ( qtLibs.findIndex( "opengl" ) != -1 ) - checkQt4OpenGL->setChecked( true ); - else - checkQt4OpenGL->setChecked( false ); - if ( qtLibs.findIndex( "qt3support" ) != -1 ) - checkQt3Support->setChecked( true ); - else - checkQt3Support->setChecked( false ); - if ( qtLibs.findIndex( "script" ) != -1 ) - checkQtScript->setChecked( true ); - else - checkQtScript->setChecked( false ); - if ( qtLibs.findIndex( "phonon" ) != -1 ) - checkPhonon->setChecked( true ); - else - checkPhonon->setChecked( false ); - if ( qtLibs.findIndex( "webkit" ) != -1 ) - checkQtWebKit->setChecked( true ); - else - checkQtWebKit->setChecked( false ); - if ( qtLibs.findIndex( "xmlpatterns" ) != -1 ) - checkQtXmlPatterns->setChecked( true ); - else - checkQtXmlPatterns->setChecked( false ); - - checkDebugReleaseMode->setEnabled( true ); - checkBuildAll->setEnabled( true ); - groupQt4Libs->setEnabled( checkQt->isChecked() ); - rccdir_url->setEnabled( true ); - rccdir_label->setEnabled( true ); - } - //fill the custom config edit TQStringList extraValues; for ( TQStringList::const_iterator it = configValues.begin() ; it != configValues.end() ; ++it ) @@ -1882,10 +1711,6 @@ void ProjectConfigurationDlg::groupLibrariesChanged( int ) checkPlugin->setEnabled( true ); checkDesigner->setEnabled( checkPlugin->isChecked() ); } - else if ( checkPlugin->isChecked() && prjWidget->m_part->isTQt4Project() ) - { - checkDesigner->setEnabled( true ); - } else { checkDesigner->setEnabled( false ); @@ -1978,14 +1803,6 @@ void ProjectConfigurationDlg::groupTemplateChanged( int ) void ProjectConfigurationDlg::groupRequirementsChanged( int ) { - if ( checkQt->isChecked() && prjWidget->m_part->isTQt4Project() ) - { - groupQt4Libs->setEnabled( true ); - } - else - { - groupQt4Libs->setEnabled( false ); - } activateApply( 0 ); } diff --git a/buildtools/qmake/projectconfigurationdlgbase.ui b/buildtools/qmake/projectconfigurationdlgbase.ui index 686240fe..d809814d 100644 --- a/buildtools/qmake/projectconfigurationdlgbase.ui +++ b/buildtools/qmake/projectconfigurationdlgbase.ui @@ -415,9 +415,6 @@ <property name="text"> <string>Debug && Release</string> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>Set project to be built in debug_and_release mode</string> </property> @@ -579,9 +576,6 @@ <property name="text"> <string>Console</string> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>Check to build a win32 console app</string> </property> @@ -590,164 +584,6 @@ </widget> <widget class="TQButtonGroup"> <property name="name"> - <cstring>groupQt4Libs</cstring> - </property> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="title"> - <string>Qt4 Libraries</string> - </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="TQCheckBox" row="1" column="0"> - <property name="name"> - <cstring>checkQt4Gui</cstring> - </property> - <property name="text"> - <string>Gui</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - <widget class="TQCheckBox" row="2" column="0"> - <property name="name"> - <cstring>checkQt4XML</cstring> - </property> - <property name="text"> - <string>XML</string> - </property> - </widget> - <widget class="TQCheckBox" row="3" column="0"> - <property name="name"> - <cstring>checkQt4Network</cstring> - </property> - <property name="text"> - <string>Network</string> - </property> - </widget> - <widget class="TQCheckBox" row="0" column="0"> - <property name="name"> - <cstring>checkQt4Core</cstring> - </property> - <property name="text"> - <string>Core</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - <widget class="TQCheckBox" row="0" column="1"> - <property name="name"> - <cstring>checkQt4OpenGL</cstring> - </property> - <property name="text"> - <string>OpenGL</string> - </property> - </widget> - <widget class="TQCheckBox" row="1" column="1"> - <property name="name"> - <cstring>checkUiTools</cstring> - </property> - <property name="text"> - <string>QtUiTools</string> - </property> - </widget> - <widget class="TQCheckBox" row="2" column="1"> - <property name="name"> - <cstring>checkQt4SQL</cstring> - </property> - <property name="text"> - <string>SQL</string> - </property> - </widget> - <widget class="TQCheckBox" row="3" column="1"> - <property name="name"> - <cstring>checkQt4SVG</cstring> - </property> - <property name="text"> - <string>SVG</string> - </property> - </widget> - <widget class="TQCheckBox" row="0" column="2"> - <property name="name"> - <cstring>checkTestlib</cstring> - </property> - <property name="text"> - <string>QtTest</string> - </property> - </widget> - <widget class="TQCheckBox" row="1" column="2"> - <property name="name"> - <cstring>checkQt3Support</cstring> - </property> - <property name="text"> - <string>Qt3 Support</string> - </property> - </widget> - <widget class="TQCheckBox" row="2" column="2"> - <property name="name"> - <cstring>checkQDBus</cstring> - </property> - <property name="text"> - <string>QDBus (Qt4.2)</string> - </property> - </widget> - <widget class="TQCheckBox" row="3" column="2"> - <property name="name"> - <cstring>checkAssistant</cstring> - </property> - <property name="text"> - <string>QtAssistant</string> - </property> - </widget> - <widget class="TQCheckBox" row="0" column="3"> - <property name="name"> - <cstring>checkQtScript</cstring> - </property> - <property name="text"> - <string>QtScript (Qt4.3)</string> - </property> - </widget> - <widget class="TQCheckBox" row="1" column="3"> - <property name="name"> - <cstring>checkQtWebKit</cstring> - </property> - <property name="text"> - <string>QtWebKit (Qt4.4)</string> - </property> - </widget> - <widget class="TQCheckBox" row="2" column="3"> - <property name="name"> - <cstring>checkQtXmlPatterns</cstring> - </property> - <property name="text"> - <string>QtXmlPatterns (Qt4.4)</string> - </property> - </widget> - <widget class="TQCheckBox" row="3" column="3"> - <property name="name"> - <cstring>checkPhonon</cstring> - </property> - <property name="text"> - <string>Phonon (Qt4.4)</string> - </property> - </widget> - <widget class="TQCheckBox" row="0" column="4"> - <property name="name"> - <cstring>checkQtHelp</cstring> - </property> - <property name="text"> - <string>QtHelp (Qt4.4)</string> - </property> - </widget> - </grid> - </widget> - <widget class="TQButtonGroup"> - <property name="name"> <cstring>groupLibraries</cstring> </property> <property name="title"> @@ -849,9 +685,6 @@ <property name="text"> <string>Designer Plugin</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQLayoutWidget"> <property name="name"> @@ -2326,12 +2159,6 @@ <slot>activateApply(int)</slot> </connection> <connection> - <sender>groupQt4Libs</sender> - <signal>clicked(int)</signal> - <receiver>ProjectConfigurationDlgBase</receiver> - <slot>activateApply(int)</slot> - </connection> - <connection> <sender>insideinc_listview</sender> <signal>clicked(TQListViewItem*)</signal> <receiver>ProjectConfigurationDlgBase</receiver> @@ -2706,23 +2533,6 @@ <tabstop>checkConsole</tabstop> <tabstop>checkPCH</tabstop> <tabstop>editConfigExtra</tabstop> - <tabstop>checkQt4Core</tabstop> - <tabstop>checkQt4Gui</tabstop> - <tabstop>checkQt4XML</tabstop> - <tabstop>checkQt4Network</tabstop> - <tabstop>checkQt4OpenGL</tabstop> - <tabstop>checkUiTools</tabstop> - <tabstop>checkQt4SQL</tabstop> - <tabstop>checkQt4SVG</tabstop> - <tabstop>checkTestlib</tabstop> - <tabstop>checkQt3Support</tabstop> - <tabstop>checkQDBus</tabstop> - <tabstop>checkAssistant</tabstop> - <tabstop>checkQtScript</tabstop> - <tabstop>checkQtWebKit</tabstop> - <tabstop>checkQtXmlPatterns</tabstop> - <tabstop>checkPhonon</tabstop> - <tabstop>checkQtHelp</tabstop> <tabstop>staticRadio</tabstop> <tabstop>checkPlugin</tabstop> <tabstop>checkLibtool</tabstop> @@ -2786,7 +2596,7 @@ <tabstop>buttonApply</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>updateProjectConfiguration()</slot> <slot>buildorderMoveUpClicked()</slot> <slot>buildorderMoveDownClicked()</slot> @@ -2830,7 +2640,7 @@ <slot>activateApply( const TQString & )</slot> <slot>activateApply( TQListViewItem * )</slot> <slot>customVarChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/qmake/qmakeoptionswidget.h b/buildtools/qmake/qmakeoptionswidget.h index 05bed8c2..c64d9efb 100644 --- a/buildtools/qmake/qmakeoptionswidget.h +++ b/buildtools/qmake/qmakeoptionswidget.h @@ -18,7 +18,7 @@ class QMakeOptionsWidget : public QMakeOptionsWidgetBase { - Q_OBJECT + TQ_OBJECT public: QMakeOptionsWidget( const TQString& projectdir, TQDomDocument &dom, const TQString &configGroup, diff --git a/buildtools/qmake/qmakescopeitem.cpp b/buildtools/qmake/qmakescopeitem.cpp index 6549a557..ec0cd2af 100644 --- a/buildtools/qmake/qmakescopeitem.cpp +++ b/buildtools/qmake/qmakescopeitem.cpp @@ -649,16 +649,6 @@ void QMakeScopeItem::buildGroups() item->files.append( createFileItem( *it ) ); } - if ( scope->isTQt4Project() ) - { - values = scope->variableValues( "RESOURCES" ); - item = createGroupItem( GroupItem::Resources, "RESOURCES", this ); - groups.insert( item->groupType, item ); - for ( it = values.begin(); it != values.end(); ++it ) - { - item->files.append( createFileItem( *it ) ); - } - } values = scope->variableValues( "IMAGES" ); item = createGroupItem( GroupItem::Images, "IMAGES", this ); groups.insert( item->groupType, item ); diff --git a/buildtools/qmake/scope.cpp b/buildtools/qmake/scope.cpp index 84052970..4e2b079a 100644 --- a/buildtools/qmake/scope.cpp +++ b/buildtools/qmake/scope.cpp @@ -514,10 +514,7 @@ Scope* Scope::createSimpleScope( const TQString& scopename ) ast->setDepth( m_root->depth() ); m_root->addChildAST( ast ); m_root->addChildAST( new TQMake::NewLineAST() ); - /* We can't unconditionally add the scope name to CONFIG, scope might be win32 which may only be in CONFIG under windows. - if ( m_part->isTQt4Project() ) - addToPlusOp( "CONFIG", TQStringList( scopename ) ); - */ + // We can't unconditionally add the scope name to CONFIG, scope might be win32 which may only be in CONFIG under windows. Scope* simpleScope = new Scope( m_environment, getNextScopeNum(), this, ast, m_defaultopts, m_part ); if( simpleScope->scopeType() != Scope::InvalidScope ) @@ -1182,11 +1179,6 @@ TQStringList Scope::cleanStringList(const TQStringList& list) const return result; } -bool Scope::isTQt4Project() const -{ - return m_part->isTQt4Project(); -} - void Scope::reloadProject() { if ( !m_root || !m_root->isProject() ) @@ -1426,16 +1418,6 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res } } - if ( isTQt4Project() ) - { - values = variableValues( "RESOURCES" ,false, false ); - for ( it = values.begin(); it != values.end(); ++it ) - { - file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; - file = resolveVariables( file ); - res.insert( TQDir::cleanDirPath( file ) ); - } - } values = variableValues( "IMAGES" ,false, false ); for ( it = values.begin(); it != values.end(); ++it ) { @@ -1481,22 +1463,12 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res file = resolveVariables( file ); res.insert( TQDir::cleanDirPath( file ) ); - if( !m_part->isTQt4Project()) - { - header = projectDir()+TQString(TQChar(TQDir::separator())) + *it+".h"; - if( TQFileInfo(header).exists() ) - res.insert( TQDir::cleanDirPath( header ) ); - header = projectDir()+TQString(TQChar(TQDir::separator())) + *it+".cpp"; - if( TQFileInfo(header).exists() ) - res.insert( TQDir::cleanDirPath( header ) ); - } - else - { - header = projectDir()+TQString(TQChar(TQDir::separator())) + "ui_" +*it; - header.replace(TQRegExp("\\.ui$"),".h"); - if( TQFileInfo(header).exists() ) - res.insert( TQDir::cleanDirPath( header ) ); - } + header = projectDir()+TQString(TQChar(TQDir::separator())) + *it+".h"; + if( TQFileInfo(header).exists() ) + res.insert( TQDir::cleanDirPath( header ) ); + header = projectDir()+TQString(TQChar(TQDir::separator())) + *it+".cpp"; + if( TQFileInfo(header).exists() ) + res.insert( TQDir::cleanDirPath( header ) ); } } diff --git a/buildtools/qmake/scope.h b/buildtools/qmake/scope.h index 5be259bd..f50d4d99 100644 --- a/buildtools/qmake/scope.h +++ b/buildtools/qmake/scope.h @@ -125,9 +125,6 @@ public: /* deletes the subproject (including the subdir if deleteSubdir is true) */ bool deleteSubProject( unsigned int, bool deleteSubdir ); - /* find out wether the project is TQt4 or TQt3 */ - bool isTQt4Project() const ; - /* Provide a Map of Custom variables */ const TQMap<unsigned int, TQMap<TQString, TQString> > customVariables() const; diff --git a/buildtools/qmake/trolllistview.h b/buildtools/qmake/trolllistview.h index 8c2c021f..13c0565d 100644 --- a/buildtools/qmake/trolllistview.h +++ b/buildtools/qmake/trolllistview.h @@ -26,7 +26,7 @@ class TrollListView : public TDEListView { -Q_OBJECT +TQ_OBJECT public: TrollListView(TrollProjectWidget *widget, TQWidget *parent, TrollProjectWidget::TrollProjectView view, const char *name = 0); diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index 82bb7416..de9b7f6e 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -92,7 +92,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS const TQIconSet icon(SmallIcon("compfile")); action = new TDEAction( i18n("Compile &File"), "compfile", 0, - TQT_TQOBJECT(m_widget), TQT_SLOT(slotBuildOpenFile()), + m_widget, TQ_SLOT(slotBuildOpenFile()), actionCollection(),"build_compilefile" ); action->setToolTip(i18n("Compile file")); action->setWhatsThis(i18n("<b>Compile file</b><p>Runs <b>make filename.o</b> command from the directory where 'filename' is the name of currently opened file.<br>" @@ -101,7 +101,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS action = new TDEAction( i18n("&Build Project"), "make_tdevelop", Key_F8, - TQT_TQOBJECT(m_widget), TQT_SLOT(slotBuildProject()), + m_widget, TQ_SLOT(slotBuildProject()), actionCollection(), "build_build_project" ); action->setToolTip(i18n("Build project")); action->setWhatsThis(i18n("<b>Build project</b><p>Runs <b>make</b> from the project directory.<br>" @@ -109,7 +109,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("&Rebuild Project"),"rebuild" , 0, - TQT_TQOBJECT(m_widget), TQT_SLOT(slotRebuildProject()), + m_widget, TQ_SLOT(slotRebuildProject()), actionCollection(),"build_rebuild_project" ); action->setToolTip(i18n("Rebuild project")); action->setWhatsThis(i18n("<b>Rebuild project</b><p>Runs <b>make clean</b> and then <b>make</b> from the project directory.<br>" @@ -117,7 +117,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("&Install Project"),"install" , 0, - TQT_TQOBJECT(m_widget), TQT_SLOT(slotInstallProject()), + m_widget, TQ_SLOT(slotInstallProject()), actionCollection(),"build_install_project" ); action->setToolTip(i18n("Install project")); action->setWhatsThis(i18n("<b>Install project</b><p>Runs <b>make install</b> from the project directory.<br>" @@ -125,7 +125,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("&Clean Project"), 0, - TQT_TQOBJECT(m_widget), TQT_SLOT(slotCleanProject()), + m_widget, TQ_SLOT(slotCleanProject()), actionCollection(), "build_clean_project" ); action->setToolTip(i18n("Clean project")); action->setWhatsThis(i18n("<b>Clean project</b><p>Runs <b>make clean</b> command from the project directory.<br>" @@ -133,7 +133,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("&Dist-Clean Project"), 0, - TQT_TQOBJECT(m_widget), TQT_SLOT(slotDistCleanProject()), + m_widget, TQ_SLOT(slotDistCleanProject()), actionCollection(), "build_distclean_project" ); action->setToolTip(i18n("Dist-Clean project")); action->setWhatsThis(i18n("<b>Dist-Clean project</b><p>Runs <b>make distclean</b> command from the " @@ -141,13 +141,13 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("Execute Main Program"), "application-x-executable", SHIFT+Key_F9, - this, TQT_SLOT(slotBuildAndExecuteProject()), + this, TQ_SLOT(slotBuildAndExecuteProject()), actionCollection(), "build_execute_project" ); action->setToolTip(i18n("Execute main program")); action->setWhatsThis(i18n("<b>Execute program</b><p>Executes the currently selected subproject if it is an application or the program specified in project settings, <b>Run Options</b> tab.")); action = new TDEAction( i18n("&Build Subproject"), "make_tdevelop", Key_F7, - TQT_TQOBJECT(m_widget), TQT_SLOT(slotBuildTarget()), + m_widget, TQ_SLOT(slotBuildTarget()), actionCollection(), "build_build_target" ); action->setToolTip(i18n("Build subproject")); action->setWhatsThis(i18n("<b>Build subproject</b><p>Runs <b>make</b> from the current subproject directory. " @@ -156,7 +156,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("&Rebuild Subproject"), "rebuild", 0, - TQT_TQOBJECT(m_widget), TQT_SLOT(slotRebuildTarget()), + m_widget, TQ_SLOT(slotRebuildTarget()), actionCollection(),"build_rebuild_target" ); action->setToolTip(i18n("Rebuild subproject")); action->setWhatsThis(i18n("<b>Rebuild subproject</b><p>Runs <b>make clean</b> and then <b>make</b> from the current subproject directory. " @@ -165,7 +165,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("&Install Subproject"), "install", 0, - TQT_TQOBJECT(m_widget), TQT_SLOT(slotInstallTarget()), + m_widget, TQ_SLOT(slotInstallTarget()), actionCollection(),"build_install_target" ); action->setToolTip(i18n("Install subproject")); action->setWhatsThis(i18n("<b>Install subproject</b><p>Runs <b>make install</b> from the current subproject directory. " @@ -174,7 +174,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("&Clean Subproject"), 0, - TQT_TQOBJECT(m_widget), TQT_SLOT(slotCleanTarget()), + m_widget, TQ_SLOT(slotCleanTarget()), actionCollection(), "build_clean_target" ); action->setToolTip(i18n("Clean subproject")); action->setWhatsThis(i18n("<b>Clean subproject</b><p>Runs <b>make clean</b> from the current subproject directory. " @@ -183,7 +183,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("&Dist-Clean Subproject"), 0, - TQT_TQOBJECT(m_widget), TQT_SLOT(slotDistCleanTarget()), + m_widget, TQ_SLOT(slotDistCleanTarget()), actionCollection(), "build_distclean_target" ); action->setToolTip(i18n("Dist-Clean subproject")); action->setWhatsThis(i18n("<b>Dist-Clean subproject</b><p>Runs <b>make distclean</b> from the current" @@ -192,18 +192,18 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("Execute Subproject"), "application-x-executable", 0, - this, TQT_SLOT(slotBuildAndExecuteTarget()), + this, TQ_SLOT(slotBuildAndExecuteTarget()), actionCollection(), "build_execute_target" ); action->setToolTip(i18n("Execute subproject")); action->setWhatsThis(i18n("<b>Execute subproject</b><p>Executes the target program for the currently selected subproject. " "This action is allowed only if a type of the subproject is 'application'. The type of the subproject can be " "defined in <b>Subproject Settings</b> dialog (open it from the subproject context menu).")); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)), - this, TQT_SLOT(slotCommandFinished(const TQString&)) ); + connect( makeFrontend(), TQ_SIGNAL(commandFinished(const TQString&)), + this, TQ_SLOT(slotCommandFinished(const TQString&)) ); TQString m_defaultTQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); TQString m_qmakePath = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/qmake", ""); @@ -255,7 +255,7 @@ TQString TrollProjectPart::makeEnvironment() environstr += " "; } - if( !hasTQtDir && !isTQt4Project() && !DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() ) + if( !hasTQtDir && !DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() ) { environstr += TQString( "TQTDIR=" ) + EnvVarTools::quote( DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "") ) + TQString( " PATH=$TQTDIR/bin:$PATH " ); } @@ -280,9 +280,9 @@ void TrollProjectPart::projectConfigWidget(KDialogBase *dlg) QMakeOptionsWidget *qm = new QMakeOptionsWidget( projectDirectory(), *projectDom(), "/kdevtrollproject", vbox); - connect( dlg, TQT_SIGNAL(okClicked()), w4, TQT_SLOT(accept()) ); - connect( dlg, TQT_SIGNAL(okClicked()), qm, TQT_SLOT(accept()) ); - connect( dlg, TQT_SIGNAL(okClicked()), optdlg, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w4, TQ_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), qm, TQ_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), optdlg, TQ_SLOT(accept()) ); } @@ -291,7 +291,7 @@ void TrollProjectPart::openProject(const TQString &dirName, const TQString &proj mainWindow()->statusBar()->message( i18n("Loading Project...") ); TQString defaultTQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); - if( !isTQt4Project() && ( defaultTQtDir.isEmpty() || !isValidTQtDir( defaultTQtDir ) ) ) + if( defaultTQtDir.isEmpty() || !isValidTQtDir( defaultTQtDir ) ) { bool doask = true; while( doask ) @@ -705,11 +705,6 @@ void TrollProjectPart::startTQMakeCommand(const TQString &dir, bool recursive) cmdline = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/qmake", "")+" "; } - if(isTQt4Project() && recursive) - { - cmdline += " -recursive "; - } - //TQString cmdline = TQString::fromLatin1( isTMakeProject() ? "tmake " : "qmake " ); // cmdline += fi.baseName() + ".pro"; TQDir d(dir); @@ -798,18 +793,15 @@ bool TrollProjectPart::isValidTQtDir( const TQString& path ) const TQFileInfo inc( path + TQString( TQChar( TQDir::separator() ) )+ "include"+TQString( TQChar( TQDir::separator() ) )+ "tqt.h" ); - return ( isTQt4Project() || ( !isTQt4Project() && inc.exists() ) ); + return ( inc.exists() ); } void TrollProjectPart::buildBinDirs( TQStringList & dirs ) const { - if( !isTQt4Project() ) - { - TQString m_defaultTQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); - if( !m_defaultTQtDir.isEmpty() ) - dirs << (m_defaultTQtDir + TQString( TQChar( TQDir::separator() ) ) + "bin" ); - dirs << ( ::getenv("TQTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin" ); - } + TQString m_defaultTQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); + if( !m_defaultTQtDir.isEmpty() ) + dirs << (m_defaultTQtDir + TQString( TQChar( TQDir::separator() ) ) + "bin" ); + dirs << ( ::getenv("TQTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin" ); TQStringList paths = TQStringList::split(":",::getenv("PATH")); dirs += paths; TQString binpath = TQDir::rootDirPath() + "bin"; @@ -850,8 +842,7 @@ bool TrollProjectPart::isExecutable( const TQString& path ) const TQString TrollProjectPart::findTQtDir() { TQStringList qtdirs; - if( !isTQt4Project() ) - qtdirs.push_back( ::getenv("TQTDIR") ); + qtdirs.push_back( ::getenv("TQTDIR") ); qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); @@ -909,11 +900,6 @@ TQStringList TrollProjectPart::distFiles() const return sourceList + files; } -bool TrollProjectPart::isTQt4Project() const -{ - return ( DomUtil::readIntEntry( *projectDom(), "kdevcppsupport/qt/version", 3 ) == 4 ); -} - KDirWatch* TrollProjectPart::dirWatch() { return m_dirWatch; diff --git a/buildtools/qmake/trollprojectpart.h b/buildtools/qmake/trollprojectpart.h index e36ef202..1516c477 100644 --- a/buildtools/qmake/trollprojectpart.h +++ b/buildtools/qmake/trollprojectpart.h @@ -30,7 +30,7 @@ class TQMakeDefaultOpts; class TrollProjectPart : public KDevBuildTool { - Q_OBJECT + TQ_OBJECT public: @@ -38,7 +38,6 @@ public: ~TrollProjectPart(); bool isTMakeProject() const { return m_tmakeProject; } - bool isTQt4Project() const; bool isDirty(); KDirWatch* dirWatch(); virtual Options options() const; diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 3c35cb94..919ca69e 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -84,7 +84,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) m_rootScope ( 0 ), m_part ( part ), m_configDlg( 0 ), m_filesCached(false) { - TQSplitter * splitter = new TQSplitter(Qt::Vertical, this ); + TQSplitter * splitter = new TQSplitter(TQt::Vertical, this ); ////////////////// // PROJECT VIEW // @@ -156,16 +156,16 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) "external libraries,<br>build order,<br>intermediate files locations,<br>compiler options." ) ); // Project button connections - connect ( addSubdirButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddSubproject () ) ); - connect ( createScopeButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotCreateScope () ) ); + connect ( addSubdirButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotAddSubproject () ) ); + connect ( createScopeButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotCreateScope () ) ); - connect ( buildProjectButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotBuildProject () ) ); - connect ( rebuildProjectButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRebuildProject () ) ); - connect ( executeProjectButton, TQT_SIGNAL ( clicked () ), m_part, TQT_SLOT ( slotBuildAndExecuteProject () ) ); + connect ( buildProjectButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotBuildProject () ) ); + connect ( rebuildProjectButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotRebuildProject () ) ); + connect ( executeProjectButton, TQ_SIGNAL ( clicked () ), m_part, TQ_SLOT ( slotBuildAndExecuteProject () ) ); - connect ( projectconfButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotConfigureProject () ) ); + connect ( projectconfButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotConfigureProject () ) ); // Project tree overview = new TrollListView( this, overviewContainer, SubprojectView, "project overview widget" ); @@ -175,10 +175,10 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) overview->addColumn( TQString() ); // Project tree connections - connect( overview, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( slotOverviewSelectionChanged( TQListViewItem* ) ) ); - connect( overview, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( slotOverviewContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( overview, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( slotOverviewSelectionChanged( TQListViewItem* ) ) ); + connect( overview, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQ_SLOT( slotOverviewContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); ///////////////// @@ -284,30 +284,30 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) details->header() ->hide(); details->addColumn( TQString() ); // Detail button connections - connect ( addfilesButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddFiles () ) ); - connect ( newfileButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotNewFile () ) ); - connect ( removefileButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRemoveFile () ) ); - connect ( buildFileButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotBuildSelectedFile () ) ); - connect ( excludeFileFromScopeButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotExcludeFileFromScopeButton() ) ); + connect ( addfilesButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotAddFiles () ) ); + connect ( newfileButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotNewFile () ) ); + connect ( removefileButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotRemoveFile () ) ); + connect ( buildFileButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotBuildSelectedFile () ) ); + connect ( excludeFileFromScopeButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotExcludeFileFromScopeButton() ) ); // Detail tree connections - connect( details, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( slotDetailsSelectionChanged( TQListViewItem* ) ) ); - connect( details, TQT_SIGNAL( executed( TQListViewItem* ) ), - this, TQT_SLOT( slotDetailsExecuted( TQListViewItem* ) ) ); - connect( details, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( slotDetailsContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); - - connect ( buildTargetButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotBuildTarget () ) ); - connect ( rebuildTargetButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRebuildTarget () ) ); - connect ( executeTargetButton, TQT_SIGNAL ( clicked () ), m_part, TQT_SLOT ( slotBuildAndExecuteTarget () ) ); + connect( details, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( slotDetailsSelectionChanged( TQListViewItem* ) ) ); + connect( details, TQ_SIGNAL( executed( TQListViewItem* ) ), + this, TQ_SLOT( slotDetailsExecuted( TQListViewItem* ) ) ); + connect( details, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQ_SLOT( slotDetailsContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); + + connect ( buildTargetButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotBuildTarget () ) ); + connect ( rebuildTargetButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotRebuildTarget () ) ); + connect ( executeTargetButton, TQ_SIGNAL ( clicked () ), m_part, TQ_SLOT ( slotBuildAndExecuteTarget () ) ); buildTargetButton->setEnabled( false ); rebuildTargetButton->setEnabled( false ); executeTargetButton->setEnabled( false ); m_configDlg = new ProjectConfigurationDlg( overview, this, this ); - connect( m_part->dirWatch(), TQT_SIGNAL( dirty(const TQString&) ), this, TQT_SLOT( slotProjectDirty(const TQString&) ) ); + connect( m_part->dirWatch(), TQ_SIGNAL( dirty(const TQString&) ), this, TQ_SLOT( slotProjectDirty(const TQString&) ) ); } @@ -1301,7 +1301,7 @@ void TrollProjectWidget::slotAddFiles() case AddFilesDialog::Link: { // Link selected files to current subproject folder - TDEProcess *proc = new TDEProcess( TQT_TQOBJECT(this) ); + TDEProcess *proc = new TDEProcess( this ); *proc << "ln"; *proc << "-s"; *proc << files[ i ]; @@ -1416,10 +1416,7 @@ void TrollProjectWidget::slotNewFile() fcext = "h"; break; case GroupItem::Forms: - if ( !m_part->isTQt4Project() ) - fcext = "ui-widget"; - else - fcext = "ui-widget-qt4"; + fcext = "ui-widget"; break; case GroupItem::Translations: fcext = "ts"; @@ -1645,7 +1642,7 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem * case AddFilesDialog::Link: { // Link selected files to current subproject folder - TDEProcess *proc = new TDEProcess( TQT_TQOBJECT(this) ); + TDEProcess *proc = new TDEProcess( this ); *proc << "ln"; *proc << "-s"; *proc << files[ i ]; @@ -1694,10 +1691,7 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem * fcext = "h"; break; case GroupItem::Forms: - if ( !m_part->isTQt4Project() ) - fcext = "ui-widget"; - else - fcext = "ui-widget-qt4"; + fcext = "ui-widget"; break; case GroupItem::Translations: fcext = "ts"; @@ -1782,11 +1776,8 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem * popup.setWhatsThis( idSubclassWidget, i18n( "<b>Subclass widget</b><p>Launches <b>Subclassing</b> wizard. " "It allows to create a subclass from the class defined in .ui file. " "There is also possibility to implement slots and functions defined in the base class." ) ); - if ( !m_part->isTQt4Project() ) - { - idViewUIH = popup.insertItem( SmallIconSet( "qmake_ui_h" ), i18n( "Open ui.h File" ) ); - popup.setWhatsThis( idViewUIH, i18n( "<b>Open ui.h file</b><p>Opens .ui.h file associated with the selected .ui." ) ); - } + idViewUIH = popup.insertItem( SmallIconSet( "qmake_ui_h" ), i18n( "Open ui.h File" ) ); + popup.setWhatsThis( idViewUIH, i18n( "<b>Open ui.h file</b><p>Opens .ui.h file associated with the selected .ui." ) ); idUISubclasses = popup.insertItem( SmallIconSet( "qmake_subclass" ), i18n( "List of Subclasses..." ) ); popup.setWhatsThis( idUISubclasses, i18n( "<b>List of subclasses</b><p>Shows subclasses list editor. " "There is possibility to add or remove subclasses from the list." ) ); @@ -2340,21 +2331,15 @@ void TrollProjectWidget::setLastFocusedView( TrollProjectView view ) void TrollProjectWidget::runTQMakeRecursive( QMakeScopeItem* proj ) { - if( m_part->isTQt4Project() ) + if ( proj->scope->scopeType() == Scope::ProjectScope ) { - m_part->startTQMakeCommand( proj->scope->projectDir(), true ); - }else + m_part->startTQMakeCommand( proj->scope->projectDir() ); + } + QMakeScopeItem* item = static_cast<QMakeScopeItem*>( proj->firstChild() ); + while ( item ) { - if ( proj->scope->scopeType() == Scope::ProjectScope ) - { - m_part->startTQMakeCommand( proj->scope->projectDir() ); - } - QMakeScopeItem* item = static_cast<QMakeScopeItem*>( proj->firstChild() ); - while ( item ) - { - runTQMakeRecursive( item ); - item = static_cast<QMakeScopeItem*>( item->nextSibling() ); - } + runTQMakeRecursive( item ); + item = static_cast<QMakeScopeItem*>( item->nextSibling() ); } } @@ -2533,7 +2518,7 @@ TQMap<TQString,TQString> TrollProjectWidget::qmakeEnvironment() const map[(*it).first] = (*it).second; } - if( !hasTQtDir && !m_part->isTQt4Project() && !DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() ) + if( !hasTQtDir && !DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() ) { map["TQTDIR="] = DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", ""); map["PATH"] = map["PATH"].prepend( DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "") +"/bin" ); diff --git a/buildtools/qmake/trollprojectwidget.h b/buildtools/qmake/trollprojectwidget.h index 04a07ed9..7821d075 100644 --- a/buildtools/qmake/trollprojectwidget.h +++ b/buildtools/qmake/trollprojectwidget.h @@ -43,7 +43,7 @@ class ProjectConfigurationDlg; class TrollProjectWidget : public TQVBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/script/scriptnewfiledlg.cpp b/buildtools/script/scriptnewfiledlg.cpp index 9308792a..001565b2 100644 --- a/buildtools/script/scriptnewfiledlg.cpp +++ b/buildtools/script/scriptnewfiledlg.cpp @@ -54,8 +54,8 @@ ScriptNewFileDialog::ScriptNewFileDialog(ScriptProjectPart *part, TQPushButton *ok_button = buttonbox->addButton(KStdGuiItem::ok()); TQPushButton *cancel_button = buttonbox->addButton(KStdGuiItem::cancel()); ok_button->setDefault(true); - connect( ok_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); - connect( cancel_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); + connect( ok_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); + connect( cancel_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) ); buttonbox->layout(); TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4); diff --git a/buildtools/script/scriptnewfiledlg.h b/buildtools/script/scriptnewfiledlg.h index fa054091..9c204894 100644 --- a/buildtools/script/scriptnewfiledlg.h +++ b/buildtools/script/scriptnewfiledlg.h @@ -21,7 +21,7 @@ class ScriptProjectPart; class ScriptNewFileDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/script/scriptoptionswidget.h b/buildtools/script/scriptoptionswidget.h index 8f136d75..04a7e742 100644 --- a/buildtools/script/scriptoptionswidget.h +++ b/buildtools/script/scriptoptionswidget.h @@ -19,7 +19,7 @@ class KDevPlugin; class ScriptOptionsWidget : public ScriptOptionsWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp index 42ce8935..600ce07d 100644 --- a/buildtools/script/scriptprojectpart.cpp +++ b/buildtools/script/scriptprojectpart.cpp @@ -51,17 +51,17 @@ ScriptProjectPart::ScriptProjectPart(TQObject *parent, const char *name, const T if (!extension<KDevCreateFile>("TDevelop/CreateFile")) { TDEAction *action; action = new TDEAction( i18n("New File..."), 0, - this, TQT_SLOT(slotNewFile()), + this, TQ_SLOT(slotNewFile()), actionCollection(), "file_newfile" ); action->setWhatsThis( i18n("<b>New file</b><p>Creates a new file.") ); action->setToolTip( i18n("Create a new file") ); } new TDEAction( i18n("Rescan Project"), 0, CTRL+ALT+Key_R, - this, TQT_SLOT(rescan()), + this, TQ_SLOT(rescan()), actionCollection(), "rescan" ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); } @@ -74,7 +74,7 @@ void ScriptProjectPart::projectConfigWidget(KDialogBase *dlg) TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Script Project Options"), i18n("Script Project Options"), BarIcon("tdevelop", TDEIcon::SizeMedium)); ScriptOptionsWidget *w = new ScriptOptionsWidget(this, vbox); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } diff --git a/buildtools/script/scriptprojectpart.h b/buildtools/script/scriptprojectpart.h index 92087991..8a06fa81 100644 --- a/buildtools/script/scriptprojectpart.h +++ b/buildtools/script/scriptprojectpart.h @@ -24,7 +24,7 @@ class ScriptProjectWidget; class ScriptProjectPart : public KDevBuildTool { - Q_OBJECT + TQ_OBJECT public: diff --git a/cmake b/cmake deleted file mode 160000 -Subproject f0a5bcc7600c36f8fe59754d1167d1bbc70a495 diff --git a/doc/api/HowToAddPlugins.dox b/doc/api/HowToAddPlugins.dox index 3f9d1b20..e40840a8 100644 --- a/doc/api/HowToAddPlugins.dox +++ b/doc/api/HowToAddPlugins.dox @@ -85,7 +85,7 @@ Your part must be derived from <code>KDevPlugin</code>. - KDevPlugin takes two arguments: - 1) A <i>parent</i> argument. This also comes from <code>createPartObject()</code>. - - 2) A <i>name</i>, which in turn is given to the <code>QObject</code> + - 2) A <i>name</i>, which in turn is given to the <code>TQObject</code> constructor. . . @@ -134,7 +134,7 @@ rooted in the <code>dom</code> document node. For example, the <code>autoproject</code> part uses the statement <code><pre> - QString cflags = DomUtil::readEntry( *part->document(), + TQString cflags = DomUtil::readEntry( *part->document(), "/kdevautoproject/cflags" ); </pre></code> @@ -181,7 +181,7 @@ void GDBBreakpointWidget::savePartialProjectSession(QDomElement* el) { BreakpointTableRow* btr = (BreakpointTableRow *) m_table->item(row, Control); Breakpoint* bp = btr->breakpoint(); - QDomElement breakpointEl = domDoc.createElement("breakpoint"+QString::number(row)); + QDomElement breakpointEl = domDoc.createElement("breakpoint"+TQString::number(row)); breakpointEl.setAttribute("type", bp->type()); breakpointEl.setAttribute("location", bp->location(false)); breakpointEl.setAttribute("enabled", bp->isEnabled()); diff --git a/doc/api/HowToAddProgrammingLanguages.dox b/doc/api/HowToAddProgrammingLanguages.dox index 9ef228e2..78091009 100644 --- a/doc/api/HowToAddProgrammingLanguages.dox +++ b/doc/api/HowToAddProgrammingLanguages.dox @@ -71,10 +71,10 @@ Language support can offer additional features: \subsection sectionAttributeMethodWizard Attribute/Method wizard - add method dialog: (See <code>cpp</code> or <code>java</code>) - - <code>virtual void addMethod(const QString &className);</code> + - <code>virtual void addMethod(const TQString &className);</code> . - add attribute dialog: (See <code>cpp</code> or <code>java</code>) - - <code>virtual void addAttribute(const QString &className);</code> + - <code>virtual void addAttribute(const TQString &className);</code> . . @@ -82,8 +82,8 @@ Language support can offer additional features: If there is a Qt bindings for your language and there is a possibility to use QtDesigner ui files, you could implement ui subclassing feature: - - <code>virtual QStringList subclassWidget(const QString& formName);</code> - - <code>virtual QStringList updateWidget(const QString& formName, const QString& + - <code>virtual QStringList subclassWidget(const TQString& formName);</code> + - <code>virtual QStringList updateWidget(const TQString& formName, const TQString& fileName);</code> . diff --git a/doc/api/PropEditor.dox b/doc/api/PropEditor.dox index 40ce4261..a0bd38a5 100644 --- a/doc/api/PropEditor.dox +++ b/doc/api/PropEditor.dox @@ -73,7 +73,7 @@ A simple example on how to create a property editor and use it with one property list->addProperty("My Group", new Property(String, "Second Property", "This is my second property", "Hello")); list->addProperty(new Property(Color, "Third Property", - "This is my third property", QColor("green"))); + "This is my third property", TQColor("green"))); m_editor->populateProperties(*list); \endcode @@ -88,7 +88,7 @@ More advanced example with property accessors and list intersection: list->addProperty("My Group", new Property(String, "Second Property", "This is my second property", "Hello")); list->addProperty(new Property(Color, "Third Property", - "This is my third property", QColor("green"))); + "This is my third property", TQColor("green"))); PropertyList *list2 = new PropertyList; list2->addProperty("My Group", new Property(Integer, "First Property", diff --git a/doc/kdearch/index.docbook b/doc/kdearch/index.docbook index 97dee33d..0dbe8dbe 100644 --- a/doc/kdearch/index.docbook +++ b/doc/kdearch/index.docbook @@ -337,7 +337,7 @@ Pixmap effects like gradients and patterns. <listitem><formalpara><title><ulink url="kdeapi:tdeui/KPixmapIO">KPixmapIO</ulink></title> <para> -Fast <classname>QImage</classname> to <classname>QPixmap</classname> conversion. +Fast <classname>TQImage</classname> to <classname>QPixmap</classname> conversion. </para> </formalpara></listitem> @@ -684,7 +684,7 @@ The central graphics class for 2D painting with Qt is draw on a <ulink url="kdeapi:qt/QPaintDevice">QPaintDevice</ulink>. There are three possible paint devices implemented: One is -<ulink url="kdeapi:qt/QWidget">QWidget</ulink> +<ulink url="kdeapi:qt/TQWidget">TQWidget</ulink> which represents a widget on the screen. The second is <ulink url="kdeapi:qt/QPrinter">QPrinter</ulink> which represents a printer and produces Postscript output. The third it @@ -878,7 +878,7 @@ stored in it are a style, a color, a join style and a cap style. <para> The pen style is member of the enum -<ulink url="kdeapi:qt/Qt#PenStyle-enum">Qt::PenStyle</ulink>. +<ulink url="kdeapi:qt/Qt#PenStyle-enum">TQt::PenStyle</ulink>. and can take one of the following values: </para> @@ -888,7 +888,7 @@ and can take one of the following values: <para> The join style is a member of the enum -<ulink url="kdeapi:qt/Qt#PenJoinStyle-enum">Qt::PenJoinStyle</ulink>. +<ulink url="kdeapi:qt/Qt#PenJoinStyle-enum">TQt::PenJoinStyle</ulink>. It specifies how the junction between multiple lines which are attached to each other is drawn. It takes one of the following values: </para> @@ -918,7 +918,7 @@ other is drawn. It takes one of the following values: <para> The cap style is a member of the enum -<ulink url="kdeapi:qt/Qt#PenCapStyle-enum">Qt::PenCapStyle</ulink>and specifies how the end points of lines are drawn. It takes one of the values +<ulink url="kdeapi:qt/Qt#PenCapStyle-enum">TQt::PenCapStyle</ulink>and specifies how the end points of lines are drawn. It takes one of the values from the following table: </para> @@ -967,18 +967,18 @@ Brushes can be constructed in four different ways: patterns shown below.</para> </listitem> <listitem> -<para>QBrush::QBrush(const QColor &, BrushStyle) - This creates a colored brush +<para>QBrush::QBrush(const TQColor &, BrushStyle) - This creates a colored brush with one of the patterns shown below.</para> </listitem> <listitem> -<para>QBrush::QBrush(const QColor &, const QPixmap) - This creates a colored +<para>QBrush::QBrush(const TQColor &, const QPixmap) - This creates a colored brush with the custom pattern you give as second parameter.</para> </listitem> </itemizedlist> <para> A default brush style is from the enum -<ulink url="kdeapi:qt/Qt#BrushStyle-enum">Qt::BrushStyle</ulink>. +<ulink url="kdeapi:qt/Qt#BrushStyle-enum">TQt::BrushStyle</ulink>. Here is a picture of all predefined patterns: </para> @@ -1000,7 +1000,7 @@ QPainter::setBrushOrigin(). <para> Colors play a role both when stroking curves and when filling shapes. In Qt, colors are represented by the class -<ulink url="kdeapi:qt/QColor">QColor</ulink>. Qt does not support +<ulink url="kdeapi:qt/TQColor">TQColor</ulink>. Qt does not support advanced graphics features like ICC color profiles and color correction. Colors are usually constructed by specifying their red, green and blue components, as the RGB model is the way pixels are composed of on a monitor. @@ -1104,14 +1104,14 @@ to avoid flicker. </para> <para> -In contrast, <ulink url="kdeapi:qt/QImage">QImage</ulink> objects +In contrast, <ulink url="kdeapi:qt/TQImage">TQImage</ulink> objects live on the client side. Their emphasis in on providing direct access to the pixels of the image. This makes them of use for image manipulation, and things -like loading and saving to disk (QPixmap's load() method takes QImage as +like loading and saving to disk (QPixmap's load() method takes TQImage as intermediate step). On the other hand, painting an image on a widget is a relatively expensive operation, as it implies a transfer to the X server, which can take some time, especially for large images and for remote servers. -Depending on the color depth, the conversion from QImage to QPixmap may also +Depending on the color depth, the conversion from TQImage to QPixmap may also require dithering. </para> @@ -1123,12 +1123,12 @@ require dithering. <para> Text can be drawn with one of the overloaded variants of the method -QPainter::drawText(). These draw a QString either at a given point or in a given +QPainter::drawText(). These draw a TQString either at a given point or in a given rectangle, using the font set by QPainter::setFont(). There is also a parameter which takes an ORed combination of some flags from the enums -<ulink url="kdeapi:qt/Qt#AlignmentFlags-enum">Qt::AlignmentFlags</ulink> +<ulink url="kdeapi:qt/Qt#AlignmentFlags-enum">TQt::AlignmentFlags</ulink> and -<ulink url="kdeapi:qt/Qt#TextFlags-enum">Qt::TextFlags</ulink> +<ulink url="kdeapi:qt/Qt#TextFlags-enum">TQt::TextFlags</ulink> </para> <para> @@ -1420,23 +1420,23 @@ The corresponding part of the setup in C++ is: </para> <programlisting> - KStdAction::zoomIn ( this, SLOT(slotZoomIn()), actionCollection() ); - KStdAction::zoomOut ( this, SLOT(slotZoomOut()), actionCollection() ); - KStdAction::zoom ( this, SLOT(slotZoom()), actionCollection() ); + KStdAction::zoomIn ( this, TQ_SLOT(slotZoomIn()), actionCollection() ); + KStdAction::zoomOut ( this, TQ_SLOT(slotZoomOut()), actionCollection() ); + KStdAction::zoom ( this, TQ_SLOT(slotZoom()), actionCollection() ); new TDEAction ( i18n("&Half size"), ALT+Key_0, - this, SLOT(slotHalfSize()), + this, TQ_SLOT(slotHalfSize()), actionCollection(), "zoom50" ); new TDEAction ( i18n("&Normal size"), ALT+Key_1, - this, SLOT(slotDoubleSize()), + this, TQ_SLOT(slotDoubleSize()), actionCollection(), "zoom100" ); new TDEAction ( i18n("&Double size"), ALT+Key_2, - this, SLOT(slotDoubleSize()), + this, TQ_SLOT(slotDoubleSize()), actionCollection(), "zoom200" ); new TDEAction ( i18n("&Fill Screen"), ALT+Key_3, - this, SLOT(slotFillScreen()), + this, TQ_SLOT(slotFillScreen()), actionCollection(), "zoomMaxpect" ); new TDEAction ( i18n("Fullscreen &Mode"), CTRL+SHIFT+Key_F, - this, SLOT(slotFullScreen()), + this, TQ_SLOT(slotFullScreen()), actionCollection(), "fullscreen" ); </programlisting> @@ -1658,7 +1658,7 @@ ask the client's factory for it: <programlisting> void MainWindow::popupRequested() { - QWidget *w = factory()->container("context_popup", this); + TQWidget *w = factory()->container("context_popup", this); QPopupMenu *popup = static_cast<QPopupMenu *>(w); popup->exec(QCursor::pos()); } @@ -1929,13 +1929,13 @@ X-TDE-ServiceType=TDevelop/Part Name=TDevelop Part [PropertyDef::X-TDevelop-Scope] -Type=QString +Type=TQString [PropertyDef::X-TDevelop-ProgrammingLanguages] Type=QStringList [PropertyDef::X-TDevelop-Args] -Type=QString +Type=TQString </programlisting> <para> @@ -2032,11 +2032,11 @@ load the library and get a pointer to its factory object: <programlisting> KService *service = ... -QString libName = QFile::encodeName(service->library()); +TQString libName = QFile::encodeName(service->library()); KLibFactory *factory = KLibLoader::self()->factory(libName); if (!factory) { - QString name = service->name(); - QString errorMessage = KLibLoader::self()->lastErrorMessage(); + TQString name = service->name(); + TQString errorMessage = KLibLoader::self()->lastErrorMessage(); KMessageBox::error(0, i18n("There was an error loading service %1.\n" "The diagnostics from libtool is:\n%2") .arg(name).arg(errorMessage); @@ -2054,7 +2054,7 @@ its create() method: <programlisting> if (factory->inherits("KParts::Factory")) { KParts::Factory *partFactory = static_cast<KParts::Factory*>(factory); - QObject *obj = partFactory->createPart(parentWidget, widgetName, + TQObject *obj = partFactory->createPart(parentWidget, widgetName, parent, name, "KParts::ReadOnlyPart"); ... } else { @@ -2142,7 +2142,7 @@ class: DCOPClient *client = kapp->dcopClient(); client->attach(); if (!client->isApplicationRegistered("tdeio_uiserver")) { - QString error; + TQString error; if (TDEApplication::startServiceByName("tdeio_uiserver", QStringList(), &error)) cout << "Starting kioserver failed with message " << error << endl; } @@ -2176,7 +2176,7 @@ the file name of its desktop file as argument, i.e. in this case <para> All these calls take a list of URLs as a second argument, which is given to the service on the command line. The third argument is a pointer to a -<classname>QString</classname>. If starting the service fails, this argument +<classname>TQString</classname>. If starting the service fails, this argument is set to a translated error message. </para> @@ -2385,7 +2385,7 @@ contents of a local file. For remote files, there is a further possibility: <programlisting> KURL url("http://developer.kde.org/favicon.ico"); -QString type = TDEIO::NetAccess::mimetype(url); +TQString type = TDEIO::NetAccess::mimetype(url); if (type == KMimeType::defaultMimeType()) cout << "Could not find out type" << endl; else @@ -2409,8 +2409,8 @@ void FooClass::findType() { KURL url("http://developer.kde.org/favicon.ico"); TDEIO::MimetypeJob *job = TDEIO::mimetype(url); - connect( job, SIGNAL(result(TDEIO::Job*)), - this, SLOT(mimeResult(TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(mimeResult(TDEIO::Job*)) ); } void FooClass::mimeResult(TDEIO::Job *job) @@ -2514,7 +2514,7 @@ and returns the associated icon. <programlisting> KURL url("ftp://ftp.kde.org/pub/incoming/wibble.c"); -QString icon = KMimeType::iconForURL(url); +TQString icon = KMimeType::iconForURL(url); </programlisting> <para> @@ -2603,8 +2603,8 @@ deletes itself. Thus, a typical use case will look like this: void FooClass::makeDirectory() { SimpleJob *job = TDEIO::mkdir(KURL("file:/home/bernd/tdeiodir")); - connect( job, SIGNAL(result(TDEIO::Job*)), - this, SLOT(mkdirResult(TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(mkdirResult(TDEIO::Job*)) ); } void FooClass::mkdirResult(TDEIO::Job *job) @@ -2652,7 +2652,7 @@ Renames a file. </para></listitem> </varlistentry> -<varlistentry><term>TDEIO::symlink(const QString &target, const KURL &dest, +<varlistentry><term>TDEIO::symlink(const TQString &target, const KURL &dest, bool overwrite, bool showProgressInfo)</term> <listitem><para> Creates a symbolic link. @@ -2892,7 +2892,7 @@ files regardless of their location is the following code snippet: <programlisting> KURL url; url = ...; -QString tempFile; +TQString tempFile; if (TDEIO::NetAccess::download(url, tempFile) { // load the file with the name tempFile TDEIO::NetAccess::removeTempFile(tempFile); @@ -2942,18 +2942,18 @@ void FooClass::printModifiedDate() { KURL url("http://developer.kde.org/documentation/kde2arch/index.html"); TDEIO::TransferJob *job = TDEIO::get(url, true, false); - connect( job, SIGNAL(result(TDEIO::Job*)), - this, SLOT(transferResult(TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(transferResult(TDEIO::Job*)) ); } void FooClass::transferResult(TDEIO::Job *job) { - QString mimetype; + TQString mimetype; if (job->error()) job->showErrorDialog(); else { TDEIO::TransferJob *transferJob = (TDEIO::TransferJob*) job; - QString modified = transferJob->queryMetaData("modified"); + TQString modified = transferJob->queryMetaData("modified"); cout << "Last modified: " << modified << endl; } </programlisting> @@ -3193,7 +3193,7 @@ or not (i.e. the default implementation returns an error). <listitem><para>copy(const KURL &url, const KURL &dest, int permissions, bool overwrite)</para></listitem></varlistentry> <varlistentry><term>Creates a symbolic link.</term> -<listitem><para>void symlink(const QString &target, const KURL &dest, bool overwrite)</para></listitem></varlistentry> +<listitem><para>void symlink(const TQString &target, const KURL &dest, bool overwrite)</para></listitem></varlistentry> </variablelist> diff --git a/doc/tde_app_devel/index.docbook b/doc/tde_app_devel/index.docbook index 0149af56..f24131a9 100644 --- a/doc/tde_app_devel/index.docbook +++ b/doc/tde_app_devel/index.docbook @@ -305,14 +305,14 @@ But what about the <methodname>show()</methodname> method? Now, you see that lik This shows you a lot of other widgets that are inherited by <classname>QPushButton</classname>, which we'll use later to explain the signal/slot mechanism. Anyway, the <methodname>show()</methodname> method is not listed, therefore, it must be a method that is provided by inheritance as well. The class -that <classname>QButton</classname> inherits is <classname>QWidget</classname>. Just follow the link -again, and you will see a whole bunch of methods that the QWidget class provides; including +that <classname>QButton</classname> inherits is <classname>TQWidget</classname>. Just follow the link +again, and you will see a whole bunch of methods that the TQWidget class provides; including the <methodname>show()</methodname> method. Now we understand what was done in the sample with the button: <orderedlist> <listitem><para>Create an instance of <classname>QPushButton</classname>, use the second constructor to set the button text</para></listitem> <listitem><para>Resize the widget to its contents</para></listitem> <listitem><para>Set the widget as the main widget of the <classname>QApplication</classname> instance a</para></listitem> -<listitem><para>Tell the widget to display itself on the screen by calling <methodname>show()</methodname>, an inherited method from <classname>QWidget</classname></para></listitem> +<listitem><para>Tell the widget to display itself on the screen by calling <methodname>show()</methodname>, an inherited method from <classname>TQWidget</classname></para></listitem> </orderedlist> </para> <para> @@ -327,7 +327,7 @@ user events. <note><para> For already advanced users: The button has no parent declared in the constructor, therefore it is a top-level widget alone and runs in a local event loop which doesn't need to wait for the main -event loop. See the QWidget class documentation and The TDE Library Reference Guide</para> +event loop. See the TQWidget class documentation and The TDE Library Reference Guide</para> </note> </sect3> @@ -352,7 +352,7 @@ provide methods that detect actions and methods that do something as a reaction The Window system therefore sends all interaction events to the according application. The <classname>QApplication</classname> then sends them to the active window as a <classname>QEvent</classname> and the widgets themselves have to decide what to do with them. A widget receives the event and processes -<methodname>QWidget::event(QEvent*)</methodname>, which then decides which event has been executed +<methodname>TQWidget::event(QEvent*)</methodname>, which then decides which event has been executed and how to react; <methodname>event()</methodname> is therefore the main event handler. Then, the <methodname>event()</methodname> method passes the event to so-called event filters that determine what happened and what to do with the event. If no filter signs responsible for the @@ -405,9 +405,9 @@ Window events containing the widget</para> </para> <para> Note that all event functions are virtual and protected; therefore you can re-implement the events -that you need in your own widgets and specify how your widget has to react. <classname>QWidget</classname> +that you need in your own widgets and specify how your widget has to react. <classname>TQWidget</classname> also contains some other virtual methods that can be useful in your programs; anyway, it is sufficient -to know about <classname>QWidget</classname> very well. +to know about <classname>TQWidget</classname> very well. </para> </sect2> <sect2 id="c1s2s4"> @@ -422,8 +422,8 @@ that can be connected to methods declared as slots. For the C++ part of the prog some things about this mechanism: <itemizedlist> <listitem><para> -the class declaration of a class using signals/slots has to contain the Q_OBJECT macro at the beginning -(without a semicolon); and have to be derved from the <classname>QObject</classname> class +the class declaration of a class using signals/slots has to contain the TQ_OBJECT macro at the beginning +(without a semicolon); and have to be derved from the <classname>TQObject</classname> class </para></listitem> <listitem><para> a signal can be emitted by the keyword emit, e.g. emit signal(parameters); from within any member function @@ -445,9 +445,9 @@ implementation (which is not necessary to know). The output files of moc are co </itemizedlist> </para> <para> -Another way to use signals without deriving from <classname>QObject</classname> is to use the +Another way to use signals without deriving from <classname>TQObject</classname> is to use the <classname>QSignal</classname> class- see the reference documentation for more information and example -usage. In the following, we assume you're deriving from <classname>QObject</classname>. +usage. In the following, we assume you're deriving from <classname>TQObject</classname>. </para> <para> This way, your class is able to send signals anywhere and to provide slots that signals can connect @@ -457,7 +457,7 @@ as normal methods during implementation. </para> <para> Now, to connect a signal to a slot, you have to use the <methodname>connect()</methodname> methods that -are provided by <classname>QObject</classname> or, where available, special methods that objects provide +are provided by <classname>TQObject</classname> or, where available, special methods that objects provide to set the connection for a certain signal. </para> @@ -479,7 +479,7 @@ hello.resize( 100, 30 ); a.setMainWidget( &hello ); -QObject::connect(&hello, SIGNAL( clicked() ), &a, SLOT( quit() )); +TQObject::connect(&hello, TQ_SIGNAL( clicked() ), &a, TQ_SLOT( quit() )); hello.show(); return a.exec(); @@ -488,15 +488,15 @@ return a.exec(); </para> <para> You see, the only addition to give the button more interaction is to use a <methodname>connect() -</methodname> method: <methodname>connect(&hello, SIGNAL( clicked() ), &a, SLOT( quit() ))</methodname>; -is all you have to add. What is the meaning now? The class declaration of QObject says about the +</methodname> method: <methodname>connect(&hello, TQ_SIGNAL( clicked() ), &a, TQ_SLOT( quit() ))</methodname>; +is all you have to add. What is the meaning now? The class declaration of TQObject says about the <methodname>connect()</methodname> method: </para> <para><methodname> -bool connect ( const QObject * sender, const char * signal, const QObject * receiver, const char * member ) +bool connect ( const TQObject * sender, const char * signal, const TQObject * receiver, const char * member ) </methodname></para> <para> -This means you have to specify a <classname>QObject</classname> instance pointer that is the sender +This means you have to specify a <classname>TQObject</classname> instance pointer that is the sender of the signal, meaning that it can emit this signal as first parameter; then you have to specify the signal that you want to connect to. The last two parameters are the receiver object that provides a slot, followed by the member function which actually is the slot that will be executed on signal emission. @@ -573,7 +573,7 @@ hello.resize( 100, 30 ); a.setTopWidget( &hello ); -QObject::connect(&hello, SIGNAL( clicked() ), &a, SLOT( quit() )); +TQObject::connect(&hello, TQ_SIGNAL( clicked() ), &a, TQ_SLOT( quit() )); hello.show(); return a.exec(); @@ -595,7 +595,7 @@ mentioned before and see the effects. </para> <para> What you should have looked into additionally until now is the reference documentation for Qt, -especially the <classname>QApplication</classname>, <classname>QWidget</classname> and <classname>QObject +especially the <classname>QApplication</classname>, <classname>TQWidget</classname> and <classname>TQObject </classname> class and the tdecore library documentation for the <classname>TDEApplication</classname> class. The <ulink url="developer.kde.org/documentation/library/libraryref.html">TDE Library Reference handbook</ulink> also covers a complete description about the invocation of the <classname>QApplication</classname> and @@ -822,7 +822,7 @@ via &tdevelop;. <para> Before the next file (kscribble.cpp, line 29) is compiled, the moc (meta object compiler) is first invoked on kscribble.h (line 25). This is because KScribble classes use signals/slots, so the -Q_OBJECT macro must be expanded, and the moc does this for us. The resultant file, kscribble.moc, is +TQ_OBJECT macro must be expanded, and the moc does this for us. The resultant file, kscribble.moc, is used by kscribble.cpp via an #include statement inside of the file. </para> </sect1> @@ -924,10 +924,10 @@ Let's have a look at the constructor and see how this instance is called 16 statusBar()->show(); 17 18 // allow the view to change the statusbar and caption -19 connect(m_view, SIGNAL(signalChangeStatusbar(const QString&)), -20 this, SLOT(changeStatusbar(const QString&))); -21 connect(m_view, SIGNAL(signalChangeCaption(const QString&)), -22 this, SLOT(changeCaption(const QString&))); +19 connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), +20 this, TQ_SLOT(changeStatusbar(const TQString&))); +21 connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), +22 this, TQ_SLOT(changeCaption(const TQString&))); 23 24 } </programlisting> @@ -1011,10 +1011,10 @@ a joy if you know how to exploit it's capabilities- inheritance, information hid already existing code. </para> <para> -When creating a TDE or Qt project, you always have to have a view that inherits QWidget, either by -direct inheritance or because the library widget you want to use inherits QWidget. Therefore, the +When creating a TDE or Qt project, you always have to have a view that inherits TQWidget, either by +direct inheritance or because the library widget you want to use inherits TQWidget. Therefore, the Application Wizard already constructed a view that is an instance of a class yourappView, which -inherits QWidget already. +inherits TQWidget already. </para> <para> This chapter therefore describes how to use library widgets for creating views of TDE or @@ -1080,7 +1080,7 @@ inherit your own widget from <classname>QScrollView</classname> or use an instan document's view widget. </para></listitem> <listitem><para> -to create a ScrollView yourself, inherit the View widget from <classname>QWidget</classname> +to create a ScrollView yourself, inherit the View widget from <classname>TQWidget</classname> and add vertical and horizontal <classname>QScrollBars </classname>. (This is done by TDE`s TDEHTMLView widget.) </para></listitem> @@ -1206,7 +1206,7 @@ such as F1 for accessing online-help, Ctrl+N for New File etc. </para> <para> If your application contains a lot of accelerators, you should make them configurable -by an Options-menu; either it could be combined with other application configuration in a QWidget +by an Options-menu; either it could be combined with other application configuration in a TQWidget or stand alone. The TDE library already provides a <classname>KKeyChooser</classname> for use in tab dialogs, whereas <classname>KKeyDialog</classname> provides a ready-to use key-configuration dialog. @@ -1305,7 +1305,7 @@ a visible widget item and gets a help window. As an exercise, you could try this </para> <para> To add the What's This...? help to one of your widgets, use the static method -<methodname>QWhatsThis::add(QWidget *widget, const QString &text)</methodname> +<methodname>QWhatsThis::add(TQWidget *widget, const TQString &text)</methodname> </para> </sect1> </chapter> diff --git a/editors/editor-chooser/editchooser.ui b/editors/editor-chooser/editchooser.ui index a1e265cd..40106306 100644 --- a/editors/editor-chooser/editchooser.ui +++ b/editors/editor-chooser/editchooser.ui @@ -122,9 +122,9 @@ already open files.</string> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot>slotEditPartChanged(const TQString &)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/editors/editor-chooser/editorchooser_part.cpp b/editors/editor-chooser/editorchooser_part.cpp index c700823d..b8b28e86 100644 --- a/editors/editor-chooser/editorchooser_part.cpp +++ b/editors/editor-chooser/editorchooser_part.cpp @@ -21,7 +21,7 @@ EditorChooserPart::EditorChooserPart(TQObject *parent, const char *name, const T { setInstance(EditorChooserFactory::instance()); - connect(core(), TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(configWidget(KDialogBase*))); + connect(core(), TQ_SIGNAL(configWidget(KDialogBase*)), this, TQ_SLOT(configWidget(KDialogBase*))); } @@ -34,7 +34,7 @@ void EditorChooserPart::configWidget(KDialogBase *dlg) { TQVBox *vbox = dlg->addVBoxPage(i18n("Editor"), i18n("Editor"), BarIcon("kate", TDEIcon::SizeMedium) ); EditorChooserWidget *w = new EditorChooserWidget(vbox); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); } diff --git a/editors/editor-chooser/editorchooser_part.h b/editors/editor-chooser/editorchooser_part.h index d7a9dbd1..a200ea6c 100644 --- a/editors/editor-chooser/editorchooser_part.h +++ b/editors/editor-chooser/editorchooser_part.h @@ -15,7 +15,7 @@ class KDialogBase; class EditorChooserPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/editors/editor-chooser/editorchooser_widget.h b/editors/editor-chooser/editorchooser_widget.h index efe82cfd..db34412e 100644 --- a/editors/editor-chooser/editorchooser_widget.h +++ b/editors/editor-chooser/editorchooser_widget.h @@ -10,7 +10,7 @@ class EditorChooserWidget : public EditChooser { - Q_OBJECT + TQ_OBJECT public: diff --git a/embedded/visualboyadvance/vbaconfigwidget.cpp b/embedded/visualboyadvance/vbaconfigwidget.cpp index f2f53c23..730d8615 100644 --- a/embedded/visualboyadvance/vbaconfigwidget.cpp +++ b/embedded/visualboyadvance/vbaconfigwidget.cpp @@ -98,7 +98,7 @@ VBAConfigWidget::VBAConfigWidget(VisualBoyAdvancePart* part,TQWidget *parent, co } addOptionsEdit->setText(addOptions); - connect(emuPathButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(emuPathButtonClicked())); + connect(emuPathButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(emuPathButtonClicked())); } VBAConfigWidget::~VBAConfigWidget(){ } diff --git a/embedded/visualboyadvance/vbaconfigwidget.h b/embedded/visualboyadvance/vbaconfigwidget.h index 4c1bc00a..9e44c615 100644 --- a/embedded/visualboyadvance/vbaconfigwidget.h +++ b/embedded/visualboyadvance/vbaconfigwidget.h @@ -28,7 +28,7 @@ namespace VisualBoyAdvance { */ class VBAConfigWidget : public VBAConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: VBAConfigWidget(VisualBoyAdvancePart* part,TQWidget *parent=0, const char *name=0); diff --git a/embedded/visualboyadvance/visualboyadvance_part.cpp b/embedded/visualboyadvance/visualboyadvance_part.cpp index effee085..f1191501 100644 --- a/embedded/visualboyadvance/visualboyadvance_part.cpp +++ b/embedded/visualboyadvance/visualboyadvance_part.cpp @@ -31,11 +31,11 @@ VisualBoyAdvancePart::VisualBoyAdvancePart(TQObject *parent, const char *name, c TDEAction *action; action = new TDEAction( i18n("Execute Program"), "application-x-executable", Key_F9, - this, TQT_SLOT(slotExecute()), + this, TQ_SLOT(slotExecute()), actionCollection(), "build_execute" ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); } @@ -70,7 +70,7 @@ void VisualBoyAdvancePart::projectConfigWidget(KDialogBase *dlg){ TQVBox *vbox; vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "text-x-makefile", TDEIcon::SizeMedium )); VBAConfigWidget* w = new VBAConfigWidget(this,vbox); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } diff --git a/embedded/visualboyadvance/visualboyadvance_part.h b/embedded/visualboyadvance/visualboyadvance_part.h index 941e0ff2..abf39b8d 100644 --- a/embedded/visualboyadvance/visualboyadvance_part.h +++ b/embedded/visualboyadvance/visualboyadvance_part.h @@ -13,7 +13,7 @@ namespace VisualBoyAdvance { class VisualBoyAdvancePart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/actiondnd.cpp b/kdevdesigner/designer/actiondnd.cpp index 33f0c4bf..c76f13b6 100644 --- a/kdevdesigner/designer/actiondnd.cpp +++ b/kdevdesigner/designer/actiondnd.cpp @@ -105,7 +105,7 @@ bool QDesignerAction::addTo( TQWidget *w ) if ( !widgetToInsert ) return TQAction::addTo( w ); - if ( ::tqqt_cast<TQPopupMenu*>(w) ) + if ( ::tqt_cast<TQPopupMenu*>(w) ) return FALSE; widgetToInsert->reparent( w, TQPoint( 0, 0 ), FALSE ); @@ -127,23 +127,23 @@ void QDesignerAction::remove() { if ( !widgetToInsert ) return; - MainWindow::self->formWindow()->selectWidget( TQT_TQOBJECT(widgetToInsert), FALSE ); + MainWindow::self->formWindow()->selectWidget( widgetToInsert, FALSE ); widgetToInsert->reparent( 0, TQPoint( 0, 0 ), FALSE ); } -QDesignerToolBarSeparator::QDesignerToolBarSeparator(Qt::Orientation o , TQToolBar *parent, +QDesignerToolBarSeparator::QDesignerToolBarSeparator(TQt::Orientation o , TQToolBar *parent, const char* name ) : TQWidget( parent, name ) { - connect( parent, TQT_SIGNAL(orientationChanged(Qt::Orientation)), - this, TQT_SLOT(setOrientation(Qt::Orientation)) ); + connect( parent, TQ_SIGNAL(orientationChanged(TQt::Orientation)), + this, TQ_SLOT(setOrientation(TQt::Orientation)) ); setOrientation( o ); setBackgroundMode( parent->backgroundMode() ); setBackgroundOrigin( ParentOrigin ); setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); } -void QDesignerToolBarSeparator::setOrientation( Qt::Orientation o ) +void QDesignerToolBarSeparator::setOrientation( TQt::Orientation o ) { orient = o; } @@ -157,7 +157,7 @@ TQSize QDesignerToolBarSeparator::sizeHint() const { int extent = style().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); - if ( orient ==Qt::Horizontal ) + if ( orient ==TQt::Horizontal ) return TQSize( extent, 0 ); else return TQSize( 0, extent ); @@ -168,10 +168,10 @@ void QDesignerToolBarSeparator::paintEvent( TQPaintEvent * ) TQPainter p( this ); TQStyle::SFlags flags = TQStyle::Style_Default; - if ( orientation() ==Qt::Horizontal ) + if ( orientation() ==TQt::Horizontal ) flags |= TQStyle::Style_Horizontal; - style().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(), + style().drawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(), colorGroup(), flags ); } @@ -184,11 +184,11 @@ QSeparatorAction::QSeparatorAction( TQObject *parent ) bool QSeparatorAction::addTo( TQWidget *w ) { - if ( ::tqqt_cast<TQToolBar*>(w) ) { + if ( ::tqt_cast<TQToolBar*>(w) ) { TQToolBar *tb = (TQToolBar*)w; wid = new QDesignerToolBarSeparator( tb->orientation(), tb ); return TRUE; - } else if ( ::tqqt_cast<TQPopupMenu*>(w) ) { + } else if ( ::tqt_cast<TQPopupMenu*>(w) ) { idx = ( (TQPopupMenu*)w )->count(); ( (TQPopupMenu*)w )->insertSeparator( idx ); return TRUE; @@ -198,10 +198,10 @@ bool QSeparatorAction::addTo( TQWidget *w ) bool QSeparatorAction::removeFrom( TQWidget *w ) { - if ( ::tqqt_cast<TQToolBar*>(w) ) { + if ( ::tqt_cast<TQToolBar*>(w) ) { delete wid; return TRUE; - } else if ( ::tqqt_cast<TQPopupMenu*>(w) ) { + } else if ( ::tqt_cast<TQPopupMenu*>(w) ) { ( (TQPopupMenu*)w )->removeItemAt( idx ); return TRUE; } @@ -221,7 +221,7 @@ QDesignerToolBar::QDesignerToolBar( TQMainWindow *mw ) insertAnchor = 0; afterAnchor = TRUE; setAcceptDrops( TRUE ); - MetaDataBase::addEntry( TQT_TQOBJECT(this) ); + MetaDataBase::addEntry( this ); lastIndicatorPos = TQPoint( -1, -1 ); indicator = new QDesignerIndicatorWidget( this ); indicator->hide(); @@ -239,7 +239,7 @@ QDesignerToolBar::QDesignerToolBar( TQMainWindow *mw, Dock dock ) setAcceptDrops( TRUE ); indicator = new QDesignerIndicatorWidget( this ); indicator->hide(); - MetaDataBase::addEntry( TQT_TQOBJECT(this) ); + MetaDataBase::addEntry( this ); installEventFilter( this ); widgetInserting = FALSE; findFormWindow(); @@ -250,7 +250,7 @@ void QDesignerToolBar::findFormWindow() { TQWidget *w = this; while ( w ) { - formWindow = ::tqqt_cast<FormWindow*>(w); + formWindow = ::tqt_cast<FormWindow*>(w); if ( formWindow ) break; w = w->parentWidget(); @@ -260,11 +260,11 @@ void QDesignerToolBar::findFormWindow() void QDesignerToolBar::addAction( TQAction *a ) { actionList.append( a ); - connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( actionRemoved() ) ); - if ( ::tqqt_cast<TQActionGroup*>(a) ) { + connect( a, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( actionRemoved() ) ); + if ( ::tqt_cast<TQActionGroup*>(a) ) { ( (QDesignerActionGroup*)a )->widget()->installEventFilter( this ); actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a ); - } else if ( ::tqqt_cast<QSeparatorAction*>(a) ) { + } else if ( ::tqt_cast<QSeparatorAction*>(a) ) { ( (QSeparatorAction*)a )->widget()->installEventFilter( this ); actionMap.insert( ( (QSeparatorAction*)a )->widget(), a ); } else { @@ -275,22 +275,22 @@ void QDesignerToolBar::addAction( TQAction *a ) static void fixObject( TQObject *&o ) { - while ( o && o->parent() && !::tqqt_cast<QDesignerToolBar*>(o->parent()) ) + while ( o && o->parent() && !::tqt_cast<QDesignerToolBar*>(o->parent()) ) o = o->parent(); } bool QDesignerToolBar::eventFilter( TQObject *o, TQEvent *e ) { - if ( !o || !e || o->inherits( TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING ) || o->inherits( "TQDockWindowTitleBar" ) ) + if ( !o || !e || o->inherits( "TQDockWindowHandle" ) || o->inherits( "TQDockWindowTitleBar" ) ) return TQToolBar::eventFilter( o, e ); - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) && e->type() == TQEvent::MouseButtonPress && - ( ( TQMouseEvent*)e )->button() == Qt::LeftButton ) { + if ( o == this && e->type() == TQEvent::MouseButtonPress && + ( ( TQMouseEvent*)e )->button() == TQt::LeftButton ) { mousePressEvent( (TQMouseEvent*)e ); return TRUE; } - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) + if ( o == this ) return TQToolBar::eventFilter( o, e ); if ( e->type() == TQEvent::MouseButtonPress ) { @@ -359,7 +359,7 @@ void QDesignerToolBar::contextMenuEvent( TQContextMenuEvent *e ) void QDesignerToolBar::mousePressEvent( TQMouseEvent *e ) { widgetInserting = FALSE; - if ( e->button() == Qt::LeftButton && + if ( e->button() == TQt::LeftButton && MainWindow::self->currentTool() != POINTER_TOOL && MainWindow::self->currentTool() != ORDER_TOOL && MainWindow::self->currentTool() != CONNECT_TOOL && @@ -393,7 +393,7 @@ void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject * const int ID_SEP = 2; const int ID_DELTOOLBAR = 3; TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.find( (TQWidget*)o ); - if ( it != actionMap.end() && ::tqqt_cast<QSeparatorAction*>(*it) ) + if ( it != actionMap.end() && ::tqt_cast<QSeparatorAction*>(*it) ) menu.insertItem( i18n( "Delete Separator" ), ID_DELETE ); else menu.insertItem( i18n( "Delete Item" ), ID_DELETE ); @@ -440,10 +440,10 @@ void QDesignerToolBar::buttonMousePressEvent( TQMouseEvent *e, TQObject * ) { widgetInserting = FALSE; - if ( e->button() == Qt::MidButton ) + if ( e->button() == TQt::MidButton ) return; - if ( e->button() == Qt::LeftButton && + if ( e->button() == TQt::LeftButton && MainWindow::self->currentTool() != POINTER_TOOL && MainWindow::self->currentTool() != ORDER_TOOL && MainWindow::self->currentTool() != CONNECT_TOOL && @@ -474,7 +474,7 @@ void QDesignerToolBar::removeWidget( TQWidget *w ) void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) { - if ( widgetInserting || ( e->state() & Qt::LeftButton ) == 0 ) + if ( widgetInserting || ( e->state() & TQt::LeftButton ) == 0 ) return; if ( TQABS( TQPoint( dragStartPos - e->pos() ).manhattanLength() ) < TQApplication::startDragDistance() ) return; @@ -494,13 +494,13 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) TQApplication::sendPostedEvents(); adjustSize(); - TQString type = ::tqqt_cast<TQActionGroup*>(a) ? TQString( "application/x-designer-actiongroup" ) : - ::tqqt_cast<QSeparatorAction*>(a) ? TQString( "application/x-designer-separator" ) : TQString( "application/x-designer-actions" ); + TQString type = ::tqt_cast<TQActionGroup*>(a) ? TQString( "application/x-designer-actiongroup" ) : + ::tqt_cast<QSeparatorAction*>(a) ? TQString( "application/x-designer-separator" ) : TQString( "application/x-designer-actions" ); TQStoredDrag *drag = new ActionDrag( type, a, this ); drag->setPixmap( a->iconSet().pixmap() ); - if ( ::tqqt_cast<QDesignerAction*>(a) ) { + if ( ::tqt_cast<QDesignerAction*>(a) ) { if ( formWindow->widgets()->find( ( (QDesignerAction*)a )->widget() ) ) - formWindow->selectWidget( ( TQT_TQOBJECT(( (QDesignerAction*)a )->widget())), FALSE ); + formWindow->selectWidget( ( ( (QDesignerAction*)a )->widget()), FALSE ); } if ( !drag->drag() ) { AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n( "Add Action '%1' to Toolbar '%2'" ). @@ -555,11 +555,11 @@ void QDesignerToolBar::dropEvent( TQDropEvent *e ) if ( e->provides( "application/x-designer-actions" ) || e->provides( "application/x-designer-separator" ) ) { if ( e->provides( "application/x-designer-actions" ) ) - a = ::tqqt_cast<QDesignerAction*>(ActionDrag::action()); + a = ::tqt_cast<QDesignerAction*>(ActionDrag::action()); else - a = ::tqqt_cast<QSeparatorAction*>(ActionDrag::action()); + a = ::tqt_cast<QSeparatorAction*>(ActionDrag::action()); } else { - a = ::tqqt_cast<QDesignerActionGroup*>(ActionDrag::action()); + a = ::tqt_cast<QDesignerActionGroup*>(ActionDrag::action()); } if ( actionList.findRef( a ) != -1 ) { @@ -588,14 +588,14 @@ void QDesignerToolBar::reInsert() clear(); for ( a = actionList.first(); a; a = actionList.next() ) { a->addTo( this ); - if ( ::tqqt_cast<TQActionGroup*>(a) ) { + if ( ::tqt_cast<TQActionGroup*>(a) ) { actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a ); if ( ( (QDesignerActionGroup*)a )->widget() ) ( (QDesignerActionGroup*)a )->widget()->installEventFilter( this ); - } else if ( ::tqqt_cast<QDesignerAction*>(a) ) { + } else if ( ::tqt_cast<QDesignerAction*>(a) ) { actionMap.insert( ( (QDesignerAction*)a )->widget(), a ); ( (QDesignerAction*)a )->widget()->installEventFilter( this ); - } else if ( ::tqqt_cast<QSeparatorAction*>(a) ) { + } else if ( ::tqt_cast<QSeparatorAction*>(a) ) { actionMap.insert( ( (QSeparatorAction*)a )->widget(), a ); ( (QSeparatorAction*)a )->widget()->installEventFilter( this ); } @@ -611,7 +611,7 @@ void QDesignerToolBar::actionRemoved() TQPoint QDesignerToolBar::calcIndicatorPos( const TQPoint &pos ) { - if ( orientation() ==Qt::Horizontal ) { + if ( orientation() ==TQt::Horizontal ) { TQPoint pnt( width() - 2, 0 ); insertAnchor = 0; afterAnchor = TRUE; @@ -665,7 +665,7 @@ void QDesignerToolBar::drawIndicator( const TQPoint &pos ) if ( lastIndicatorPos == pos ) return; bool wasVsisible = indicator->isVisible(); - if ( orientation() ==Qt::Horizontal ) { + if ( orientation() ==TQt::Horizontal ) { indicator->resize( 3, height() ); if ( pos != TQPoint( -1, -1 ) ) indicator->move( pos.x() - 1, 0 ); @@ -709,7 +709,7 @@ void QDesignerToolBar::doInsertWidget( const TQPoint &p ) void QDesignerToolBar::clear() { for ( TQAction *a = actionList.first(); a; a = actionList.next() ) { - if ( ::tqqt_cast<QDesignerAction*>(a) ) + if ( ::tqt_cast<QDesignerAction*>(a) ) ( (QDesignerAction*)a )->remove(); } TQToolBar::clear(); @@ -719,7 +719,7 @@ void QDesignerToolBar::installEventFilters( TQWidget *w ) { if ( !w ) return; - TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = w->queryList( "TQWidget" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( this ); delete l; diff --git a/kdevdesigner/designer/actiondnd.h b/kdevdesigner/designer/actiondnd.h index 1e9f68b0..ae8d8df0 100644 --- a/kdevdesigner/designer/actiondnd.h +++ b/kdevdesigner/designer/actiondnd.h @@ -45,7 +45,7 @@ class TQPopupMenu; class QDesignerIndicatorWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -58,7 +58,7 @@ public: class ActionDrag : public TQStoredDrag { - Q_OBJECT + TQ_OBJECT public: @@ -81,12 +81,12 @@ private: class QDesignerActionGroup : public TQActionGroup { - Q_OBJECT + TQ_OBJECT public: QDesignerActionGroup( TQObject *parent ) - : TQActionGroup( ::tqqt_cast<TQActionGroup*>(parent) ? parent : 0 ), wid( 0 ), idx( -1 ) { init(); } + : TQActionGroup( ::tqt_cast<TQActionGroup*>(parent) ? parent : 0 ), wid( 0 ), idx( -1 ) { init(); } void init(); @@ -117,14 +117,14 @@ private: class QDesignerAction : public TQAction { - Q_OBJECT + TQ_OBJECT public: QDesignerAction( TQObject *parent ) - : TQAction( ::tqqt_cast<TQActionGroup*>(parent) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) { init(); } + : TQAction( ::tqt_cast<TQActionGroup*>(parent) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) { init(); } QDesignerAction( TQWidget *w, TQObject *parent ) - : TQAction( ::tqqt_cast<TQActionGroup*>(parent) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) { init(); } + : TQAction( ::tqt_cast<TQActionGroup*>(parent) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) { init(); } void init(); @@ -154,27 +154,27 @@ private: class QDesignerToolBarSeparator : public TQWidget { - Q_OBJECT + TQ_OBJECT public: - QDesignerToolBarSeparator( Qt::Orientation, TQToolBar *parent, const char* name=0 ); + QDesignerToolBarSeparator( TQt::Orientation, TQToolBar *parent, const char* name=0 ); TQSize sizeHint() const; - Qt::Orientation orientation() const { return orient; } + TQt::Orientation orientation() const { return orient; } public slots: - void setOrientation( Qt::Orientation ); + void setOrientation( TQt::Orientation ); protected: void styleChange( TQStyle& ); void paintEvent( TQPaintEvent * ); private: - Qt::Orientation orient; + TQt::Orientation orient; }; class QSeparatorAction : public TQAction { - Q_OBJECT + TQ_OBJECT public: @@ -194,7 +194,7 @@ private: class QDesignerToolBar : public TQToolBar { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/actioneditor.ui b/kdevdesigner/designer/actioneditor.ui index 13a56a04..9cb136ae 100644 --- a/kdevdesigner/designer/actioneditor.ui +++ b/kdevdesigner/designer/actioneditor.ui @@ -210,14 +210,14 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot access="protected">connectionsClicked()</slot> <slot access="protected">currentActionChanged( TQListViewItem * )</slot> <slot access="protected">deleteAction()</slot> <slot access="protected">newAction()</slot> -</Q_SLOTS> +</slots> <includes> <include location="local" impldecl="in implementation">myiconloader.h</include> </includes> diff --git a/kdevdesigner/designer/actioneditorimpl.cpp b/kdevdesigner/designer/actioneditorimpl.cpp index 294507a9..f97e8a47 100644 --- a/kdevdesigner/designer/actioneditorimpl.cpp +++ b/kdevdesigner/designer/actioneditorimpl.cpp @@ -54,17 +54,17 @@ ActionEditor::ActionEditor( TQWidget* parent, const char* name, WFlags fl ) buttonConnect->setEnabled( FALSE ); TQPopupMenu *popup = new TQPopupMenu( this ); - popup->insertItem( i18n( "New &Action" ), this, TQT_SLOT( newAction() ) ); - popup->insertItem( i18n( "New Action &Group" ), this, TQT_SLOT( newActionGroup() ) ); - popup->insertItem( i18n( "New &Dropdown Action Group" ), this, TQT_SLOT( newDropDownActionGroup() ) ); + popup->insertItem( i18n( "New &Action" ), this, TQ_SLOT( newAction() ) ); + popup->insertItem( i18n( "New Action &Group" ), this, TQ_SLOT( newActionGroup() ) ); + popup->insertItem( i18n( "New &Dropdown Action Group" ), this, TQ_SLOT( newDropDownActionGroup() ) ); buttonNewAction->setPopup( popup ); buttonNewAction->setPopupDelay( 0 ); - connect( listActions, TQT_SIGNAL( insertAction() ), this, TQT_SLOT( newAction() ) ); - connect( listActions, TQT_SIGNAL( insertActionGroup() ), this, TQT_SLOT( newActionGroup() ) ); - connect( listActions, TQT_SIGNAL( insertDropDownActionGroup() ), this, TQT_SLOT( newDropDownActionGroup() ) ); - connect( listActions, TQT_SIGNAL( deleteAction() ), this, TQT_SLOT( deleteAction() ) ); - connect( listActions, TQT_SIGNAL( connectAction() ), this, TQT_SLOT( connectionsClicked() ) ); + connect( listActions, TQ_SIGNAL( insertAction() ), this, TQ_SLOT( newAction() ) ); + connect( listActions, TQ_SIGNAL( insertActionGroup() ), this, TQ_SLOT( newActionGroup() ) ); + connect( listActions, TQ_SIGNAL( insertDropDownActionGroup() ), this, TQ_SLOT( newDropDownActionGroup() ) ); + connect( listActions, TQ_SIGNAL( deleteAction() ), this, TQ_SLOT( deleteAction() ) ); + connect( listActions, TQ_SIGNAL( connectAction() ), this, TQ_SLOT( connectionsClicked() ) ); } void ActionEditor::closeEvent( TQCloseEvent *e ) @@ -103,8 +103,8 @@ TQAction *ActionEditor::newActionEx() { ActionItem *i = new ActionItem( listActions, (bool)FALSE ); TQAction *a = i->action(); - TQObject::connect( a, TQT_SIGNAL( destroyed( TQObject * ) ), - this, TQT_SLOT( removeConnections( TQObject* ) ) ); + TQObject::connect( a, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject* ) ) ); MetaDataBase::addEntry( i->action() ); TQString n = "Action"; formWindow->unify( i->action(), n, TRUE ); @@ -139,7 +139,7 @@ void ActionEditor::deleteAction() ++it; } if ( formWindow ) { - formWindow->setActiveObject( TQT_TQOBJECT(formWindow->mainContainer()) ); + formWindow->setActiveObject( formWindow->mainContainer() ); if ( formWindow->formFile() ) formWindow->formFile()->setModified( TRUE ); } @@ -149,7 +149,7 @@ void ActionEditor::newAction() { ActionItem *actionParent = (ActionItem*)listActions->selectedItem(); if ( actionParent ) { - if ( !::tqqt_cast<TQActionGroup*>(actionParent->actionGroup()) ) + if ( !::tqt_cast<TQActionGroup*>(actionParent->actionGroup()) ) actionParent = (ActionItem*)actionParent->parent(); } @@ -159,8 +159,8 @@ void ActionEditor::newAction() else i = new ActionItem( listActions, (bool)FALSE ); TQAction *a = i->action(); - TQObject::connect( a, TQT_SIGNAL( destroyed( TQObject * ) ), - this, TQT_SLOT( removeConnections( TQObject* ) ) ); + TQObject::connect( a, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject* ) ) ); MetaDataBase::addEntry( i->action() ); TQString n = "Action"; formWindow->unify( i->action(), n, TRUE ); @@ -185,7 +185,7 @@ void ActionEditor::newActionGroup() { ActionItem *actionParent = (ActionItem*)listActions->selectedItem(); if ( actionParent ) { - if ( !::tqqt_cast<TQActionGroup*>(actionParent->actionGroup()) ) + if ( !::tqt_cast<TQActionGroup*>(actionParent->actionGroup()) ) actionParent = (ActionItem*)actionParent->parent(); } @@ -195,8 +195,8 @@ void ActionEditor::newActionGroup() else i = new ActionItem( listActions, TRUE ); TQAction *ag = i->actionGroup(); - TQObject::connect( ag, TQT_SIGNAL( destroyed( TQObject * ) ), - this, TQT_SLOT( removeConnections( TQObject* ) ) ); + TQObject::connect( ag, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject* ) ) ); MetaDataBase::addEntry( i->actionGroup() ); MetaDataBase::setPropertyChanged( i->actionGroup(), "usesDropDown", TRUE ); TQString n = "ActionGroup"; @@ -225,23 +225,23 @@ void ActionEditor::setFormWindow( FormWindow *fw ) listActions->clear(); formWindow = fw; if ( !formWindow || - !::tqqt_cast<TQMainWindow*>(formWindow->mainContainer()) ) { + !::tqt_cast<TQMainWindow*>(formWindow->mainContainer()) ) { setEnabled( FALSE ); } else { setEnabled( TRUE ); for ( TQAction *a = formWindow->actionList().first(); a; a = formWindow->actionList().next() ) { ActionItem *i = 0; - if ( ::tqqt_cast<TQAction*>(a->parent()) ) + if ( ::tqt_cast<TQAction*>(a->parent()) ) continue; i = new ActionItem( listActions, a ); i->setText( 0, a->name() ); i->setPixmap( 0, a->iconSet().pixmap() ); // make sure we don't duplicate the connection - TQObject::disconnect( a, TQT_SIGNAL( destroyed( TQObject * ) ), - this, TQT_SLOT( removeConnections( TQObject * ) ) ); - TQObject::connect( a, TQT_SIGNAL( destroyed( TQObject * ) ), - this, TQT_SLOT( removeConnections( TQObject* ) ) ); - if ( ::tqqt_cast<TQActionGroup*>(a) ) { + TQObject::disconnect( a, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject * ) ) ); + TQObject::connect( a, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject* ) ) ); + if ( ::tqt_cast<TQActionGroup*>(a) ) { insertChildActions( i ); } } @@ -261,7 +261,7 @@ void ActionEditor::insertChildActions( ActionItem *i ) while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !::tqqt_cast<TQAction*>(o) ) + if ( !::tqt_cast<TQAction*>(o) ) continue; TQAction *a = (TQAction*)o; ActionItem *i2 = new ActionItem( (TQListViewItem*)i, a ); @@ -269,11 +269,11 @@ void ActionEditor::insertChildActions( ActionItem *i ) i2->setText( 0, a->name() ); i2->setPixmap( 0, a->iconSet().pixmap() ); // make sure we don't duplicate the connection - TQObject::disconnect( o, TQT_SIGNAL( destroyed( TQObject * ) ), - this, TQT_SLOT( removeConnections( TQObject * ) ) ); - TQObject::connect( o, TQT_SIGNAL( destroyed( TQObject * ) ), - this, TQT_SLOT( removeConnections( TQObject * ) ) ); - if ( ::tqqt_cast<TQActionGroup*>(a) ) + TQObject::disconnect( o, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject * ) ) ); + TQObject::connect( o, TQ_SIGNAL( destroyed( TQObject * ) ), + this, TQ_SLOT( removeConnections( TQObject * ) ) ); + if ( ::tqt_cast<TQActionGroup*>(a) ) insertChildActions( i2 ); } } @@ -305,7 +305,7 @@ void ActionEditor::updateActionIcon( TQAction *a ) void ActionEditor::connectionsClicked() { ConnectionDialog dlg( formWindow->mainWindow() ); - dlg.setDefault( TQT_TQOBJECT(currentAction), TQT_TQOBJECT(formWindow) ); + dlg.setDefault( currentAction, formWindow ); dlg.addConnection(); dlg.exec(); } @@ -313,9 +313,9 @@ void ActionEditor::connectionsClicked() void ActionEditor::removeConnections( TQObject *o ) { TQValueList<MetaDataBase::Connection> conns = - MetaDataBase::connections( TQT_TQOBJECT(formWindow), o ); + MetaDataBase::connections( formWindow, o ); for ( TQValueList<MetaDataBase::Connection>::Iterator it2 = conns.begin(); it2 != conns.end(); ++it2 ) - MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow), (*it2).sender, (*it2).signal, + MetaDataBase::removeConnection( formWindow, (*it2).sender, (*it2).signal, (*it2).receiver, (*it2).slot ); } diff --git a/kdevdesigner/designer/actioneditorimpl.h b/kdevdesigner/designer/actioneditorimpl.h index 9e67ed9a..2062aaa2 100644 --- a/kdevdesigner/designer/actioneditorimpl.h +++ b/kdevdesigner/designer/actioneditorimpl.h @@ -37,7 +37,7 @@ class ActionItem; class ActionEditor : public ActionEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/actionlistview.cpp b/kdevdesigner/designer/actionlistview.cpp index 3e8c95c2..8f99679a 100644 --- a/kdevdesigner/designer/actionlistview.cpp +++ b/kdevdesigner/designer/actionlistview.cpp @@ -36,25 +36,25 @@ ActionListView::ActionListView( TQWidget *parent, const char *name ) setShowSortIndicator( TRUE ); setResizeMode( LastColumn ); setRootIsDecorated( TRUE ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( rmbMenu( TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( rmbMenu( TQListViewItem *, const TQPoint & ) ) ); } ActionItem::ActionItem( TQListView *lv, TQAction *ac ) : TQListViewItem( lv ), a( 0 ), g( 0 ) { - g = ::tqqt_cast<QDesignerActionGroup*>(ac); + g = ::tqt_cast<QDesignerActionGroup*>(ac); if ( !g ) - a = ::tqqt_cast<QDesignerAction*>(ac); + a = ::tqt_cast<QDesignerAction*>(ac); setDragEnabled( TRUE ); } ActionItem::ActionItem( TQListViewItem *i, TQAction *ac ) : TQListViewItem( i ), a( 0 ), g( 0 ) { - g = ::tqqt_cast<QDesignerActionGroup*>(ac); + g = ::tqt_cast<QDesignerActionGroup*>(ac); if ( !g ) - a = ::tqqt_cast<QDesignerAction*>(ac); + a = ::tqt_cast<QDesignerAction*>(ac); setDragEnabled( TRUE ); moveToEnd(); } diff --git a/kdevdesigner/designer/actionlistview.h b/kdevdesigner/designer/actionlistview.h index 047b21bd..093c884c 100644 --- a/kdevdesigner/designer/actionlistview.h +++ b/kdevdesigner/designer/actionlistview.h @@ -58,7 +58,7 @@ private: class ActionListView : public TQListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/asciivalidator.h b/kdevdesigner/designer/asciivalidator.h index a284f6ab..31f53fa6 100644 --- a/kdevdesigner/designer/asciivalidator.h +++ b/kdevdesigner/designer/asciivalidator.h @@ -33,7 +33,7 @@ class AsciiValidator: public TQValidator { - Q_OBJECT + TQ_OBJECT public: AsciiValidator( TQObject * parent, const char *name = 0 ); diff --git a/kdevdesigner/designer/command.cpp b/kdevdesigner/designer/command.cpp index b9b97827..4b3b3109 100644 --- a/kdevdesigner/designer/command.cpp +++ b/kdevdesigner/designer/command.cpp @@ -243,7 +243,7 @@ void ResizeCommand::execute() { widget->setGeometry( newRect ); formWindow()->updateSelection( widget ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(widget) ); + formWindow()->emitUpdateProperties( widget ); if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout ) formWindow()->updateChildSelections( widget ); } @@ -252,7 +252,7 @@ void ResizeCommand::unexecute() { widget->setGeometry( oldRect ); formWindow()->updateSelection( widget ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(widget) ); + formWindow()->emitUpdateProperties( widget ); if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout ) formWindow()->updateChildSelections( widget ); } @@ -279,15 +279,15 @@ void InsertCommand::execute() widget->show(); formWindow()->widgets()->insert( widget, widget ); formWindow()->clearSelection( FALSE ); - formWindow()->selectWidget( TQT_TQOBJECT(widget) ); + formWindow()->selectWidget( widget ); formWindow()->mainWindow()->objectHierarchy()->widgetInserted( widget ); } void InsertCommand::unexecute() { widget->hide(); - formWindow()->selectWidget( TQT_TQOBJECT(widget), FALSE ); - formWindow()->widgets()->remove( TQT_TQOBJECT(widget) ); + formWindow()->selectWidget( widget, FALSE ); + formWindow()->widgets()->remove( widget ); formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( widget ); } @@ -326,7 +326,7 @@ void MoveCommand::execute() w->reparent( newParent, pos, TRUE ); formWindow()->raiseSelection( w ); formWindow()->raiseChildSelections( w ); - formWindow()->widgetChanged( TQT_TQOBJECT(w) ); + formWindow()->widgetChanged( w ); formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( w ); formWindow()->mainWindow()->objectHierarchy()->widgetInserted( w ); } @@ -334,7 +334,7 @@ void MoveCommand::execute() } formWindow()->updateSelection( w ); formWindow()->updateChildSelections( w ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(w) ); + formWindow()->emitUpdateProperties( w ); } } @@ -347,7 +347,7 @@ void MoveCommand::unexecute() w->reparent( oldParent, pos, TRUE ); formWindow()->raiseSelection( w ); formWindow()->raiseChildSelections( w ); - formWindow()->widgetChanged( TQT_TQOBJECT(w) ); + formWindow()->widgetChanged( w ); formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( w ); formWindow()->mainWindow()->objectHierarchy()->widgetInserted( w ); } @@ -355,7 +355,7 @@ void MoveCommand::unexecute() } formWindow()->updateSelection( w ); formWindow()->updateChildSelections( w ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(w) ); + formWindow()->emitUpdateProperties( w ); } } @@ -371,7 +371,7 @@ DeleteCommand::DeleteCommand( const TQString &n, FormWindow *fw, // Include the children of the selected items when deleting for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { - TQObjectList *children = w->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *children = w->queryList( "TQWidget" ); for ( TQWidget *c = (TQWidget *)children->first(); c; c = (TQWidget *)children->next() ) { if ( copyOfWidgets.find( c ) == -1 && formWindow()->widgets()->find( c ) ) { widgets.insert(widgets.at() + 1, c); @@ -392,13 +392,13 @@ void DeleteCommand::execute() TQString s = w->name(); s.prepend( "qt_dead_widget_" ); w->setName( s ); - formWindow()->selectWidget( TQT_TQOBJECT(w), FALSE ); + formWindow()->selectWidget( w, FALSE ); formWindow()->widgets()->remove( w ); - TQValueList<MetaDataBase::Connection> conns = MetaDataBase::connections( TQT_TQOBJECT(formWindow()), TQT_TQOBJECT(w) ); + TQValueList<MetaDataBase::Connection> conns = MetaDataBase::connections( formWindow(), w ); connections.insert( w, conns ); TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin(); for ( ; it != conns.end(); ++it ) { - MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow()), (*it).sender, + MetaDataBase::removeConnection( formWindow(), (*it).sender, (*it).signal, (*it).receiver, (*it).slot ); } } @@ -418,11 +418,11 @@ void DeleteCommand::unexecute() s.remove( 0, TQString( "qt_dead_widget_" ).length() ); w->setName( s ); formWindow()->widgets()->insert( w, w ); - formWindow()->selectWidget( TQT_TQOBJECT(w) ); + formWindow()->selectWidget( w ); TQValueList<MetaDataBase::Connection> conns = *connections.find( w ); TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin(); for ( ; it != conns.end(); ++it ) { - MetaDataBase::addConnection( TQT_TQOBJECT(formWindow()), (*it).sender, + MetaDataBase::addConnection( formWindow(), (*it).sender, (*it).signal, (*it).receiver, (*it).slot ); } } @@ -457,8 +457,8 @@ void SetPropertyCommand::execute() if ( isResetCommand ) { MetaDataBase::setPropertyChanged( widget, propName, FALSE ); if ( WidgetFactory::resetProperty( widget, propName ) ) { - if ( !formWindow()->isWidgetSelected( widget ) && TQT_TQOBJECT(formWindow()) != TQT_TQOBJECT(widget) ) - formWindow()->selectWidget( TQT_TQOBJECT(widget) ); + if ( !formWindow()->isWidgetSelected( widget ) && formWindow() != widget ) + formWindow()->selectWidget( widget ); if ( editor->widget() != widget ) editor->setWidget( widget, formWindow() ); editor->propertyList()->setCurrentProperty( propName ); @@ -494,7 +494,7 @@ bool SetPropertyCommand::canMerge( Command *c ) if ( !p ) { if ( propName == "toolTip" || propName == "whatsThis" ) return TRUE; - if ( ::tqqt_cast<CustomWidget*>((TQObject *)widget) ) { + if ( ::tqt_cast<CustomWidget*>((TQObject *)widget) ) { MetaDataBase::CustomWidget *cw = ((CustomWidget*)(TQObject*)widget)->customWidget(); if ( !cw ) return FALSE; @@ -545,7 +545,7 @@ bool SetPropertyCommand::checkProperty() return FALSE; } - if ( ::tqqt_cast<FormWindow*>(widget->parent()) ) + if ( ::tqt_cast<FormWindow*>(widget->parent()) ) formWindow()->mainWindow()->formNameChanged( (FormWindow*)((TQWidget*)(TQObject*)widget)->parentWidget() ); } return TRUE; @@ -557,7 +557,7 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ return; if ( !formWindow()->isWidgetSelected( widget ) && !formWindow()->isMainContainer( widget ) && select ) - formWindow()->selectWidget( TQT_TQOBJECT(widget) ); + formWindow()->selectWidget( widget ); if ( editor->widget() != widget && select ) editor->setWidget( widget, formWindow() ); if ( select ) @@ -587,17 +587,17 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ TQVariant val = v; if ( val.toString() == "default" ) val = -1; - MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), val.toInt() ); + MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( static_cast<TQWidget*>(editor->widget()) ), val.toInt() ); } else if ( propName == "layoutMargin" ) { TQVariant val = v; if ( val.toString() == "default" ) val = -1; - MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), val.toInt() ); + MetaDataBase::setMargin( WidgetFactory::containerOfWidget( static_cast<TQWidget*>(editor->widget()) ), val.toInt() ); } else if ( propName == "resizeMode" ) { - MetaDataBase::setResizeMode( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), currentItemText ); + MetaDataBase::setResizeMode( WidgetFactory::containerOfWidget( static_cast<TQWidget*>(editor->widget()) ), currentItemText ); } else if ( propName == "toolTip" || propName == "whatsThis" || propName == "database" || propName == "frameworkCode" ) { MetaDataBase::setFakeProperty( editor->widget(), propName, v ); - } else if ( ::tqqt_cast<CustomWidget*>(editor->widget()) ) { + } else if ( ::tqt_cast<CustomWidget*>(editor->widget()) ) { MetaDataBase::CustomWidget *cw = ((CustomWidget *)(TQObject *)widget)->customWidget(); if ( cw ) { MetaDataBase::setFakeProperty( editor->widget(), propName, v ); @@ -634,9 +634,9 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ oldSerNum = v.toPixmap().serialNumber(); widget->setProperty( propName, v ); if ( oldSerNum != -1 && oldSerNum != widget->property( propName ).toPixmap().serialNumber() ) - MetaDataBase::setPixmapKey( TQT_TQOBJECT(formWindow()), + MetaDataBase::setPixmapKey( formWindow(), widget->property( propName ).toPixmap().serialNumber(), - MetaDataBase::pixmapKey( TQT_TQOBJECT(formWindow()), oldSerNum ) ); + MetaDataBase::pixmapKey( formWindow(), oldSerNum ) ); if ( propName == "cursor" ) { MetaDataBase::setCursor( (TQWidget*)((TQObject *)widget), v.toCursor() ); } @@ -645,10 +645,10 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ if ( formWindow()->isMainContainer( widget ) ) formWindow()->setName( v.toCString() ); } - if ( propName == "name" && ::tqqt_cast<TQAction*>((TQObject *)widget) && ::tqqt_cast<TQMainWindow*>(formWindow()->mainContainer()) ) { + if ( propName == "name" && ::tqt_cast<TQAction*>((TQObject *)widget) && ::tqt_cast<TQMainWindow*>(formWindow()->mainContainer()) ) { formWindow()->mainWindow()->actioneditor()->updateActionName( (TQAction*)(TQObject *)widget ); } - if ( propName == "iconSet" && ::tqqt_cast<TQAction*>((TQObject *)widget) && ::tqqt_cast<TQMainWindow*>(formWindow()->mainContainer()) ) { + if ( propName == "iconSet" && ::tqt_cast<TQAction*>((TQObject *)widget) && ::tqt_cast<TQMainWindow*>(formWindow()->mainContainer()) ) { formWindow()->mainWindow()->actioneditor()->updateActionIcon( (TQAction*)(TQObject *)widget ); } if ( propName == "caption" ) { @@ -666,7 +666,7 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ ( ( PropertyItem* )editor->propertyList()->currentItem() )->setChanged( MetaDataBase::isPropertyChanged( widget, propName ) ); } editor->emitWidgetChanged(); - formWindow()->killAccels( TQT_TQOBJECT(widget) ); + formWindow()->killAccels( widget ); } // ------------------------------------------------------------ @@ -791,13 +791,13 @@ BreakLayoutCommand::BreakLayoutCommand( const TQString &n, FormWindow *fw, : Command( n, fw ), lb( layoutBase ), widgets( wl ) { WidgetFactory::LayoutType lay = WidgetFactory::layoutType( layoutBase ); - spacing = MetaDataBase::spacing( TQT_TQOBJECT(layoutBase) ); - margin = MetaDataBase::margin( TQT_TQOBJECT(layoutBase) ); + spacing = MetaDataBase::spacing( layoutBase ); + margin = MetaDataBase::margin( layoutBase ); layout = 0; if ( lay == WidgetFactory::HBox ) - layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqqt_cast<TQSplitter*>(layoutBase) != 0 ); + layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqt_cast<TQSplitter*>(layoutBase) != 0 ); else if ( lay == WidgetFactory::VBox ) - layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqqt_cast<TQSplitter*>(layoutBase) != 0 ); + layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqt_cast<TQSplitter*>(layoutBase) != 0 ); else if ( lay == WidgetFactory::Grid ) layout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 5, fw->grid().y()) ), FALSE ); } @@ -820,8 +820,8 @@ void BreakLayoutCommand::unexecute() formWindow()->clearSelection( FALSE ); layout->doLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); - MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), spacing ); - MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), margin ); + MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( lb ), spacing ); + MetaDataBase::setMargin( WidgetFactory::containerOfWidget( lb ), margin ); } // ------------------------------------------------------------ @@ -853,7 +853,7 @@ AddTabPageCommand::AddTabPageCommand( const TQString &n, FormWindow *fw, tabPage = new QDesignerWidget( formWindow(), tabWidget, "TabPage" ); tabPage->hide(); index = -1; - MetaDataBase::addEntry( TQT_TQOBJECT(tabPage) ); + MetaDataBase::addEntry( tabPage ); } void AddTabPageCommand::execute() @@ -862,7 +862,7 @@ void AddTabPageCommand::execute() index = ( (QDesignerTabWidget*)tabWidget )->count(); tabWidget->insertTab( tabPage, tabLabel, index ); tabWidget->showPage( tabPage ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } @@ -870,7 +870,7 @@ void AddTabPageCommand::unexecute() { tabWidget->removePage( tabPage ); tabPage->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } @@ -889,7 +889,7 @@ void MoveTabPageCommand::execute() ((QDesignerTabWidget*)tabWidget )->removePage( tabPage ); ((QDesignerTabWidget*)tabWidget )->insertTab( tabPage, tabLabel, newIndex ); ((QDesignerTabWidget*)tabWidget )->showPage( tabPage ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } @@ -898,7 +898,7 @@ void MoveTabPageCommand::unexecute() ((QDesignerTabWidget*)tabWidget )->removePage( tabPage ); ((QDesignerTabWidget*)tabWidget )->insertTab( tabPage, tabLabel, oldIndex ); ((QDesignerTabWidget*)tabWidget )->showPage( tabPage ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } @@ -916,7 +916,7 @@ void DeleteTabPageCommand::execute() { tabWidget->removePage( tabPage ); tabPage->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } @@ -924,7 +924,7 @@ void DeleteTabPageCommand::unexecute() { tabWidget->insertTab( tabPage, tabLabel, index ); tabWidget->showPage( tabPage ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } @@ -937,13 +937,13 @@ AddWidgetStackPageCommand::AddWidgetStackPageCommand( const TQString &n, FormWin stackPage = new QDesignerWidget( formWindow(), widgetStack, "WStackPage" ); stackPage->hide(); index = -1; - MetaDataBase::addEntry( TQT_TQOBJECT(stackPage) ); + MetaDataBase::addEntry( stackPage ); } void AddWidgetStackPageCommand::execute() { index = widgetStack->insertPage( stackPage, index ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( 0 ); } @@ -951,7 +951,7 @@ void AddWidgetStackPageCommand::unexecute() { index = widgetStack->removePage( stackPage ); stackPage->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( 0 ); } @@ -966,7 +966,7 @@ void DeleteWidgetStackPageCommand::execute() { index = widgetStack->removePage( stackPage ); stackPage->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( stackPage ); } @@ -974,7 +974,7 @@ void DeleteWidgetStackPageCommand::unexecute() { index = widgetStack->insertPage( stackPage, index ); widgetStack->raiseWidget( stackPage ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->widgetInserted( stackPage ); } @@ -988,7 +988,7 @@ AddWizardPageCommand::AddWizardPageCommand( const TQString &n, FormWindow *fw, page->hide(); index = i; show = s; - MetaDataBase::addEntry( TQT_TQOBJECT(page) ); + MetaDataBase::addEntry( page ); } void AddWizardPageCommand::execute() @@ -998,7 +998,7 @@ void AddWizardPageCommand::execute() wizard->insertPage( page, pageLabel, index ); if ( show ) ( (QDesignerWizard*)wizard )->setCurrentPage( ( (QDesignerWizard*)wizard )->pageNum( page ) ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -1006,7 +1006,7 @@ void AddWizardPageCommand::unexecute() { wizard->removePage( page ); page->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -1025,7 +1025,7 @@ void DeleteWizardPageCommand::execute() pageLabel = wizard->title( page ); wizard->removePage( page ); page->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -1034,7 +1034,7 @@ void DeleteWizardPageCommand::unexecute() wizard->insertPage( page, pageLabel, index ); if ( show ) ( (QDesignerWizard*)wizard )->setCurrentPage( ( (QDesignerWizard*)wizard )->pageNum( page ) ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -1054,7 +1054,7 @@ void RenameWizardPageCommand::execute() wizard->setTitle( page, label ); label = oldLabel; - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); } void RenameWizardPageCommand::unexecute() @@ -1079,7 +1079,7 @@ void SwapWizardPagesCommand::execute() wizard->removePage( page2 ); wizard->insertPage( page1, page1Label, index2 ); wizard->insertPage( page2, page2Label, index1 ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -1101,7 +1101,7 @@ void MoveWizardPageCommand::execute() TQString pageLabel = wizard->title( page ); wizard->removePage( page ); wizard->insertPage( page, pageLabel, index2 ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -1112,7 +1112,7 @@ void MoveWizardPageCommand::unexecute() TQString pageLabel = wizard->title( page ); wizard->removePage( page ); wizard->insertPage( page, pageLabel, index1 ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -1126,17 +1126,17 @@ AddConnectionCommand::AddConnectionCommand( const TQString &name, FormWindow *fw void AddConnectionCommand::execute() { - MetaDataBase::addConnection( TQT_TQOBJECT(formWindow()), connection.sender, + MetaDataBase::addConnection( formWindow(), connection.sender, connection.signal, connection.receiver, connection.slot ); - if ( TQT_BASE_OBJECT(connection.receiver) == TQT_BASE_OBJECT(formWindow()->mainContainer()) ) + if ( connection.receiver == formWindow()->mainContainer() ) formWindow()->mainWindow()->propertyeditor()->eventList()->setup(); } void AddConnectionCommand::unexecute() { - MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow()), connection.sender, + MetaDataBase::removeConnection( formWindow(), connection.sender, connection.signal, connection.receiver, connection.slot ); - if ( TQT_BASE_OBJECT(connection.receiver) == TQT_BASE_OBJECT(formWindow()->mainContainer()) ) + if ( connection.receiver == formWindow()->mainContainer() ) formWindow()->mainWindow()->propertyeditor()->eventList()->setup(); } @@ -1150,17 +1150,17 @@ RemoveConnectionCommand::RemoveConnectionCommand( const TQString &name, FormWind void RemoveConnectionCommand::execute() { - MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow()), connection.sender, + MetaDataBase::removeConnection( formWindow(), connection.sender, connection.signal, connection.receiver, connection.slot ); - if ( TQT_BASE_OBJECT(connection.receiver) == TQT_BASE_OBJECT(formWindow()->mainContainer()) ) + if ( connection.receiver == formWindow()->mainContainer() ) formWindow()->mainWindow()->propertyeditor()->eventList()->setup(); } void RemoveConnectionCommand::unexecute() { - MetaDataBase::addConnection( TQT_TQOBJECT(formWindow()), connection.sender, + MetaDataBase::addConnection( formWindow(), connection.sender, connection.signal, connection.receiver, connection.slot ); - if ( TQT_BASE_OBJECT(connection.receiver) == TQT_BASE_OBJECT(formWindow()->mainContainer()) ) + if ( connection.receiver == formWindow()->mainContainer() ) formWindow()->mainWindow()->propertyeditor()->eventList()->setup(); } @@ -1176,7 +1176,7 @@ AddFunctionCommand::AddFunctionCommand( const TQString &name, FormWindow *fw, co void AddFunctionCommand::execute() { - MetaDataBase::addFunction( TQT_TQOBJECT(formWindow()), function, specifier, access, functionType, language, returnType ); + MetaDataBase::addFunction( formWindow(), function, specifier, access, functionType, language, returnType ); formWindow()->mainWindow()->functionsChanged(); //integration (add - execute) @@ -1195,7 +1195,7 @@ void AddFunctionCommand::execute() void AddFunctionCommand::unexecute() { - MetaDataBase::removeFunction( TQT_TQOBJECT(formWindow()), function, specifier, access, functionType, language, returnType ); + MetaDataBase::removeFunction( formWindow(), function, specifier, access, functionType, language, returnType ); formWindow()->mainWindow()->functionsChanged(); //integration (add - unexecute) @@ -1230,7 +1230,7 @@ ChangeFunctionAttribCommand::ChangeFunctionAttribCommand( const TQString &name, void ChangeFunctionAttribCommand::execute() { - MetaDataBase::changeFunctionAttributes( TQT_TQOBJECT(formWindow()), oldName, newName, newSpec, newAccess, + MetaDataBase::changeFunctionAttributes( formWindow(), oldName, newName, newSpec, newAccess, newType, newLang, newReturnType ); formWindow()->formFile()->functionNameChanged( oldName, newName ); formWindow()->formFile()->functionRetTypeChanged( newName, oldReturnType, newReturnType ); @@ -1257,7 +1257,7 @@ void ChangeFunctionAttribCommand::execute() void ChangeFunctionAttribCommand::unexecute() { - MetaDataBase::changeFunctionAttributes( TQT_TQOBJECT(formWindow()), newName, oldName, oldSpec, oldAccess, + MetaDataBase::changeFunctionAttributes( formWindow(), newName, oldName, oldSpec, oldAccess, oldType, oldLang, oldReturnType ); formWindow()->formFile()->functionNameChanged( newName, oldName ); formWindow()->formFile()->functionRetTypeChanged( oldName, newReturnType, oldReturnType ); @@ -1291,7 +1291,7 @@ RemoveFunctionCommand::RemoveFunctionCommand( const TQString &name, FormWindow * returnType( rt ) { if ( spec.isNull() ) { - TQValueList<MetaDataBase::Function> lst = MetaDataBase::functionList( TQT_TQOBJECT(fw) ); + TQValueList<MetaDataBase::Function> lst = MetaDataBase::functionList( fw ); for ( TQValueList<MetaDataBase::Function>::Iterator it = lst.begin(); it != lst.end(); ++it ) { if ( MetaDataBase::normalizeFunction( (*it).function ) == MetaDataBase::normalizeFunction( function ) ) { @@ -1308,7 +1308,7 @@ RemoveFunctionCommand::RemoveFunctionCommand( const TQString &name, FormWindow * void RemoveFunctionCommand::execute() { - MetaDataBase::removeFunction( TQT_TQOBJECT(formWindow()), function, specifier, access, functionType, language, returnType ); + MetaDataBase::removeFunction( formWindow(), function, specifier, access, functionType, language, returnType ); formWindow()->mainWindow()->functionsChanged(); //integration (remove - execute) @@ -1326,9 +1326,9 @@ void RemoveFunctionCommand::execute() void RemoveFunctionCommand::unexecute() { - if ( MetaDataBase::hasFunction( TQT_TQOBJECT(formWindow()), function ) ) + if ( MetaDataBase::hasFunction( formWindow(), function ) ) return; - MetaDataBase::addFunction( TQT_TQOBJECT(formWindow()), function, specifier, access, functionType, language, returnType ); + MetaDataBase::addFunction( formWindow(), function, specifier, access, functionType, language, returnType ); formWindow()->mainWindow()->functionsChanged(); //integration (remove - unexecute) @@ -1354,7 +1354,7 @@ AddVariableCommand::AddVariableCommand( const TQString &name, FormWindow *fw, co void AddVariableCommand::execute() { - MetaDataBase::addVariable( TQT_TQOBJECT(formWindow()), varName, access ); + MetaDataBase::addVariable( formWindow(), varName, access ); formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView(); if ( formWindow()->formFile() ) formWindow()->formFile()->setModified( TRUE ); @@ -1362,7 +1362,7 @@ void AddVariableCommand::execute() void AddVariableCommand::unexecute() { - MetaDataBase::removeVariable( TQT_TQOBJECT(formWindow()), varName ); + MetaDataBase::removeVariable( formWindow(), varName ); formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView(); if ( formWindow()->formFile() ) formWindow()->formFile()->setModified( TRUE ); @@ -1374,12 +1374,12 @@ SetVariablesCommand::SetVariablesCommand( const TQString &name, FormWindow *fw, TQValueList<MetaDataBase::Variable> lst ) : Command( name, fw ), newList( lst ) { - oldList = MetaDataBase::variables( TQT_TQOBJECT(formWindow()) ); + oldList = MetaDataBase::variables( formWindow() ); } void SetVariablesCommand::execute() { - MetaDataBase::setVariables( TQT_TQOBJECT(formWindow()), newList ); + MetaDataBase::setVariables( formWindow(), newList ); formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView(); if ( formWindow()->formFile() ) formWindow()->formFile()->setModified( TRUE ); @@ -1387,7 +1387,7 @@ void SetVariablesCommand::execute() void SetVariablesCommand::unexecute() { - MetaDataBase::setVariables( TQT_TQOBJECT(formWindow()), oldList ); + MetaDataBase::setVariables( formWindow(), oldList ); formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView(); if ( formWindow()->formFile() ) formWindow()->formFile()->setModified( TRUE ); @@ -1398,7 +1398,7 @@ void SetVariablesCommand::unexecute() RemoveVariableCommand::RemoveVariableCommand( const TQString &name, FormWindow *fw, const TQString &vn ) : Command( name, fw ), varName( vn ) { - TQValueList<MetaDataBase::Variable> lst = MetaDataBase::variables( TQT_TQOBJECT(fw) ); + TQValueList<MetaDataBase::Variable> lst = MetaDataBase::variables( fw ); for ( TQValueList<MetaDataBase::Variable>::Iterator it = lst.begin(); it != lst.end(); ++it ) { if ( (*it).varName == varName ) { access = (*it).varAccess; @@ -1409,7 +1409,7 @@ RemoveVariableCommand::RemoveVariableCommand( const TQString &name, FormWindow * void RemoveVariableCommand::execute() { - MetaDataBase::removeVariable( TQT_TQOBJECT(formWindow()), varName ); + MetaDataBase::removeVariable( formWindow(), varName ); formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView(); if ( formWindow()->formFile() ) formWindow()->formFile()->setModified( TRUE ); @@ -1417,7 +1417,7 @@ void RemoveVariableCommand::execute() void RemoveVariableCommand::unexecute() { - MetaDataBase::addVariable( TQT_TQOBJECT(formWindow()), varName, access ); + MetaDataBase::addVariable( formWindow(), varName, access ); formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView(); if ( formWindow()->formFile() ) formWindow()->formFile()->setModified( TRUE ); @@ -1510,7 +1510,7 @@ void PasteCommand::execute() { for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { w->show(); - formWindow()->selectWidget( TQT_TQOBJECT(w) ); + formWindow()->selectWidget( w ); formWindow()->widgets()->insert( w, w ); formWindow()->mainWindow()->objectHierarchy()->widgetInserted( w ); } @@ -1520,7 +1520,7 @@ void PasteCommand::unexecute() { for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { w->hide(); - formWindow()->selectWidget( TQT_TQOBJECT(w), FALSE ); + formWindow()->selectWidget( w, FALSE ); formWindow()->widgets()->remove( w ); formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( w ); } @@ -1762,21 +1762,21 @@ PopulateMultiLineEditCommand::PopulateMultiLineEditCommand( const TQString &n, F : Command( n, fw ), newText( txt ), mlined( mle ) { oldText = mlined->text(); - wasChanged = MetaDataBase::isPropertyChanged( TQT_TQOBJECT(mlined), "text" ); + wasChanged = MetaDataBase::isPropertyChanged( mlined, "text" ); } void PopulateMultiLineEditCommand::execute() { mlined->setText( newText ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(mlined), "text", TRUE ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(mlined) ); + MetaDataBase::setPropertyChanged( mlined, "text", TRUE ); + formWindow()->emitUpdateProperties( mlined ); } void PopulateMultiLineEditCommand::unexecute() { mlined->setText( oldText ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(mlined), "text", wasChanged ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(mlined) ); + MetaDataBase::setPropertyChanged( mlined, "text", wasChanged ); + formWindow()->emitUpdateProperties( mlined ); } // ------------------------------------------------------------ @@ -1788,7 +1788,7 @@ PopulateTableCommand::PopulateTableCommand( const TQString &n, FormWindow *fw, T { #ifndef TQT_NO_TABLE int i = 0; - TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( TQT_TQOBJECT(table) ); + TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( table ); for ( i = 0; i < table->horizontalHeader()->count(); ++i ) { PopulateTableCommand::Column col; col.text = table->horizontalHeader()->label( i ); @@ -1818,7 +1818,7 @@ void PopulateTableCommand::execute() if ( !(*cit).field.isEmpty() ) columnFields.insert( (*cit).text, (*cit).field ); } - MetaDataBase::setColumnFields( TQT_TQOBJECT(table), columnFields ); + MetaDataBase::setColumnFields( table, columnFields ); table->setNumRows( newRows.count() ); i = 0; for ( TQValueList<Row>::Iterator rit = newRows.begin(); rit != newRows.end(); ++rit, ++i ) @@ -1837,7 +1837,7 @@ void PopulateTableCommand::unexecute() if ( !(*cit).field.isEmpty() ) columnFields.insert( (*cit).text, (*cit).field ); } - MetaDataBase::setColumnFields( TQT_TQOBJECT(table), columnFields ); + MetaDataBase::setColumnFields( table, columnFields ); table->setNumRows( oldRows.count() ); i = 0; for ( TQValueList<Row>::Iterator rit = oldRows.begin(); rit != oldRows.end(); ++rit, ++i ) @@ -1857,7 +1857,7 @@ void AddActionToToolBarCommand::execute() { action->addTo( toolBar ); - if ( ::tqqt_cast<QDesignerAction*>(action) ) { + if ( ::tqt_cast<QDesignerAction*>(action) ) { TQString s = ( (QDesignerAction*)action )->widget()->name(); if ( s.startsWith( "qt_dead_widget_" ) ) { s.remove( 0, TQString( "qt_dead_widget_" ).length() ); @@ -1865,22 +1865,22 @@ void AddActionToToolBarCommand::execute() } toolBar->insertAction( ( (QDesignerAction*)action )->widget(), action ); ( (QDesignerAction*)action )->widget()->installEventFilter( toolBar ); - } else if ( ::tqqt_cast<QDesignerActionGroup*>(action) ) { + } else if ( ::tqt_cast<QDesignerActionGroup*>(action) ) { if ( ( (QDesignerActionGroup*)action )->usesDropDown() ) { toolBar->insertAction( ( (QDesignerActionGroup*)action )->widget(), action ); ( (QDesignerActionGroup*)action )->widget()->installEventFilter( toolBar ); } - } else if ( ::tqqt_cast<QSeparatorAction*>(action) ) { + } else if ( ::tqt_cast<QSeparatorAction*>(action) ) { toolBar->insertAction( ( (QSeparatorAction*)action )->widget(), action ); ( (QSeparatorAction*)action )->widget()->installEventFilter( toolBar ); } - if ( !::tqqt_cast<TQActionGroup*>(action) || ( (TQActionGroup*)action )->usesDropDown()) { + if ( !::tqt_cast<TQActionGroup*>(action) || ( (TQActionGroup*)action )->usesDropDown()) { if ( index == -1 ) toolBar->appendAction( action ); else toolBar->insertAction( index, action ); toolBar->reInsert(); - TQObject::connect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } else { TQObjectList clo = action->childrenListObject(); if ( !clo.isEmpty() ) { @@ -1889,10 +1889,10 @@ void AddActionToToolBarCommand::execute() while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !::tqqt_cast<TQAction*>(o) ) + if ( !::tqt_cast<TQAction*>(o) ) continue; // ### fix it for nested actiongroups - if ( ::tqqt_cast<QDesignerAction*>(o) ) { + if ( ::tqt_cast<QDesignerAction*>(o) ) { QDesignerAction *ac = (QDesignerAction*)o; toolBar->insertAction( ac->widget(), ac ); ac->widget()->installEventFilter( toolBar ); @@ -1901,18 +1901,18 @@ void AddActionToToolBarCommand::execute() else toolBar->insertAction( index + (i++), ac ); } - TQObject::connect( o, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + TQObject::connect( o, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } } toolBar->reInsert(); - TQObject::connect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } formWindow()->mainWindow()->objectHierarchy()->rebuild(); } void AddActionToToolBarCommand::unexecute() { - if ( ::tqqt_cast<QDesignerAction*>(action) ) { + if ( ::tqt_cast<QDesignerAction*>(action) ) { TQString s = ( (QDesignerAction*)action )->widget()->name(); s.prepend( "qt_dead_widget_" ); ( (QDesignerAction*)action )->widget()->setName( s ); @@ -1920,8 +1920,8 @@ void AddActionToToolBarCommand::unexecute() toolBar->removeAction( action ); action->removeFrom( toolBar ); - TQObject::disconnect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); - if ( !::tqqt_cast<TQActionGroup*>(action) || ( (TQActionGroup*)action )->usesDropDown()) { + TQObject::disconnect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); + if ( !::tqt_cast<TQActionGroup*>(action) || ( (TQActionGroup*)action )->usesDropDown()) { action->removeEventFilter( toolBar ); } else { TQObjectList clo = action->childrenListObject(); @@ -1930,13 +1930,13 @@ void AddActionToToolBarCommand::unexecute() while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !::tqqt_cast<TQAction*>(o) ) + if ( !::tqt_cast<TQAction*>(o) ) continue; - if ( ::tqqt_cast<QDesignerAction*>(o) ) { + if ( ::tqt_cast<QDesignerAction*>(o) ) { o->removeEventFilter( toolBar ); toolBar->removeAction( (TQAction*)o ); } - TQObject::disconnect( o, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + TQObject::disconnect( o, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } } } @@ -1955,7 +1955,7 @@ void AddToolBarCommand::execute() if ( !toolBar ) { toolBar = new QDesignerToolBar( mainWindow ); TQString n = "Toolbar"; - formWindow()->unify( TQT_TQOBJECT(toolBar), n, TRUE ); + formWindow()->unify( toolBar, n, TRUE ); toolBar->setName( n ); mainWindow->addToolBar( toolBar, n ); } else { @@ -2011,7 +2011,7 @@ void AddContainerPageCommand::execute() wiface->insertPage( wClassName, container, pageLabel, index, page ); MetaDataBase::addEntry( page ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); // #### show and update pages in object hierarchy view } @@ -2020,7 +2020,7 @@ void AddContainerPageCommand::unexecute() if ( !wiface || !wiface->supportsPages( wClassName ) ) return; wiface->removePage( wClassName, container, index ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); // #### show and update pages in object hierarchy view } @@ -2054,7 +2054,7 @@ void DeleteContainerPageCommand::execute() return; wiface->removePage( wClassName, container, index ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); // #### show and update pages in object hierarchy view } @@ -2066,7 +2066,7 @@ void DeleteContainerPageCommand::unexecute() index = wiface->count( wClassName, container ); wiface->insertPage( wClassName, container, pageLabel, index, page ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); // #### show and update pages in object hierarchy view } @@ -2099,7 +2099,7 @@ void RenameContainerPageCommand::execute() if ( !wiface || !wiface->supportsPages( wClassName ) ) return; wiface->renamePage( wClassName, container, index, newLabel ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); // #### show and update pages in object hierarchy view } @@ -2108,7 +2108,7 @@ void RenameContainerPageCommand::unexecute() if ( !wiface || !wiface->supportsPages( wClassName ) ) return; wiface->renamePage( wClassName, container, index, oldLabel ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); // #### show and update pages in object hierarchy view } #endif // TQT_CONTAINER_CUSTOM_WIDGETS @@ -2407,7 +2407,7 @@ void RenameMenuCommand::execute() PopupMenuEditor *popup = item->menu(); item->setMenuText( newName ); TQString legal = makeLegal( newName ); - formWindow()->unify( TQT_TQOBJECT(popup), legal, TRUE ); + formWindow()->unify( popup, legal, TRUE ); popup->setName( legal ); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -2429,14 +2429,14 @@ AddToolBoxPageCommand::AddToolBoxPageCommand( const TQString &n, FormWindow *fw, toolBoxPage = new QDesignerWidget( formWindow(), toolBox, "page" ); toolBoxPage->hide(); index = -1; - MetaDataBase::addEntry( TQT_TQOBJECT(toolBoxPage) ); + MetaDataBase::addEntry( toolBoxPage ); } void AddToolBoxPageCommand::execute() { index = toolBox->insertItem( index, toolBoxPage, toolBoxLabel); toolBox->setCurrentIndex( index ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -2444,7 +2444,7 @@ void AddToolBoxPageCommand::unexecute() { toolBox->removeItem( toolBoxPage ); toolBoxPage->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -2462,7 +2462,7 @@ void DeleteToolBoxPageCommand::execute() { toolBox->removeItem( toolBoxPage ); toolBoxPage->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -2470,6 +2470,6 @@ void DeleteToolBoxPageCommand::unexecute() { index = toolBox->insertItem( index, toolBoxPage, toolBoxLabel ); toolBox->setCurrentIndex( index ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } diff --git a/kdevdesigner/designer/command.h b/kdevdesigner/designer/command.h index b1c7a2a5..a4c1243d 100644 --- a/kdevdesigner/designer/command.h +++ b/kdevdesigner/designer/command.h @@ -149,7 +149,7 @@ private: class CommandHistory : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/configtoolboxdialog.ui b/kdevdesigner/designer/configtoolboxdialog.ui index 226cdd35..6b006d74 100644 --- a/kdevdesigner/designer/configtoolboxdialog.ui +++ b/kdevdesigner/designer/configtoolboxdialog.ui @@ -305,7 +305,7 @@ <includes> <include location="local" impldecl="in implementation">configtoolboxdialog.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>addTool()</slot> <slot>removeTool()</slot> <slot>moveToolUp()</slot> @@ -313,7 +313,7 @@ <slot>currentToolChanged( TQListViewItem * i )</slot> <slot>currentCommonToolChanged( TQListViewItem * i )</slot> <slot>ok()</slot> -</Q_SLOTS> +</slots> <functions> <function access="private">init()</function> </functions> diff --git a/kdevdesigner/designer/configtoolboxdialog.ui.h b/kdevdesigner/designer/configtoolboxdialog.ui.h index 7dcd6530..77e294b1 100644 --- a/kdevdesigner/designer/configtoolboxdialog.ui.h +++ b/kdevdesigner/designer/configtoolboxdialog.ui.h @@ -40,10 +40,10 @@ void ConfigToolboxDialog::init() ListViewDnd *commonDnd = new ListViewDnd( listViewCommon ); commonDnd->setDragMode( ListViewDnd::Both | ListViewDnd::Move | ListViewDnd::Flat ); - TQObject::connect( toolsDnd, TQT_SIGNAL( dropped( TQListViewItem * ) ), - commonDnd, TQT_SLOT( confirmDrop( TQListViewItem * ) ) ); - TQObject::connect( commonDnd, TQT_SIGNAL( dropped( TQListViewItem * ) ), - commonDnd, TQT_SLOT( confirmDrop( TQListViewItem * ) ) ); + TQObject::connect( toolsDnd, TQ_SIGNAL( dropped( TQListViewItem * ) ), + commonDnd, TQ_SLOT( confirmDrop( TQListViewItem * ) ) ); + TQObject::connect( commonDnd, TQ_SIGNAL( dropped( TQListViewItem * ) ), + commonDnd, TQ_SLOT( confirmDrop( TQListViewItem * ) ) ); TQDict<TQListViewItem> groups; TQAction *a; diff --git a/kdevdesigner/designer/connectiondialog.ui b/kdevdesigner/designer/connectiondialog.ui index 51995633..d6712a84 100644 --- a/kdevdesigner/designer/connectiondialog.ui +++ b/kdevdesigner/designer/connectiondialog.ui @@ -201,7 +201,7 @@ <variable>TQObject *defaultSender;</variable> <variable>TQObject *defaultReceiver;</variable> </variables> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>addConnection()</slot> <slot returnType="ConnectionContainer *">addConnection( TQObject * sender, TQObject * receiver, const TQString & signal, const TQString & slot )</slot> @@ -214,6 +214,6 @@ <slot>updateEditSlotsButton()</slot> <slot>updateConnectionContainers()</slot> <slot>ensureConnectionVisible()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/connectiondialog.ui.h b/kdevdesigner/designer/connectiondialog.ui.h index 25a5d5f2..0e0877da 100644 --- a/kdevdesigner/designer/connectiondialog.ui.h +++ b/kdevdesigner/designer/connectiondialog.ui.h @@ -69,10 +69,10 @@ static TQPixmap *validConnection = 0; void ConnectionDialog::init() { - connect( connectionsTable, TQT_SIGNAL( currentChanged( int, int ) ), - this, TQT_SLOT( updateEditSlotsButton() ) ); - connect( connectionsTable, TQT_SIGNAL( resorted() ), - this, TQT_SLOT( updateConnectionContainers() ) ); + connect( connectionsTable, TQ_SIGNAL( currentChanged( int, int ) ), + this, TQ_SLOT( updateEditSlotsButton() ) ); + connect( connectionsTable, TQ_SIGNAL( resorted() ), + this, TQ_SLOT( updateConnectionContainers() ) ); buttonEditSlots->setEnabled( FALSE ); if ( !invalidConnection ) { @@ -81,7 +81,7 @@ void ConnectionDialog::init() } TQValueList<MetaDataBase::Connection> conns = - MetaDataBase::connections( TQT_TQOBJECT(MainWindow::self->formWindow()) ); + MetaDataBase::connections( MainWindow::self->formWindow() ); for ( TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin(); it != conns.end(); ++it ) { ConnectionContainer *c = addConnection( (*it).sender, (*it).receiver, @@ -144,13 +144,13 @@ ConnectionContainer *ConnectionDialog::addConnection( TQObject *sender, TQObject re->setSlot( sl ); sl->setSlot( sl ); - connect( re, TQT_SIGNAL( currentReceiverChanged( TQObject * ) ), - this, TQT_SLOT( updateEditSlotsButton() ) ); + connect( re, TQ_SIGNAL( currentReceiverChanged( TQObject * ) ), + this, TQ_SLOT( updateEditSlotsButton() ) ); - ConnectionContainer *c = new ConnectionContainer( TQT_TQOBJECT(this), se, si, re, sl, row ); + ConnectionContainer *c = new ConnectionContainer( this, se, si, re, sl, row ); connections.append( c ); - connect( c, TQT_SIGNAL( changed( ConnectionContainer * ) ), - this, TQT_SLOT( updateConnectionState( ConnectionContainer * ) ) ); + connect( c, TQ_SIGNAL( changed( ConnectionContainer * ) ), + this, TQ_SLOT( updateConnectionState( ConnectionContainer * ) ) ); connectionsTable->setCurrentCell( row, 0 ); @@ -188,7 +188,7 @@ void ConnectionDialog::updateConnectionState( ConnectionContainer *c ) void ConnectionDialog::okClicked() { TQValueList<MetaDataBase::Connection> oldConnections = - MetaDataBase::connections( TQT_TQOBJECT(MainWindow::self->formWindow()) ); + MetaDataBase::connections( MainWindow::self->formWindow() ); TQPtrList<Command> newConnectionCmds; TQPtrList<Command> oldConnectionCmds; for ( ConnectionContainer *c = connections.first(); c; c = connections.next() ) { @@ -215,7 +215,7 @@ void ConnectionDialog::okClicked() TQValueList<MetaDataBase::Connection> conns = - MetaDataBase::connections( TQT_TQOBJECT(MainWindow::self->formWindow()) ); + MetaDataBase::connections( MainWindow::self->formWindow() ); for ( TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin(); it != conns.end(); ++it ) { RemoveConnectionCommand *cmd = new RemoveConnectionCommand( i18n( "Remove Signal/Slot " diff --git a/kdevdesigner/designer/connectionitems.cpp b/kdevdesigner/designer/connectionitems.cpp index 12b03a1d..322d9e4b 100644 --- a/kdevdesigner/designer/connectionitems.cpp +++ b/kdevdesigner/designer/connectionitems.cpp @@ -122,26 +122,26 @@ void ConnectionItem::slotChanged( const TQString & ) void ConnectionItem::setSender( SenderItem *i ) { - connect( i, TQT_SIGNAL( currentSenderChanged( TQObject * ) ), - this, TQT_SLOT( senderChanged( TQObject * ) ) ); + connect( i, TQ_SIGNAL( currentSenderChanged( TQObject * ) ), + this, TQ_SLOT( senderChanged( TQObject * ) ) ); } void ConnectionItem::setReceiver( ReceiverItem *i ) { - connect( i, TQT_SIGNAL( currentReceiverChanged( TQObject * ) ), - this, TQT_SLOT( receiverChanged( TQObject * ) ) ); + connect( i, TQ_SIGNAL( currentReceiverChanged( TQObject * ) ), + this, TQ_SLOT( receiverChanged( TQObject * ) ) ); } void ConnectionItem::setSignal( SignalItem *i ) { - connect( i, TQT_SIGNAL( currentSignalChanged( const TQString & ) ), - this, TQT_SLOT( signalChanged( const TQString & ) ) ); + connect( i, TQ_SIGNAL( currentSignalChanged( const TQString & ) ), + this, TQ_SLOT( signalChanged( const TQString & ) ) ); } void ConnectionItem::setSlot( SlotItem *i ) { - connect( i, TQT_SIGNAL( currentSlotChanged( const TQString & ) ), - this, TQT_SLOT( slotChanged( const TQString & ) ) ); + connect( i, TQ_SIGNAL( currentSlotChanged( const TQString & ) ), + this, TQ_SLOT( slotChanged( const TQString & ) ) ); } void ConnectionItem::paint( TQPainter *p, const TQColorGroup &cg, @@ -187,10 +187,10 @@ static void appendChildActions( TQAction *action, TQStringList &lst ) while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !::tqqt_cast<TQAction*>(o) ) + if ( !::tqt_cast<TQAction*>(o) ) continue; lst << o->name(); - if ( !o->childrenListObject().isEmpty() && ::tqqt_cast<TQActionGroup*>(o) ) + if ( !o->childrenListObject().isEmpty() && ::tqt_cast<TQActionGroup*>(o) ) appendChildActions( (TQAction*)o, lst ); } } @@ -203,7 +203,7 @@ static TQStringList flatActions( const TQPtrList<TQAction> &l ) while ( it.current() ) { TQAction *action = it.current(); lst << action->name(); - if ( !action->childrenListObject().isEmpty() && ::tqqt_cast<TQActionGroup*>(action) ) + if ( !action->childrenListObject().isEmpty() && ::tqt_cast<TQActionGroup*>(action) ) appendChildActions( action, lst ); ++it; } @@ -225,9 +225,9 @@ SenderItem::SenderItem( TQTable *table, FormWindow *fw ) continue; } if ( !TQString( it.current()->name() ).startsWith( "qt_dead_widget_" ) && - !::tqqt_cast<TQLayoutWidget*>(it.current()) && - !::tqqt_cast<Spacer*>(it.current()) && - !::tqqt_cast<SizeHandle*>(it.current()) && + !::tqt_cast<TQLayoutWidget*>(it.current()) && + !::tqt_cast<Spacer*>(it.current()) && + !::tqt_cast<SizeHandle*>(it.current()) && qstrcmp( it.current()->name(), "central widget" ) != 0 ) { lst << it.current()->name(); } @@ -245,8 +245,8 @@ TQWidget *SenderItem::createEditor() const { TQComboBox *cb = (TQComboBox*)ConnectionItem::createEditor(); cb->listBox()->setMinimumWidth( cb->fontMetrics().width( "01234567890123456789012345678901234567890123456789" ) ); - connect( cb, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( senderChanged( const TQString & ) ) ); + connect( cb, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( senderChanged( const TQString & ) ) ); return cb; } @@ -258,7 +258,7 @@ void SenderItem::setSenderEx( TQObject *sender ) void SenderItem::senderChanged( const TQString &sender ) { - TQObject *o = formWindow->child( sender, TQOBJECT_OBJECT_NAME_STRING ); + TQObject *o = formWindow->child( sender, "TQObject" ); if ( !o ) o = formWindow->findAction( sender ); if ( !o ) @@ -282,9 +282,9 @@ ReceiverItem::ReceiverItem( TQTable *table, FormWindow *fw ) continue; } if ( !TQString( it.current()->name() ).startsWith( "qt_dead_widget_" ) && - !::tqqt_cast<TQLayoutWidget*>(it.current()) && - !::tqqt_cast<Spacer*>(it.current()) && - !::tqqt_cast<SizeHandle*>(it.current()) && + !::tqt_cast<TQLayoutWidget*>(it.current()) && + !::tqt_cast<Spacer*>(it.current()) && + !::tqt_cast<SizeHandle*>(it.current()) && qstrcmp( it.current()->name(), "central widget" ) != 0 ) { lst << it.current()->name(); } @@ -302,8 +302,8 @@ TQWidget *ReceiverItem::createEditor() const { TQComboBox *cb = (TQComboBox*)ConnectionItem::createEditor(); cb->listBox()->setMinimumWidth( cb->fontMetrics().width( "01234567890123456789012345678901234567890123456789" ) ); - connect( cb, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( receiverChanged( const TQString & ) ) ); + connect( cb, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( receiverChanged( const TQString & ) ) ); return cb; } @@ -315,7 +315,7 @@ void ReceiverItem::setReceiverEx( TQObject *receiver ) void ReceiverItem::receiverChanged( const TQString &receiver ) { - TQObject *o = formWindow->child( receiver, TQOBJECT_OBJECT_NAME_STRING ); + TQObject *o = formWindow->child( receiver, "TQObject" ); if ( !o ) o = formWindow->findAction( receiver ); if ( !o ) @@ -346,15 +346,15 @@ void SignalItem::senderChanged( TQObject *sender ) TQStringList lst = TQStringList::fromStrList( sigs ); - if ( ::tqqt_cast<CustomWidget*>(sender) ) { + if ( ::tqt_cast<CustomWidget*>(sender) ) { MetaDataBase::CustomWidget *w = ( (CustomWidget*)sender )->customWidget(); for ( TQValueList<TQCString>::Iterator it = w->lstSignals.begin(); it != w->lstSignals.end(); ++it ) lst << MetaDataBase::normalizeFunction( *it ); } - if ( TQT_BASE_OBJECT(sender) == TQT_BASE_OBJECT(formWindow->mainContainer()) ) { - TQStringList extra = MetaDataBase::signalList( TQT_TQOBJECT(formWindow) ); + if ( sender == formWindow->mainContainer() ) { + TQStringList extra = MetaDataBase::signalList( formWindow ); if ( !extra.isEmpty() ) lst += extra; } @@ -371,8 +371,8 @@ TQWidget *SignalItem::createEditor() const { TQComboBox *cb = (TQComboBox*)ConnectionItem::createEditor(); cb->listBox()->setMinimumWidth( cb->fontMetrics().width( "01234567890123456789012345678901234567890123456789" ) ); - connect( cb, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SIGNAL( currentSignalChanged( const TQString & ) ) ); + connect( cb, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SIGNAL( currentSignalChanged( const TQString & ) ) ); return cb; } @@ -408,7 +408,7 @@ bool SlotItem::ignoreSlot( const char* slot ) const { #ifndef TQT_NO_SQL if ( qstrcmp( slot, "update()" ) == 0 && - ::tqqt_cast<TQDataBrowser*>(lastReceiver) ) + ::tqt_cast<TQDataBrowser*>(lastReceiver) ) return FALSE; #endif @@ -417,14 +417,14 @@ bool SlotItem::ignoreSlot( const char* slot ) const return TRUE; } - if ( !formWindow->isMainContainer( TQT_TQOBJECT(lastReceiver) ) ) { + if ( !formWindow->isMainContainer( lastReceiver ) ) { if ( qstrcmp( slot, "close()" ) == 0 ) return TRUE; } if ( qstrcmp( slot, "setFocus()" ) == 0 ) if ( lastReceiver->isWidgetType() && - ( (TQWidget*)lastReceiver )->focusPolicy() == TQ_NoFocus ) + ( (TQWidget*)lastReceiver )->focusPolicy() == TQWidget::NoFocus ) return TRUE; return FALSE; @@ -447,21 +447,21 @@ void SlotItem::updateSlotList() for( int i = 0; i < n; ++i ) { // accept only public slots. For the form window, also accept protected slots const TQMetaData* md = lastReceiver->metaObject()->slot( i, TRUE ); - if ( ( (lastReceiver->metaObject()->slot( i, TRUE )->tqt_mo_access == TQMetaData::Public) || - (formWindow->isMainContainer( TQT_TQOBJECT(lastReceiver) ) && - lastReceiver->metaObject()->slot(i, TRUE)->tqt_mo_access == + if ( ( (lastReceiver->metaObject()->slot( i, TRUE )->access == TQMetaData::Public) || + (formWindow->isMainContainer( lastReceiver ) && + lastReceiver->metaObject()->slot(i, TRUE)->access == TQMetaData::Protected) ) && - !ignoreSlot( md->tqt_mo_ci_name ) && - checkConnectArgs( signal.latin1(), lastReceiver, md->tqt_mo_ci_name ) ) - if ( lst.find( md->tqt_mo_ci_name ) == lst.end() ) - lst << MetaDataBase::normalizeFunction( md->tqt_mo_ci_name ); + !ignoreSlot( md->name ) && + checkConnectArgs( signal.latin1(), lastReceiver, md->name ) ) + if ( lst.find( md->name ) == lst.end() ) + lst << MetaDataBase::normalizeFunction( md->name ); } LanguageInterface *iface = MetaDataBase::languageInterface( formWindow->project()->language() ); if ( !iface || iface->supports( LanguageInterface::ConnectionsToCustomSlots ) ) { - if ( formWindow->isMainContainer( TQT_TQOBJECT(lastReceiver) ) ) { - TQValueList<MetaDataBase::Function> moreSlots = MetaDataBase::slotList( TQT_TQOBJECT(formWindow) ); + if ( formWindow->isMainContainer( lastReceiver ) ) { + TQValueList<MetaDataBase::Function> moreSlots = MetaDataBase::slotList( formWindow ); if ( !moreSlots.isEmpty() ) { for ( TQValueList<MetaDataBase::Function>::Iterator it = moreSlots.begin(); it != moreSlots.end(); ++it ) { @@ -478,7 +478,7 @@ void SlotItem::updateSlotList() } } - if ( ::tqqt_cast<CustomWidget*>(lastReceiver) ) { + if ( ::tqt_cast<CustomWidget*>(lastReceiver) ) { MetaDataBase::CustomWidget *w = ( (CustomWidget*)lastReceiver )->customWidget(); for ( TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.begin(); it != w->lstSlots.end(); ++it ) { @@ -502,8 +502,8 @@ TQWidget *SlotItem::createEditor() const { TQComboBox *cb = (TQComboBox*)ConnectionItem::createEditor(); cb->listBox()->setMinimumWidth( cb->fontMetrics().width( "01234567890123456789012345678901234567890123456789" ) ); - connect( cb, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SIGNAL( currentSlotChanged( const TQString & ) ) ); + connect( cb, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SIGNAL( currentSlotChanged( const TQString & ) ) ); return cb; } diff --git a/kdevdesigner/designer/connectionitems.h b/kdevdesigner/designer/connectionitems.h index fe5e276d..0883b961 100644 --- a/kdevdesigner/designer/connectionitems.h +++ b/kdevdesigner/designer/connectionitems.h @@ -41,7 +41,7 @@ class ConnectionContainer; class ConnectionItem : public TQObject, public TQComboTableItem { - Q_OBJECT + TQ_OBJECT public: @@ -77,7 +77,7 @@ private: class SenderItem : public ConnectionItem { - Q_OBJECT + TQ_OBJECT public: @@ -97,7 +97,7 @@ private slots: class ReceiverItem : public ConnectionItem { - Q_OBJECT + TQ_OBJECT public: @@ -117,7 +117,7 @@ private slots: class SignalItem : public ConnectionItem { - Q_OBJECT + TQ_OBJECT public: @@ -135,7 +135,7 @@ signals: class SlotItem : public ConnectionItem { - Q_OBJECT + TQ_OBJECT public: @@ -164,7 +164,7 @@ private: class ConnectionContainer : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -176,10 +176,10 @@ public: i2->setConnection( this ); i3->setConnection( this ); i4->setConnection( this ); - connect( i1, TQT_SIGNAL( changed() ), this, TQT_SLOT( somethingChanged() ) ); - connect( i2, TQT_SIGNAL( changed() ), this, TQT_SLOT( somethingChanged() ) ); - connect( i3, TQT_SIGNAL( changed() ), this, TQT_SLOT( somethingChanged() ) ); - connect( i4, TQT_SIGNAL( changed() ), this, TQT_SLOT( somethingChanged() ) ); + connect( i1, TQ_SIGNAL( changed() ), this, TQ_SLOT( somethingChanged() ) ); + connect( i2, TQ_SIGNAL( changed() ), this, TQ_SLOT( somethingChanged() ) ); + connect( i3, TQ_SIGNAL( changed() ), this, TQ_SLOT( somethingChanged() ) ); + connect( i4, TQ_SIGNAL( changed() ), this, TQ_SLOT( somethingChanged() ) ); } bool isModified() const { return mod; } diff --git a/kdevdesigner/designer/connectiontable.h b/kdevdesigner/designer/connectiontable.h index 60b84426..ba19d589 100644 --- a/kdevdesigner/designer/connectiontable.h +++ b/kdevdesigner/designer/connectiontable.h @@ -31,7 +31,7 @@ class ConnectionTable : public TQTable { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/customwidgeteditor.ui b/kdevdesigner/designer/customwidgeteditor.ui index 99f98961..d1cfc071 100644 --- a/kdevdesigner/designer/customwidgeteditor.ui +++ b/kdevdesigner/designer/customwidgeteditor.ui @@ -573,7 +573,7 @@ <cstring>listSignals</cstring> </property> <property name="whatsThis" stdset="0"> - <string>The list of all the Q_SIGNALS that the selected widget can emit.</string> + <string>The list of all the signals that the selected widget can emit.</string> </property> </widget> <widget class="TQLayoutWidget"> @@ -787,7 +787,7 @@ <string>Change slot access</string> </property> <property name="whatsThis" stdset="0"> - <string><b>Change the slot's access policy.</b><p>You can only connect to the widget's public Q_SLOTS.</p></string> + <string><b>Change the slot's access policy.</b><p>You can only connect to the widget's public slots.</p></string> </property> </widget> <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="4"> diff --git a/kdevdesigner/designer/customwidgeteditorimpl.cpp b/kdevdesigner/designer/customwidgeteditorimpl.cpp index f417f6f2..cc736635 100644 --- a/kdevdesigner/designer/customwidgeteditorimpl.cpp +++ b/kdevdesigner/designer/customwidgeteditorimpl.cpp @@ -58,10 +58,10 @@ CustomWidgetEditor::CustomWidgetEditor( TQWidget *parent, MainWindow *mw ) : CustomWidgetEditorBase( parent, 0, TRUE ), mainWindow( mw ) { - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); checkTimer = new TQTimer( this ); - connect( checkTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( checkWidgetName() ) ); + connect( checkTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( checkWidgetName() ) ); editClass->setEnabled( FALSE ); editHeader->setEnabled( FALSE ); @@ -73,10 +73,10 @@ CustomWidgetEditor::CustomWidgetEditor( TQWidget *parent, MainWindow *mw ) sizeVer->setEnabled( FALSE ); checkContainer->setEnabled( FALSE ); localGlobalCombo->setEnabled( FALSE ); - editClass->setValidator( new AsciiValidator( TQString(":"), TQT_TQOBJECT(editClass) ) ); - editSignal->setValidator( new AsciiValidator( TRUE, TQT_TQOBJECT(editSignal) ) ); - editSlot->setValidator( new AsciiValidator( TRUE, TQT_TQOBJECT(editSignal) ) ); - editProperty->setValidator( new AsciiValidator( TQT_TQOBJECT(editSignal) ) ); + editClass->setValidator( new AsciiValidator( TQString(":"), editClass ) ); + editSignal->setValidator( new AsciiValidator( TRUE, editSignal ) ); + editSlot->setValidator( new AsciiValidator( TRUE, editSignal ) ); + editProperty->setValidator( new AsciiValidator( editSignal ) ); editSignal->setEnabled( FALSE ); buttonRemoveSignal->setEnabled( FALSE ); diff --git a/kdevdesigner/designer/customwidgeteditorimpl.h b/kdevdesigner/designer/customwidgeteditorimpl.h index 9e53b2ce..c49f4960 100644 --- a/kdevdesigner/designer/customwidgeteditorimpl.h +++ b/kdevdesigner/designer/customwidgeteditorimpl.h @@ -39,7 +39,7 @@ class MainWindow; class CustomWidgetEditor : public CustomWidgetEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/database.cpp b/kdevdesigner/designer/database.cpp index b5baea28..e7fdf0df 100644 --- a/kdevdesigner/designer/database.cpp +++ b/kdevdesigner/designer/database.cpp @@ -62,7 +62,7 @@ void DatabaseSupport::initPreview( const TQString &connection, const TQString &t con = TQSqlDatabase::database(); frm = new TQSqlForm( o, table ); for ( TQMap<TQString, TQString>::Iterator it = dbControls.begin(); it != dbControls.end(); ++it ) { - TQObject *chld = parent->child( it.key(), TQWIDGET_OBJECT_NAME_STRING ); + TQObject *chld = parent->child( it.key(), "TQWidget" ); if ( !chld ) continue; frm->insert( (TQWidget*)chld, *it ); diff --git a/kdevdesigner/designer/database.h b/kdevdesigner/designer/database.h index cbde491f..cf5ae055 100644 --- a/kdevdesigner/designer/database.h +++ b/kdevdesigner/designer/database.h @@ -58,7 +58,7 @@ protected: class QDesignerDataBrowser : public TQDataBrowser, public DatabaseSupport { - Q_OBJECT + TQ_OBJECT public: @@ -70,7 +70,7 @@ protected: class QDesignerDataView : public TQDataView, public DatabaseSupport { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/dbconnection.ui b/kdevdesigner/designer/dbconnection.ui index 1510629b..c21e0ce8 100644 --- a/kdevdesigner/designer/dbconnection.ui +++ b/kdevdesigner/designer/dbconnection.ui @@ -214,10 +214,10 @@ <tabstop>editHostname</tabstop> <tabstop>editPort</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kdevdesigner/designer/dbconnectionimpl.cpp b/kdevdesigner/designer/dbconnectionimpl.cpp index 3cfd1fdc..678dbad0 100644 --- a/kdevdesigner/designer/dbconnectionimpl.cpp +++ b/kdevdesigner/designer/dbconnectionimpl.cpp @@ -61,7 +61,7 @@ void DatabaseConnectionEditor::accept() void DatabaseConnectionEditor::init() { connectionWidget->editName->setEnabled( FALSE ); - connectionWidget->editName->setValidator( new AsciiValidator( TQT_TQOBJECT(connectionWidget->editName) ) ); + connectionWidget->editName->setValidator( new AsciiValidator( connectionWidget->editName ) ); connectionWidget->editName->setText( conn->name() ); connectionWidget->comboDriver->setEnabled( FALSE ); connectionWidget->comboDriver->lineEdit()->setText( conn->driver() ); diff --git a/kdevdesigner/designer/dbconnectionimpl.h b/kdevdesigner/designer/dbconnectionimpl.h index e2db2286..bb92c27e 100644 --- a/kdevdesigner/designer/dbconnectionimpl.h +++ b/kdevdesigner/designer/dbconnectionimpl.h @@ -35,7 +35,7 @@ class TQGridLayout; class DatabaseConnectionEditor : public DatabaseConnectionEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/dbconnectionsimpl.cpp b/kdevdesigner/designer/dbconnectionsimpl.cpp index e589679b..e71718a0 100644 --- a/kdevdesigner/designer/dbconnectionsimpl.cpp +++ b/kdevdesigner/designer/dbconnectionsimpl.cpp @@ -54,7 +54,7 @@ static bool blockChanges = FALSE; DatabaseConnectionsEditor::DatabaseConnectionsEditor( Project *pro, TQWidget* parent, const char* name, bool modal, WFlags fl ) : DatabaseConnectionBase( parent, name, modal, fl ), project( pro ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); connectionWidget = new DatabaseConnectionWidget( grp ); grpLayout->addWidget( connectionWidget, 0, 0 ); #ifndef TQT_NO_SQL @@ -63,7 +63,7 @@ DatabaseConnectionsEditor::DatabaseConnectionsEditor( Project *pro, TQWidget* pa listConnections->insertItem( conn->name() ); connectionWidget->comboDriver->insertStringList( TQSqlDatabase::drivers() ); #endif - connectionWidget->editName->setValidator( new AsciiValidator( TQT_TQOBJECT(connectionWidget->editName) ) ); + connectionWidget->editName->setValidator( new AsciiValidator( connectionWidget->editName ) ); enableAll( FALSE ); } diff --git a/kdevdesigner/designer/dbconnectionsimpl.h b/kdevdesigner/designer/dbconnectionsimpl.h index e06cc06a..18bd60bb 100644 --- a/kdevdesigner/designer/dbconnectionsimpl.h +++ b/kdevdesigner/designer/dbconnectionsimpl.h @@ -34,7 +34,7 @@ class Project; class DatabaseConnectionsEditor : public DatabaseConnectionBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/designeraction.h b/kdevdesigner/designer/designeraction.h index 85efef6b..9d6aeaed 100644 --- a/kdevdesigner/designer/designeraction.h +++ b/kdevdesigner/designer/designeraction.h @@ -24,7 +24,7 @@ class DesignerAction : public TQAction { -Q_OBJECT +TQ_OBJECT public: DesignerAction(TQObject *parent = 0, const char *name = 0) diff --git a/kdevdesigner/designer/designerappiface.cpp b/kdevdesigner/designer/designerappiface.cpp index 57ee992e..c871e301 100644 --- a/kdevdesigner/designer/designerappiface.cpp +++ b/kdevdesigner/designer/designerappiface.cpp @@ -55,9 +55,9 @@ TQRESULT DesignerInterfaceImpl::queryInterface( const TQUuid &uuid, TQUnknownInt { *iface = 0; - if ( uuid == IID_TQUnknown ) + if ( uuid == IID_QUnknown ) *iface = (TQUnknownInterface*)this; - else if ( uuid == IID_TQComponentInformation ) + else if ( uuid == IID_QComponentInformation ) *iface = (TQComponentInformationInterface*)this; else if ( uuid == IID_Designer ) *iface = (DesignerInterface*)this; @@ -129,13 +129,13 @@ void DesignerInterfaceImpl::updateFunctionList() void DesignerInterfaceImpl::onProjectChange( TQObject *receiver, const char *slot ) { - TQObject::connect( mainWindow, TQT_SIGNAL( projectChanged() ), receiver, slot ); + TQObject::connect( mainWindow, TQ_SIGNAL( projectChanged() ), receiver, slot ); } void DesignerInterfaceImpl::onFormChange( TQObject *receiver, const char *slot ) { - TQObject::connect( mainWindow, TQT_SIGNAL( formWindowChanged() ), receiver, slot ); - TQObject::connect( mainWindow, TQT_SIGNAL( editorChanged() ), receiver, slot ); + TQObject::connect( mainWindow, TQ_SIGNAL( formWindowChanged() ), receiver, slot ); + TQObject::connect( mainWindow, TQ_SIGNAL( editorChanged() ), receiver, slot ); } bool DesignerInterfaceImpl::singleProjectMode() const @@ -146,7 +146,7 @@ bool DesignerInterfaceImpl::singleProjectMode() const void DesignerInterfaceImpl::showError( TQWidget *widget, int line, const TQString &message ) { - mainWindow->showErrorMessage( TQT_TQOBJECT(widget), line, message ); + mainWindow->showErrorMessage( widget, line, message ); } void DesignerInterfaceImpl::runFinished() @@ -156,12 +156,12 @@ void DesignerInterfaceImpl::runFinished() void DesignerInterfaceImpl::showStackFrame( TQWidget *w, int line ) { - mainWindow->showStackFrame( TQT_TQOBJECT(w), line ); + mainWindow->showStackFrame( w, line ); } void DesignerInterfaceImpl::showDebugStep( TQWidget *w, int line ) { - mainWindow->showDebugStep( TQT_TQOBJECT(w), line ); + mainWindow->showDebugStep( w, line ); } void DesignerInterfaceImpl::runProjectPrecondition() @@ -190,7 +190,7 @@ TQPtrList<DesignerFormWindow> DesignerProjectImpl::formList() const while ( it.current() ) { TQObject *obj = it.current(); ++it; - TQWidget *par = ::tqqt_cast<FormWindow*>(obj->parent()); + TQWidget *par = ::tqt_cast<FormWindow*>(obj->parent()); if ( !obj->isWidgetType() || !par ) continue; @@ -335,7 +335,7 @@ void DesignerProjectImpl::breakPoints( TQMap<TQString, TQValueList<uint> > &bps for ( TQPtrListIterator<FormFile> forms = project->formFiles(); forms.current(); ++forms ) { if ( forms.current()->formWindow() ) - bps.insert( TQString( forms.current()->formWindow()->name() ) + " <Form>", MetaDataBase::breakPoints( TQT_TQOBJECT(forms.current()->formWindow()) ) ); + bps.insert( TQString( forms.current()->formWindow()->name() ) + " <Form>", MetaDataBase::breakPoints( forms.current()->formWindow() ) ); } } @@ -360,7 +360,7 @@ void DesignerProjectImpl::clearAllBreakpoints() const for ( TQPtrListIterator<FormFile> forms = project->formFiles(); forms.current(); ++forms ) { if ( forms.current()->formWindow() ) - MetaDataBase::setBreakPoints( TQT_TQOBJECT(forms.current()->formWindow()), empty ); + MetaDataBase::setBreakPoints( forms.current()->formWindow(), empty ); MainWindow::self->resetBreakPoints(); } } @@ -535,7 +535,7 @@ void DesignerPixmapCollectionImpl::addPixmap( const TQPixmap &p, const TQString pixCollection->addPixmap( pix, force ); FormWindow *fw = MainWindow::self->formWindow(); if ( fw ) - MetaDataBase::setPixmapKey( TQT_TQOBJECT(fw), p.serialNumber(), name ); + MetaDataBase::setPixmapKey( fw, p.serialNumber(), name ); } TQPixmap DesignerPixmapCollectionImpl::pixmap( const TQString &name ) const @@ -586,7 +586,7 @@ TQWidget *DesignerFormWindowImpl::create( const char *className, TQWidget *paren { TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, name ); formWindow->insertWidget( w, TRUE ); - formWindow->killAccels( TQT_TQOBJECT(formWindow->mainContainer()) ); + formWindow->killAccels( formWindow->mainContainer() ); return w; } @@ -674,7 +674,7 @@ void DesignerFormWindowImpl::breakLayout() void DesignerFormWindowImpl::selectWidget( TQWidget * w ) { - formWindow->selectWidget( TQT_TQOBJECT(w), TRUE ); + formWindow->selectWidget( w, TRUE ); } void DesignerFormWindowImpl::selectAll() @@ -755,14 +755,14 @@ void DesignerFormWindowImpl::preview() const void DesignerFormWindowImpl::addConnection( TQObject *sender, const char *signal, TQObject *receiver, const char *slot ) { - MetaDataBase::addConnection( TQT_TQOBJECT(formWindow), sender, signal, receiver, slot ); + MetaDataBase::addConnection( formWindow, sender, signal, receiver, slot ); } void DesignerFormWindowImpl::addFunction( const TQCString &function, const TQString &specifier, const TQString &access, const TQString &type, const TQString &language, const TQString &returnType ) { - MetaDataBase::addFunction( TQT_TQOBJECT(formWindow), function, specifier, access, type, language, returnType ); + MetaDataBase::addFunction( formWindow, function, specifier, access, type, language, returnType ); formWindow->mainWindow()->functionsChanged(); } @@ -804,7 +804,7 @@ void DesignerFormWindowImpl::setColumnFields( TQObject *o, const TQMap<TQString, TQStringList DesignerFormWindowImpl::implementationIncludes() const { - TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( TQT_TQOBJECT(formWindow) ); + TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( formWindow ); TQStringList lst; for ( TQValueList<MetaDataBase::Include>::Iterator it = includes.begin(); it != includes.end(); ++it ) { MetaDataBase::Include inc = *it; @@ -825,7 +825,7 @@ TQStringList DesignerFormWindowImpl::implementationIncludes() const TQStringList DesignerFormWindowImpl::declarationIncludes() const { - TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( TQT_TQOBJECT(formWindow) ); + TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( formWindow ); TQStringList lst; for ( TQValueList<MetaDataBase::Include>::Iterator it = includes.begin(); it != includes.end(); ++it ) { MetaDataBase::Include inc = *it; @@ -846,7 +846,7 @@ TQStringList DesignerFormWindowImpl::declarationIncludes() const void DesignerFormWindowImpl::setImplementationIncludes( const TQStringList &lst ) { - TQValueList<MetaDataBase::Include> oldIncludes = MetaDataBase::includes( TQT_TQOBJECT(formWindow) ); + TQValueList<MetaDataBase::Include> oldIncludes = MetaDataBase::includes( formWindow ); TQValueList<MetaDataBase::Include> includes; for ( TQValueList<MetaDataBase::Include>::Iterator it = oldIncludes.begin(); it != oldIncludes.end(); ++it ) { MetaDataBase::Include inc = *it; @@ -882,13 +882,13 @@ void DesignerFormWindowImpl::setImplementationIncludes( const TQStringList &lst includes << inc; } } - MetaDataBase::setIncludes( TQT_TQOBJECT(formWindow), includes ); + MetaDataBase::setIncludes( formWindow, includes ); formWindow->mainWindow()->objectHierarchy()->formDefinitionView()->setup(); } void DesignerFormWindowImpl::setDeclarationIncludes( const TQStringList &lst ) { - TQValueList<MetaDataBase::Include> oldIncludes = MetaDataBase::includes( TQT_TQOBJECT(formWindow) ); + TQValueList<MetaDataBase::Include> oldIncludes = MetaDataBase::includes( formWindow ); TQValueList<MetaDataBase::Include> includes; for ( TQValueList<MetaDataBase::Include>::Iterator it = oldIncludes.begin(); it != oldIncludes.end(); ++it ) { MetaDataBase::Include inc = *it; @@ -924,60 +924,60 @@ void DesignerFormWindowImpl::setDeclarationIncludes( const TQStringList &lst ) includes << inc; } } - MetaDataBase::setIncludes( TQT_TQOBJECT(formWindow), includes ); + MetaDataBase::setIncludes( formWindow, includes ); formWindow->mainWindow()->objectHierarchy()->formDefinitionView()->setup(); } TQStringList DesignerFormWindowImpl::forwardDeclarations() const { - return MetaDataBase::forwards( TQT_TQOBJECT(formWindow) ); + return MetaDataBase::forwards( formWindow ); } void DesignerFormWindowImpl::setForwardDeclarations( const TQStringList &lst ) { - MetaDataBase::setForwards( TQT_TQOBJECT(formWindow), lst ); + MetaDataBase::setForwards( formWindow, lst ); formWindow->mainWindow()->objectHierarchy()->formDefinitionView()->setup(); } TQStringList DesignerFormWindowImpl::signalList() const { - return MetaDataBase::signalList( TQT_TQOBJECT(formWindow) ); + return MetaDataBase::signalList( formWindow ); } void DesignerFormWindowImpl::setSignalList( const TQStringList &lst ) { - MetaDataBase::setSignalList( TQT_TQOBJECT(formWindow), lst ); + MetaDataBase::setSignalList( formWindow, lst ); formWindow->mainWindow()->objectHierarchy()->formDefinitionView()->setup(); } void DesignerFormWindowImpl::onModificationChange( TQObject *receiver, const char *slot ) { - TQObject::connect( formWindow, TQT_SIGNAL( modificationChanged( bool, FormWindow * ) ), receiver, slot ); + TQObject::connect( formWindow, TQ_SIGNAL( modificationChanged( bool, FormWindow * ) ), receiver, slot ); } void DesignerFormWindowImpl::addMenu( const TQString &text, const TQString &name ) { - if ( !::tqqt_cast<TQMainWindow*>(formWindow->mainContainer()) ) + if ( !::tqt_cast<TQMainWindow*>(formWindow->mainContainer()) ) return; TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer(); PopupMenuEditor *popup = new PopupMenuEditor( formWindow, mw ); TQString n = name; - formWindow->unify( TQT_TQOBJECT(popup), n, TRUE ); + formWindow->unify( popup, n, TRUE ); popup->setName( n ); MenuBarEditor *mb = (MenuBarEditor *)mw->child( 0, "MenuBarEditor" ); if ( !mb ) { mb = new MenuBarEditor( formWindow, mw ); mb->setName( "MenuBar" ); - MetaDataBase::addEntry( TQT_TQOBJECT(mb) ); + MetaDataBase::addEntry( mb ); } mb->insertItem( text, popup ); - MetaDataBase::addEntry( TQT_TQOBJECT(popup) ); + MetaDataBase::addEntry( popup ); } void DesignerFormWindowImpl::addMenuAction( const TQString &menu, TQAction *a ) { - if ( !::tqqt_cast<TQMainWindow*>(formWindow->mainContainer()) ) + if ( !::tqt_cast<TQMainWindow*>(formWindow->mainContainer()) ) return; TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer(); if ( !mw->child( 0, "MenuBarEditor" ) ) @@ -990,7 +990,7 @@ void DesignerFormWindowImpl::addMenuAction( const TQString &menu, TQAction *a ) void DesignerFormWindowImpl::addMenuSeparator( const TQString &menu ) { - if ( !::tqqt_cast<TQMainWindow*>(formWindow->mainContainer()) ) + if ( !::tqt_cast<TQMainWindow*>(formWindow->mainContainer()) ) return; TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer(); if ( !mw->child( 0, "MenuBarEditor" ) ) @@ -1004,19 +1004,19 @@ void DesignerFormWindowImpl::addMenuSeparator( const TQString &menu ) void DesignerFormWindowImpl::addToolBar( const TQString &text, const TQString &name ) { - if ( !::tqqt_cast<TQMainWindow*>(formWindow->mainContainer()) ) + if ( !::tqt_cast<TQMainWindow*>(formWindow->mainContainer()) ) return; TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer(); TQToolBar *tb = new QDesignerToolBar( mw ); TQString n = name; - formWindow->unify( TQT_TQOBJECT(tb), n, TRUE ); + formWindow->unify( tb, n, TRUE ); tb->setName( n ); mw->addToolBar( tb, text ); } void DesignerFormWindowImpl::addToolBarAction( const TQString &tbn, TQAction *a ) { - if ( !::tqqt_cast<TQMainWindow*>(formWindow->mainContainer()) ) + if ( !::tqt_cast<TQMainWindow*>(formWindow->mainContainer()) ) return; TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer(); QDesignerToolBar *tb = (QDesignerToolBar*)mw->child( tbn, "QDesignerToolBar" ); @@ -1028,7 +1028,7 @@ void DesignerFormWindowImpl::addToolBarAction( const TQString &tbn, TQAction *a void DesignerFormWindowImpl::addToolBarSeparator( const TQString &tbn ) { - if ( !::tqqt_cast<TQMainWindow*>(formWindow->mainContainer()) ) + if ( !::tqt_cast<TQMainWindow*>(formWindow->mainContainer()) ) return; TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer(); QDesignerToolBar *tb = (QDesignerToolBar*)mw->child( tbn, "QDesignerToolBar" ); diff --git a/kdevdesigner/designer/editfunctions.ui b/kdevdesigner/designer/editfunctions.ui index a5075250..fefe1dfe 100644 --- a/kdevdesigner/designer/editfunctions.ui +++ b/kdevdesigner/designer/editfunctions.ui @@ -696,7 +696,7 @@ <tabstop>addFunction</tabstop> <tabstop>deleteFunction</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">currentItemChanged( TQListViewItem * )</slot> <slot access="protected">currentSpecifierChanged( const TQString & )</slot> <slot access="protected">currentTextChanged( const TQString & )</slot> @@ -709,7 +709,7 @@ <slot access="protected">functionAdd()</slot> <slot access="protected">functionRemove()</slot> <slot access="protected">displaySlots( bool )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kdevdesigner/designer/editfunctionsimpl.cpp b/kdevdesigner/designer/editfunctionsimpl.cpp index 5681f00b..40c7eae2 100644 --- a/kdevdesigner/designer/editfunctionsimpl.cpp +++ b/kdevdesigner/designer/editfunctionsimpl.cpp @@ -52,12 +52,12 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots ) : EditFunctionsBase( parent, 0, TRUE ), formWindow( fw ) { - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); id = 0; functList.clear(); - TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(fw) ); + TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( fw ); for ( TQValueList<MetaDataBase::Function>::Iterator it = functionList.begin(); it != functionList.end(); ++it ) { TQListViewItem *i = new TQListViewItem( functionListView ); @@ -86,7 +86,7 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots ) id++; if ( (*it).type == "slot" ) { - if ( MetaDataBase::isSlotUsed( TQT_TQOBJECT(formWindow), MetaDataBase::normalizeFunction( (*it).function ).latin1() ) ) + if ( MetaDataBase::isSlotUsed( formWindow, MetaDataBase::normalizeFunction( (*it).function ).latin1() ) ) i->setText( 5, i18n( "Yes" ) ); else i->setText( 5, i18n( "No" ) ); @@ -96,7 +96,7 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots ) } boxProperties->setEnabled( FALSE ); - functionName->setValidator( new AsciiValidator( TRUE, TQT_TQOBJECT(functionName) ) ); + functionName->setValidator( new AsciiValidator( TRUE, functionName ) ); if ( functionListView->firstChild() ) functionListView->setCurrentItem( functionListView->firstChild() ); @@ -111,27 +111,27 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots ) // Connect listview signal to signal-relay TQObject::connect( functionListView, - TQT_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString & ) ), + TQ_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString & ) ), this, - TQT_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); + TQ_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); // Connect signal-relay to TQLineEdit "functionName" - TQObjectList *l = parent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "functionName" ); + TQObjectList *l = parent->queryList( "TQLineEdit", "functionName" ); TQObject *obj; TQObjectListIt itemsLineEditIt( *l ); while ( (obj = itemsLineEditIt.current()) != 0 ) { ++itemsLineEditIt; TQObject::connect( this, - TQT_SIGNAL( itemRenamed( const TQString & ) ), + TQ_SIGNAL( itemRenamed( const TQString & ) ), obj, - TQT_SLOT( setText( const TQString & ) ) ); + TQ_SLOT( setText( const TQString & ) ) ); } delete l; } void EditFunctions::okClicked() { - TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(formWindow) ); + TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( formWindow ); TQString n = i18n( "Add/Remove functions of '%1'" ).arg( formWindow->name() ); TQPtrList<Command> commands; TQValueList<MetaDataBase::Function>::Iterator fit; @@ -291,7 +291,7 @@ void EditFunctions::functionAdd( const TQString &access, const TQString &type ) if ( i->text( 4 ) == "slot" ) { i->setText( 0, "newSlot()" ); - if ( MetaDataBase::isSlotUsed( TQT_TQOBJECT(formWindow), "newSlot()" ) ) + if ( MetaDataBase::isSlotUsed( formWindow, "newSlot()" ) ) i->setText( 5, i18n( "Yes" ) ); else i->setText( 5, i18n( "No" ) ); @@ -398,7 +398,7 @@ void EditFunctions::currentTextChanged( const TQString &txt ) functionListView->currentItem()->setText( 0, txt ); if ( functionListView->currentItem()->text( 4 ) == "slot" ) { - if ( MetaDataBase::isSlotUsed( TQT_TQOBJECT(formWindow), MetaDataBase::normalizeFunction( txt.latin1() ).latin1() ) ) + if ( MetaDataBase::isSlotUsed( formWindow, MetaDataBase::normalizeFunction( txt.latin1() ).latin1() ) ) functionListView->currentItem()->setText( 5, i18n( "Yes" ) ); else functionListView->currentItem()->setText( 5, i18n( "No" ) ); @@ -441,7 +441,7 @@ void EditFunctions::currentTypeChanged( const TQString &type ) lastType = type; functionListView->currentItem()->setText( 4, type ); if ( type == "slot" ) { - if ( MetaDataBase::isSlotUsed( TQT_TQOBJECT(formWindow), + if ( MetaDataBase::isSlotUsed( formWindow, MetaDataBase::normalizeFunction( functionListView->currentItem()->text( 0 ).latin1() ).latin1() ) ) functionListView->currentItem()->setText( 5, i18n( "Yes" ) ); else @@ -515,7 +515,7 @@ void EditFunctions::displaySlots( bool justSlots ) i->setText( 4, (*it).type ); if ( (*it).type == "slot" ) { - if ( MetaDataBase::isSlotUsed( TQT_TQOBJECT(formWindow), MetaDataBase::normalizeFunction( (*it).newName ).latin1() ) ) + if ( MetaDataBase::isSlotUsed( formWindow, MetaDataBase::normalizeFunction( (*it).newName ).latin1() ) ) i->setText( 5, i18n( "Yes" ) ); else i->setText( 5, i18n( "No" ) ); diff --git a/kdevdesigner/designer/editfunctionsimpl.h b/kdevdesigner/designer/editfunctionsimpl.h index 0d4259dc..c4ddf83b 100644 --- a/kdevdesigner/designer/editfunctionsimpl.h +++ b/kdevdesigner/designer/editfunctionsimpl.h @@ -37,7 +37,7 @@ class TQListViewItem; class EditFunctions : public EditFunctionsBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/filechooser.cpp b/kdevdesigner/designer/filechooser.cpp index 0f4c426e..6923e94c 100644 --- a/kdevdesigner/designer/filechooser.cpp +++ b/kdevdesigner/designer/filechooser.cpp @@ -41,15 +41,15 @@ FileChooser::FileChooser( TQWidget *parent, const char *name ) lineEdit = new TQLineEdit( this, "filechooser_lineedit" ); layout->addWidget( lineEdit ); - connect( lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( fileNameChanged( const TQString & ) ) ); + connect( lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( fileNameChanged( const TQString & ) ) ); button = new TQPushButton( "...", this, "filechooser_button" ); button->setFixedWidth( button->fontMetrics().width( " ... " ) ); layout->addWidget( button ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( chooseFile() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( chooseFile() ) ); setFocusProxy( lineEdit ); } diff --git a/kdevdesigner/designer/filechooser.h b/kdevdesigner/designer/filechooser.h index 42430334..c4026336 100644 --- a/kdevdesigner/designer/filechooser.h +++ b/kdevdesigner/designer/filechooser.h @@ -34,7 +34,7 @@ class TQPushButton; class FileChooser : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_ENUMS( Mode ) diff --git a/kdevdesigner/designer/finddialog.ui b/kdevdesigner/designer/finddialog.ui index 9b16cd8c..c257206e 100644 --- a/kdevdesigner/designer/finddialog.ui +++ b/kdevdesigner/designer/finddialog.ui @@ -264,11 +264,11 @@ <variable>EditorInterface *editor;</variable> <variable>TQObject *formWindow;</variable> </variables> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>doFind()</slot> <slot>setEditor( EditorInterface * e, TQObject * fw )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/formfile.cpp b/kdevdesigner/designer/formfile.cpp index 4ba5b7c7..ef111031 100644 --- a/kdevdesigner/designer/formfile.cpp +++ b/kdevdesigner/designer/formfile.cpp @@ -77,13 +77,13 @@ FormFile::FormFile( const TQString &fn, bool temp, Project *p, const char *name if ( !temp ) checkFileName( FALSE ); - connect(this, TQT_SIGNAL(somethingChanged(FormFile* )), this, TQT_SLOT(emitNewStatus(FormFile* ))); + connect(this, TQ_SIGNAL(somethingChanged(FormFile* )), this, TQ_SLOT(emitNewStatus(FormFile* ))); } FormFile::~FormFile() { pro->removeFormFile( this ); - if ( TQT_TQOBJECT(formWindow()) ) + if ( formWindow() ) formWindow()->setFormFile( 0 ); } @@ -97,7 +97,7 @@ void FormFile::setFormWindow( FormWindow *f ) if ( fw ) fw->setFormFile( this ); parseCode( cod, FALSE ); - TQTimer::singleShot( 0, this, TQT_SLOT( notifyFormWindowChange() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( notifyFormWindowChange() ) ); } void FormFile::setEditor( SourceEditor *e ) @@ -170,7 +170,7 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified ) if ( ed ) ed->save(); - if ( TQT_TQOBJECT(formWindow()) && isModified( WFormWindow ) ) { + if ( formWindow() && isModified( WFormWindow ) ) { if ( withMsgBox ) { if ( !formWindow()->checkCustomWidgets() ) return FALSE; @@ -221,7 +221,7 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified ) } } - if ( TQT_TQOBJECT(formWindow()) ) { + if ( formWindow() ) { Resource resource( MainWindow::self ); resource.setWidget( formWindow() ); bool formCodeOnly = isModified( WFormCode ) && !isModified( WFormWindow ); @@ -247,7 +247,7 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified ) bool FormFile::saveAs( bool ignoreModified ) { TQString f = pro->makeAbsolute( fileName() ); - if ( fileNameTemp && TQT_TQOBJECT(formWindow()) ) { + if ( fileNameTemp && formWindow() ) { f = TQString( formWindow()->name() ).lower(); f.replace( "::", "_" ); f = pro->makeAbsolute( f + ".ui" ); @@ -293,7 +293,7 @@ bool FormFile::saveAs( bool ignoreModified ) } pro->setModified( TRUE ); timeStamp.setFileName( pro->makeAbsolute( codeFile() ) ); - if ( ed && TQT_TQOBJECT(formWindow()) ) + if ( ed && formWindow() ) ed->setCaption( i18n( "Edit %1" ).arg( formWindow()->name() ) ); setModified( TRUE ); if ( pro->isDummy() ) @@ -307,7 +307,7 @@ bool FormFile::close() editor()->save(); editor()->close(); } - if ( TQT_TQOBJECT(formWindow()) ) + if ( formWindow() ) return formWindow()->close(); return TRUE; } @@ -372,7 +372,7 @@ bool FormFile::isModified( int who ) bool FormFile::isFormWindowModified() const { - if ( !TQT_TQOBJECT(formWindow()) || !formWindow()->commandHistory() ) + if ( !formWindow() || !formWindow()->commandHistory() ) return FALSE; return formWindow()->commandHistory()->isModified(); } @@ -389,7 +389,7 @@ void FormFile::setFormWindowModified( bool m ) bool b = isFormWindowModified(); if ( m == b ) return; - if ( !TQT_TQOBJECT(formWindow()) || !formWindow()->commandHistory() ) + if ( !formWindow() || !formWindow()->commandHistory() ) return; formWindow()->commandHistory()->setModified( m ); emit somethingChanged( this ); @@ -411,13 +411,13 @@ void FormFile::showFormWindow() { if ( !MainWindow::self ) return; - if ( TQT_TQOBJECT(formWindow()) ) { + if ( formWindow() ) { if ( ( formWindow()->hasFocus() || - TQT_BASE_OBJECT(MainWindow::self->qWorkspace()->activeWindow()) == TQT_BASE_OBJECT(formWindow()) ) && - TQT_BASE_OBJECT(MainWindow::self->propertyeditor()->formWindow()) != TQT_BASE_OBJECT(formWindow()) ) { - MainWindow::self->propertyeditor()->setWidget( TQT_TQOBJECT(formWindow()->currentWidget()), formWindow() ); + MainWindow::self->qWorkspace()->activeWindow() == formWindow() ) && + MainWindow::self->propertyeditor()->formWindow() != formWindow() ) { + MainWindow::self->propertyeditor()->setWidget( formWindow()->currentWidget(), formWindow() ); MainWindow::self->objectHierarchy()->setFormWindow( formWindow(), - TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->currentWidget() ); } formWindow()->setFocus(); return; @@ -519,14 +519,14 @@ void FormFile::setCodeFileState( UihState s ) void FormFile::createFormCode() { - if ( !TQT_TQOBJECT(formWindow()) ) + if ( !formWindow() ) return; LanguageInterface *iface = MetaDataBase::languageInterface( pro->language() ); if ( !iface ) return; if ( pro->isCpp() ) cod = codeComment(); - TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(formWindow()) ); + TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( formWindow() ); for ( TQValueList<MetaDataBase::Function>::Iterator it = functionList.begin(); it != functionList.end(); ++it ) { cod += (!cod.isEmpty() ? "\n\n" : "") + iface->createFunctionStart( formWindow()->name(), make_func_pretty((*it).function), @@ -573,14 +573,14 @@ void FormFile::setCodeEdited( bool b ) void FormFile::parseCode( const TQString &txt, bool allowModify ) { - if ( !TQT_TQOBJECT(formWindow()) ) + if ( !formWindow() ) return; LanguageInterface *iface = MetaDataBase::languageInterface( pro->language() ); if ( !iface ) return; TQValueList<LanguageInterface::Function> functions; TQValueList<MetaDataBase::Function> newFunctions, oldFunctions; - oldFunctions = MetaDataBase::functionList( TQT_TQOBJECT(formWindow()) ); + oldFunctions = MetaDataBase::functionList( formWindow() ); iface->functions( txt, &functions ); TQMap<TQString, TQString> funcs; for ( TQValueList<LanguageInterface::Function>::Iterator it = functions.begin(); @@ -634,7 +634,7 @@ void FormFile::parseCode( const TQString &txt, bool allowModify ) if ( allowModify && oldFunctions.count() > 0 ) setFormWindowModified( TRUE ); - MetaDataBase::setFunctionList( TQT_TQOBJECT(formWindow()), newFunctions ); + MetaDataBase::setFunctionList( formWindow(), newFunctions ); } void FormFile::syncCode() @@ -704,7 +704,7 @@ void FormFile::addFunctionCode( MetaDataBase::Function function ) if ( !hasFunc ) { if ( !codeEdited && !timeStamp.isUpToDate() ) loadCode(); - MetaDataBase::MetaInfo mi = MetaDataBase::metaInfo( TQT_TQOBJECT(formWindow()) ); + MetaDataBase::MetaInfo mi = MetaDataBase::metaInfo( formWindow() ); TQString cn; if ( mi.classNameChanged ) cn = mi.className; @@ -802,7 +802,7 @@ void FormFile::functionRetTypeChanged( const TQString &fuName, const TQString &o TQString FormFile::formName() const { FormFile* that = (FormFile*) this; - if ( TQT_TQOBJECT(formWindow()) ) { + if ( formWindow() ) { that->cachedFormName = formWindow()->name(); return cachedFormName; } diff --git a/kdevdesigner/designer/formfile.h b/kdevdesigner/designer/formfile.h index 79f92d16..6f80e040 100644 --- a/kdevdesigner/designer/formfile.h +++ b/kdevdesigner/designer/formfile.h @@ -37,7 +37,7 @@ class SourceEditor; class FormFile : public TQObject { - Q_OBJECT + TQ_OBJECT friend class SourceEditor; diff --git a/kdevdesigner/designer/formsettings.ui b/kdevdesigner/designer/formsettings.ui index 812f30a0..89afbd97 100644 --- a/kdevdesigner/designer/formsettings.ui +++ b/kdevdesigner/designer/formsettings.ui @@ -542,9 +542,9 @@ <tabstop>buttonCancel</tabstop> <tabstop>buttonHelp</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>okClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kdevdesigner/designer/formsettingsimpl.cpp b/kdevdesigner/designer/formsettingsimpl.cpp index e29ea157..412d6067 100644 --- a/kdevdesigner/designer/formsettingsimpl.cpp +++ b/kdevdesigner/designer/formsettingsimpl.cpp @@ -43,8 +43,8 @@ FormSettings::FormSettings( TQWidget *parent, FormWindow *fw ) : FormSettingsBase( parent, 0, TRUE ), formwindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); - MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( TQT_TQOBJECT(fw) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); + MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( fw ); if ( info.classNameChanged && !info.className.isEmpty() ) editClassName->setText( info.className ); else @@ -52,8 +52,8 @@ FormSettings::FormSettings( TQWidget *parent, FormWindow *fw ) editComment->setText( info.comment ); editAuthor->setText( info.author ); - editClassName->setValidator( new AsciiValidator( TQString( ":" ), TQT_TQOBJECT(editClassName) ) ); - editPixmapFunction->setValidator( new AsciiValidator( TQString( ":" ), TQT_TQOBJECT(editPixmapFunction) ) ); + editClassName->setValidator( new AsciiValidator( TQString( ":" ), editClassName ) ); + editPixmapFunction->setValidator( new AsciiValidator( TQString( ":" ), editPixmapFunction ) ); if ( formwindow->savePixmapInline() ) radioPixmapInline->setChecked( TRUE ); @@ -65,8 +65,8 @@ FormSettings::FormSettings( TQWidget *parent, FormWindow *fw ) radioProjectImageFile->setEnabled( !fw->project()->isDummy() ); spinSpacing->setValue( formwindow->layoutDefaultSpacing() ); spinMargin->setValue( formwindow->layoutDefaultMargin() ); - editSpacingFunction->setValidator( new AsciiValidator( TQString( ":" ), TQT_TQOBJECT(editSpacingFunction) ) ); - editMarginFunction->setValidator( new AsciiValidator( TQString( ":" ), TQT_TQOBJECT(editMarginFunction) ) ); + editSpacingFunction->setValidator( new AsciiValidator( TQString( ":" ), editSpacingFunction ) ); + editMarginFunction->setValidator( new AsciiValidator( TQString( ":" ), editMarginFunction ) ); checkLayoutFunctions->setChecked( formwindow->hasLayoutFunctions() ); editSpacingFunction->setText( formwindow->spacingFunction() ); editMarginFunction->setText( formwindow->marginFunction() ); @@ -79,17 +79,17 @@ void FormSettings::okClicked() info.classNameChanged = info.className != TQString( formwindow->name() ); info.comment = editComment->text(); info.author = editAuthor->text(); - MetaDataBase::setMetaInfo( TQT_TQOBJECT(formwindow), info ); + MetaDataBase::setMetaInfo( formwindow, info ); formwindow->commandHistory()->setModified( TRUE ); if ( formwindow->savePixmapInline() ) { - MetaDataBase::clearPixmapArguments( TQT_TQOBJECT(formwindow) ); - MetaDataBase::clearPixmapKeys( TQT_TQOBJECT(formwindow) ); + MetaDataBase::clearPixmapArguments( formwindow ); + MetaDataBase::clearPixmapKeys( formwindow ); } else if ( formwindow->savePixmapInProject() ) { - MetaDataBase::clearPixmapArguments( TQT_TQOBJECT(formwindow) ); + MetaDataBase::clearPixmapArguments( formwindow ); } else { - MetaDataBase::clearPixmapKeys( TQT_TQOBJECT(formwindow) ); + MetaDataBase::clearPixmapKeys( formwindow ); } if ( radioPixmapInline->isChecked() ) { diff --git a/kdevdesigner/designer/formsettingsimpl.h b/kdevdesigner/designer/formsettingsimpl.h index 3dcb6dd7..0580128d 100644 --- a/kdevdesigner/designer/formsettingsimpl.h +++ b/kdevdesigner/designer/formsettingsimpl.h @@ -33,7 +33,7 @@ class FormWindow; class FormSettings : public FormSettingsBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/formwindow.cpp b/kdevdesigner/designer/formwindow.cpp index 99f631ae..ab4aed7e 100644 --- a/kdevdesigner/designer/formwindow.cpp +++ b/kdevdesigner/designer/formwindow.cpp @@ -87,7 +87,7 @@ static void setCursorToAll( const TQCursor &c, TQWidget *start ) TQObjectList l = start->childrenListObject(); if ( !l.isEmpty() ) { for ( TQObject *o = l.first(); o; o = l.next() ) { - if ( o->isWidgetType() && !::tqqt_cast<SizeHandle*>(o) ) + if ( o->isWidgetType() && !::tqt_cast<SizeHandle*>(o) ) setCursorToAll( c, ( (TQWidget*)o ) ); } } @@ -102,7 +102,7 @@ static void restoreCursors( TQWidget *start, FormWindow *fw ) TQObjectList l = start->childrenListObject(); if ( !l.isEmpty() ) { for ( TQObject *o = l.first(); o; o = l.next() ) { - if ( o->isWidgetType() && !::tqqt_cast<SizeHandle*>(o) ) + if ( o->isWidgetType() && !::tqt_cast<SizeHandle*>(o) ) restoreCursors( ( (TQWidget*)o ), fw ); } } @@ -156,7 +156,7 @@ void FormWindow::init() setWFlags(getWFlags() & TQt::WStyle_Maximize); fake = qstrcmp( name(), "qt_fakewindow" ) == 0; - MetaDataBase::addEntry( TQT_TQOBJECT(this) ); + MetaDataBase::addEntry( this ); ff->setFormWindow( this ); iface = 0; proj = 0; @@ -169,38 +169,38 @@ void FormWindow::init() unclippedPainter = 0; widgetPressed = FALSE; drawRubber = FALSE; - setFocusPolicy( TQ_ClickFocus ); + setFocusPolicy( TQWidget::ClickFocus ); sizePreviewLabel = 0; checkSelectionsTimer = new TQTimer( this, "checkSelectionsTimer" ); - connect( checkSelectionsTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( invalidCheckedSelections() ) ); + connect( checkSelectionsTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( invalidCheckedSelections() ) ); updatePropertiesTimer = new TQTimer( this ); - connect( updatePropertiesTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( updatePropertiesTimerDone() ) ); + connect( updatePropertiesTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( updatePropertiesTimerDone() ) ); showPropertiesTimer = new TQTimer( this ); //!!!! - connect( showPropertiesTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( showPropertiesTimerDone() ) ); + connect( showPropertiesTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( showPropertiesTimerDone() ) ); selectionChangedTimer = new TQTimer( this ); - connect( selectionChangedTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( selectionChangedTimerDone() ) ); + connect( selectionChangedTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( selectionChangedTimerDone() ) ); windowsRepaintWorkaroundTimer = new TQTimer( this ); - connect( windowsRepaintWorkaroundTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( windowsRepaintWorkaroundTimerTimeout() ) ); + connect( windowsRepaintWorkaroundTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( windowsRepaintWorkaroundTimerTimeout() ) ); insertParent = 0; - connect( &commands, TQT_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), - this, TQT_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ) ); + connect( &commands, TQ_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), + this, TQ_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ) ); propShowBlocked = FALSE; setIcon( SmallIcon( "designer_form.png" , KDevDesignerPartFactory::instance()) ); - connect( &commands, TQT_SIGNAL( modificationChanged( bool ) ), - this, TQT_SLOT( modificationChanged( bool ) ) ); + connect( &commands, TQ_SIGNAL( modificationChanged( bool ) ), + this, TQ_SLOT( modificationChanged( bool ) ) ); buffer = 0; - TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQFRAME_OBJECT_NAME_STRING ), this ); + TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQFrame" ), this ); setMainContainer( w ); - propertyWidget = TQT_TQOBJECT(w); + propertyWidget = w; targetContainer = 0; hadOwnPalette = FALSE; @@ -212,7 +212,7 @@ void FormWindow::init() void FormWindow::setMainWindow( MainWindow *w ) { mainwindow = w; - MetaDataBase::addEntry( TQT_TQOBJECT(this) ); + MetaDataBase::addEntry( this ); initSlots(); } @@ -236,7 +236,7 @@ FormWindow::~FormWindow() if ( MainWindow::self && MainWindow::self->objectHierarchy()->formWindow() == this ) MainWindow::self->objectHierarchy()->setFormWindow( 0, 0 ); - MetaDataBase::clear( TQT_TQOBJECT(this) ); + MetaDataBase::clear( this ); if ( ff ) ff->setFormWindow( 0 ); delete iface; @@ -353,15 +353,15 @@ void FormWindow::insertWidget() return; bool useSizeHint = !oldRectValid || ( currRect.width() < 2 && currRect.height() < 2 ); - Qt::Orientation orient =Qt::Horizontal; + TQt::Orientation orient =TQt::Horizontal; TQString n = WidgetDatabase::className( currTool ); - if ( useSizeHint && ( n == "Spacer" || n == TQSLIDER_OBJECT_NAME_STRING || n == "Line" || n == TQSCROLLBAR_OBJECT_NAME_STRING ) ) { + if ( useSizeHint && ( n == "Spacer" || n == "TQSlider" || n == "Line" || n == "TQScrollBar" ) ) { TQPopupMenu m( mainWindow() ); m.insertItem( i18n( "&Horizontal" ) ); int ver = m.insertItem( i18n( "&Vertical" ) ); int r = m.exec( TQCursor::pos() ); if ( r == ver ) - orient =Qt::Vertical; + orient =TQt::Vertical; } @@ -375,7 +375,7 @@ void FormWindow::insertWidget() pix.convertFromImage( SmallIcon( "designer_image.png" , KDevDesignerPartFactory::instance()).convertToImage() ); ( (TQLabel*)w )->setPixmap( pix ); } - int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT(w)) ); + int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(w) ); if ( WidgetDatabase::isCustomWidget( id ) ) { TQWhatsThis::add( w, i18n("<b>A %1 (custom widget)</b> " "<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> " @@ -393,7 +393,7 @@ void FormWindow::insertWidget() } TQString s = w->name(); - unify( TQT_TQOBJECT(w), s, TRUE ); + unify( w, s, TRUE ); w->setName( s ); insertWidget( w ); TQRect r( currRect ); @@ -408,7 +408,7 @@ void FormWindow::insertWidget() if ( useSizeHint ) { if ( n == "Spacer" ) { - if ( orient ==Qt::Vertical ) { + if ( orient ==TQt::Vertical ) { r.setWidth( 20 ); r.setHeight( 40 ); } else { @@ -429,13 +429,13 @@ void FormWindow::insertWidget() const TQObjectList l = insertParent->childrenListObject(); TQObjectListIt it( l ); TQWidgetList lst; - if ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ) { + if ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) ) { for ( ; it.current(); ) { TQObject *o = it.current(); ++it; if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( this ) && - insertedWidgets.find( TQT_TQWIDGET(o) ) && TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(w) ) { + insertedWidgets.find( o ) && o != w ) { TQRect r2( ( (TQWidget*)o )->pos(), ( (TQWidget*)o )->size() ); if ( r.contains( r2 ) ) @@ -497,12 +497,12 @@ void FormWindow::insertWidget( TQWidget *w, bool checkName ) return; if ( checkName ) { TQString s = w->name(); - unify( TQT_TQOBJECT(w), s, TRUE ); + unify( w, s, TRUE ); w->setName( s ); } - MetaDataBase::addEntry( TQT_TQOBJECT(w) ); - int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT(w)) ); + MetaDataBase::addEntry( w ); + int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(w) ); if ( WidgetDatabase::isCustomWidget( id ) ) { TQWhatsThis::add( w, i18n("<b>A %1 (custom widget)</b> " "<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> " @@ -526,7 +526,7 @@ void FormWindow::insertWidget( TQWidget *w, bool checkName ) void FormWindow::removeWidget( TQWidget *w ) { - MetaDataBase::removeEntry( TQT_TQOBJECT(w) ); + MetaDataBase::removeEntry( w ); widgets()->take( w ); } @@ -535,16 +535,16 @@ void FormWindow::handleContextMenu( TQContextMenuEvent *e, TQWidget *w ) CHECK_MAINWINDOW; switch ( currTool ) { case POINTER_TOOL: { - if ( !isMainContainer( TQT_TQOBJECT(w) ) && qstrcmp( w->name(), "central widget" ) != 0 ) { // press on a child widget + if ( !isMainContainer( w ) && qstrcmp( w->name(), "central widget" ) != 0 ) { // press on a child widget raiseChildSelections( w ); // raise selections and select widget - selectWidget( TQT_TQOBJECT(w) ); + selectWidget( w ); // if widget is laid out, find the first non-laid out super-widget TQWidget *realWidget = w; // but store the original one while ( w->parentWidget() && ( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.find(w) ) ) w = w->parentWidget(); - if ( ::tqqt_cast<TQMainWindow*>(mainContainer()) && ((TQMainWindow*)mainContainer())->centralWidget() == realWidget ) { + if ( ::tqt_cast<TQMainWindow*>(mainContainer()) && ((TQMainWindow*)mainContainer())->centralWidget() == realWidget ) { e->accept(); mainwindow->popupFormWindowMenu( e->globalPos(), this ); } else { @@ -576,7 +576,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) switch ( currTool ) { case POINTER_TOOL: - if ( !isMainContainer( TQT_TQOBJECT(w) ) && qstrcmp( w->name(), "central widget" ) != 0 ) { // press on a child widget + if ( !isMainContainer( w ) && qstrcmp( w->name(), "central widget" ) != 0 ) { // press on a child widget // if the clicked widget is not in a layout, raise it if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ) w->raise(); @@ -587,20 +587,20 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) break; } - bool sel = isWidgetSelected( TQT_TQOBJECT(w) ); + bool sel = isWidgetSelected( w ); if ( !( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) ) ) { // control not pressed... if ( !sel ) { // ...and widget no selectted: unselect all clearSelection( FALSE ); } else { // ...widget selected // only if widget has a layout (it is a layout meta widget or a laid out container!), unselect its childs if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ) { - TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = w->queryList( "TQWidget" ); setPropertyShowingBlocked( TRUE ); for ( TQObject *o = l->first(); o; o = l->next() ) { if ( !o->isWidgetType() ) continue; if ( insertedWidgets.find( (TQWidget*)o ) ) - selectWidget( TQT_TQOBJECT(o), FALSE ); + selectWidget( o, FALSE ); } setPropertyShowingBlocked( FALSE ); delete l; @@ -609,39 +609,39 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) tqApp->processEvents(); } if ( ( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) ) && - sel && e->button() == Qt::LeftButton ) { // control pressed and selected, unselect widget - selectWidget( TQT_TQOBJECT(w), FALSE ); + sel && e->button() == TQt::LeftButton ) { // control pressed and selected, unselect widget + selectWidget( w, FALSE ); break; } raiseChildSelections( w ); // raise selections and select widget - selectWidget( TQT_TQOBJECT(w) ); + selectWidget( w ); // if widget is laid out, find the first non-laid out super-widget while ( w->parentWidget() && ( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.find(w) ) ) w = w->parentWidget(); - if ( e->button() == Qt::LeftButton ) { // left button: store original geometry and more as the widget might start moving + if ( e->button() == TQt::LeftButton ) { // left button: store original geometry and more as the widget might start moving widgetPressed = TRUE; widgetGeom = TQRect( w->pos(), w->size() ); oldPressPos = w->mapFromGlobal( e->globalPos() ); origPressPos = oldPressPos; checkedSelectionsForMove = FALSE; moving.clear(); - if ( w->parentWidget() && !isMainContainer( TQT_TQOBJECT(w->parentWidget()) ) && !isCentralWidget( TQT_TQOBJECT(w->parentWidget()) ) ) { + if ( w->parentWidget() && !isMainContainer( w->parentWidget() ) && !isCentralWidget( w->parentWidget() ) ) { targetContainer = w->parentWidget(); hadOwnPalette = w->parentWidget()->ownPalette(); restorePalette = w->parentWidget()->palette(); } } } else { // press was on the formwindow - if ( e->button() == Qt::LeftButton ) { // left button: start rubber selection and show formwindow properties + if ( e->button() == TQt::LeftButton ) { // left button: start rubber selection and show formwindow properties drawRubber = TRUE; if ( !( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) ) ) { clearSelection( FALSE ); TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(mainContainer()); + propertyWidget = mainContainer(); if ( opw->isWidgetType() ) repaintSelection( (TQWidget*)opw ); } @@ -652,11 +652,11 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) break; case CONNECT_TOOL: case BUDDY_TOOL: - if ( e->button() != Qt::LeftButton ) + if ( e->button() != TQt::LeftButton ) break; validForBuddy = FALSE; if ( currTool == BUDDY_TOOL ) { - if ( !::tqqt_cast<TQLabel*>(w) ) + if ( !::tqt_cast<TQLabel*>(w) ) break; clearSelection( FALSE ); validForBuddy = TRUE; @@ -667,13 +667,13 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) saveBackground(); startPos = mapFromGlobal( e->globalPos() ); currentPos = startPos; - startWidget = designerWidget( TQT_TQOBJECT(w) ); + startWidget = designerWidget( w ); endWidget = startWidget; beginUnclippedPainter( FALSE ); drawConnectionLine(); break; case ORDER_TOOL: - if ( !isMainContainer( TQT_TQOBJECT(w) ) ) { // press on a child widget + if ( !isMainContainer( w ) ) { // press on a child widget orderedWidgets.removeRef( w ); orderedWidgets.append( w ); for ( TQWidget *wid = orderedWidgets.last(); wid; wid = orderedWidgets.prev() ) { @@ -691,14 +691,14 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) } break; default: // any insert widget tool - if ( e->button() == Qt::LeftButton ) { + if ( e->button() == TQt::LeftButton ) { insertParent = WidgetFactory::containerOfWidget( mainContainer() ); // default parent for new widget is the formwindow - if ( !isMainContainer( TQT_TQOBJECT(w) ) ) { // press was not on formwindow, check if we can find another parent + if ( !isMainContainer( w ) ) { // press was not on formwindow, check if we can find another parent TQWidget *wid = w; for (;;) { - int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(wid) ) ); + int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( wid ) ); if ( ( WidgetDatabase::isContainer( id ) || wid == mainContainer() ) && - !::tqqt_cast<TQLayoutWidget*>(wid) && !::tqqt_cast<TQSplitter*>(wid) ) { + !::tqt_cast<TQLayoutWidget*>(wid) && !::tqt_cast<TQSplitter*>(wid) ) { insertParent = WidgetFactory::containerOfWidget( wid ); // found another parent, store it break; } else { @@ -719,7 +719,7 @@ void FormWindow::handleMouseDblClick( TQMouseEvent *, TQWidget *w ) CHECK_MAINWINDOW; switch ( currTool ) { case ORDER_TOOL: - if ( !isMainContainer( TQT_TQOBJECT(w) ) ) { // press on a child widget + if ( !isMainContainer( w ) ) { // press on a child widget orderedWidgets.clear(); orderedWidgets.append( w ); for ( TQWidget *wid = orderedWidgets.last(); wid; wid = orderedWidgets.prev() ) { @@ -736,8 +736,8 @@ void FormWindow::handleMouseDblClick( TQMouseEvent *, TQWidget *w ) updateOrderIndicators(); } default: - if ( !WidgetFactory::isPassiveInteractor( TQT_TQOBJECT(w) ) && - ( isMainContainer( TQT_TQOBJECT(w) ) || TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(this) ) ) + if ( !WidgetFactory::isPassiveInteractor( w ) && + ( isMainContainer( w ) || w == this ) ) mainWindow()->editSource(); break; } @@ -746,7 +746,7 @@ void FormWindow::handleMouseDblClick( TQMouseEvent *, TQWidget *w ) void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) { CHECK_MAINWINDOW; - if ( ( e->state() & Qt::LeftButton ) != Qt::LeftButton ) + if ( ( e->state() & TQt::LeftButton ) != TQt::LeftButton ) return; TQWidget *newendWidget = endWidget, *oldendWidget = endWidget, *wid; @@ -799,9 +799,9 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) if ( x - p.x() != 0 || y - p.y() != 0 ) { // if we actually have to move if ( !checkedSelectionsForMove ) { // if not checked yet, check if the correct widget are selected... - if ( !isWidgetSelected( TQT_TQOBJECT(w) ) ) { // and unselect others. Only siblings can be moved at the same time + if ( !isWidgetSelected( w ) ) { // and unselect others. Only siblings can be moved at the same time setPropertyShowingBlocked( TRUE ); - selectWidget( TQT_TQOBJECT(w) ); + selectWidget( w ); setPropertyShowingBlocked( FALSE ); } checkSelectionsForMove( w ); @@ -810,7 +810,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) // check whether we would have to reparent the selection and highlight the possible new parent container TQMapConstIterator<TQWidget*, TQPoint> it = moving.begin(); TQWidget* wa = containerAt( e->globalPos(), it.key() ); - if ( wa && !isMainContainer( TQT_TQOBJECT(wa) ) && !isCentralWidget( TQT_TQOBJECT(wa) ) ) { + if ( wa && !isMainContainer( wa ) && !isCentralWidget( wa ) ) { wa = WidgetFactory::containerOfWidget( wa ); // ok, looks like we moved onto a container @@ -862,14 +862,14 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) restoreConnectionLine(); wid = tqApp->widgetAt( e->globalPos(), TRUE ); if ( wid ) - wid = designerWidget( TQT_TQOBJECT(wid) ); - if ( wid && ( isMainContainer( TQT_TQOBJECT(wid) ) || insertedWidgets.find( wid ) ) && wid->isVisibleTo( this ) ) + wid = designerWidget( wid ); + if ( wid && ( isMainContainer( wid ) || insertedWidgets.find( wid ) ) && wid->isVisibleTo( this ) ) newendWidget = wid; - if ( ::tqqt_cast<TQLayoutWidget*>(newendWidget) || ::tqqt_cast<Spacer*>(newendWidget) ) + if ( ::tqt_cast<TQLayoutWidget*>(newendWidget) || ::tqt_cast<Spacer*>(newendWidget) ) newendWidget = (TQWidget*)endWidget; drawRecRect = newendWidget != endWidget; if ( newendWidget && - ( isMainContainer( TQT_TQOBJECT(newendWidget) ) || insertedWidgets.find( newendWidget ) ) && !isCentralWidget( TQT_TQOBJECT(newendWidget) ) ) + ( isMainContainer( newendWidget ) || insertedWidgets.find( newendWidget ) ) && !isCentralWidget( newendWidget ) ) endWidget = newendWidget; mainWindow()->statusMessage( i18n( "Connect '%1' to '%2'" ).arg( startWidget->name() ). arg( endWidget->name() ) ); @@ -886,17 +886,17 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) restoreConnectionLine(); wid = tqApp->widgetAt( e->globalPos(), TRUE ); if ( wid ) - wid = designerWidget( TQT_TQOBJECT(wid) ); + wid = designerWidget( wid ); if ( wid && canBeBuddy( wid ) && wid->isVisibleTo( this ) ) newendWidget = wid; else newendWidget = 0; - if ( ::tqqt_cast<TQLayoutWidget*>(newendWidget) || ::tqqt_cast<Spacer*>(newendWidget) ) + if ( ::tqt_cast<TQLayoutWidget*>(newendWidget) || ::tqt_cast<Spacer*>(newendWidget) ) newendWidget = (TQWidget*)endWidget; drawRecRect = newendWidget != endWidget; if ( !newendWidget ) endWidget = newendWidget; - else if ( insertedWidgets.find( newendWidget ) && !isCentralWidget( TQT_TQOBJECT(newendWidget) ) ) + else if ( insertedWidgets.find( newendWidget ) && !isCentralWidget( newendWidget ) ) endWidget = newendWidget; if ( endWidget ) mainWindow()->statusMessage( i18n( "Set buddy '%1' to '%2'" ).arg( startWidget->name() ). @@ -922,7 +922,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w ) { CHECK_MAINWINDOW; - if ( e->button() != Qt::LeftButton ) + if ( e->button() != TQt::LeftButton ) return; switch ( currTool ) { @@ -977,12 +977,12 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w ) bool emitSelChanged = FALSE; for ( TQMap<TQWidget*, TQPoint>::Iterator it = moving.begin(); it != moving.end(); ++it ) { TQWidget *i = it.key(); - if ( !emitSelChanged && ::tqqt_cast<TQButton*>(i) ) { - if ( ::tqqt_cast<TQButtonGroup*>(i->parentWidget()) || ::tqqt_cast<TQButtonGroup*>(wa) ) + if ( !emitSelChanged && ::tqt_cast<TQButton*>(i) ) { + if ( ::tqt_cast<TQButtonGroup*>(i->parentWidget()) || ::tqt_cast<TQButtonGroup*>(wa) ) emitSelChanged = TRUE; - if ( !::tqqt_cast<TQButtonGroup*>(wa) ) { - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(i), "buttonGroupId", FALSE ); - if ( ::tqqt_cast<TQButtonGroup*>(i->parentWidget()) ) + if ( !::tqt_cast<TQButtonGroup*>(wa) ) { + MetaDataBase::setPropertyChanged( i, "buttonGroupId", FALSE ); + if ( ::tqt_cast<TQButtonGroup*>(i->parentWidget()) ) ( (TQButtonGroup*)i->parentWidget() )->remove( (TQButton*)i ); } } @@ -990,12 +990,12 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w ) i->reparent( wa, pos, TRUE ); raiseSelection( i ); raiseChildSelections( i ); - widgetChanged( TQT_TQOBJECT(i) ); + widgetChanged( i ); mainWindow()->objectHierarchy()->widgetRemoved( i ); mainWindow()->objectHierarchy()->widgetInserted( i ); } if ( emitSelChanged ) { - emit showProperties( TQT_TQOBJECT(wa) ); + emit showProperties( wa ); emit showProperties( propertyWidget ); } newParent = wa; @@ -1045,13 +1045,13 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w ) if ( oldBuddy.isNull() ) oldBuddy = ""; SetPropertyCommand *cmd = new SetPropertyCommand( i18n( "Set Buddy for %1" ).arg( startWidget->name() ), - this, TQT_TQOBJECT(startWidget), mainWindow()->propertyeditor(), + this, startWidget, mainWindow()->propertyeditor(), "buddy", startWidget->property( "buddy" ), endWidget->name(), endWidget->name(), oldBuddy ); commandHistory()->addCommand( cmd, TRUE ); cmd->execute(); - emitUpdateProperties( TQT_TQOBJECT(startWidget) ); + emitUpdateProperties( startWidget ); } } if ( !toolFixed ) @@ -1160,10 +1160,10 @@ void FormWindow::handleKeyPress( TQKeyEvent *e, TQWidget *w ) } } if ( !e->isAccepted() ) { - TQObjectList *l = queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = queryList( "TQWidget" ); if ( !l ) return; - if ( l->find( TQT_TQOBJECT(w) ) != -1 ) + if ( l->find( w ) != -1 ) e->accept(); delete l; } @@ -1185,30 +1185,30 @@ void FormWindow::selectWidget( TQObject *o, bool select ) TQWidget *w = (TQWidget*)o; - if ( isMainContainer( TQT_TQOBJECT(w) ) ) { + if ( isMainContainer( w ) ) { TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(mainContainer()); + propertyWidget = mainContainer(); if ( opw->isWidgetType() ) repaintSelection( (TQWidget*)opw ); emitShowProperties( propertyWidget ); return; } - if ( ::tqqt_cast<TQMainWindow*>(mainContainer()) && w == ( (TQMainWindow*)mainContainer() )->centralWidget() ) { + if ( ::tqt_cast<TQMainWindow*>(mainContainer()) && w == ( (TQMainWindow*)mainContainer() )->centralWidget() ) { TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(mainContainer()); + propertyWidget = mainContainer(); if ( opw->isWidgetType() ) repaintSelection( (TQWidget*)opw ); emitShowProperties( propertyWidget ); return; } - if ( ::tqqt_cast<QDesignerToolBar*>(o) ) + if ( ::tqt_cast<QDesignerToolBar*>(o) ) return; if ( select ) { TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(w); + propertyWidget = w; if ( opw->isWidgetType() ) repaintSelection( (TQWidget*)opw ); if ( !isPropertyShowingBlocked() ) @@ -1238,9 +1238,9 @@ void FormWindow::selectWidget( TQObject *o, bool select ) s->setWidget( 0 ); TQObject *opw = propertyWidget; if ( !usedSelections.isEmpty() ) - propertyWidget = TQT_TQOBJECT(TQPtrDictIterator<WidgetSelection>( usedSelections ).current()->widget()); + propertyWidget = TQPtrDictIterator<WidgetSelection>( usedSelections ).current()->widget(); else - propertyWidget = TQT_TQOBJECT(mainContainer()); + propertyWidget = mainContainer(); if ( opw->isWidgetType() ) repaintSelection( (TQWidget*)opw ); if ( !isPropertyShowingBlocked() ) @@ -1260,7 +1260,7 @@ void FormWindow::updateSelection( TQWidget *w ) { WidgetSelection *s = usedSelections.find( w ); if ( !w->isVisibleTo( this ) ) - selectWidget( TQT_TQOBJECT(w), FALSE ); + selectWidget( w, FALSE ); else if ( s ) s->updateGeometry(); } @@ -1288,7 +1288,7 @@ void FormWindow::clearSelection( bool changePropertyDisplay ) usedSelections.clear(); if ( changePropertyDisplay ) { TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(mainContainer()); + propertyWidget = mainContainer(); if ( opw->isWidgetType() ) repaintSelection( (TQWidget*)opw ); emitShowProperties( propertyWidget ); @@ -1365,7 +1365,7 @@ void FormWindow::endRectDraw() void FormWindow::selectWidgets() { - TQObjectList *l = mainContainer()->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = mainContainer()->queryList( "TQWidget" ); if ( l ) { for ( TQObject *o = l->first(); o; o = l->next() ) { if ( ( (TQWidget*)o )->isVisibleTo( this ) && @@ -1374,7 +1374,7 @@ void FormWindow::selectWidgets() p = mapFromGlobal( p ); TQRect r( p, ( (TQWidget*)o )->size() ); if ( r.intersects( currRect ) && !r.contains( currRect ) ) - selectWidget( TQT_TQOBJECT(o) ); + selectWidget( o ); } } delete l; @@ -1420,7 +1420,7 @@ void FormWindow::redo() void FormWindow::raiseChildSelections( TQWidget *w ) { - TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = w->queryList( "TQWidget" ); if ( !l || !l->first() ) { delete l; return; @@ -1428,7 +1428,7 @@ void FormWindow::raiseChildSelections( TQWidget *w ) TQPtrDictIterator<WidgetSelection> it( usedSelections ); for ( ; it.current(); ++it ) { - if ( l->findRef( TQT_TQOBJECT(it.current()->widget()) ) != -1 ) + if ( l->findRef( it.current()->widget() ) != -1 ) it.current()->show(); } delete l; @@ -1436,7 +1436,7 @@ void FormWindow::raiseChildSelections( TQWidget *w ) void FormWindow::updateChildSelections( TQWidget *w ) { - TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = w->queryList( "TQWidget" ); if ( l ) { for ( TQObject *o = l->first(); o; o = l->next() ) { if ( o->isWidgetType() && @@ -1451,7 +1451,7 @@ void FormWindow::checkSelectionsForMove( TQWidget *w ) { checkedSelectionsForMove = TRUE; - TQObjectList *l = w->parentWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, 0, FALSE, FALSE ); + TQObjectList *l = w->parentWidget()->queryList( "TQWidget", 0, FALSE, FALSE ); moving.clear(); if ( l ) { TQPtrDictIterator<WidgetSelection> it( usedSelections ); @@ -1460,7 +1460,7 @@ void FormWindow::checkSelectionsForMove( TQWidget *w ) if ( it.current()->widget() == mainContainer() ) continue; ++it; - if ( l->find( TQT_TQOBJECT(sel->widget()) ) == -1 ) { + if ( l->find( sel->widget() ) == -1 ) { if ( WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) sel->setWidget( 0 ); } else { @@ -1483,7 +1483,7 @@ void FormWindow::deleteWidgets() TQPtrDictIterator<WidgetSelection> it( usedSelections ); for ( ; it.current(); ++it ) { TQWidget *tb = 0; - if ( !( tb = mainWindow()->isAToolBarChild( TQT_TQOBJECT(it.current()->widget()) ) ) ) + if ( !( tb = mainWindow()->isAToolBarChild( it.current()->widget() ) ) ) widgets.append( it.current()->widget() ); else ( (QDesignerToolBar*)tb )->removeWidget( it.current()->widget() ); @@ -1569,7 +1569,7 @@ void FormWindow::invalidCheckedSelections() void FormWindow::checkPreviewGeometry( TQRect &r ) { - if ( !TQT_TQRECT_OBJECT(rect()).contains( r ) ) { + if ( !rect().contains( r ) ) { if ( r.left() < rect().left() ) r.moveTopLeft( TQPoint( 0, r.top() ) ); if ( r.right() > rect().right() ) @@ -1591,7 +1591,7 @@ void FormWindow::focusOutEvent( TQFocusEvent * ) { if ( propertyWidget && !isMainContainer( propertyWidget ) && !isWidgetSelected( propertyWidget ) ) { TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(mainContainer()); + propertyWidget = mainContainer(); if ( opw->isWidgetType() ) repaintSelection( (TQWidget*)opw ); } @@ -1613,7 +1613,7 @@ void FormWindow::resizeEvent( TQResizeEvent *e ) void FormWindow::windowsRepaintWorkaroundTimerTimeout() { #if defined(TQ_WS_WIN32) - TQObjectList *l = queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = queryList( "TQWidget" ); for ( TQObject *o = l->first(); o; o = l->next() ) { flickerfree_update( (TQWidget*)o ); } @@ -1632,7 +1632,7 @@ TQWidget *FormWindow::designerWidget( TQObject *o ) const if ( !o || !o->isWidgetType() ) return 0; TQWidget *w = (TQWidget*)o; - while ( w && !isMainContainer( TQT_TQOBJECT(w) ) && !insertedWidgets[ (void*)w ] || isCentralWidget( TQT_TQOBJECT(w) ) ) + while ( w && !isMainContainer( w ) && !insertedWidgets[ (void*)w ] || isCentralWidget( w ) ) w = (TQWidget*)w->parent(); return w; } @@ -1735,7 +1735,7 @@ void FormWindow::currentToolChanged() switch ( currTool ) { case POINTER_TOOL: if ( propertyWidget && !isMainContainer( propertyWidget ) && !isWidgetSelected( propertyWidget ) ) - emitShowProperties( TQT_TQOBJECT(mainContainer()) ); + emitShowProperties( mainContainer() ); restoreCursors( this, this ); break; case ORDER_TOOL: @@ -1744,7 +1744,7 @@ void FormWindow::currentToolChanged() orderedWidgets.clear(); showOrderIndicators(); if ( mainWindow()->formWindow() == this ) - emitShowProperties( TQT_TQOBJECT(mainContainer()) ); + emitShowProperties( mainContainer() ); setCursorToAll( ArrowCursor, this ); } break; @@ -1756,13 +1756,13 @@ void FormWindow::currentToolChanged() mainWindow()->statusMessage( i18n( "Drag a line to set a buddy...") ); setCursorToAll( CrossCursor, this ); if ( mainWindow()->formWindow() == this ) - emitShowProperties( TQT_TQOBJECT(mainContainer()) ); + emitShowProperties( mainContainer() ); break; default: mainWindow()->statusMessage( i18n( "Click on the form to insert a %1..." ).arg( WidgetDatabase::toolTip( currTool ).lower() ) ); setCursorToAll( CrossCursor, this ); if ( mainWindow()->formWindow() == this ) - emitShowProperties( TQT_TQOBJECT(mainContainer()) ); + emitShowProperties( mainContainer() ); break; } } @@ -1771,7 +1771,7 @@ void FormWindow::showOrderIndicators() { hideOrderIndicators(); orderIndicators.setAutoDelete( TRUE ); - TQObjectList *l = mainContainer()->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = mainContainer()->queryList( "TQWidget" ); stackedWidgets = MetaDataBase::tabOrder( this ); if ( l ) { int order = 1; @@ -1779,7 +1779,7 @@ void FormWindow::showOrderIndicators() TQWidget* w = (TQWidget*) o; if ( w->isShown() && insertedWidgets[ (void*)w ] && - w->focusPolicy() != TQ_NoFocus ) { + w->focusPolicy() != TQWidget::NoFocus ) { OrderIndicator* ind = new OrderIndicator( order++, w, this ); orderIndicators.append( ind ); if ( stackedWidgets.findRef( w ) == -1 ) @@ -1824,7 +1824,7 @@ bool FormWindow::checkCustomWidgets() TQPtrDictIterator<TQWidget> it( insertedWidgets ); for ( ; it.current(); ++it ) { if ( it.current()->isA( "CustomWidget" ) ) { - TQString className = WidgetFactory::classNameOf( TQT_TQOBJECT(it.current()) ); + TQString className = WidgetFactory::classNameOf( it.current() ); if ( !MetaDataBase::hasCustomWidget( className ) ) missingCustomWidgets << className; } @@ -1903,7 +1903,7 @@ void FormWindow::checkAccels() { CHECK_MAINWINDOW; TQMap<TQChar, TQWidgetList > accels; - TQObjectList *l = mainContainer()->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = mainContainer()->queryList( "TQWidget" ); if ( l ) { for ( TQObject *o = l->first(); o; o = l->next() ) { if ( ( (TQWidget*)o )->isVisibleTo( this ) && @@ -1921,7 +1921,7 @@ void FormWindow::checkAccels() find_accel( w->property( "title" ).toString(), accels, w ); if ( pageTitle ) find_accel( w->property( "pageTitle" ).toString(), accels, w ); - } else if ( ::tqqt_cast<MenuBarEditor*>(o) ) { + } else if ( ::tqt_cast<MenuBarEditor*>(o) ) { ((MenuBarEditor *)o)->checkAccels( accels ); } } @@ -1941,7 +1941,7 @@ void FormWindow::checkAccels() case 0: // select clearSelection( FALSE ); for ( wid = (*it).first(); wid; wid = (*it).next() ) - selectWidget( TQT_TQOBJECT(wid), TRUE ); + selectWidget( wid, TRUE ); return; case 1: // cancel return; @@ -1978,12 +1978,12 @@ void FormWindow::selectAll() { checkedSelectionsForMove = FALSE; blockSignals( TRUE ); - TQObjectList *l = mainContainer()->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = mainContainer()->queryList( "TQWidget" ); if ( l ) { for ( TQObject *o = l->first(); o; o = l->next() ) { if ( ( (TQWidget*)o )->isVisibleTo( this ) && insertedWidgets[ (void*)o ] ) { - selectWidget( TQT_TQOBJECT(o) ); + selectWidget( o ); } } delete l; @@ -2126,11 +2126,11 @@ void FormWindow::breakLayout( TQWidget *w ) if ( !w || w == this ) break; if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout && - WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ) { + WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) ) { Command *cmd = breakLayoutCommand( w ); if ( cmd ) commands.insert( 0, cmd ); - if ( !::tqqt_cast<TQLayoutWidget*>(w) && !::tqqt_cast<TQSplitter*>(w) ) + if ( !::tqt_cast<TQLayoutWidget*>(w) && !::tqt_cast<TQSplitter*>(w) ) break; } w = w->parentWidget(); @@ -2155,7 +2155,7 @@ BreakLayoutCommand *FormWindow::breakLayoutCommand( TQWidget *w ) TQWidgetList widgets; for ( TQObject *o = l.first(); o; o = l.next() ) { if ( o->isWidgetType() && - !mainWindow()->isAToolBarChild( TQT_TQOBJECT(o) ) && + !mainWindow()->isAToolBarChild( o ) && ( (TQWidget*)o )->isVisibleTo( this ) && insertedWidgets.find( (TQWidget*)o ) ) widgets.append( (TQWidget*)o ); @@ -2181,7 +2181,7 @@ bool FormWindow::hasInsertedChildren( TQWidget *w ) const w = WidgetFactory::containerOfWidget( w ); if ( !w ) return FALSE; - TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = w->queryList( "TQWidget" ); if ( !l || !l->first() ) { delete l; return FALSE; @@ -2204,7 +2204,7 @@ bool FormWindow::allowMove( TQWidget *w ) { w = w->parentWidget(); while ( w ) { - if ( ( isMainContainer( TQT_TQOBJECT(w) ) || insertedWidgets.find( w ) ) && WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) + if ( ( isMainContainer( w ) || insertedWidgets.find( w ) ) && WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) return TRUE; w = w->parentWidget(); } @@ -2221,8 +2221,8 @@ void FormWindow::editConnections() ConnectionDialog dlg( mainwindow ); mainWindow()->statusMessage( i18n( "Edit connections...") ); - dlg.addConnection( TQT_TQOBJECT(startWidget), TQT_TQOBJECT(endWidget), TQString(), TQString() ); - TQTimer::singleShot( 0, &dlg, TQT_SLOT(ensureConnectionVisible()) ); + dlg.addConnection( startWidget, endWidget, TQString(), TQString() ); + TQTimer::singleShot( 0, &dlg, TQ_SLOT(ensureConnectionVisible()) ); dlg.exec(); } @@ -2361,7 +2361,7 @@ bool FormWindow::unify( TQObject *w, TQString &s, bool changeIt ) int num = 1; TQPtrDictIterator<TQWidget> it( insertedWidgets ); for ( ; it.current();) { - if ( TQT_BASE_OBJECT(it.current()) != TQT_BASE_OBJECT(w) && + if ( it.current() != w && qstrcmp( it.current()->name(), s.latin1() ) == 0 ) { found = TRUE; if ( !changeIt ) @@ -2376,7 +2376,7 @@ bool FormWindow::unify( TQObject *w, TQString &s, bool changeIt ) TQPtrList<TQAction> al; TQAction *a = 0; for ( a = actions.first(); a; a = actions.next() ) { - TQObjectList *l = a->queryList( TQACTION_OBJECT_NAME_STRING ); + TQObjectList *l = a->queryList( "TQAction" ); al.append( a ); for ( TQObject *ao = l->first(); ao; ao = l->next() ) al.append( (TQAction*)ao ); @@ -2393,7 +2393,7 @@ bool FormWindow::unify( TQObject *w, TQString &s, bool changeIt ) } } } - if ( ::tqqt_cast<TQMainWindow*>(mainContainer()) && !found ) { + if ( ::tqt_cast<TQMainWindow*>(mainContainer()) && !found ) { TQObjectList *l = mainContainer()->queryList( "PopupMenuEditor" ); for ( TQObject *o = l->first(); o; o = l->next() ) { if ( o != w && @@ -2407,9 +2407,9 @@ bool FormWindow::unify( TQObject *w, TQString &s, bool changeIt ) } delete l; } - if ( ::tqqt_cast<TQMainWindow*>(mainContainer()) ) { + if ( ::tqt_cast<TQMainWindow*>(mainContainer()) ) { if ( !found ) { - TQObjectList *l = mainContainer()->queryList( TQDOCKWINDOW_OBJECT_NAME_STRING, 0, TRUE ); + TQObjectList *l = mainContainer()->queryList( "TQDockWindow", 0, TRUE ); for ( TQObject *o = l->first(); o; o = l->next() ) { if ( o != w && qstrcmp( o->name(), s.latin1() ) == 0 ) { @@ -2435,7 +2435,7 @@ bool FormWindow::isCustomWidgetUsed( MetaDataBase::CustomWidget *w ) TQPtrDictIterator<TQWidget> it( insertedWidgets ); for ( ; it.current(); ++it ) { if ( it.current()->isA( "CustomWidget" ) ) { - if ( qstrcmp( WidgetFactory::classNameOf( TQT_TQOBJECT(it.current()) ), w->className.utf8() ) == 0 ) + if ( qstrcmp( WidgetFactory::classNameOf( it.current() ), w->className.utf8() ) == 0 ) return TRUE; } } @@ -2447,7 +2447,7 @@ bool FormWindow::isDatabaseWidgetUsed() const { #ifndef TQT_NO_SQL TQStringList dbClasses; - dbClasses << TQDATATABLE_OBJECT_NAME_STRING; // add more here + dbClasses << "TQDataTable"; // add more here TQPtrDictIterator<TQWidget> it( insertedWidgets ); for ( ; it.current(); ++it ) { TQString c( it.current()->className() ); @@ -2473,7 +2473,7 @@ bool FormWindow::isDatabaseAware() const void FormWindow::visibilityChanged() { if ( currTool != ORDER_TOOL ) { - emitUpdateProperties( TQT_TQOBJECT(currentWidget()) ); + emitUpdateProperties( currentWidget() ); } else { updateOrderIndicators(); repositionOrderIndicators(); @@ -2491,7 +2491,7 @@ TQPoint FormWindow::mapToForm( const TQWidget* w, const TQPoint& pos ) const { TQPoint p = pos; const TQWidget* i = w; - while ( i && !i->isTopLevel() && !isMainContainer( TQT_TQOBJECT(const_cast<TQWidget*>(i)) ) ) { + while ( i && !i->isTopLevel() && !isMainContainer( const_cast<TQWidget*>(i) ) ) { p = i->mapToParent( p ); i = i->parentWidget(); } @@ -2525,27 +2525,27 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf ) TQWidget *container = 0; int depth = -1; TQWidgetList selected = selectedWidgets(); - if ( TQT_TQRECT_OBJECT(rect()).contains( mapFromGlobal( pos ) ) ) { + if ( rect().contains( mapFromGlobal( pos ) ) ) { container = mainContainer(); depth = widgetDepth( container ); } for ( ; it.current(); ++it ) { - if ( ::tqqt_cast<TQLayoutWidget*>(it.current()) - || ::tqqt_cast<TQSplitter*>(it.current()) ) + if ( ::tqt_cast<TQLayoutWidget*>(it.current()) + || ::tqt_cast<TQSplitter*>(it.current()) ) continue; if ( !it.current()->isVisibleTo( this ) ) continue; if ( selected.find( it.current() ) != -1 ) continue; - if ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(it.current()) ) ) ) && + if ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( it.current() ) ) ) && it.current() != mainContainer() ) continue; // the rectangles of all ancestors of the container must contain the insert position TQWidget *w = it.current(); while ( w && !w->isTopLevel() ) { - if ( !TQT_TQRECT_OBJECT(w->rect()).contains( ( w->mapFromGlobal( pos ) ) ) ) + if ( !w->rect().contains( ( w->mapFromGlobal( pos ) ) ) ) break; w = w->parentWidget(); } @@ -2553,8 +2553,8 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf ) int wd = widgetDepth( it.current() ); if ( wd == depth && container ) { - if ( ( it.current()->parentWidget()->childrenListObject() ).find( TQT_TQOBJECT(it.current()) ) > - ( container->parentWidget()->childrenListObject() ).find( TQT_TQOBJECT(container) ) ) + if ( ( it.current()->parentWidget()->childrenListObject() ).find( it.current() ) > + ( container->parentWidget()->childrenListObject() ).find( container ) ) wd++; } if ( wd > depth && !isChildOf( it.current(), notParentOf ) ) { @@ -2568,7 +2568,7 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf ) bool FormWindow::isMainContainer( TQObject *w ) const { - return w && w->isWidgetType() && ( TQT_BASE_OBJECT(w) == this || TQT_BASE_OBJECT(w) == mainContainer() ); + return w && w->isWidgetType() && ( w == this || w == mainContainer() ); } void FormWindow::setMainContainer( TQWidget *w ) @@ -2576,7 +2576,7 @@ void FormWindow::setMainContainer( TQWidget *w ) bool resetPropertyWidget = isMainContainer( propertyWidget ); if ( mContainer ) insertedWidgets.remove( mContainer ); - if ( TQT_BASE_OBJECT(propertyWidget) == TQT_BASE_OBJECT(mContainer) ) + if ( propertyWidget == mContainer ) propertyWidget = 0; delete mContainer; mContainer = w; @@ -2586,24 +2586,24 @@ void FormWindow::setMainContainer( TQWidget *w ) l->addWidget( w ); if ( resetPropertyWidget ) { TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(mContainer); + propertyWidget = mContainer; if ( opw && opw->isWidgetType() ) repaintSelection( (TQWidget*)opw ); } if ( project() ) { LanguageInterface *iface = MetaDataBase::languageInterface( project()->language() ); if ( iface && !project()->isCpp() && !isFake() ) { - if ( !MetaDataBase::hasFunction( TQT_TQOBJECT(this), "init()" ) ) - MetaDataBase::addFunction( TQT_TQOBJECT(this), "init()", "", "private", "function", + if ( !MetaDataBase::hasFunction( this, "init()" ) ) + MetaDataBase::addFunction( this, "init()", "", "private", "function", project()->language(), "void" ); - if ( !MetaDataBase::hasFunction( TQT_TQOBJECT(this), "destroy()" ) ) - MetaDataBase::addFunction( TQT_TQOBJECT(this), "destroy()", "", "private", "function", + if ( !MetaDataBase::hasFunction( this, "destroy()" ) ) + MetaDataBase::addFunction( this, "destroy()", "", "private", "function", project()->language(), "void" ); - if ( !MetaDataBase::hasConnection( TQT_TQOBJECT(this), TQT_TQOBJECT(mainContainer()), "shown()", TQT_TQOBJECT(mainContainer()), "init" ) ) - MetaDataBase::addConnection( TQT_TQOBJECT(this), TQT_TQOBJECT(mainContainer()), "shown()", TQT_TQOBJECT(mainContainer()), "init" ); - if ( !MetaDataBase::hasConnection( TQT_TQOBJECT(this), TQT_TQOBJECT(mainContainer()), "destroyed()", TQT_TQOBJECT(mainContainer()), "destroy" ) ) - MetaDataBase::addConnection( TQT_TQOBJECT(this), TQT_TQOBJECT(mainContainer()), "destroyed()", - TQT_TQOBJECT(mainContainer()), "destroy" ); + if ( !MetaDataBase::hasConnection( this, mainContainer(), "shown()", mainContainer(), "init" ) ) + MetaDataBase::addConnection( this, mainContainer(), "shown()", mainContainer(), "init" ); + if ( !MetaDataBase::hasConnection( this, mainContainer(), "destroyed()", mainContainer(), "destroy" ) ) + MetaDataBase::addConnection( this, mainContainer(), "destroyed()", + mainContainer(), "destroy" ); } } } @@ -2663,7 +2663,7 @@ TQAction *FormWindow::findAction( const TQString &name ) for ( TQAction *a = actionList().first(); a; a = actionList().next() ) { if ( TQString( a->name() ) == name ) return a; - TQAction *ac = (TQAction*)a->child( name.latin1(), TQACTION_OBJECT_NAME_STRING ); + TQAction *ac = (TQAction*)a->child( name.latin1(), "TQAction" ); if ( ac ) return ac; } @@ -2672,7 +2672,7 @@ TQAction *FormWindow::findAction( const TQString &name ) void FormWindow::killAccels( TQObject *top ) { - TQObjectList *l = top->queryList( TQACCEL_OBJECT_NAME_STRING ); + TQObjectList *l = top->queryList( "TQAccel" ); if ( !l ) return; for ( TQObject *o = l->first(); o; o = l->next() ) @@ -2689,9 +2689,9 @@ DesignerFormWindow *FormWindow::iFace() bool FormWindow::isCentralWidget( TQObject *w ) const { - if ( !::tqqt_cast<TQMainWindow*>(mainContainer()) ) + if ( !::tqt_cast<TQMainWindow*>(mainContainer()) ) return FALSE; - return TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(( (TQMainWindow*)mainContainer() )->centralWidget()); + return w == ((TQMainWindow*)mainContainer())->centralWidget(); } int FormWindow::layoutDefaultSpacing() const @@ -2753,12 +2753,12 @@ void FormWindow::setFormFile( FormFile *f ) { ff = f; if ( ff ) - connect( this, TQT_SIGNAL( modificationChanged(bool, const TQString&) ), ff, TQT_SLOT( formWindowChangedSomehow() ) ); + connect( this, TQ_SIGNAL( modificationChanged(bool, const TQString&) ), ff, TQ_SLOT( formWindowChangedSomehow() ) ); } bool FormWindow::canBeBuddy( const TQWidget *w ) const { - return w->focusPolicy() != TQ_NoFocus; + return w->focusPolicy() != TQWidget::NoFocus; } bool FormWindow::event( TQEvent *e ) diff --git a/kdevdesigner/designer/formwindow.h b/kdevdesigner/designer/formwindow.h index d4295e7e..43e26321 100644 --- a/kdevdesigner/designer/formwindow.h +++ b/kdevdesigner/designer/formwindow.h @@ -64,7 +64,7 @@ class OrderIndicator; class FormWindow : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString fileName READ fileName WRITE setFileName ) diff --git a/kdevdesigner/designer/hierarchyview.cpp b/kdevdesigner/designer/hierarchyview.cpp index c6433cd0..138b9499 100644 --- a/kdevdesigner/designer/hierarchyview.cpp +++ b/kdevdesigner/designer/hierarchyview.cpp @@ -193,20 +193,20 @@ HierarchyList::HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects p.setColor( TQColorGroup::Base, TQColor( *backColor2 ) ); (void)*selectedBack; // hack setPalette( p ); - disconnect( header(), TQT_SIGNAL( sectionClicked( int ) ), - this, TQT_SLOT( changeSortColumn( int ) ) ); + disconnect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( changeSortColumn( int ) ) ); setSorting( -1 ); setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); if ( doConnects ) { - connect( this, TQT_SIGNAL( clicked( TQListViewItem * ) ), - this, TQT_SLOT( objectClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( objectDoubleClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - this, TQT_SLOT( objectClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint&, int ) ), - this, TQT_SLOT( showRMBMenu( TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( clicked( TQListViewItem * ) ), + this, TQ_SLOT( objectClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( objectDoubleClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + this, TQ_SLOT( objectClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint&, int ) ), + this, TQ_SLOT( showRMBMenu( TQListViewItem *, const TQPoint & ) ) ); } deselect = TRUE; setColumnWidthMode( 1, Manual ); @@ -249,39 +249,39 @@ TQObject *HierarchyList::handleObjectClick( TQListViewItem *i ) TQObject *o = findObject( i ); if ( !o ) return 0; - if ( TQT_BASE_OBJECT(formWindow) == TQT_BASE_OBJECT(o) ) { + if ( formWindow == o ) { if ( deselect ) formWindow->clearSelection( FALSE ); - formWindow->emitShowProperties( TQT_TQOBJECT(formWindow) ); + formWindow->emitShowProperties( formWindow ); return 0; } if ( o->isWidgetType() ) { TQWidget *w = (TQWidget*)o; if ( !formWindow->widgets()->find( w ) ) { - if ( ::tqqt_cast<TQWidgetStack*>(w->parent()) ) { - if (::tqqt_cast<TQTabWidget*>(w->parent()->parent()) ) { + if ( ::tqt_cast<TQWidgetStack*>(w->parent()) ) { + if (::tqt_cast<TQTabWidget*>(w->parent()->parent()) ) { ((TQTabWidget*)w->parent()->parent())->showPage( w ); - o = TQT_TQOBJECT((TQWidget*)w->parent()->parent()); - formWindow->emitUpdateProperties( TQT_TQOBJECT(formWindow->currentWidget()) ); - } else if ( ::tqqt_cast<TQWizard*>(w->parent()->parent()) ) { + o = (TQWidget*)w->parent()->parent(); + formWindow->emitUpdateProperties( formWindow->currentWidget() ); + } else if ( ::tqt_cast<TQWizard*>(w->parent()->parent()) ) { ((QDesignerWizard*)w->parent()->parent())-> setCurrentPage( ( (QDesignerWizard*)w->parent()->parent() )->pageNum( w ) ); - o = TQT_TQOBJECT((TQWidget*)w->parent()->parent()); - formWindow->emitUpdateProperties( TQT_TQOBJECT(formWindow->currentWidget()) ); + o = (TQWidget*)w->parent()->parent(); + formWindow->emitUpdateProperties( formWindow->currentWidget() ); } else { ( (TQWidgetStack*)w->parent() )->raiseWidget( w ); if ( (TQWidgetStack*)w->parent()->isA( "QDesignerWidgetStack" ) ) ( (QDesignerWidgetStack*)w->parent() )->updateButtons(); } - } else if ( ::tqqt_cast<TQMenuBar*>(w) || ::tqqt_cast<TQDockWindow*>(w) ) { - formWindow->setActiveObject( TQT_TQOBJECT(w) ); - } else if ( ::tqqt_cast<TQPopupMenu*>(w) ) { + } else if ( ::tqt_cast<TQMenuBar*>(w) || ::tqt_cast<TQDockWindow*>(w) ) { + formWindow->setActiveObject( w ); + } else if ( ::tqt_cast<TQPopupMenu*>(w) ) { return 0; // ### we could try to find our menu bar and change the currentMenu to our index } else { return 0; } } - } else if ( ::tqqt_cast<TQAction*>(o) ) { + } else if ( ::tqt_cast<TQAction*>(o) ) { MainWindow::self->actioneditor()->setCurrentAction( (TQAction*)o ); deselect = TRUE; } @@ -303,7 +303,7 @@ void HierarchyList::objectDoubleClicked( TQListViewItem *i ) if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ) w->raise(); - formWindow->selectWidget( TQT_TQOBJECT(w), TRUE ); + formWindow->selectWidget( w, TRUE ); } } @@ -314,7 +314,7 @@ void HierarchyList::objectClicked( TQListViewItem *i ) return; if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( formWindow ) ) { TQWidget *w = (TQWidget*)o; - formWindow->selectWidget( TQT_TQOBJECT(w), TRUE ); + formWindow->selectWidget( w, TRUE ); } } @@ -388,7 +388,7 @@ void HierarchyList::setup() if ( !widgetStacks ) widgetStacks = new TQPtrList<TQWidgetStack>; if ( w ) - insertObject( TQT_TQOBJECT(w), 0 ); + insertObject( w, 0 ); widgetStacks->clear(); } @@ -402,8 +402,8 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) if ( TQString( o->name() ).startsWith( "qt_dead_widget_" ) ) return; bool fakeMainWindow = FALSE; - if ( ::tqqt_cast<TQMainWindow*>(o) ) { - TQObject *cw = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget()); + if ( ::tqt_cast<TQMainWindow*>(o) ) { + TQObject *cw = ( (TQMainWindow*)o )->centralWidget(); if ( cw ) { o = cw; fakeMainWindow = TRUE; @@ -411,7 +411,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) } TQListViewItem *item = 0; TQString className = WidgetFactory::classNameOf( o ); - if ( ::tqqt_cast<TQLayoutWidget*>(o) ) { + if ( ::tqt_cast<TQLayoutWidget*>(o) ) { switch ( WidgetFactory::layoutType( (TQWidget*)o ) ) { case WidgetFactory::HBox: className = "HBox"; @@ -433,21 +433,21 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) #endif TQString name = o->name(); - if ( ::tqqt_cast<TQWidgetStack*>(o->parent()) ) { - if ( ::tqqt_cast<TQTabWidget*>(o->parent()->parent()) ) + if ( ::tqt_cast<TQWidgetStack*>(o->parent()) ) { + if ( ::tqt_cast<TQTabWidget*>(o->parent()->parent()) ) name = ( (TQTabWidget*)o->parent()->parent() )->tabLabel( (TQWidget*)o ); - else if ( ::tqqt_cast<TQWizard*>(o->parent()->parent()) ) + else if ( ::tqt_cast<TQWizard*>(o->parent()->parent()) ) name = ( (TQWizard*)o->parent()->parent() )->title( (TQWidget*)o ); } TQToolBox *tb; if ( o->parent() && o->parent()->parent() && - (tb = ::tqqt_cast<TQToolBox*>(o->parent()->parent()->parent())) ) + (tb = ::tqt_cast<TQToolBox*>(o->parent()->parent()->parent())) ) name = tb->itemLabel( tb->indexOf((TQWidget*)o) ); if ( fakeMainWindow ) { name = o->parent()->name(); - className = TQMAINWINDOW_OBJECT_NAME_STRING; + className = "TQMainWindow"; } if ( !parent ) @@ -457,18 +457,18 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) item->setOpen( TRUE ); if ( !parent ) item->setPixmap( 0, DesignerFormPix ); - else if ( ::tqqt_cast<TQLayoutWidget*>(o) ) + else if ( ::tqt_cast<TQLayoutWidget*>(o) ) item->setPixmap( 0, DesignerLayoutPix ); else item->setPixmap( 0, WidgetDatabase::iconSet( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( o ) ) ). pixmap( TQIconSet::Small, TQIconSet::Normal ) ); - if ( ::tqqt_cast<TQAction*>(o) ) + if ( ::tqt_cast<TQAction*>(o) ) item->setPixmap( 0, ( (TQAction*)o )->iconSet().pixmap() ); ( (HierarchyItem*)item )->setObject( o ); TQObjectList l = o->childrenListObject(); - if ( ::tqqt_cast<QDesignerToolBar*>(o) ) + if ( ::tqt_cast<QDesignerToolBar*>(o) ) l.clear(); if ( !l.isEmpty() ) { TQObjectListIt it( l ); @@ -478,20 +478,20 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) ( (TQWidget*)it.current() )->isHidden() ) continue; if ( !formWindow->widgets()->find( (TQWidget*)it.current() ) ) { - if ( ::tqqt_cast<TQWidgetStack*>(it.current()->parent()) || - ::tqqt_cast<TQWidgetStack*>(it.current()) ) { + if ( ::tqt_cast<TQWidgetStack*>(it.current()->parent()) || + ::tqt_cast<TQWidgetStack*>(it.current()) ) { TQObject *obj = it.current(); - QDesignerTabWidget *tw = ::tqqt_cast<QDesignerTabWidget*>(it.current()->parent()); - QDesignerWizard *dw = ::tqqt_cast<QDesignerWizard*>(it.current()->parent()); + QDesignerTabWidget *tw = ::tqt_cast<QDesignerTabWidget*>(it.current()->parent()); + QDesignerWizard *dw = ::tqt_cast<QDesignerWizard*>(it.current()->parent()); TQWidgetStack *stack = 0; - if ( dw || tw || ::tqqt_cast<TQWidgetStack*>(obj) ) + if ( dw || tw || ::tqt_cast<TQWidgetStack*>(obj) ) stack = (TQWidgetStack*)obj; else stack = (TQWidgetStack*)obj->parent(); if ( widgetStacks->findRef( stack ) != -1 ) continue; widgetStacks->append( stack ); - TQObjectList *l2 = stack->queryList( TQWIDGET_OBJECT_NAME_STRING, 0, TRUE, FALSE ); + TQObjectList *l2 = stack->queryList( "TQWidget", 0, TRUE, FALSE ); for ( obj = l2->last(); obj; obj = l2->prev() ) { if ( qstrcmp( obj->className(), "TQWidgetStackPrivate::Invisible" ) == 0 || @@ -505,12 +505,12 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) insertObject( obj, item ); } delete l2; - } else if ( ::tqqt_cast<TQToolBox*>(it.current()->parent()) ) { - if ( !::tqqt_cast<TQScrollView*>(it.current()) ) + } else if ( ::tqt_cast<TQToolBox*>(it.current()->parent()) ) { + if ( !::tqt_cast<TQScrollView*>(it.current()) ) continue; TQToolBox *tb = (TQToolBox*)it.current()->parent(); for ( int i = tb->count() - 1; i >= 0; --i ) - insertObject( TQT_TQOBJECT(tb->item( i )), item ); + insertObject( tb->item( i ), item ); } continue; } @@ -528,9 +528,9 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) for ( obj = l->first(); obj; obj = l->next() ) insertObject( obj, item ); delete l; - } else if ( ::tqqt_cast<QDesignerToolBar*>(o) || ::tqqt_cast<PopupMenuEditor*>(o) ) { + } else if ( ::tqt_cast<QDesignerToolBar*>(o) || ::tqt_cast<PopupMenuEditor*>(o) ) { TQPtrList<TQAction> actions; - if ( ::tqqt_cast<QDesignerToolBar*>(o) ) + if ( ::tqt_cast<QDesignerToolBar*>(o) ) actions = ( (QDesignerToolBar*)o )->insertedActions(); else ( (PopupMenuEditor*)o )->insertedActions( actions ); @@ -539,37 +539,37 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) it.toLast(); while ( it.current() ) { TQAction *a = it.current(); - if ( ::tqqt_cast<QDesignerAction*>(a) ) { + if ( ::tqt_cast<QDesignerAction*>(a) ) { QDesignerAction *da = (QDesignerAction*)a; if ( da->supportsMenu() ) insertObject( da, item ); else - insertObject( TQT_TQOBJECT(da->widget()), item ); - } else if ( ::tqqt_cast<QDesignerActionGroup*>(a) ) { + insertObject( da->widget(), item ); + } else if ( ::tqt_cast<QDesignerActionGroup*>(a) ) { insertObject( a, item ); } --it; } - } else if ( ::tqqt_cast<QDesignerActionGroup*>(o) && !o->childrenListObject().isEmpty() ) { + } else if ( ::tqt_cast<QDesignerActionGroup*>(o) && !o->childrenListObject().isEmpty() ) { TQObjectList l = o->childrenListObject(); for ( TQObject *obj = l.last(); obj; obj = l.prev() ) { - if ( ::tqqt_cast<QDesignerAction*>(obj) ) { + if ( ::tqt_cast<QDesignerAction*>(obj) ) { QDesignerAction *da = (QDesignerAction*)obj; if ( da->supportsMenu() ) insertObject( da, item ); else - insertObject( TQT_TQOBJECT(da->widget()), item ); - } else if ( ::tqqt_cast<QDesignerActionGroup*>(obj) ) { + insertObject( da->widget(), item ); + } else if ( ::tqt_cast<QDesignerActionGroup*>(obj) ) { insertObject( obj, item ); } } - } else if ( ::tqqt_cast<MenuBarEditor*>(o) ) { + } else if ( ::tqt_cast<MenuBarEditor*>(o) ) { MenuBarEditor *mb = (MenuBarEditor*)o; for ( int i = mb->count() -1; i >= 0; --i ) { MenuBarEditorItem *md = mb->item( i ); if ( !md || !md->menu() ) continue; - insertObject( TQT_TQOBJECT(md->menu()), item ); + insertObject( md->menu(), item ); } } } @@ -599,12 +599,12 @@ void HierarchyList::showRMBMenu( TQListViewItem *i, const TQPoint & p ) return; if ( !o->isWidgetType() || - ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(formWindow) && !formWindow->widgets()->find( (TQWidget*)o ) ) ) + ( o != formWindow && !formWindow->widgets()->find( (TQWidget*)o ) ) ) return; TQWidget *w = (TQWidget*)o; if ( w->isVisibleTo( formWindow ) ) { - if ( !::tqqt_cast<TQTabWidget*>(w) && !::tqqt_cast<TQWizard*>(w) ) { + if ( !::tqt_cast<TQTabWidget*>(w) && !::tqt_cast<TQWizard*>(w) ) { if ( !normalMenu ) normalMenu = formWindow->mainWindow()->setupNormalHierarchyMenu( this ); normalMenu->popup( p ); @@ -612,8 +612,8 @@ void HierarchyList::showRMBMenu( TQListViewItem *i, const TQPoint & p ) if ( !tabWidgetMenu ) tabWidgetMenu = formWindow->mainWindow()->setupTabWidgetHierarchyMenu( - this, TQT_SLOT( addTabPage() ), - TQT_SLOT( removeTabPage() ) ); + this, TQ_SLOT( addTabPage() ), + TQ_SLOT( removeTabPage() ) ); tabWidgetMenu->popup( p ); } } @@ -625,14 +625,14 @@ void HierarchyList::addTabPage() if ( !o || !o->isWidgetType() ) return; TQWidget *w = (TQWidget*)o; - if ( ::tqqt_cast<TQTabWidget*>(w) ) { + if ( ::tqt_cast<TQTabWidget*>(w) ) { TQTabWidget *tw = (TQTabWidget*)w; AddTabPageCommand *cmd = new AddTabPageCommand( i18n( "Add Page to %1" ). arg( tw->name() ), formWindow, tw, "Tab" ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); - } else if ( ::tqqt_cast<TQWizard*>(w) ) { + } else if ( ::tqt_cast<TQWizard*>(w) ) { TQWizard *wiz = (TQWizard*)formWindow->mainContainer(); AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n( "Add Page to %1" ). arg( wiz->name() ), formWindow, @@ -648,7 +648,7 @@ void HierarchyList::removeTabPage() if ( !o || !o->isWidgetType() ) return; TQWidget *w = (TQWidget*)o; - if ( ::tqqt_cast<TQTabWidget*>(w) ) { + if ( ::tqt_cast<TQTabWidget*>(w) ) { TQTabWidget *tw = (TQTabWidget*)w; if ( tw->currentPage() ) { QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw; @@ -659,7 +659,7 @@ void HierarchyList::removeTabPage() formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); } - } else if ( ::tqqt_cast<TQWizard*>(w) ) { + } else if ( ::tqt_cast<TQWizard*>(w) ) { TQWizard *wiz = (TQWizard*)formWindow->mainContainer(); if ( wiz->currentPage() ) { QDesignerWizard *dw = (QDesignerWizard*)wiz; @@ -681,8 +681,8 @@ FormDefinitionView::FormDefinitionView( TQWidget *parent, FormWindow *fw ) { header()->hide(); removeColumn( 1 ); - connect( this, TQT_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), - this, TQT_SLOT( renamed( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), + this, TQ_SLOT( renamed( TQListViewItem * ) ) ); popupOpen = FALSE; } @@ -762,7 +762,7 @@ void FormDefinitionView::setupVariables() itemVarPubl = new HierarchyItem( HierarchyItem::VarPublic, itemVar, 0, i18n( "public" ), TQString(), TQString() ); - TQValueList<MetaDataBase::Variable> varList = MetaDataBase::variables( TQT_TQOBJECT(formWindow) ); + TQValueList<MetaDataBase::Variable> varList = MetaDataBase::variables( formWindow ); TQValueList<MetaDataBase::Variable>::Iterator it = --( varList.end() ); if ( !varList.isEmpty() && itemVar ) { for (;;) { @@ -852,7 +852,7 @@ void FormDefinitionView::refresh() itemPublic = new HierarchyItem( HierarchyItem::SlotPublic, itemSlots, 0, i18n( "public" ), TQString(), TQString() ); - TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(formWindow) ); + TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( formWindow ); TQValueList<MetaDataBase::Function>::Iterator it = --( functionList.end() ); if ( !functionList.isEmpty() && itemFunct ) { for (;;) { @@ -1197,7 +1197,7 @@ void FormDefinitionView::save( TQListViewItem *p, TQListViewItem *i ) varName = varName.simplifyWhiteSpace(); if ( varName[(int)varName.length() - 1] != ';' ) varName += ";"; - if ( MetaDataBase::hasVariable( TQT_TQOBJECT(formWindow), varName ) ) { + if ( MetaDataBase::hasVariable( formWindow, varName ) ) { TQMessageBox::information( this, i18n( "Edit Variables" ), i18n( "This variable has already been declared." ) ); } else { @@ -1268,7 +1268,7 @@ HierarchyView::HierarchyView( TQWidget *parent ) ClassBrowser cb( ciface->createClassBrowser( this ), ciface ); addTab( cb.lv, i18n( "Class Declarations" ) ); setTabToolTip( cb.lv, i18n( "List of all classes and its declarations of the current source file" ) ); - ciface->onClick( TQT_TQOBJECT(this), TQT_SLOT( jumpTo( const TQString &, const TQString &, int ) ) ); + ciface->onClick( this, TQ_SLOT( jumpTo( const TQString &, const TQString &, int ) ) ); classBrowsers->insert( *it, cb ); setTabEnabled( cb.lv, FALSE ); } @@ -1307,7 +1307,7 @@ void HierarchyView::setFormWindow( FormWindow *fw, TQObject *o ) if ( fw == formwindow ) { if ( fw ) { if ( !fake ) - listview->setCurrent( TQT_TQOBJECT(o) ); + listview->setCurrent( o ); else listview->clear(); if ( MainWindow::self->qWorkspace()->activeWindow() == fw ) @@ -1330,7 +1330,7 @@ void HierarchyView::setFormWindow( FormWindow *fw, TQObject *o ) fView->setFormWindow( fw ); if ( !fake ) { listview->setup(); - listview->setCurrent( TQT_TQOBJECT(o) ); + listview->setCurrent( o ); } fView->setup(); @@ -1356,7 +1356,7 @@ void HierarchyView::showClasses( SourceEditor *se ) return; lastSourceEditor = se; - TQTimer::singleShot( 100, this, TQT_SLOT( showClassesTimeout() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( showClassesTimeout() ) ); } void HierarchyView::showClassesTimeout() @@ -1367,8 +1367,8 @@ void HierarchyView::showClassesTimeout() if ( !se->object() ) return; if ( se->formWindow() && se->formWindow()->project()->isCpp() ) { - setFormWindow( se->formWindow(), TQT_TQOBJECT(se->formWindow()->currentWidget()) ); - MainWindow::self->propertyeditor()->setWidget( TQT_TQOBJECT(se->formWindow()->currentWidget()), + setFormWindow( se->formWindow(), se->formWindow()->currentWidget() ); + MainWindow::self->propertyeditor()->setWidget( se->formWindow()->currentWidget(), se->formWindow() ); return; } @@ -1445,9 +1445,9 @@ void HierarchyView::widgetsRemoved( const TQWidgetList & ) void HierarchyView::namePropertyChanged( TQWidget *w, const TQVariant & ) { TQWidget *w2 = w; - if ( ::tqqt_cast<TQMainWindow*>(w) ) + if ( ::tqt_cast<TQMainWindow*>(w) ) w2 = ( (TQMainWindow*)w )->centralWidget(); - listview->changeNameOf( TQT_TQOBJECT(w2), w->name() ); + listview->changeNameOf( w2, w->name() ); } @@ -1455,7 +1455,7 @@ void HierarchyView::databasePropertyChanged( TQWidget *w, const TQStringList& in { #ifndef TQT_NO_SQL TQString i = info.join( "." ); - listview->changeDatabaseOf( TQT_TQOBJECT(w), i ); + listview->changeDatabaseOf( w, i ); #endif } diff --git a/kdevdesigner/designer/hierarchyview.h b/kdevdesigner/designer/hierarchyview.h index cb21ed50..fc4e563f 100644 --- a/kdevdesigner/designer/hierarchyview.h +++ b/kdevdesigner/designer/hierarchyview.h @@ -97,7 +97,7 @@ private: class HierarchyList : public TQListView { - Q_OBJECT + TQ_OBJECT public: @@ -155,7 +155,7 @@ protected: class FormDefinitionView : public HierarchyList { - Q_OBJECT + TQ_OBJECT public: @@ -189,7 +189,7 @@ private: class HierarchyView : public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/iconvieweditor.ui b/kdevdesigner/designer/iconvieweditor.ui index 8711bd6b..93cb8ac7 100644 --- a/kdevdesigner/designer/iconvieweditor.ui +++ b/kdevdesigner/designer/iconvieweditor.ui @@ -439,7 +439,7 @@ <tabstop>buttonHelp</tabstop> <tabstop>buttonApply</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot access="protected">applyClicked()</slot> @@ -451,7 +451,7 @@ <slot access="protected">insertNewItem()</slot> <slot access="protected">deletePixmap()</slot> <slot access="protected">okClicked()</slot> -</Q_SLOTS> +</slots> <includes> <include location="local" impldecl="in implementation">myiconloader.h</include> </includes> diff --git a/kdevdesigner/designer/iconvieweditorimpl.cpp b/kdevdesigner/designer/iconvieweditorimpl.cpp index 32a81412..340047ac 100644 --- a/kdevdesigner/designer/iconvieweditorimpl.cpp +++ b/kdevdesigner/designer/iconvieweditorimpl.cpp @@ -40,7 +40,7 @@ IconViewEditor::IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) : IconViewEditorBase( parent, 0, TRUE ), formwindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); iconview = (TQIconView*)editWidget; itemText->setText( "" ); diff --git a/kdevdesigner/designer/iconvieweditorimpl.h b/kdevdesigner/designer/iconvieweditorimpl.h index 969c9cf4..87ac63fa 100644 --- a/kdevdesigner/designer/iconvieweditorimpl.h +++ b/kdevdesigner/designer/iconvieweditorimpl.h @@ -33,7 +33,7 @@ class FormWindow; class IconViewEditor : public IconViewEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp index 8c8917a2..1e4a208c 100644 --- a/kdevdesigner/designer/kdevdesigner_part.cpp +++ b/kdevdesigner/designer/kdevdesigner_part.cpp @@ -62,7 +62,7 @@ KDevDesignerPart::KDevDesignerPart( TQWidget *parentWidget, const char *// widge setReadWrite(true); setModified(false); - connect(m_widget, TQT_SIGNAL(formModified(bool )), this, TQT_SLOT(formModified(bool))); + connect(m_widget, TQ_SIGNAL(formModified(bool )), this, TQ_SLOT(formModified(bool))); } void KDevDesignerPart::setupDesignerWindow() @@ -87,48 +87,48 @@ static TQIconSet createPartIconSet( const TQString &name ) void KDevDesignerPart::setupActions( ) { TDEAction *action; - action = KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - action = KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - action = KStdAction::close(this, TQT_SLOT(fileClose()), actionCollection()); + action = KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + action = KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + action = KStdAction::close(this, TQ_SLOT(fileClose()), actionCollection()); stateSync(action, m_widget->actionFileClose); - action = KStdAction::save(this, TQT_SLOT(save()), actionCollection()); + action = KStdAction::save(this, TQ_SLOT(save()), actionCollection()); stateSync(action, m_widget->actionFileSave); - action = KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); + action = KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); stateSync(action, m_widget->actionFileSaveAs); - action = new TDEAction(i18n("Save Al&l"), 0, this, TQT_SLOT(fileSaveAs()), actionCollection(), "file_saveall"); + action = new TDEAction(i18n("Save Al&l"), 0, this, TQ_SLOT(fileSaveAs()), actionCollection(), "file_saveall"); stateSync(action, m_widget->actionFileSaveAll); - new TDEAction(i18n("Create &Template..."), 0, this, TQT_SLOT(fileCreateTemplate()), actionCollection(), "file_createtemplate"); + new TDEAction(i18n("Create &Template..."), 0, this, TQ_SLOT(fileCreateTemplate()), actionCollection(), "file_createtemplate"); - action = KStdAction::undo(this, TQT_SLOT(editUndo()), actionCollection()); + action = KStdAction::undo(this, TQ_SLOT(editUndo()), actionCollection()); stateSync(action, m_widget->actionEditUndo); - action = KStdAction::redo(this, TQT_SLOT(editRedo()), actionCollection()); + action = KStdAction::redo(this, TQ_SLOT(editRedo()), actionCollection()); stateSync(action, m_widget->actionEditRedo); - action = KStdAction::cut(this, TQT_SLOT(editCut()), actionCollection()); + action = KStdAction::cut(this, TQ_SLOT(editCut()), actionCollection()); stateSync(action, m_widget->actionEditCut); - action = KStdAction::copy(this, TQT_SLOT(editCopy()), actionCollection()); + action = KStdAction::copy(this, TQ_SLOT(editCopy()), actionCollection()); stateSync(action, m_widget->actionEditCopy); - action = KStdAction::paste(this, TQT_SLOT(editPaste()), actionCollection()); + action = KStdAction::paste(this, TQ_SLOT(editPaste()), actionCollection()); stateSync(action, m_widget->actionEditPaste); - action = new TDEAction(i18n("&Delete"), Key_Delete, this, TQT_SLOT(editDelete()), actionCollection(), "edit_delete"); + action = new TDEAction(i18n("&Delete"), Key_Delete, this, TQ_SLOT(editDelete()), actionCollection(), "edit_delete"); stateSync(action, m_widget->actionEditDelete); - action = KStdAction::selectAll(this, TQT_SLOT(editSelectAll()), actionCollection()); + action = KStdAction::selectAll(this, TQ_SLOT(editSelectAll()), actionCollection()); stateSync(action, m_widget->actionEditSelectAll); - action = new TDEAction(i18n("Chec&k Accelerators"), ALT + Key_R, this, TQT_SLOT(editAccels()), actionCollection(), "edit_accels"); + action = new TDEAction(i18n("Chec&k Accelerators"), ALT + Key_R, this, TQ_SLOT(editAccels()), actionCollection(), "edit_accels"); stateSync(action, m_widget->actionEditAccels); - action = new TDEAction(i18n("S&lots..."), createPartIconSet("designer_editslots.png"), 0, this, TQT_SLOT(editFunctions()), actionCollection(), "edit_functions"); + action = new TDEAction(i18n("S&lots..."), createPartIconSet("designer_editslots.png"), 0, this, TQ_SLOT(editFunctions()), actionCollection(), "edit_functions"); stateSync(action, m_widget->actionEditFunctions); - action = new TDEAction(i18n("Co&nnections..."), createPartIconSet("designer_connecttool.png"), 0, this, TQT_SLOT(editConnections()), actionCollection(), "edit_connections"); + action = new TDEAction(i18n("Co&nnections..."), createPartIconSet("designer_connecttool.png"), 0, this, TQ_SLOT(editConnections()), actionCollection(), "edit_connections"); stateSync(action, m_widget->actionEditConnections); - action = new TDEAction(i18n("&Form Settings..."), 0, this, TQT_SLOT(editFormSettings()), actionCollection(), "edit_formsettings"); + action = new TDEAction(i18n("&Form Settings..."), 0, this, TQ_SLOT(editFormSettings()), actionCollection(), "edit_formsettings"); stateSync(action, m_widget->actionEditFormSettings); - action = new TDEAction(i18n("&Add File..."), 0, this, TQT_SLOT(projectAddFile()), actionCollection(), "project_addfile"); + action = new TDEAction(i18n("&Add File..."), 0, this, TQ_SLOT(projectAddFile()), actionCollection(), "project_addfile"); stateSync(action, m_widget->actionProjectAddFile); - action = new TDEAction(i18n("&Image Collection..."), 0, this, TQT_SLOT(projectImageCollection()), actionCollection(), "project_imagecollection"); + action = new TDEAction(i18n("&Image Collection..."), 0, this, TQ_SLOT(projectImageCollection()), actionCollection(), "project_imagecollection"); stateSync(action, m_widget->actionEditPixmapCollection); - action = new TDEAction(i18n("&Database Connections..."), 0, this, TQT_SLOT(projectDatabaseCollections()), actionCollection(), "project_databasecollections"); + action = new TDEAction(i18n("&Database Connections..."), 0, this, TQ_SLOT(projectDatabaseCollections()), actionCollection(), "project_databasecollections"); stateSync(action, m_widget->actionEditDatabaseConnections); - action = new TDEAction(i18n("&Designer Project Settings..."), 0, this, TQT_SLOT(projectSettings()), actionCollection(), "project_settings"); + action = new TDEAction(i18n("&Designer Project Settings..."), 0, this, TQ_SLOT(projectSettings()), actionCollection(), "project_settings"); stateSync(action, m_widget->actionEditProjectSettings); TDERadioAction *toggle; @@ -141,34 +141,34 @@ void KDevDesignerPart::setupActions( ) setupToolsAction(toggle, m_widget->actionOrderTool); toggle = new TDERadioAction(i18n("Set &Buddy"), createPartIconSet("designer_setbuddy.png"), Key_F12, actionCollection(), "tools_setbuddy"); setupToolsAction(toggle, m_widget->actionBuddyTool); - new TDEAction(i18n("Configure Toolbox..."), 0, this, TQT_SLOT(toolsConfigureToolbox()), actionCollection(), "tools_toolbox"); - new TDEAction(i18n("Edit &Custom Widgets..."), 0, this, TQT_SLOT(toolsEditCustomWidgets()), actionCollection(), "tools_editcustomwidgets"); + new TDEAction(i18n("Configure Toolbox..."), 0, this, TQ_SLOT(toolsConfigureToolbox()), actionCollection(), "tools_toolbox"); + new TDEAction(i18n("Edit &Custom Widgets..."), 0, this, TQ_SLOT(toolsEditCustomWidgets()), actionCollection(), "tools_editcustomwidgets"); - action = new TDEAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, TQT_SLOT(layoutAdjustSize()), actionCollection(), "layout_adjustsize"); + action = new TDEAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, TQ_SLOT(layoutAdjustSize()), actionCollection(), "layout_adjustsize"); stateSync(action, m_widget->actionEditAdjustSize); - action = new TDEAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithlayout.png"), CTRL + Key_H, this, TQT_SLOT(layoutHLayout()), actionCollection(), "layout_h"); + action = new TDEAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithlayout.png"), CTRL + Key_H, this, TQ_SLOT(layoutHLayout()), actionCollection(), "layout_h"); stateSync(action, m_widget->actionEditHLayout); - action = new TDEAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvlayout.png"), CTRL + Key_V, this, TQT_SLOT(layoutVLayout()), actionCollection(), "layout_v"); + action = new TDEAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvlayout.png"), CTRL + Key_V, this, TQ_SLOT(layoutVLayout()), actionCollection(), "layout_v"); stateSync(action, m_widget->actionEditVLayout); - action = new TDEAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, TQT_SLOT(layoutGridLayout()), actionCollection(), "layout_grid"); + action = new TDEAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, TQ_SLOT(layoutGridLayout()), actionCollection(), "layout_grid"); stateSync(action, m_widget->actionEditGridLayout); - action = new TDEAction(i18n("Lay Out Horizontally (in S&plitter)"), createPartIconSet("designer_editvlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitHLayout()), actionCollection(), "layout_splith"); + action = new TDEAction(i18n("Lay Out Horizontally (in S&plitter)"), createPartIconSet("designer_editvlayoutsplit.png"), 0, this, TQ_SLOT(layoutSplitHLayout()), actionCollection(), "layout_splith"); stateSync(action, m_widget->actionEditSplitHorizontal); - action = new TDEAction(i18n("Lay Out Vertically (in Sp&litter)"), createPartIconSet("designer_edithlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitVLayout()), actionCollection(), "layout_splitv"); + action = new TDEAction(i18n("Lay Out Vertically (in Sp&litter)"), createPartIconSet("designer_edithlayoutsplit.png"), 0, this, TQ_SLOT(layoutSplitVLayout()), actionCollection(), "layout_splitv"); stateSync(action, m_widget->actionEditSplitVertical); - action = new TDEAction(i18n("&Break Layout"), createPartIconSet("designer_editbreaklayout.png"), CTRL + Key_B, this, TQT_SLOT(layoutBreak()), actionCollection(), "layout_break"); + action = new TDEAction(i18n("&Break Layout"), createPartIconSet("designer_editbreaklayout.png"), CTRL + Key_B, this, TQ_SLOT(layoutBreak()), actionCollection(), "layout_break"); stateSync(action, m_widget->actionEditBreakLayout); toggle = new TDERadioAction(i18n("Add Spacer"), createPartIconSet("designer_spacer.png"), 0, actionCollection(), "layout_spacer"); setupToolsAction(toggle, m_widget->actionInsertSpacer); - action = new TDEAction(i18n("Preview &Form"), CTRL + Key_T, this, TQT_SLOT(windowPreview()), actionCollection(), "window_preview"); + action = new TDEAction(i18n("Preview &Form"), CTRL + Key_T, this, TQ_SLOT(windowPreview()), actionCollection(), "window_preview"); stateSync(action, m_widget->actionPreview); - action = new TDEAction(i18n("Ne&xt Form"), CTRL + Key_F6, this, TQT_SLOT(windowNext()), actionCollection(), "window_next"); + action = new TDEAction(i18n("Ne&xt Form"), CTRL + Key_F6, this, TQ_SLOT(windowNext()), actionCollection(), "window_next"); stateSync(action, m_widget->actionWindowNext); - action = new TDEAction(i18n("Pre&vious Form"), CTRL + SHIFT + Key_F6, this, TQT_SLOT(windowPrev()), actionCollection(), "window_prev"); + action = new TDEAction(i18n("Pre&vious Form"), CTRL + SHIFT + Key_F6, this, TQ_SLOT(windowPrev()), actionCollection(), "window_prev"); stateSync(action, m_widget->actionWindowPrevious); - action = KStdAction::preferences(this, TQT_SLOT(editPreferences()), actionCollection()); + action = KStdAction::preferences(this, TQ_SLOT(editPreferences()), actionCollection()); action->setText(i18n("Configure &KDevDesigner...")); stateSync(action, m_widget->actionEditPreferences); } @@ -217,7 +217,7 @@ void KDevDesignerPart::stateSync( TDEAction * tdeaction, TQAction * qaction ) DesignerAction *ac = dynamic_cast<DesignerAction*>(qaction); if (!ac) return; - connect(ac, TQT_SIGNAL(actionEnabled(bool )), tdeaction, TQT_SLOT(setEnabled(bool ))); + connect(ac, TQ_SIGNAL(actionEnabled(bool )), tdeaction, TQ_SLOT(setEnabled(bool ))); } void KDevDesignerPart::setupToolsAction( TDERadioAction * toggle, TQAction * action ) @@ -227,8 +227,8 @@ void KDevDesignerPart::setupToolsAction( TDERadioAction * toggle, TQAction * act toggle->setGroup("tools"); toggle->setExclusiveGroup("tools"); - connect(action, TQT_SIGNAL(toggled(bool )), this, TQT_SLOT(setToggleActionChecked(bool ))); - connect(toggle, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setToggleActionOn(bool))); + connect(action, TQ_SIGNAL(toggled(bool )), this, TQ_SLOT(setToggleActionChecked(bool ))); + connect(toggle, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setToggleActionOn(bool))); toggle->setChecked(action->isOn()); m_actionMap[action] = toggle; m_actionMap2[toggle] = action; @@ -495,9 +495,9 @@ void KDevDesignerPart::setToggleActionOn( bool b ) TQAction *qaction = m_actionMap2[action]; if (!qaction) return; - disconnect(qaction, TQT_SIGNAL(toggled(bool )), this, TQT_SLOT(setToggleActionChecked(bool ))); + disconnect(qaction, TQ_SIGNAL(toggled(bool )), this, TQ_SLOT(setToggleActionChecked(bool ))); qaction->setOn(b); - connect(qaction, TQT_SIGNAL(toggled(bool )), this, TQT_SLOT(setToggleActionChecked(bool ))); + connect(qaction, TQ_SIGNAL(toggled(bool )), this, TQ_SLOT(setToggleActionChecked(bool ))); } void KDevDesignerPart::openProject( const TQString & // projectFile diff --git a/kdevdesigner/designer/kdevdesigner_part.h b/kdevdesigner/designer/kdevdesigner_part.h index 3006c600..ed940b52 100644 --- a/kdevdesigner/designer/kdevdesigner_part.h +++ b/kdevdesigner/designer/kdevdesigner_part.h @@ -38,7 +38,7 @@ class TDERadioAction; class KDevDesignerPart : public KInterfaceDesigner::Designer { - Q_OBJECT + TQ_OBJECT public: KDevDesignerPart(TQWidget *parentWidget, const char *widgetName, @@ -130,7 +130,7 @@ class TDEAboutData; class KDevDesignerPartFactory : public KParts::Factory { - Q_OBJECT + TQ_OBJECT public: KDevDesignerPartFactory(); diff --git a/kdevdesigner/designer/layout.cpp b/kdevdesigner/designer/layout.cpp index b8fb737c..7c593025 100644 --- a/kdevdesigner/designer/layout.cpp +++ b/kdevdesigner/designer/layout.cpp @@ -124,7 +124,7 @@ void Layout::setup() // we leave here. if ( !lastList || ( lastList->count() < 2 && ( !layoutBase || - ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(layoutBase) ) ) ) && + ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( layoutBase ) ) ) && layoutBase != formWindow->mainContainer() ) ) ) ) { widgets.clear(); @@ -142,8 +142,8 @@ void Layout::setup() // widgets to get informed if one gets deleted to be able to // handle that and do not crash in this case for ( w = widgets.first(); w; w = widgets.next() ) { - connect( w, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( widgetDestroyed() ) ); + connect( w, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( widgetDestroyed() ) ); startPoint = TQPoint( TQMIN( startPoint.x(), w->x() ), TQMIN( startPoint.y(), w->y() ) ); geometries.insert( w, TQRect( w->pos(), w->size() ) ); @@ -167,13 +167,13 @@ bool Layout::prepareLayout( bool &needMove, bool &needReparent ) for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) w->raise(); needMove = !layoutBase; - needReparent = needMove || ::tqqt_cast<TQLayoutWidget*>(layoutBase) || ::tqqt_cast<TQSplitter*>(layoutBase); + needReparent = needMove || ::tqt_cast<TQLayoutWidget*>(layoutBase) || ::tqt_cast<TQSplitter*>(layoutBase); if ( !layoutBase ) { if ( !useSplitter ) - layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ), + layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQLayoutWidget" ), WidgetFactory::containerOfWidget( parent ) ); else - layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQSPLITTER_OBJECT_NAME_STRING ), + layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQSplitter" ), WidgetFactory::containerOfWidget( parent ) ); } else { WidgetFactory::deleteLayout( layoutBase ); @@ -195,7 +195,7 @@ void Layout::finishLayout( bool needMove, TQLayout *layout ) layoutBase->show(); layout->activate(); formWindow->insertWidget( layoutBase ); - formWindow->selectWidget( TQT_TQOBJECT(layoutBase) ); + formWindow->selectWidget( layoutBase ); TQString n = layoutBase->name(); if ( n.find( "qt_dead_widget_" ) != -1 ) { n.remove( 0, TQString( "qt_dead_widget_" ).length() ); @@ -214,9 +214,9 @@ void Layout::undoLayout() it.key()->reparent( WidgetFactory::containerOfWidget( parent ), 0, ( *it ).topLeft(), it.key()->isVisibleTo( formWindow ) ); it.key()->resize( ( *it ).size() ); } - formWindow->selectWidget( TQT_TQOBJECT(layoutBase), FALSE ); + formWindow->selectWidget( layoutBase, FALSE ); WidgetFactory::deleteLayout( layoutBase ); - if ( parent != layoutBase && !::tqqt_cast<TQMainWindow*>(layoutBase) ) { + if ( parent != layoutBase && !::tqt_cast<TQMainWindow*>(layoutBase) ) { layoutBase->hide(); TQString n = layoutBase->name(); n.prepend( "qt_dead_widget_" ); @@ -225,9 +225,9 @@ void Layout::undoLayout() layoutBase->setGeometry( oldGeometry ); } if ( widgets.first() ) - formWindow->selectWidget( TQT_TQOBJECT(widgets.first()) ); + formWindow->selectWidget( widgets.first() ); else - formWindow->selectWidget( TQT_TQOBJECT(formWindow) ); + formWindow->selectWidget( formWindow ); } void Layout::breakLayout() @@ -239,11 +239,11 @@ void Layout::breakLayout() rects.insert( w, w->geometry() ); } WidgetFactory::deleteLayout( layoutBase ); - bool needReparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 || - qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0 || - ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(layoutBase) ) ) ) && + bool needReparent = qstrcmp( layoutBase->className(), "TQLayoutWidget" ) == 0 || + qstrcmp( layoutBase->className(), "TQSplitter" ) == 0 || + ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( layoutBase ) ) ) && layoutBase != formWindow->mainContainer() ); - bool needResize = qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0; + bool needResize = qstrcmp( layoutBase->className(), "TQSplitter" ) == 0; bool add = geometries.isEmpty(); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { if ( needReparent ) @@ -267,9 +267,9 @@ void Layout::breakLayout() parent = layoutBase; } if ( widgets.first() && widgets.first()->isVisibleTo( formWindow ) ) - formWindow->selectWidget( TQT_TQOBJECT(widgets.first()) ); + formWindow->selectWidget( widgets.first() ); else - formWindow->selectWidget( TQT_TQOBJECT(formWindow) ); + formWindow->selectWidget( formWindow ); } class HorizontalLayoutList : public TQWidgetList @@ -314,21 +314,21 @@ void HorizontalLayout::doLayout() TQHBoxLayout *layout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox ); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { - if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) + if ( needReparent && w->parent() != layoutBase ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); if ( !useSplitter ) { if ( qstrcmp( w->className(), "Spacer" ) == 0 ) layout->addWidget( w, 0, ( (Spacer*)w )->alignment() ); else layout->addWidget( w ); - if ( ::tqqt_cast<TQLayoutWidget*>(w) ) + if ( ::tqt_cast<TQLayoutWidget*>(w) ) ( (TQLayoutWidget*)w )->updateSizePolicy(); } w->show(); } - if ( ::tqqt_cast<TQSplitter*>(layoutBase) ) - ( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal ); + if ( ::tqt_cast<TQSplitter*>(layoutBase) ) + ( (TQSplitter*)layoutBase )->setOrientation( TQt::Horizontal ); finishLayout( needMove, layout ); } @@ -378,21 +378,21 @@ void VerticalLayout::doLayout() TQVBoxLayout *layout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox ); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { - if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) + if ( needReparent && w->parent() != layoutBase ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); if ( !useSplitter ) { if ( qstrcmp( w->className(), "Spacer" ) == 0 ) layout->addWidget( w, 0, ( (Spacer*)w )->alignment() ); else layout->addWidget( w ); - if ( ::tqqt_cast<TQLayoutWidget*>(w) ) + if ( ::tqt_cast<TQLayoutWidget*>(w) ) ( (TQLayoutWidget*)w )->updateSizePolicy(); } w->show(); } - if ( ::tqqt_cast<TQSplitter*>(layoutBase) ) - ( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical ); + if ( ::tqt_cast<TQSplitter*>(layoutBase) ) + ( (TQSplitter*)layoutBase )->setOrientation( TQt::Vertical ); finishLayout( needMove, layout ); } @@ -756,14 +756,14 @@ void GridLayout::doLayout() int r, c, rs, cs; for ( w = widgets.first(); w; w = widgets.next() ) { if ( grid->locateWidget( w, r, c, rs, cs) ) { - if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) + if ( needReparent && w->parent() != layoutBase ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); if ( rs * cs == 1 ) { - layout->addWidget( w, r, c, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->alignment() : 0 ); + layout->addWidget( w, r, c, ::tqt_cast<Spacer*>(w) ? ( (Spacer*)w )->alignment() : 0 ); } else { - layout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->alignment() : 0 ); + layout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, ::tqt_cast<Spacer*>(w) ? ( (Spacer*)w )->alignment() : 0 ); } - if ( ::tqqt_cast<TQLayoutWidget*>(w) ) + if ( ::tqt_cast<TQLayoutWidget*>(w) ) ( (TQLayoutWidget*)w )->updateSizePolicy(); w->show(); } else { @@ -865,7 +865,7 @@ void GridLayout::buildGrid() Spacer::Spacer( TQWidget *parent, const char *name ) : TQWidget( parent, name, WMouseNoMask ), - orient(Qt::Vertical ), interactive(TRUE), sh( TQSize(20,20) ) + orient(TQt::Vertical ), interactive(TRUE), sh( TQSize(20,20) ) { setSizeType( Expanding ); setAutoMask( TRUE ); @@ -876,7 +876,7 @@ void Spacer::paintEvent( TQPaintEvent * ) TQPainter p( this ); p.setPen( TQt::blue ); - if ( orient ==Qt::Horizontal ) { + if ( orient ==TQt::Horizontal ) { const int dist = 3; const int amplitude = TQMIN( 3, height() / 3 ); const int base = height() / 2; @@ -915,7 +915,7 @@ void Spacer::resizeEvent( TQResizeEvent* e) void Spacer::updateMask() { TQRegion r( rect() ); - if ( orient ==Qt::Horizontal ) { + if ( orient ==TQt::Horizontal ) { const int amplitude = TQMIN( 3, height() / 3 ); const int base = height() / 2; r = r.subtract( TQRect(1, 0, width() - 2, base - amplitude ) ); @@ -932,7 +932,7 @@ void Spacer::updateMask() void Spacer::setSizeType( SizeType t ) { TQSizePolicy sizeP; - if ( orient ==Qt::Vertical ) + if ( orient ==TQt::Vertical ) sizeP = TQSizePolicy( TQSizePolicy::Minimum, (TQSizePolicy::SizeType)t ); else sizeP = TQSizePolicy( (TQSizePolicy::SizeType)t, TQSizePolicy::Minimum ); @@ -942,14 +942,14 @@ void Spacer::setSizeType( SizeType t ) Spacer::SizeType Spacer::sizeType() const { - if ( orient ==Qt::Vertical ) + if ( orient ==TQt::Vertical ) return (SizeType)sizePolicy().verData(); return (SizeType)sizePolicy().horData(); } int Spacer::alignment() const { - if ( orient ==Qt::Vertical ) + if ( orient ==TQt::Vertical ) return AlignHCenter; return AlignVCenter; } @@ -958,7 +958,7 @@ TQSize Spacer::minimumSize() const { TQSize s = TQSize( 20,20 ); if ( sizeType() == Expanding ) - if ( orient ==Qt::Vertical ) + if ( orient ==TQt::Vertical ) s.rheight() = 0; else s.rwidth() = 0; @@ -979,12 +979,12 @@ void Spacer::setSizeHint( const TQSize &s ) updateGeometry(); } -Qt::Orientation Spacer::orientation() const +TQt::Orientation Spacer::orientation() const { return orient; } -void Spacer::setOrientation( Qt::Orientation o ) +void Spacer::setOrientation( TQt::Orientation o ) { if ( orient == o ) return; diff --git a/kdevdesigner/designer/layout.h b/kdevdesigner/designer/layout.h index d1ea776e..af37b323 100644 --- a/kdevdesigner/designer/layout.h +++ b/kdevdesigner/designer/layout.h @@ -40,7 +40,7 @@ class TQPaintEvent; class Layout : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -118,7 +118,7 @@ protected: class Spacer : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_OVERRIDE( TQCString name ) @@ -163,7 +163,7 @@ protected: class QDesignerGridLayout : public TQGridLayout { - Q_OBJECT + TQ_OBJECT public: QDesignerGridLayout( TQWidget *parent ) : TQGridLayout( parent ){}; diff --git a/kdevdesigner/designer/listboxdnd.cpp b/kdevdesigner/designer/listboxdnd.cpp index 54498478..4e8a7822 100644 --- a/kdevdesigner/designer/listboxdnd.cpp +++ b/kdevdesigner/designer/listboxdnd.cpp @@ -81,7 +81,7 @@ bool ListBoxDnd::dropEvent( TQDropEvent * event ) bool ListBoxDnd::mouseMoveEvent( TQMouseEvent * event ) { - if ( event->state() & Qt::LeftButton ) { + if ( event->state() & TQt::LeftButton ) { if ( ( event->pos() - mousePressPos ).manhattanLength() > 3 ) { ListBoxItemList list; diff --git a/kdevdesigner/designer/listboxdnd.h b/kdevdesigner/designer/listboxdnd.h index 5abf792f..95f3a667 100644 --- a/kdevdesigner/designer/listboxdnd.h +++ b/kdevdesigner/designer/listboxdnd.h @@ -35,7 +35,7 @@ typedef TQPtrList<TQListBoxItem> ListBoxItemList; class ListBoxDnd : public ListDnd { - Q_OBJECT + TQ_OBJECT public: // dragModes are enumerated in ListDnd diff --git a/kdevdesigner/designer/listboxeditor.ui b/kdevdesigner/designer/listboxeditor.ui index 6c5a8408..628a622c 100644 --- a/kdevdesigner/designer/listboxeditor.ui +++ b/kdevdesigner/designer/listboxeditor.ui @@ -434,7 +434,7 @@ <tabstop>helpButton</tabstop> <tabstop>buttonApply</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot access="protected">insertNewItem()</slot> @@ -448,7 +448,7 @@ <slot access="protected">deletePixmap()</slot> <slot access="protected">moveItemUp()</slot> <slot access="protected">moveItemDown()</slot> -</Q_SLOTS> +</slots> <pixmapfunction>BarIcon2</pixmapfunction> <layoutdefaults spacing="6" margin="11"/> <includes> diff --git a/kdevdesigner/designer/listboxeditorimpl.cpp b/kdevdesigner/designer/listboxeditorimpl.cpp index 01dfa64e..67720ed9 100644 --- a/kdevdesigner/designer/listboxeditorimpl.cpp +++ b/kdevdesigner/designer/listboxeditorimpl.cpp @@ -43,7 +43,7 @@ ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) : ListBoxEditorBase( parent, 0, TRUE ), formwindow( fw ) { - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); listbox = (TQListBox*)editWidget; itemText->setText( "" ); @@ -65,20 +65,20 @@ ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow ListBoxDnd *editorDnd = new ListBoxDnd( preview ); editorDnd->setDragMode( ListBoxDnd::Internal | ListBoxDnd::Move ); - TQObject::connect( editorDnd, TQT_SIGNAL( dropped( TQListBoxItem * ) ), - editorDnd, TQT_SLOT( confirmDrop( TQListBoxItem * ) ) ); + TQObject::connect( editorDnd, TQ_SIGNAL( dropped( TQListBoxItem * ) ), + editorDnd, TQ_SLOT( confirmDrop( TQListBoxItem * ) ) ); ListBoxRename *editorRename = new ListBoxRename( preview ); - TQObjectList *l = parent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "itemText" ); + TQObjectList *l = parent->queryList( "TQLineEdit", "itemText" ); TQObjectListIt it( *l ); TQObject *obj; while ( (obj = it.current()) != 0 ) { ++it; TQObject::connect( editorRename, - TQT_SIGNAL( itemTextChanged( const TQString & ) ), + TQ_SIGNAL( itemTextChanged( const TQString & ) ), obj, - TQT_SLOT( setText( const TQString & ) ) ); + TQ_SLOT( setText( const TQString & ) ) ); } delete l; diff --git a/kdevdesigner/designer/listboxeditorimpl.h b/kdevdesigner/designer/listboxeditorimpl.h index 28ca0254..7f0c9ee9 100644 --- a/kdevdesigner/designer/listboxeditorimpl.h +++ b/kdevdesigner/designer/listboxeditorimpl.h @@ -34,7 +34,7 @@ class FormWindow; class ListBoxEditor : public ListBoxEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/listboxrename.cpp b/kdevdesigner/designer/listboxrename.cpp index 0a32d292..05999779 100644 --- a/kdevdesigner/designer/listboxrename.cpp +++ b/kdevdesigner/designer/listboxrename.cpp @@ -48,8 +48,8 @@ ListBoxRename::ListBoxRename( TQListBox * eventSource, const char * name ) ed->hide(); ed->setFrame( FALSE ); - TQObject::connect( ed, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( renameClickedItem() ) ); + TQObject::connect( ed, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( renameClickedItem() ) ); } bool ListBoxRename::eventFilter( TQObject *, TQEvent * event ) @@ -63,7 +63,7 @@ bool ListBoxRename::eventFilter( TQObject *, TQEvent * event ) if ( clickedItem && clickedItem->isSelected() && (clickedItem == src->itemAt( pos )) ) { - TQTimer::singleShot( 500, this, TQT_SLOT( showLineEdit() ) ); + TQTimer::singleShot( 500, this, TQ_SLOT( showLineEdit() ) ); activity = FALSE; // no drags or clicks for 500 ms before we start the renaming } else { // new item clicked activity = TRUE; @@ -75,7 +75,7 @@ bool ListBoxRename::eventFilter( TQObject *, TQEvent * event ) case TQEvent::MouseMove: - if ( ((TQMouseEvent *) event)->state() & Qt::LeftButton ) { + if ( ((TQMouseEvent *) event)->state() & TQt::LeftButton ) { activity = TRUE; // drag } break; diff --git a/kdevdesigner/designer/listboxrename.h b/kdevdesigner/designer/listboxrename.h index ec666f70..6246eca6 100644 --- a/kdevdesigner/designer/listboxrename.h +++ b/kdevdesigner/designer/listboxrename.h @@ -34,7 +34,7 @@ class TQLineEdit; class ListBoxRename : public TQObject { - Q_OBJECT + TQ_OBJECT public: ListBoxRename( TQListBox * eventSource, const char * name = 0 ); diff --git a/kdevdesigner/designer/listdnd.cpp b/kdevdesigner/designer/listdnd.cpp index 8431fd18..2e3206ae 100644 --- a/kdevdesigner/designer/listdnd.cpp +++ b/kdevdesigner/designer/listdnd.cpp @@ -119,7 +119,7 @@ bool ListDnd::dropEvent( TQDropEvent * ) bool ListDnd::mousePressEvent( TQMouseEvent * event ) { - if ( event->button() == Qt::LeftButton ) + if ( event->button() == TQt::LeftButton ) mousePressPos = event->pos(); return FALSE; } diff --git a/kdevdesigner/designer/listdnd.h b/kdevdesigner/designer/listdnd.h index 39e1af11..27b6dc9f 100644 --- a/kdevdesigner/designer/listdnd.h +++ b/kdevdesigner/designer/listdnd.h @@ -32,7 +32,7 @@ class ListDnd : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum DragMode { None = 0, External = 1, Internal = 2, Both = 3, Move = 4, NullDrop = 8 }; diff --git a/kdevdesigner/designer/listeditor.ui b/kdevdesigner/designer/listeditor.ui index addab137..2376ea9b 100644 --- a/kdevdesigner/designer/listeditor.ui +++ b/kdevdesigner/designer/listeditor.ui @@ -158,7 +158,7 @@ <forwards> <forward>class TQStringList;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>setList( const TQStringList & l )</slot> <slot>addItem()</slot> @@ -166,7 +166,7 @@ <slot>removeItems()</slot> <slot returnType="TQStringList">items()</slot> <slot>renameItem()</slot> -</Q_SLOTS> +</slots> <pixmapfunction>BarIcon2</pixmapfunction> <layoutdefaults spacing="6" margin="11"/> <includes> diff --git a/kdevdesigner/designer/listviewdnd.cpp b/kdevdesigner/designer/listviewdnd.cpp index 32dcc6d5..f5f89d4d 100644 --- a/kdevdesigner/designer/listviewdnd.cpp +++ b/kdevdesigner/designer/listviewdnd.cpp @@ -92,7 +92,7 @@ bool ListViewDnd::dropEvent( TQDropEvent * event ) bool ListViewDnd::mouseMoveEvent( TQMouseEvent * event ) { - if ( event->state() & Qt::LeftButton ) { + if ( event->state() & TQt::LeftButton ) { if ( ( event->pos() - mousePressPos ).manhattanLength() > 3 ) { ListViewItemList list; diff --git a/kdevdesigner/designer/listviewdnd.h b/kdevdesigner/designer/listviewdnd.h index 5a59f4ad..fca1ef93 100644 --- a/kdevdesigner/designer/listviewdnd.h +++ b/kdevdesigner/designer/listviewdnd.h @@ -37,7 +37,7 @@ typedef TQPtrList<TQListViewItem> ListViewItemList; class ListViewDnd : public ListDnd { - Q_OBJECT + TQ_OBJECT public: enum DragMode { Flat = 16 }; // see ListDnd::DragMode diff --git a/kdevdesigner/designer/listvieweditor.ui b/kdevdesigner/designer/listvieweditor.ui index 8a0abe14..234b52ba 100644 --- a/kdevdesigner/designer/listvieweditor.ui +++ b/kdevdesigner/designer/listvieweditor.ui @@ -897,7 +897,7 @@ <tabstop>colClickable</tabstop> <tabstop>colResizable</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot access="protected">applyClicked()</slot> @@ -925,7 +925,7 @@ <slot access="protected">newColumnClicked()</slot> <slot access="protected">itemRightClicked()</slot> <slot access="protected">okClicked()</slot> -</Q_SLOTS> +</slots> <includes> <include location="local" impldecl="in implementation">myiconloader.h</include> </includes> diff --git a/kdevdesigner/designer/listvieweditorimpl.cpp b/kdevdesigner/designer/listvieweditorimpl.cpp index c5ec7498..32f71562 100644 --- a/kdevdesigner/designer/listvieweditorimpl.cpp +++ b/kdevdesigner/designer/listvieweditorimpl.cpp @@ -49,7 +49,7 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw ) : ListViewEditorBase( parent, 0, TRUE ), listview( lv ), formwindow( fw ) { - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); itemText->setEnabled( FALSE ); itemChoosePixmap->setEnabled( FALSE ); itemDeletePixmap->setEnabled( FALSE ); @@ -71,8 +71,8 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw // Clamp on drag and drop to TQListView ListViewDnd *itemsDnd = new ListViewDnd( itemsPreview ); itemsDnd->setDragMode( ListViewDnd::Internal | ListViewDnd::Move ); - TQObject::connect( itemsDnd, TQT_SIGNAL( dropped( TQListViewItem * ) ), - itemsDnd, TQT_SLOT( confirmDrop( TQListViewItem * ) ) ); + TQObject::connect( itemsDnd, TQ_SIGNAL( dropped( TQListViewItem * ) ), + itemsDnd, TQ_SLOT( confirmDrop( TQListViewItem * ) ) ); // Enable rename for all TQListViewItems TQListViewItemIterator it = ((TQListView *)itemsPreview)->firstChild(); @@ -81,45 +81,45 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw // Connect listview signal to signal-relay TQObject::connect( itemsPreview, - TQT_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString & ) ), + TQ_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString & ) ), this, - TQT_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); + TQ_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); // Connect signal-relay to TQLineEdit "itemText" - TQObjectList *l = parent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "itemText" ); + TQObjectList *l = parent->queryList( "TQLineEdit", "itemText" ); TQObject *obj; TQObjectListIt itemsLineEditIt( *l ); while ( (obj = itemsLineEditIt.current()) != 0 ) { ++itemsLineEditIt; TQObject::connect( this, - TQT_SIGNAL( itemRenamed( const TQString & ) ), + TQ_SIGNAL( itemRenamed( const TQString & ) ), obj, - TQT_SLOT( setText( const TQString & ) ) ); + TQ_SLOT( setText( const TQString & ) ) ); } delete l; // Clamp on drag and drop to TQListBox ListBoxDnd *columnsDnd = new ListBoxDnd( colPreview ); columnsDnd->setDragMode( ListBoxDnd::Internal | ListBoxDnd::Move ); - TQObject::connect( columnsDnd, TQT_SIGNAL( dropped( TQListBoxItem * ) ), - columnsDnd, TQT_SLOT( confirmDrop( TQListBoxItem * ) ) ); + TQObject::connect( columnsDnd, TQ_SIGNAL( dropped( TQListBoxItem * ) ), + columnsDnd, TQ_SLOT( confirmDrop( TQListBoxItem * ) ) ); // Clamp on rename to TQListBox ListBoxRename *columnsRename = new ListBoxRename( colPreview ); TQObject::connect( columnsRename, - TQT_SIGNAL( itemTextChanged( const TQString & ) ), + TQ_SIGNAL( itemTextChanged( const TQString & ) ), this, - TQT_SLOT( columnTextChanged( const TQString & ) ) ); + TQ_SLOT( columnTextChanged( const TQString & ) ) ); // Find TQLineEdit "colText" and connect - l = parent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "colText" ); + l = parent->queryList( "TQLineEdit", "colText" ); TQObjectListIt columnsLineEditIt( *l ); while ( (obj = columnsLineEditIt.current()) != 0 ) { ++columnsLineEditIt; TQObject::connect( columnsRename, - TQT_SIGNAL( itemTextChanged( const TQString & ) ), + TQ_SIGNAL( itemTextChanged( const TQString & ) ), obj, - TQT_SLOT( setText( const TQString & ) ) ); + TQ_SLOT( setText( const TQString & ) ) ); } delete l; } diff --git a/kdevdesigner/designer/listvieweditorimpl.h b/kdevdesigner/designer/listvieweditorimpl.h index 64048c9d..2644d4d8 100644 --- a/kdevdesigner/designer/listvieweditorimpl.h +++ b/kdevdesigner/designer/listvieweditorimpl.h @@ -37,7 +37,7 @@ class FormWindow; class ListViewEditor : public ListViewEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp index 5d64f8bf..cd1bcd93 100644 --- a/kdevdesigner/designer/mainwindow.cpp +++ b/kdevdesigner/designer/mainwindow.cpp @@ -173,12 +173,12 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons savePluginPaths = FALSE; updateFunctionsTimer = new TQTimer( this ); - connect( updateFunctionsTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( doFunctionsChanged() ) ); + connect( updateFunctionsTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doFunctionsChanged() ) ); autoSaveTimer = new TQTimer( this ); - connect( autoSaveTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( fileSaveAll() ) ); + connect( autoSaveTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( fileSaveAll() ) ); set_splash_status( "Loading Plugins..." ); setupPluginManagers(); @@ -201,12 +201,7 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons singleProject = single; statusBar()->clear(); -#if defined(TQT_NON_COMMERCIAL) - statusBar()->addWidget( new TQLabel(i18n("Ready - This is the non-commercial version of TQt - " - "For commercial evaluations, use the help menu to register with Trolltech."), statusBar()), 1 ); -#else statusBar()->addWidget( new TQLabel("Ready", statusBar()), 1 ); -#endif set_splash_status( "Setting up GUI..." ); @@ -239,8 +234,8 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons setupRMBMenus(); - connect( this, TQT_SIGNAL( projectChanged() ), this, TQT_SLOT( emitProjectSignals() ) ); - connect( this, TQT_SIGNAL( hasActiveWindow(bool) ), this, TQT_SLOT( emitProjectSignals() ) ); + connect( this, TQ_SIGNAL( projectChanged() ), this, TQ_SLOT( emitProjectSignals() ) ); + connect( this, TQ_SIGNAL( hasActiveWindow(bool) ), this, TQ_SLOT( emitProjectSignals() ) ); emit hasActiveForm( FALSE ); emit hasActiveWindow( FALSE ); @@ -252,8 +247,8 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons as -= TQSize( 30, 30 ); resize( TQSize( 1200, 1000 ).boundedTo( as ) ); - connect( tqApp->clipboard(), TQT_SIGNAL( dataChanged() ), - this, TQT_SLOT( clipboardChanged() ) ); + connect( tqApp->clipboard(), TQ_SIGNAL( dataChanged() ), + this, TQ_SLOT( clipboardChanged() ) ); clipboardChanged(); layoutChilds = FALSE; layoutSelected = FALSE; @@ -263,30 +258,30 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons set_splash_status( "Loading User Settings..." ); readConfig(); // hack to make WidgetFactory happy (so it knows TQWidget and TQDialog for resetting properties) - TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQWIDGET_OBJECT_NAME_STRING ), this, 0, FALSE ); + TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQWidget" ), this, 0, FALSE ); delete w; - w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQDIALOG_OBJECT_NAME_STRING ), this, 0, FALSE ); + w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQDialog" ), this, 0, FALSE ); delete w; - w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQLABEL_OBJECT_NAME_STRING ), this, 0, FALSE ); + w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQLabel" ), this, 0, FALSE ); delete w; - w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQTABWIDGET_OBJECT_NAME_STRING ), this, 0, FALSE ); + w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQTabWidget" ), this, 0, FALSE ); delete w; - w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQFRAME_OBJECT_NAME_STRING ), this, 0, FALSE ); + w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQFrame" ), this, 0, FALSE ); delete w; setAppropriate( (TQDockWindow*)actionEditor->parentWidget(), FALSE ); actionEditor->parentWidget()->hide(); - assistant = new TQAssistantClient( assistantPath(), TQT_TQOBJECT(this) ); + assistant = new TQAssistantClient( assistantPath(), this ); statusBar()->setSizeGripEnabled( TRUE ); set_splash_status( "Initialization Done." ); /* if ( shStartDialog ) - TQTimer::singleShot( 0, this, TQT_SLOT( showStartDialog() ));*/ + TQTimer::singleShot( 0, this, TQ_SLOT( showStartDialog() ));*/ if ( autoSaveEnabled ) autoSaveTimer->start( autoSaveInterval * 1000 ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); } MainWindow::~MainWindow() @@ -338,8 +333,8 @@ void MainWindow::setupMDI() qworkspace = new TQWorkspace( vbox ); qworkspace->setPaletteBackgroundPixmap( UserIcon( "designer_background.png", KDevDesignerPartFactory::instance() ) ); qworkspace->setScrollBarsEnabled( TRUE ); - connect( qworkspace, TQT_SIGNAL( windowActivated( TQWidget * ) ), - this, TQT_SLOT( activeWindowChanged( TQWidget * ) ) ); + connect( qworkspace, TQ_SIGNAL( windowActivated( TQWidget * ) ), + this, TQ_SLOT( activeWindowChanged( TQWidget * ) ) ); lastActiveFormWindow = 0; qworkspace->setAcceptDrops( TRUE ); } @@ -423,7 +418,7 @@ void MainWindow::setupWorkspace() QCompletionEdit *edit = new QCompletionEdit( vbox ); TQToolTip::add( edit, i18n( "Start typing the buffer you want to switch to here (ALT+B)" ) ); TQAccel *a = new TQAccel( this ); - a->connectItem( a->insertItem( ALT + Key_B ), edit, TQT_SLOT( setFocus() ) ); + a->connectItem( a->insertItem( ALT + Key_B ), edit, TQ_SLOT( setFocus() ) ); wspace = new Workspace( vbox, this ); wspace->setBufferEdit( edit ); wspace->setCurrentProject( currentProject ); @@ -475,7 +470,7 @@ void MainWindow::setupToolbox() setDockEnabled( dw, TQt::DockBottom, FALSE ); commonWidgetsToolBar = new TQToolBar( "Common Widgets", 0, toolBox, FALSE, "Common Widgets" ); commonWidgetsToolBar->setFrameStyle( TQFrame::NoFrame ); - commonWidgetsToolBar->setOrientation( Qt::Vertical ); + commonWidgetsToolBar->setOrientation( TQt::Vertical ); commonWidgetsToolBar->setBackgroundMode(PaletteBase); toolBox->addItem( commonWidgetsToolBar, "Common Widgets" ); } @@ -582,7 +577,7 @@ TQWidget* MainWindow::previewFormInternal( TQStyle* style, TQPalette* palet ) TQStringList databases; TQPtrDictIterator<TQWidget> wit( *fw->widgets() ); while ( wit.current() ) { - TQStringList lst = MetaDataBase::fakeProperty( TQT_TQOBJECT(wit.current()), "database" ).toStringList(); + TQStringList lst = MetaDataBase::fakeProperty( wit.current(), "database" ).toStringList(); if ( !lst.isEmpty() ) databases << lst [ 0 ]; ++wit; @@ -601,12 +596,12 @@ TQWidget* MainWindow::previewFormInternal( TQStyle* style, TQPalette* palet ) Resource resource( this ); resource.setWidget( fw ); TQValueList<Resource::Image> images; - resource.save( TQT_TQIODEVICE(&buffer) ); + resource.save( &buffer ); buffer.close(); buffer.open( IO_ReadOnly ); - TQWidget *w = TQWidgetFactory::create( TQT_TQIODEVICE(&buffer) ); + TQWidget *w = TQWidgetFactory::create( &buffer ); if ( w ) { previewedForm = w; if ( palet ) { @@ -618,7 +613,7 @@ TQWidget* MainWindow::previewFormInternal( TQStyle* style, TQPalette* palet ) if ( style ) w->setStyle( style ); - TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = w->queryList( "TQWidget" ); for ( TQObject *o = l->first(); o; o = l->next() ) { if ( style ) ( (TQWidget*)o )->setStyle( style ); @@ -729,7 +724,7 @@ void MainWindow::previewForm( const TQString & style ) if ( !w ) return; - w->insertChild( TQT_TQOBJECT(st) ); + w->insertChild( st ); w->show(); } @@ -793,7 +788,7 @@ void MainWindow::helpContents() if ( source.isEmpty() || source == "designer-manual.html" ) { if ( classname.lower() == "spacer" ) source = "qspaceritem.html#details"; - else if ( classname == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) + else if ( classname == "TQLayoutWidget" ) source = "layout.html"; else source = TQString( WidgetFactory::classNameOf( propertyEditor->widget() ) ).lower() + ".html#details"; @@ -886,14 +881,14 @@ void MainWindow::showProperties( TQObject *o ) if ( !o->isWidgetType() ) { propertyEditor->setWidget( o, lastActiveFormWindow ); if ( lastActiveFormWindow ) - hierarchyView->setFormWindow( lastActiveFormWindow, TQT_TQOBJECT(lastActiveFormWindow->mainContainer()) ); + hierarchyView->setFormWindow( lastActiveFormWindow, lastActiveFormWindow->mainContainer() ); else hierarchyView->setFormWindow( 0, 0 ); return; } TQWidget *w = (TQWidget*)o; setupHierarchyView(); - FormWindow *fw = (FormWindow*)isAFormWindowChild( TQT_TQOBJECT(w) ); + FormWindow *fw = (FormWindow*)isAFormWindowChild( w ); if ( fw ) { if ( fw->numSelectedWidgets() > 1 ) { TQWidgetList wl = fw->selectedWidgets(); @@ -903,16 +898,16 @@ void MainWindow::showProperties( TQObject *o ) } propertyEditor->setWidget( new PropertyObject( wl ), fw ); } else { - propertyEditor->setWidget( TQT_TQOBJECT(w), fw ); + propertyEditor->setWidget( w, fw ); } - hierarchyView->setFormWindow( fw, TQT_TQOBJECT(w) ); + hierarchyView->setFormWindow( fw, w ); } else { propertyEditor->setWidget( 0, 0 ); hierarchyView->setFormWindow( 0, 0 ); } if ( currentTool() == POINTER_TOOL && fw && - ( !qworkspace->activeWindow() || !::tqqt_cast<SourceEditor*>(qworkspace->activeWindow()) ) ) + ( !qworkspace->activeWindow() || !::tqt_cast<SourceEditor*>(qworkspace->activeWindow()) ) ) fw->setFocus(); } @@ -929,21 +924,21 @@ void MainWindow::updateProperties( TQObject * ) bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) { - if ( ::tqqt_cast<MenuBarEditor*>(o) || ::tqqt_cast<PopupMenuEditor*>(o) || + if ( ::tqt_cast<MenuBarEditor*>(o) || ::tqt_cast<PopupMenuEditor*>(o) || ( o && - ( ::tqqt_cast<MenuBarEditor*>(o->parent()) || - ::tqqt_cast<PopupMenuEditor*>(o->parent()) ) ) ) { + ( ::tqt_cast<MenuBarEditor*>(o->parent()) || + ::tqt_cast<PopupMenuEditor*>(o->parent()) ) ) ) { - if ( e->type() == TQEvent::Accel && ::tqqt_cast<PopupMenuEditor*>(o) ) { + if ( e->type() == TQEvent::Accel && ::tqt_cast<PopupMenuEditor*>(o) ) { return TRUE; // consume accel events - } else if ( e->type() == TQEvent::MouseButtonPress && ::tqqt_cast<MenuBarEditor*>(o) ) { + } else if ( e->type() == TQEvent::MouseButtonPress && ::tqt_cast<MenuBarEditor*>(o) ) { TQPoint pos = ((TQMouseEvent*)e)->pos(); - MenuBarEditor *m = ::tqqt_cast<MenuBarEditor*>(o); + MenuBarEditor *m = ::tqt_cast<MenuBarEditor*>(o); showProperties( o ); if ( m->findItem( pos ) >= m->count() ) m->setFocus(); - } else if ( e->type() == TQEvent::MouseButtonPress && ::tqqt_cast<PopupMenuEditor*>(o) ) { - PopupMenuEditor *m = ::tqqt_cast<PopupMenuEditor*>(o); + } else if ( e->type() == TQEvent::MouseButtonPress && ::tqt_cast<PopupMenuEditor*>(o) ) { + PopupMenuEditor *m = ::tqt_cast<PopupMenuEditor*>(o); PopupMenuEditorItem *i = m->at( ((TQMouseEvent*)e)->pos() ); if ( m->find( i->action() ) != -1 && !i->isSeparator() ) showProperties( i->action() ); @@ -962,7 +957,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) ( ( (TQKeyEvent*)e )->state() & ShiftButton ) != ShiftButton ) { w = (TQWidget*)o; while ( w ) { - if ( ::tqqt_cast<PropertyList*>(w) ) + if ( ::tqt_cast<PropertyList*>(w) ) break; w = w->parentWidget( TRUE ); } @@ -978,7 +973,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) ( (TQKeyEvent*)e )->key() == Key_E ) && ( (TQKeyEvent*)e )->state() & ControlButton ) { if ( qWorkspace()->activeWindow() && - ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) { + ::tqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) { ( (TQKeyEvent*)e )->ignore(); return TRUE; } @@ -987,44 +982,44 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) case TQEvent::ContextMenu: case TQEvent::MouseButtonPress: if ( o && currentTool() == POINTER_TOOL && - ( ::tqqt_cast<MenuBarEditor*>(o) || - ::tqqt_cast<PopupMenuEditor*>(o) || - ::tqqt_cast<QDesignerToolBar*>(o) || - ( ::tqqt_cast<TQComboBox*>(o) || - ::tqqt_cast<TQToolButton*>(o) || - ::tqqt_cast<QDesignerToolBarSeparator*>(o) ) && + ( ::tqt_cast<MenuBarEditor*>(o) || + ::tqt_cast<PopupMenuEditor*>(o) || + ::tqt_cast<QDesignerToolBar*>(o) || + ( ::tqt_cast<TQComboBox*>(o) || + ::tqt_cast<TQToolButton*>(o) || + ::tqt_cast<QDesignerToolBarSeparator*>(o) ) && o->parent() - && ( ::tqqt_cast<QDesignerToolBar*>(o->parent()) - || ::tqqt_cast<QDesignerWidgetStack*>(o->parent())) ) ) { + && ( ::tqt_cast<QDesignerToolBar*>(o->parent()) + || ::tqt_cast<QDesignerWidgetStack*>(o->parent())) ) ) { TQWidget *w = (TQWidget*)o; - if ( ::tqqt_cast<TQToolButton*>(w) || - ::tqqt_cast<TQComboBox*>(w) || - ::tqqt_cast<PopupMenuEditor*>(w) || - ::tqqt_cast<QDesignerToolBarSeparator*>(w) ) + if ( ::tqt_cast<TQToolButton*>(w) || + ::tqt_cast<TQComboBox*>(w) || + ::tqt_cast<PopupMenuEditor*>(w) || + ::tqt_cast<QDesignerToolBarSeparator*>(w) ) w = w->parentWidget(); TQWidget *pw = w->parentWidget(); while ( pw ) { - if ( ::tqqt_cast<FormWindow*>(pw) ) { - ( (FormWindow*)pw )->emitShowProperties( TQT_TQOBJECT(w) ); - if ( !::tqqt_cast<QDesignerToolBar*>(o) ) - return ( !::tqqt_cast<TQToolButton*>(o) && - !::tqqt_cast<MenuBarEditor*>(o) && - !::tqqt_cast<TQComboBox*>(o) && - !::tqqt_cast<QDesignerToolBarSeparator*>(o) ); + if ( ::tqt_cast<FormWindow*>(pw) ) { + ( (FormWindow*)pw )->emitShowProperties( w ); + if ( !::tqt_cast<QDesignerToolBar*>(o) ) + return ( !::tqt_cast<TQToolButton*>(o) && + !::tqt_cast<MenuBarEditor*>(o) && + !::tqt_cast<TQComboBox*>(o) && + !::tqt_cast<QDesignerToolBarSeparator*>(o) ); } pw = pw->parentWidget(); } } - if ( o && ( ::tqqt_cast<QDesignerToolBar*>(o) || o->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING) ) + if ( o && ( ::tqt_cast<QDesignerToolBar*>(o) || o->inherits("TQDockWindowHandle") ) && e->type() == TQEvent::ContextMenu ) break; if ( isAToolBarChild( o ) && currentTool() != CONNECT_TOOL && currentTool() != BUDDY_TOOL ) break; - if ( ::tqqt_cast<TQSizeGrip*>(o) ) + if ( ::tqt_cast<TQSizeGrip*>(o) ) break; if ( !( w = isAFormWindowChild( o ) ) || - ::tqqt_cast<SizeHandle*>(o) || - ::tqqt_cast<OrderIndicator*>(o) ) + ::tqt_cast<SizeHandle*>(o) || + ::tqt_cast<OrderIndicator*>(o) ) break; if ( !w->hasFocus() ) w->setFocus(); @@ -1041,7 +1036,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) } lastPressWidget = (TQWidget*)o; if ( passiveInteractor ) - TQTimer::singleShot( 0, formWindow(), TQT_SLOT( visibilityChanged() ) ); + TQTimer::singleShot( 0, formWindow(), TQ_SLOT( visibilityChanged() ) ); if ( currentTool() == CONNECT_TOOL || currentTool() == BUDDY_TOOL ) return TRUE; return !passiveInteractor; @@ -1049,19 +1044,19 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) lastPressWidget = 0; if ( isAToolBarChild( o ) && currentTool() != CONNECT_TOOL && currentTool() != BUDDY_TOOL ) break; - if ( ::tqqt_cast<TQSizeGrip*>(o) ) + if ( ::tqt_cast<TQSizeGrip*>(o) ) break; if ( !( w = isAFormWindowChild( o ) ) || - ::tqqt_cast<SizeHandle*>(o) || - ::tqqt_cast<OrderIndicator*>(o) ) + ::tqt_cast<SizeHandle*>(o) || + ::tqt_cast<OrderIndicator*>(o) ) break; passiveInteractor = WidgetFactory::isPassiveInteractor( o ); if ( !passiveInteractor ) ( (FormWindow*)w )->handleMouseRelease( (TQMouseEvent*)e, ( (FormWindow*)w )->designerWidget( o ) ); if ( passiveInteractor ) { - TQTimer::singleShot( 0, this, TQT_SLOT( selectionChanged() ) ); - TQTimer::singleShot( 0, formWindow(), TQT_SLOT( visibilityChanged() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( selectionChanged() ) ); + TQTimer::singleShot( 0, formWindow(), TQ_SLOT( visibilityChanged() ) ); } return !passiveInteractor; case TQEvent::MouseMove: @@ -1069,15 +1064,15 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) break; w = isAFormWindowChild( o ); if ( lastPressWidget != (TQWidget*)o && w && - !::tqqt_cast<SizeHandle*>(o) && !::tqqt_cast<OrderIndicator*>(o) && - !::tqqt_cast<PopupMenuEditor*>(o) && !::tqqt_cast<TQMenuBar*>(o) && - !::tqqt_cast<TQSizeGrip*>(o) ) + !::tqt_cast<SizeHandle*>(o) && !::tqt_cast<OrderIndicator*>(o) && + !::tqt_cast<PopupMenuEditor*>(o) && !::tqt_cast<TQMenuBar*>(o) && + !::tqt_cast<TQSizeGrip*>(o) ) return TRUE; - if ( o && ::tqqt_cast<TQSizeGrip*>(o) ) + if ( o && ::tqt_cast<TQSizeGrip*>(o) ) break; if ( lastPressWidget != (TQWidget*)o || - ( !w || ::tqqt_cast<SizeHandle*>(o) ) || - ::tqqt_cast<OrderIndicator*>(o) ) + ( !w || ::tqt_cast<SizeHandle*>(o) ) || + ::tqt_cast<OrderIndicator*>(o) ) break; passiveInteractor = WidgetFactory::isPassiveInteractor( o ); if ( !passiveInteractor ) @@ -1090,14 +1085,14 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) return FALSE; } if ( ( (TQKeyEvent*)e )->key() == Key_Escape && incrementalSearch->hasFocus() ) { - if ( ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) { + if ( ::tqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) { qWorkspace()->activeWindow()->setFocus(); return TRUE; } } if ( !( w = isAFormWindowChild( o ) ) || - ::tqqt_cast<SizeHandle*>(o) || - ::tqqt_cast<OrderIndicator*>(o) ) + ::tqt_cast<SizeHandle*>(o) || + ::tqt_cast<OrderIndicator*>(o) ) break; ( (FormWindow*)w )->handleKeyPress( (TQKeyEvent*)e, ( (FormWindow*)w )->designerWidget( o ) ); if ( ((TQKeyEvent*)e)->isAccepted() ) @@ -1105,10 +1100,10 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) break; case TQEvent::MouseButtonDblClick: if ( !( w = isAFormWindowChild( o ) ) || - ::tqqt_cast<SizeHandle*>(o) || - ::tqqt_cast<OrderIndicator*>(o) ) { - if ( ::tqqt_cast<TQToolButton*>(o) && ((TQToolButton*)o)->isOn() && - o->parent() && ::tqqt_cast<TQToolBar*>(o->parent()) && formWindow() ) + ::tqt_cast<SizeHandle*>(o) || + ::tqt_cast<OrderIndicator*>(o) ) { + if ( ::tqt_cast<TQToolButton*>(o) && ((TQToolButton*)o)->isOn() && + o->parent() && ::tqt_cast<TQToolBar*>(o->parent()) && formWindow() ) formWindow()->setToolFixed(); break; } @@ -1122,8 +1117,8 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) return TRUE; case TQEvent::KeyRelease: if ( !( w = isAFormWindowChild( o ) ) || - ::tqqt_cast<SizeHandle*>(o) || - ::tqqt_cast<OrderIndicator*>(o) ) + ::tqt_cast<SizeHandle*>(o) || + ::tqt_cast<OrderIndicator*>(o) ) break; ( (FormWindow*)w )->handleKeyRelease( (TQKeyEvent*)e, ( (FormWindow*)w )->designerWidget( o ) ); if ( ((TQKeyEvent*)e)->isAccepted() ) @@ -1131,25 +1126,25 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) break; case TQEvent::Hide: if ( !( w = isAFormWindowChild( o ) ) || - ::tqqt_cast<SizeHandle*>(o) || - ::tqqt_cast<OrderIndicator*>(o) ) + ::tqt_cast<SizeHandle*>(o) || + ::tqt_cast<OrderIndicator*>(o) ) break; - if ( ( (FormWindow*)w )->isWidgetSelected( TQT_TQOBJECT(o) ) ) - ( (FormWindow*)w )->selectWidget( TQT_TQOBJECT(o), FALSE ); + if ( ( (FormWindow*)w )->isWidgetSelected( o ) ) + ( (FormWindow*)w )->selectWidget( o, FALSE ); break; case TQEvent::Enter: case TQEvent::Leave: if ( !( w = isAFormWindowChild( o ) ) || - ::tqqt_cast<SizeHandle*>(o) || - ::tqqt_cast<OrderIndicator*>(o) || - ::tqqt_cast<MenuBarEditor*>(o) ) + ::tqt_cast<SizeHandle*>(o) || + ::tqt_cast<OrderIndicator*>(o) || + ::tqt_cast<MenuBarEditor*>(o) ) break; return TRUE; case TQEvent::Resize: case TQEvent::Move: if ( !( w = isAFormWindowChild( o ) ) || - ::tqqt_cast<SizeHandle*>(o) || - ::tqqt_cast<OrderIndicator*>(o) ) + ::tqt_cast<SizeHandle*>(o) || + ::tqt_cast<OrderIndicator*>(o) ) break; if ( WidgetFactory::layoutType( (TQWidget*)o->parent() ) != WidgetFactory::NoLayout ) { ( (FormWindow*)w )->updateSelection( (TQWidget*)o ); @@ -1161,31 +1156,31 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) if ( o->isWidgetType() && (TQWidget*)o == (TQWidget*)previewedForm ) { if ( lastActiveFormWindow && lastActiveFormWindow->project() ) { TQStringList lst = - MetaDataBase::fakeProperty( TQT_TQOBJECT(lastActiveFormWindow), "database" ).toStringList(); + MetaDataBase::fakeProperty( lastActiveFormWindow, "database" ).toStringList(); lastActiveFormWindow->project()->closeDatabase( lst[ 0 ] ); } } break; case TQEvent::DragEnter: - if ( TQT_BASE_OBJECT(o) == qWorkspace() || TQT_BASE_OBJECT(o) == workspace() || TQT_BASE_OBJECT(o) == workspace()->viewport() ) { + if ( o == qWorkspace() || o == workspace() || o == workspace()->viewport() ) { workspace()->contentsDragEnterEvent( (TQDragEnterEvent*)e ); return TRUE; } break; case TQEvent::DragMove: - if ( TQT_BASE_OBJECT(o) == qWorkspace() || TQT_BASE_OBJECT(o) == workspace() || TQT_BASE_OBJECT(o) == workspace()->viewport() ) { + if ( o == qWorkspace() || o == workspace() || o == workspace()->viewport() ) { workspace()->contentsDragMoveEvent( (TQDragMoveEvent*)e ); return TRUE; } break; case TQEvent::Drop: - if ( TQT_BASE_OBJECT(o) == qWorkspace() || TQT_BASE_OBJECT(o) == workspace() || TQT_BASE_OBJECT(o) == workspace()->viewport() ) { + if ( o == qWorkspace() || o == workspace() || o == workspace()->viewport() ) { workspace()->contentsDropEvent( (TQDropEvent*)e ); return TRUE; } break; case TQEvent::Show: - if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this) ) + if ( o != this ) break; if ( ((TQShowEvent*)e)->spontaneous() ) break; @@ -1195,33 +1190,33 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) return TRUE; case TQEvent::Wheel: if ( !( w = isAFormWindowChild( o ) ) || - ::tqqt_cast<SizeHandle*>(o) || - ::tqqt_cast<OrderIndicator*>(o) ) + ::tqt_cast<SizeHandle*>(o) || + ::tqt_cast<OrderIndicator*>(o) ) break; return TRUE; case TQEvent::FocusIn: - if ( !::tqqt_cast<FormWindow*>(o) && isAFormWindowChild( o ) ) + if ( !::tqt_cast<FormWindow*>(o) && isAFormWindowChild( o ) ) return TRUE; //FIXME if ( hierarchyView->formDefinitionView()->isRenaming() - && ( o->inherits( "Editor" ) || ::tqqt_cast<FormWindow*>(o) ) ) + && ( o->inherits( "Editor" ) || ::tqt_cast<FormWindow*>(o) ) ) TQApplication::sendPostedEvents(); if ( o->inherits( "Editor" ) ) { TQWidget *w = (TQWidget*)o; while ( w ) { - if ( ::tqqt_cast<SourceEditor*>(w) ) + if ( ::tqt_cast<SourceEditor*>(w) ) break; w = w->parentWidget( TRUE ); } - if ( ::tqqt_cast<SourceEditor*>(w) ) + if ( ::tqt_cast<SourceEditor*>(w) ) ( (SourceEditor*)w )->checkTimeStamp(); - } else if ( ::tqqt_cast<FormWindow*>(o) ) { + } else if ( ::tqt_cast<FormWindow*>(o) ) { FormWindow *fw = (FormWindow*)o; if ( fw->formFile() && fw->formFile()->editor() ) fw->formFile()->editor()->checkTimeStamp(); } break; case TQEvent::FocusOut: - if ( !::tqqt_cast<FormWindow*>(o) && isAFormWindowChild( o ) ) + if ( !::tqt_cast<FormWindow*>(o) && isAFormWindowChild( o ) ) return TRUE; break; default: @@ -1233,10 +1228,10 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) TQWidget *MainWindow::isAFormWindowChild( TQObject *o ) const { - if ( ::tqqt_cast<TQWizard*>(o->parent()) && !::tqqt_cast<TQPushButton*>(o) ) + if ( ::tqt_cast<TQWizard*>(o->parent()) && !::tqt_cast<TQPushButton*>(o) ) return 0; while ( o ) { - if ( ::tqqt_cast<FormWindow*>(o) ) + if ( ::tqt_cast<FormWindow*>(o) ) return (TQWidget*)o; o = o->parent(); } @@ -1246,9 +1241,9 @@ TQWidget *MainWindow::isAFormWindowChild( TQObject *o ) const TQWidget *MainWindow::isAToolBarChild( TQObject *o ) const { while ( o ) { - if ( ::tqqt_cast<QDesignerToolBar*>(o) ) + if ( ::tqt_cast<QDesignerToolBar*>(o) ) return (TQWidget*)o; - if ( ::tqqt_cast<FormWindow*>(o) ) + if ( ::tqt_cast<FormWindow*>(o) ) return 0; o = o->parent(); } @@ -1259,7 +1254,7 @@ FormWindow *MainWindow::formWindow() { if ( qworkspace->activeWindow() ) { FormWindow *fw = 0; - if ( ::tqqt_cast<FormWindow*>(qworkspace->activeWindow()) ) + if ( ::tqt_cast<FormWindow*>(qworkspace->activeWindow()) ) fw = (FormWindow*)qworkspace->activeWindow(); else if ( lastActiveFormWindow && qworkspace->windowList().find( lastActiveFormWindow ) != -1) @@ -1290,16 +1285,16 @@ void MainWindow::insertFormWindow( FormWindow *fw ) "<p>You can have several forms open, and all open forms are listed " "in the <b>Form List</b>.") ); - connect( fw, TQT_SIGNAL( showProperties( TQObject * ) ), - this, TQT_SLOT( showProperties( TQObject * ) ) ); - connect( fw, TQT_SIGNAL( updateProperties( TQObject * ) ), - this, TQT_SLOT( updateProperties( TQObject * ) ) ); - connect( this, TQT_SIGNAL( currentToolChanged() ), - fw, TQT_SLOT( currentToolChanged() ) ); - connect( fw, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( selectionChanged() ) ); - connect( fw, TQT_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), - this, TQT_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) ); + connect( fw, TQ_SIGNAL( showProperties( TQObject * ) ), + this, TQ_SLOT( showProperties( TQObject * ) ) ); + connect( fw, TQ_SIGNAL( updateProperties( TQObject * ) ), + this, TQ_SLOT( updateProperties( TQObject * ) ) ); + connect( this, TQ_SIGNAL( currentToolChanged() ), + fw, TQ_SLOT( currentToolChanged() ) ); + connect( fw, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( selectionChanged() ) ); + connect( fw, TQ_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), + this, TQ_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) ); if ( !mblockNewForms ) { } else { @@ -1310,9 +1305,9 @@ void MainWindow::insertFormWindow( FormWindow *fw ) if ( fw->caption().isEmpty() && tqstrlen( fw->name() ) ) fw->setCaption( fw->name() ); fw->mainContainer()->setCaption( fw->caption() ); - WidgetFactory::saveDefaultProperties( TQT_TQOBJECT(fw->mainContainer()), + WidgetFactory::saveDefaultProperties( fw->mainContainer(), WidgetDatabase:: - idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(fw->mainContainer()) ) ) ); + idFromClassName( WidgetFactory::classNameOf( fw->mainContainer() ) ) ); activeWindowChanged( fw ); emit formWindowsChanged(); for ( SourceEditor *e = sourceEditors.first(); e; e = sourceEditors.next() ) { @@ -1356,7 +1351,7 @@ bool MainWindow::unregisterClient( FormWindow *w ) TQPtrList<SourceEditor> waitingForDelete; waitingForDelete.setAutoDelete( TRUE ); for ( SourceEditor *e = sourceEditors.first(); e; e = sourceEditors.next() ) { - if ( TQT_BASE_OBJECT(e->object()) == TQT_BASE_OBJECT(w) ) + if ( e->object() == w ) waitingForDelete.append( e ); } @@ -1371,7 +1366,7 @@ bool MainWindow::unregisterClient( FormWindow *w ) void MainWindow::activeWindowChanged( TQWidget *w ) { TQWidget *old = formWindow(); - if ( ::tqqt_cast<FormWindow*>(w) ) { + if ( ::tqt_cast<FormWindow*>(w) ) { FormWindow *fw = (FormWindow*)w; FormWindow *ofw = lastActiveFormWindow; lastActiveFormWindow = fw; @@ -1385,13 +1380,13 @@ void MainWindow::activeWindowChanged( TQWidget *w ) } workspace()->activeFormChanged( fw ); setAppropriate( (TQDockWindow*)actionEditor->parentWidget(), - ::tqqt_cast<TQMainWindow*>(lastActiveFormWindow->mainContainer()) ); + ::tqt_cast<TQMainWindow*>(lastActiveFormWindow->mainContainer()) ); if ( appropriate( (TQDockWindow*)actionEditor->parentWidget() ) ) { if ( actionEditor->wantToBeShown() ) actionEditor->parentWidget()->show(); } else { TQWidget *mc = 0; - if ( ofw && (mc = ofw->mainContainer()) && ::tqqt_cast<TQMainWindow*>(mc) ) + if ( ofw && (mc = ofw->mainContainer()) && ::tqt_cast<TQMainWindow*>(mc) ) actionEditor->setWantToBeShown( !actionEditor->parentWidget()->isHidden() ); actionEditor->parentWidget()->hide(); } @@ -1426,7 +1421,7 @@ void MainWindow::activeWindowChanged( TQWidget *w ) selectionChanged(); - if ( ::tqqt_cast<SourceEditor*>(w) ) { + if ( ::tqt_cast<SourceEditor*>(w) ) { SourceEditor *se = (SourceEditor*)w; TQGuardedPtr<FormWindow> fw = se->formWindow(); if ( se->formWindow() && @@ -1479,7 +1474,7 @@ void MainWindow::updateUndoRedo( bool undoAvailable, bool redoAvailable, const TQString &undoCmd, const TQString &redoCmd ) { if ( qWorkspace()->activeWindow() && - ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) + ::tqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) return; // do not set a formWindow related command actionEditUndo->setEnabled( undoAvailable ); actionEditRedo->setEnabled( redoAvailable ); @@ -1504,7 +1499,7 @@ void MainWindow::updateUndoRedo( bool undoAvailable, bool redoAvailable, void MainWindow::updateEditorUndoRedo() { if ( !qWorkspace()->activeWindow() || - !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) + !::tqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) return; SourceEditor *editor = (SourceEditor*)qWorkspace()->activeWindow(); actionEditUndo->setEnabled( editor->editIsUndoAvailable() ); @@ -1555,18 +1550,18 @@ void MainWindow::popupWidgetMenu( const TQPoint &gp, FormWindow * /*fw*/, TQWidg void MainWindow::setupRMBProperties( TQValueList<uint> &ids, TQMap<TQString, int> &props, TQWidget *w ) { const TQMetaProperty* text = w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE ); - if ( text && qstrcmp( text->type(), TQSTRING_OBJECT_NAME_STRING) != 0 ) + if ( text && qstrcmp( text->type(), "TQString") != 0 ) text = 0; const TQMetaProperty* title = w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE ); - if ( title && qstrcmp( title->type(), TQSTRING_OBJECT_NAME_STRING) != 0 ) + if ( title && qstrcmp( title->type(), "TQString") != 0 ) title = 0; const TQMetaProperty* pagetitle = w->metaObject()->property( w->metaObject()->findProperty( "pageTitle", TRUE ), TRUE ); - if ( pagetitle && qstrcmp( pagetitle->type(), TQSTRING_OBJECT_NAME_STRING) != 0 ) + if ( pagetitle && qstrcmp( pagetitle->type(), "TQString") != 0 ) pagetitle = 0; const TQMetaProperty* pixmap = w->metaObject()->property( w->metaObject()->findProperty( "pixmap", TRUE ), TRUE ); - if ( pixmap && qstrcmp( pixmap->type(), TQPIXMAP_OBJECT_NAME_STRING) != 0 ) + if ( pixmap && qstrcmp( pixmap->type(), "TQPixmap") != 0 ) pixmap = 0; if ( text && text->designable(w) || @@ -1580,7 +1575,7 @@ void MainWindow::setupRMBProperties( TQValueList<uint> &ids, TQMap<TQString, int ids << ( id = rmbWidgets->insertItem( i18n("Choose Pixmap..."), -1, 0) ); props.insert( "pixmap", id ); } - if ( text && text->designable(w) && !::tqqt_cast<TQTextEdit*>(w) ) { + if ( text && text->designable(w) && !::tqt_cast<TQTextEdit*>(w) ) { ids << ( id = rmbWidgets->insertItem( i18n("Edit Text..."), -1, 0) ); props.insert( "text", id ); } @@ -1599,7 +1594,7 @@ void MainWindow::setupRMBProperties( TQValueList<uint> &ids, TQMap<TQString, int static TQWidgetContainerInterfacePrivate *containerWidgetInterface( TQWidget *w ) { WidgetInterface *iface = 0; - widgetManager()->queryInterface( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ), &iface ); + widgetManager()->queryInterface( WidgetFactory::classNameOf( w ), &iface ); if ( !iface ) return 0; TQWidgetContainerInterfacePrivate *iface2 = 0; @@ -1616,7 +1611,7 @@ void MainWindow::setupRMBSpecialCommands( TQValueList<uint> &ids, { int id; - if ( ::tqqt_cast<TQTabWidget*>(w) ) { + if ( ::tqt_cast<TQTabWidget*>(w) ) { if ( ids.isEmpty() ) ids << rmbWidgets->insertSeparator( 0 ); if ( ( (QDesignerTabWidget*)w )->count() > 1) { @@ -1625,7 +1620,7 @@ void MainWindow::setupRMBSpecialCommands( TQValueList<uint> &ids, } ids << ( id = rmbWidgets->insertItem( i18n("Add Page"), -1, 0 ) ); commands.insert( "add", id ); - } else if ( ::tqqt_cast<QDesignerWidgetStack*>(w) ) { + } else if ( ::tqt_cast<QDesignerWidgetStack*>(w) ) { if ( ids.isEmpty() ) ids << rmbWidgets->insertSeparator( 0 ); if ( ( (QDesignerWidgetStack*)w )->count() > 1) { @@ -1639,7 +1634,7 @@ void MainWindow::setupRMBSpecialCommands( TQValueList<uint> &ids, } ids << ( id = rmbWidgets->insertItem( i18n("Add Page"), -1, 0 ) ); commands.insert( "add", id ); - } else if ( ::tqqt_cast<TQToolBox*>(w) ) { + } else if ( ::tqt_cast<TQToolBox*>(w) ) { if ( ids.isEmpty() ) ids << rmbWidgets->insertSeparator( 0 ); if ( ( (TQToolBox*)w )->count() > 1 ) { @@ -1651,19 +1646,19 @@ void MainWindow::setupRMBSpecialCommands( TQValueList<uint> &ids, #ifdef TQT_CONTAINER_CUSTOM_WIDGETS } else if ( WidgetDatabase:: isCustomPluginWidget( WidgetDatabase:: - idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ) { + idFromClassName( WidgetFactory::classNameOf( w ) ) ) ) { TQWidgetContainerInterfacePrivate *iface = containerWidgetInterface( w ); - if ( iface && iface->supportsPages( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) { + if ( iface && iface->supportsPages( WidgetFactory::classNameOf( w ) ) ) { if ( ids.isEmpty() ) ids << rmbWidgets->insertSeparator( 0 ); - if ( iface->count( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ), w ) > 1 ) { + if ( iface->count( WidgetFactory::classNameOf( w ), w ) > 1 ) { ids << ( id = rmbWidgets->insertItem( i18n( "Delete Page" ), -1, 0 ) ); commands.insert( "remove", id ); } ids << ( id = rmbWidgets->insertItem( i18n("Add Page"), -1, 0 ) ); commands.insert( "add", id ); - if ( iface->currentIndex( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ), w ) != -1 ) { + if ( iface->currentIndex( WidgetFactory::classNameOf( w ), w ) != -1 ) { ids << ( id = rmbWidgets->insertItem( i18n("Rename Current Page..."), -1, 0 ) ); commands.insert( "rename", id ); } @@ -1674,7 +1669,7 @@ void MainWindow::setupRMBSpecialCommands( TQValueList<uint> &ids, } if ( WidgetFactory::hasSpecialEditor( WidgetDatabase:: - idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), TQT_TQOBJECT(w) ) ) { + idFromClassName( WidgetFactory::classNameOf( w ) ), w ) ) { if ( ids.isEmpty() ) ids << rmbWidgets->insertSeparator( 0 ); ids << ( id = rmbWidgets->insertItem( i18n("Edit..."), -1, 0 ) ); @@ -1687,7 +1682,7 @@ void MainWindow::setupRMBSpecialCommands( TQValueList<uint> &ids, { int id; - if ( ::tqqt_cast<TQWizard*>(fw->mainContainer()) ) { + if ( ::tqt_cast<TQWizard*>(fw->mainContainer()) ) { if ( ids.isEmpty() ) ids << rmbFormWindow->insertSeparator( 0 ); @@ -1705,7 +1700,7 @@ void MainWindow::setupRMBSpecialCommands( TQValueList<uint> &ids, ids << ( id = rmbFormWindow->insertItem( i18n("Edit Pages..."), -1, 0 ) ); commands.insert( "edit", id ); - } else if ( ::tqqt_cast<TQMainWindow*>(fw->mainContainer()) ) { + } else if ( ::tqt_cast<TQMainWindow*>(fw->mainContainer()) ) { if ( ids.isEmpty() ) ids << rmbFormWindow->insertSeparator( 0 ); ids << ( id = rmbFormWindow->insertItem( i18n( "Add Menu Item" ), -1, 0 ) ); @@ -1720,7 +1715,7 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid if ( id == props[ "text" ] ) { bool ok = FALSE; bool oldDoWrap = FALSE; - if ( ::tqqt_cast<TQLabel*>(w) ) { + if ( ::tqt_cast<TQLabel*>(w) ) { int align = w->property( "alignment" ).toInt(); if ( align & WordBreak ) oldDoWrap = TRUE; @@ -1728,8 +1723,8 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid bool doWrap = oldDoWrap; TQString text; - if ( ::tqqt_cast<TQTextView*>(w) || ::tqqt_cast<TQLabel*>(w) || ::tqqt_cast<TQButton*>(w) ) { - text = MultiLineEditor::getText( this, w->property( "text" ).toString(), !::tqqt_cast<TQButton*>(w), &doWrap ); + if ( ::tqt_cast<TQTextView*>(w) || ::tqt_cast<TQLabel*>(w) || ::tqt_cast<TQButton*>(w) ) { + text = MultiLineEditor::getText( this, w->property( "text" ).toString(), !::tqt_cast<TQButton*>(w), &doWrap ); ok = !text.isNull(); } else { text = TQInputDialog::getText( i18n("Text"), i18n( "New text" ), @@ -1738,21 +1733,21 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid if ( ok ) { if ( oldDoWrap != doWrap ) { TQString pn( i18n( "Set 'wordwrap' of '%1'" ).arg( w->name() ) ); - SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "wordwrap", TQVariant( oldDoWrap ), TQVariant( doWrap ), TQString(), TQString() ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "wordwrap", TRUE ); + MetaDataBase::setPropertyChanged( w, "wordwrap", TRUE ); } TQString pn( i18n( "Set the 'text' of '%1'" ).arg( w->name() ) ); - SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "text", w->property( "text" ), text, TQString(), TQString() ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "text", TRUE ); + MetaDataBase::setPropertyChanged( w, "text", TRUE ); } } else if ( id == props[ "title" ] ) { bool ok = FALSE; @@ -1760,12 +1755,12 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid TQLineEdit::Normal, w->property("title").toString(), &ok, this ); if ( ok ) { TQString pn( i18n( "Set the 'title' of '%2'" ).arg( w->name() ) ); - SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "title", w->property( "title" ), title, TQString(), TQString() ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "title", TRUE ); + MetaDataBase::setPropertyChanged( w, "title", TRUE ); } } else if ( id == props[ "pagetitle" ] ) { bool ok = FALSE; @@ -1773,32 +1768,32 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid TQLineEdit::Normal, w->property("pageTitle").toString(), &ok, this ); if ( ok ) { TQString pn( i18n( "Set the 'pageTitle' of '%2'" ).arg( w->name() ) ); - SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "pageTitle", w->property( "pageTitle" ), text, TQString(), TQString() ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "pageTitle", TRUE ); + MetaDataBase::setPropertyChanged( w, "pageTitle", TRUE ); } } else if ( id == props[ "pixmap" ] ) { TQPixmap oldPix = TQVariant(w->property( "pixmap" )).toPixmap(); TQPixmap pix = qChoosePixmap( this, formWindow(), oldPix ); if ( !pix.isNull() ) { TQString pn( i18n( "Set the 'pixmap' of '%2'" ).arg( w->name() ) ); - SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "pixmap", w->property( "pixmap" ), pix, TQString(), TQString() ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "pixmap", TRUE ); + MetaDataBase::setPropertyChanged( w, "pixmap", TRUE ); } } } void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &commands, TQWidget *w ) { - if ( ::tqqt_cast<TQTabWidget*>(w) ) { + if ( ::tqt_cast<TQTabWidget*>(w) ) { TQTabWidget *tw = (TQTabWidget*)w; if ( id == commands[ "add" ] ) { AddTabPageCommand *cmd = @@ -1817,7 +1812,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command cmd->execute(); } } - } else if ( ::tqqt_cast<TQToolBox*>(w) ) { + } else if ( ::tqt_cast<TQToolBox*>(w) ) { TQToolBox *tb = (TQToolBox*)w; if ( id == commands[ "add" ] ) { AddToolBoxPageCommand *cmd = @@ -1837,7 +1832,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command cmd->execute(); } } - } else if ( ::tqqt_cast<TQWidgetStack*>(w) ) { + } else if ( ::tqt_cast<TQWidgetStack*>(w) ) { QDesignerWidgetStack *ws = (QDesignerWidgetStack*)w; if ( id == commands[ "add" ] ) { AddWidgetStackPageCommand *cmd = @@ -1858,27 +1853,27 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command int currentPage = w->property( "currentPage" ).toInt(); TQString pn( i18n( "Raise next page of '%2'" ).arg( w->name() ) ); SetPropertyCommand *cmd = - new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "currentPage", currentPage, currentPage + 1, TQString(), TQString() ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "currentPage", TRUE ); + MetaDataBase::setPropertyChanged( w, "currentPage", TRUE ); } else if ( id == commands[ "prevpage" ] ) { int currentPage = w->property( "currentPage" ).toInt(); TQString pn( i18n( "Raise previous page of '%2'" ).arg( w->name() ) ); SetPropertyCommand *cmd = - new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "currentPage", currentPage, currentPage -1, TQString(), TQString() ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "currentPage", TRUE ); + MetaDataBase::setPropertyChanged( w, "currentPage", TRUE ); } #ifdef TQT_CONTAINER_CUSTOM_WIDGETS } else if ( WidgetDatabase:: isCustomPluginWidget( WidgetDatabase:: - idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ) { + idFromClassName( WidgetFactory::classNameOf( w ) ) ) ) { if ( id == commands[ "add" ] ) { AddContainerPageCommand *cmd = new AddContainerPageCommand( i18n( "Add Page to %1" ).arg( w->name() ), @@ -1888,7 +1883,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command } else if ( id == commands[ "remove" ] ) { TQWidgetContainerInterfacePrivate *iface = containerWidgetInterface( w ); if ( iface ) { - TQString wClassName = WidgetFactory::classNameOf( TQT_TQOBJECT(w) ); + TQString wClassName = WidgetFactory::classNameOf( w ); int index = iface->currentIndex( wClassName, w ); DeleteContainerPageCommand *cmd = new DeleteContainerPageCommand( i18n( "Delete Page %1 of %2" ). @@ -1904,7 +1899,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command TQWidgetContainerInterfacePrivate *iface = containerWidgetInterface( w ); if ( iface ) { bool ok = FALSE; - TQString wClassName = WidgetFactory::classNameOf( TQT_TQOBJECT(w) ); + TQString wClassName = WidgetFactory::classNameOf( w ); int index = iface->currentIndex( wClassName, w ); TQString text = TQInputDialog::getText( i18n("Page Title"), i18n( "New page title" ), TQLineEdit::Normal, @@ -1929,16 +1924,16 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command } if ( WidgetFactory::hasSpecialEditor( WidgetDatabase:: - idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), TQT_TQOBJECT(w) ) ) { + idFromClassName( WidgetFactory::classNameOf( w ) ), w ) ) { if ( id == commands[ "edit" ] ) WidgetFactory::editWidget( WidgetDatabase:: - idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), this, w, formWindow() ); + idFromClassName( WidgetFactory::classNameOf( w ) ), this, w, formWindow() ); } } void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &commands, FormWindow *fw ) { - if ( ::tqqt_cast<TQWizard*>(fw->mainContainer()) ) { + if ( ::tqt_cast<TQWizard*>(fw->mainContainer()) ) { TQWizard *wiz = (TQWizard*)fw->mainContainer(); if ( id == commands[ "add" ] ) { AddWizardPageCommand *cmd = @@ -1976,7 +1971,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command cmd->execute(); } } - } else if ( ::tqqt_cast<TQMainWindow*>(fw->mainContainer()) ) { + } else if ( ::tqt_cast<TQMainWindow*>(fw->mainContainer()) ) { TQMainWindow *mw = (TQMainWindow*)fw->mainContainer(); if ( id == commands[ "add_toolbar" ] ) { AddToolBarCommand *cmd = @@ -2057,7 +2052,7 @@ void MainWindow::selectionChanged() breakLayout = laidout > 0; } else if ( selectedWidgets == 1 ) { TQWidget *w = widgets.first(); - bool isContainer = WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) || + bool isContainer = WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) || w == formWindow()->mainContainer(); actionEditAdjustSize->setEnabled( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ); @@ -2067,7 +2062,7 @@ void MainWindow::selectionChanged() actionEditVLayout->setEnabled( FALSE ); actionEditGridLayout->setEnabled( FALSE ); if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout ) { - actionEditBreakLayout->setEnabled( !isAToolBarChild( TQT_TQOBJECT(w) ) ); + actionEditBreakLayout->setEnabled( !isAToolBarChild( w ) ); breakLayout = TRUE; } else { actionEditBreakLayout->setEnabled( FALSE ); @@ -2087,14 +2082,14 @@ void MainWindow::selectionChanged() layoutChilds = TRUE; } if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout ) { - actionEditBreakLayout->setEnabled( !isAToolBarChild( TQT_TQOBJECT(w) ) ); + actionEditBreakLayout->setEnabled( !isAToolBarChild( w ) ); breakLayout = TRUE; } } else { actionEditHLayout->setEnabled( FALSE ); actionEditVLayout->setEnabled( FALSE ); actionEditGridLayout->setEnabled( FALSE ); - actionEditBreakLayout->setEnabled( !isAToolBarChild( TQT_TQOBJECT(w) ) ); + actionEditBreakLayout->setEnabled( !isAToolBarChild( w ) ); breakLayout = TRUE; } } @@ -2489,7 +2484,7 @@ void MainWindow::closeEvent( TQCloseEvent *e ) while ( wit.current() ) { TQWidget *w = wit.current(); ++wit; - if ( ::tqqt_cast<FormWindow*>(w) ) { + if ( ::tqt_cast<FormWindow*>(w) ) { if ( ( (FormWindow*)w )->formFile()->editor() ) windows.removeRef( ( (FormWindow*)w )->formFile()->editor() ); if ( ( (FormWindow*)w )->formFile()->formWindow() ) @@ -2498,7 +2493,7 @@ void MainWindow::closeEvent( TQCloseEvent *e ) e->ignore(); return; } - } else if ( ::tqqt_cast<SourceEditor*>(w) ) { + } else if ( ::tqt_cast<SourceEditor*>(w) ) { if ( !( (SourceEditor*)w )->close() ) { e->ignore(); return; @@ -2562,15 +2557,15 @@ ActionEditor *MainWindow::actioneditor() const bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) { - if ( f && !f->project()->isCpp() && !WidgetFactory::isPassiveInteractor( TQT_TQOBJECT(w) ) ) { - TQString defSignal = WidgetFactory::defaultSignal( TQT_TQOBJECT(w) ); + if ( f && !f->project()->isCpp() && !WidgetFactory::isPassiveInteractor( w ) ) { + TQString defSignal = WidgetFactory::defaultSignal( w ); if ( defSignal.isEmpty() ) { editSource(); } else { TQString s = TQString( w->name() ) + "_" + defSignal; LanguageInterface *iface = MetaDataBase::languageInterface( f->project()->language() ); if ( iface ) { - TQStrList sigs = iface->signalNames( TQT_TQOBJECT(w) ); + TQStrList sigs = iface->signalNames( w ); TQString fullSignal; for ( int i = 0; i < (int)sigs.count(); ++i ) { TQString sig = sigs.at( i ); @@ -2586,14 +2581,14 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) fullSignal.remove( (int)fullSignal.length() - 1, 1 ); fullSignal = iface->createArguments( fullSignal.simplifyWhiteSpace() ); s += "(" + fullSignal + ")"; - if ( !MetaDataBase::hasFunction( TQT_TQOBJECT(f), s.latin1() ) ) - MetaDataBase::addFunction( TQT_TQOBJECT(f), s.latin1(), "", "public", "slot", + if ( !MetaDataBase::hasFunction( f, s.latin1() ) ) + MetaDataBase::addFunction( f, s.latin1(), "", "public", "slot", f->project()->language(), "void" ); s = s.left( s.find( '(' ) ).latin1(); - if ( !MetaDataBase::hasConnection( TQT_TQOBJECT(f), TQT_TQOBJECT(w), defSignal.latin1(), TQT_TQOBJECT(f->mainContainer()), s.latin1() ) ) { + if ( !MetaDataBase::hasConnection( f, w, defSignal.latin1(), f->mainContainer(), s.latin1() ) ) { MetaDataBase::Connection conn; - conn.sender = TQT_TQOBJECT(w); - conn.receiver = TQT_TQOBJECT(f->mainContainer()); + conn.sender = w; + conn.receiver = f->mainContainer(); conn.signal = signl; conn.slot = s; AddConnectionCommand *cmd = @@ -2609,9 +2604,9 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) return TRUE; } if ( WidgetFactory::hasSpecialEditor( WidgetDatabase:: - idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), TQT_TQOBJECT(w) ) ) { + idFromClassName( WidgetFactory::classNameOf( w ) ), w ) ) { statusMessage( i18n( "Edit %1..." ).arg( w->className() ) ); - WidgetFactory::editWidget( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), + WidgetFactory::editWidget( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ), this, w, formWindow() ); statusBar()->clear(); return TRUE; @@ -2622,7 +2617,7 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) if ( text && text->designable(w) ) { bool ok = FALSE; bool oldDoWrap = FALSE; - if ( ::tqqt_cast<TQLabel*>(w) ) { + if ( ::tqt_cast<TQLabel*>(w) ) { int align = w->property( "alignment" ).toInt(); if ( align & WordBreak ) oldDoWrap = TRUE; @@ -2630,9 +2625,9 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) bool doWrap = oldDoWrap; TQString text; - if ( ::tqqt_cast<TQTextEdit*>(w) || ::tqqt_cast<TQLabel*>(w) || ::tqqt_cast<TQButton*>(w) ) { + if ( ::tqt_cast<TQTextEdit*>(w) || ::tqt_cast<TQLabel*>(w) || ::tqt_cast<TQButton*>(w) ) { text = MultiLineEditor::getText( this, w->property( "text" ).toString(), - !::tqqt_cast<TQButton*>(w), &doWrap ); + !::tqt_cast<TQButton*>(w), &doWrap ); ok = !text.isNull(); } else { text = TQInputDialog::getText( i18n("Text"), i18n( "New text" ), @@ -2641,21 +2636,21 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) if ( ok ) { if ( oldDoWrap != doWrap ) { TQString pn( i18n( "Set 'wordwrap' of '%1'" ).arg( w->name() ) ); - SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "wordwrap", TQVariant( oldDoWrap ), TQVariant( doWrap ), TQString(), TQString() ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "wordwrap", TRUE ); + MetaDataBase::setPropertyChanged( w, "wordwrap", TRUE ); } TQString pn( i18n( "Set the 'text' of '%1'" ).arg( w->name() ) ); - SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "text", w->property( "text" ), text, TQString(), TQString() ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "text", TRUE ); + MetaDataBase::setPropertyChanged( w, "text", TRUE ); } return TRUE; } @@ -2665,17 +2660,17 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) text = TQInputDialog::getText( i18n("Title"), i18n( "New title" ), TQLineEdit::Normal, w->property("title").toString(), &ok, this ); if ( ok ) { TQString pn( i18n( "Set the 'title' of '%2'" ).arg( w->name() ) ); - SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor, "title", w->property( "title" ), text, TQString(), TQString() ); cmd->execute(); formWindow()->commandHistory()->addCommand( cmd ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "title", TRUE ); + MetaDataBase::setPropertyChanged( w, "title", TRUE ); } return TRUE; } - if ( !WidgetFactory::isPassiveInteractor( TQT_TQOBJECT(w) ) ) + if ( !WidgetFactory::isPassiveInteractor( w ) ) editSource(); return TRUE; @@ -2746,7 +2741,7 @@ bool MainWindow::isCustomWidgetUsed( MetaDataBase::CustomWidget *wid ) { TQWidgetList windows = qWorkspace()->windowList(); for ( TQWidget *w = windows.first(); w; w = windows.next() ) { - if ( ::tqqt_cast<FormWindow*>(w) ) { + if ( ::tqt_cast<FormWindow*>(w) ) { if ( ( (FormWindow*)w )->isCustomWidgetUsed( wid ) ) return TRUE; } @@ -2761,7 +2756,7 @@ void MainWindow::setGrid( const TQPoint &p ) grd = p; TQWidgetList windows = qWorkspace()->windowList(); for ( TQWidget *w = windows.first(); w; w = windows.next() ) { - if ( !::tqqt_cast<FormWindow*>(w) ) + if ( !::tqt_cast<FormWindow*>(w) ) continue; ( (FormWindow*)w )->mainContainer()->update(); } @@ -2774,7 +2769,7 @@ void MainWindow::setShowGrid( bool b ) sGrid = b; TQWidgetList windows = qWorkspace()->windowList(); for ( TQWidget *w = windows.first(); w; w = windows.next() ) { - if ( !::tqqt_cast<FormWindow*>(w) ) + if ( !::tqt_cast<FormWindow*>(w) ) continue; ( (FormWindow*)w )->mainContainer()->update(); } @@ -2860,48 +2855,48 @@ void MainWindow::showDialogHelp() TQString link = documentationPath() + "/designer-manual-13.html#"; - if ( ::tqqt_cast<NewFormBase*>(w) || ::tqqt_cast<StartDialogBase*>(w) ) // own doc for startdialog? + if ( ::tqt_cast<NewFormBase*>(w) || ::tqt_cast<StartDialogBase*>(w) ) // own doc for startdialog? link += "dialog-file-new"; - else if ( ::tqqt_cast<CreateTemplate*>(w) ) + else if ( ::tqt_cast<CreateTemplate*>(w) ) link += "dialog-file-create-template"; - else if ( ::tqqt_cast<EditFunctionsBase*>(w) ) + else if ( ::tqt_cast<EditFunctionsBase*>(w) ) link += "dialog-edit-functions"; -// else if ( ::tqqt_cast<ConnectionViewerBase*>(w) ) +// else if ( ::tqt_cast<ConnectionViewerBase*>(w) ) else if ( w->inherits("ConnectionViewerBase") ) link += "dialog-view-connections"; - else if ( ::tqqt_cast<FormSettingsBase*>(w) ) + else if ( ::tqt_cast<FormSettingsBase*>(w) ) link += "dialog-edit-form-settings"; - else if ( ::tqqt_cast<Preferences*>(w) ) + else if ( ::tqt_cast<Preferences*>(w) ) link += "dialog-edit-preferences"; - else if ( ::tqqt_cast<PixmapCollectionEditor*>(w) ) + else if ( ::tqt_cast<PixmapCollectionEditor*>(w) ) link += "dialog-image-collection"; -// else if ( ::tqqt_cast<DatabaseConnectionBase*>(w) ) +// else if ( ::tqt_cast<DatabaseConnectionBase*>(w) ) else if ( w->inherits( "DatabaseConnectionBase" ) ) link += "dialog-edit-database-connections"; - else if ( ::tqqt_cast<ProjectSettingsBase*>(w) ) + else if ( ::tqt_cast<ProjectSettingsBase*>(w) ) link += "dialog-project-settings"; - else if ( ::tqqt_cast<FindDialog*>(w) ) + else if ( ::tqt_cast<FindDialog*>(w) ) link += "dialog-find-text"; - else if ( ::tqqt_cast<ReplaceDialog*>(w) ) + else if ( ::tqt_cast<ReplaceDialog*>(w) ) link += "dialog-replace-text"; - else if ( ::tqqt_cast<GotoLineDialog*>(w) ) + else if ( ::tqt_cast<GotoLineDialog*>(w) ) link += "dialog-go-to-line"; -// else if ( ::tqqt_cast<ConnectionEditorBase*>(w) ) +// else if ( ::tqt_cast<ConnectionEditorBase*>(w) ) else if ( w->inherits("ConnectionEditorBase") ) link += "dialog-edit-connections"; - else if ( ::tqqt_cast<CustomWidgetEditorBase*>(w) ) + else if ( ::tqt_cast<CustomWidgetEditorBase*>(w) ) link += "dialog-edit-custom-widgets"; - else if ( ::tqqt_cast<PaletteEditorBase*>(w) ) + else if ( ::tqt_cast<PaletteEditorBase*>(w) ) link += "dialog-edit-palette"; - else if ( ::tqqt_cast<ListBoxEditorBase*>(w) ) + else if ( ::tqt_cast<ListBoxEditorBase*>(w) ) link += "dialog-edit-listbox"; - else if ( ::tqqt_cast<ListViewEditorBase*>(w) ) + else if ( ::tqt_cast<ListViewEditorBase*>(w) ) link += "dialog-edit-listview"; - else if ( ::tqqt_cast<IconViewEditorBase*>(w) ) + else if ( ::tqt_cast<IconViewEditorBase*>(w) ) link += "dialog-edit-iconview"; - else if ( ::tqqt_cast<TableEditorBase*>(w) ) + else if ( ::tqt_cast<TableEditorBase*>(w) ) link += "dialog-edit-table"; - else if ( ::tqqt_cast<MultiLineEditor*>(w) ) + else if ( ::tqt_cast<MultiLineEditor*>(w) ) link += "dialog-text"; else { @@ -2925,7 +2920,7 @@ void MainWindow::setupActionManager() continue; iface->connectTo( desInterface ); - TQAction *a = iface->create( *ait, TQT_TQOBJECT(this) ); + TQAction *a = iface->create( *ait, this ); if ( !a ) continue; @@ -2935,11 +2930,11 @@ void MainWindow::setupActionManager() TQPopupMenu *menu = 0; TQToolBar *tb = 0; - if ( !( menu = (TQPopupMenu*)child( grp.latin1(), TQPOPUPMENU_OBJECT_NAME_STRING ) ) ) { + if ( !( menu = (TQPopupMenu*)child( grp.latin1(), "TQPopupMenu" ) ) ) { menu = new TQPopupMenu( this, grp.latin1() ); menuBar()->insertItem( i18n( grp ), menu ); } - if ( !( tb = (TQToolBar*)child( grp.latin1(), TQTOOLBAR_OBJECT_NAME_STRING ) ) ) { + if ( !( tb = (TQToolBar*)child( grp.latin1(), "TQToolBar" ) ) ) { tb = new TQToolBar( this, grp.latin1() ); tb->setCloseMode( TQDockWindow::Undocked ); addToolBar( tb, grp ); @@ -2979,7 +2974,7 @@ void MainWindow::editFunction( const TQString &func, bool rereadSource ) } } - createSourceEditor( TQT_TQOBJECT(formWindow()), formWindow()->project(), lang, func, rereadSource ); + createSourceEditor( formWindow(), formWindow()->project(), lang, func, rereadSource ); } void MainWindow::setupRecentlyFilesMenu() @@ -3189,10 +3184,10 @@ void MainWindow::setModified( bool b, TQWidget *window ) { TQWidget *w = window; while ( w ) { - if ( ::tqqt_cast<FormWindow*>(w) ) { + if ( ::tqt_cast<FormWindow*>(w) ) { ( (FormWindow*)w )->modificationChanged( b ); return; - } else if ( ::tqqt_cast<SourceEditor*>(w) ) { + } else if ( ::tqt_cast<SourceEditor*>(w) ) { FormWindow *fw = ( (SourceEditor*)w )->formWindow(); if ( fw && !fw->isFake() ) { //fw->commandHistory()->setModified( b ); @@ -3227,7 +3222,7 @@ void MainWindow::doFunctionsChanged() void MainWindow::updateFunctionList() { - if ( !qWorkspace()->activeWindow() || !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) + if ( !qWorkspace()->activeWindow() || !::tqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) return; SourceEditor *se = (SourceEditor*)qWorkspace()->activeWindow(); se->save(); @@ -3238,7 +3233,7 @@ void MainWindow::updateFunctionList() return; TQValueList<LanguageInterface::Connection> conns; iface->connections( se->text(), &conns ); - MetaDataBase::setupConnections( TQT_TQOBJECT(se->formWindow()), conns ); + MetaDataBase::setupConnections( se->formWindow(), conns ); propertyEditor->eventList()->setup(); } } @@ -3298,11 +3293,11 @@ void MainWindow::finishedRun() void MainWindow::enableAll( bool enable ) { menuBar()->setEnabled( enable ); - TQObjectList *l = queryList( TQDOCKWINDOW_OBJECT_NAME_STRING ); + TQObjectList *l = queryList( "TQDockWindow" ); for ( TQObject *o = l->first(); o; o = l->next() ) { - if ( TQT_BASE_OBJECT(o) == wspace->parentWidget() || - TQT_BASE_OBJECT(o) == oWindow->parentWidget() || - TQT_BASE_OBJECT(o) == hierarchyView->parentWidget() ) + if ( o == wspace->parentWidget() || + o == oWindow->parentWidget() || + o == hierarchyView->parentWidget() ) continue; ( (TQWidget*)o )->setEnabled( enable ); } @@ -3316,9 +3311,9 @@ void MainWindow::showSourceLine( TQObject *o, int line, LineMode lm ) FormWindow *fw = 0; SourceEditor *se = 0; SourceFile *sf = 0; - if ( ::tqqt_cast<FormWindow*>(w) ) { + if ( ::tqt_cast<FormWindow*>(w) ) { fw = (FormWindow*)w; - } else if ( ::tqqt_cast<SourceEditor*>(w) ) { + } else if ( ::tqt_cast<SourceEditor*>(w) ) { se = (SourceEditor*)w; if ( !se->object() ) continue; @@ -3386,7 +3381,7 @@ void MainWindow::showSourceLine( TQObject *o, int line, LineMode lm ) } } - if ( ::tqqt_cast<SourceFile*>(o) ) { + if ( ::tqt_cast<SourceFile*>(o) ) { for ( TQPtrListIterator<SourceFile> sources = currentProject->sourceFiles(); sources.current(); ++sources ) { SourceFile* f = sources.current(); @@ -3448,12 +3443,12 @@ TQObject *MainWindow::findRealObject( TQObject *o ) { TQWidgetList windows = qWorkspace()->windowList(); for ( TQWidget *w = windows.first(); w; w = windows.next() ) { - if ( ::tqqt_cast<FormWindow*>(w) && TQString( w->name() ) == TQString( o->name() ) ) - return TQT_TQOBJECT(w); - else if ( ::tqqt_cast<SourceEditor*>(w) && ( (SourceEditor*)w )->formWindow() && + if ( ::tqt_cast<FormWindow*>(w) && TQString( w->name() ) == TQString( o->name() ) ) + return w; + else if ( ::tqt_cast<SourceEditor*>(w) && ( (SourceEditor*)w )->formWindow() && TQString( ( (SourceEditor*)w )->formWindow()->name() ) == TQString( o->name() ) ) - return TQT_TQOBJECT(w); - else if ( ::tqqt_cast<SourceFile*>(w) && ( (SourceEditor*)w )->sourceFile() && + return w; + else if ( ::tqt_cast<SourceFile*>(w) && ( (SourceEditor*)w )->sourceFile() && ( (SourceEditor*)w )->sourceFile() == o ) return o; } @@ -3463,7 +3458,7 @@ TQObject *MainWindow::findRealObject( TQObject *o ) void MainWindow::formNameChanged( FormWindow *fw ) { for ( SourceEditor *e = sourceEditors.first(); e; e = sourceEditors.next() ) { - if ( TQT_BASE_OBJECT(e->object()) == TQT_BASE_OBJECT(fw) ) + if ( e->object() == fw ) e->refresh( TRUE ); if ( e->project() == fw->project() ) e->resetContext(); @@ -3474,7 +3469,7 @@ void MainWindow::breakPointsChanged() { if ( !inDebugMode ) return; - if ( !qWorkspace()->activeWindow() || !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) + if ( !qWorkspace()->activeWindow() || !::tqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) return; SourceEditor *e = (SourceEditor*)qWorkspace()->activeWindow(); if ( !e->object() || !e->project() ) @@ -3567,11 +3562,11 @@ bool MainWindow::openProjectSettings( Project *pro ) continue; dia.tabWidget->addTab( t.w, t.title ); if ( t.receiver ) { - connect( dia.buttonOk, TQT_SIGNAL( clicked() ), senderObject, TQT_SLOT( emitAcceptSignal() ) ); - connect( senderObject, TQT_SIGNAL( acceptSignal( TQUnknownInterface * ) ), t.receiver, t.accept_slot ); - connect( senderObject, TQT_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); + connect( dia.buttonOk, TQ_SIGNAL( clicked() ), senderObject, TQ_SLOT( emitAcceptSignal() ) ); + connect( senderObject, TQ_SIGNAL( acceptSignal( TQUnknownInterface * ) ), t.receiver, t.accept_slot ); + connect( senderObject, TQ_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); senderObject->emitInitSignal(); - disconnect( senderObject, TQT_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); + disconnect( senderObject, TQ_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); } } @@ -3641,13 +3636,13 @@ void MainWindow::setSingleProject( Project *pro ) while ( wit.current() ) { TQWidget *w = wit.current(); ++wit; - if ( ::tqqt_cast<FormWindow*>(w) ) { + if ( ::tqt_cast<FormWindow*>(w) ) { if ( ( (FormWindow*)w )->project() == pro ) { if ( ( (FormWindow*)w )->formFile()->editor() ) windows.removeRef( ( (FormWindow*)w )->formFile()->editor() ); ( (FormWindow*)w )->formFile()->close(); } - } else if ( ::tqqt_cast<SourceEditor*>(w) ) { + } else if ( ::tqt_cast<SourceEditor*>(w) ) { ( (SourceEditor*)w )->close(); } } @@ -3696,11 +3691,11 @@ void MainWindow::showGUIStuff( bool b ) menubar->removeItem( toolsMenuId ); menubar->removeItem( toolsMenuId + 1 ); menubar->removeItem( toolsMenuId + 2 ); - disconnect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQT_SLOT( setEnabled(bool) ) ); - disconnect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQT_SLOT( setEnabled(bool) ) ); - disconnect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQT_SLOT( setEnabled(bool) ) ); - disconnect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQT_SLOT( setEnabled(bool) ) ); - disconnect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQT_SLOT( setEnabled(bool) ) ); + disconnect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQ_SLOT( setEnabled(bool) ) ); + disconnect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQ_SLOT( setEnabled(bool) ) ); + disconnect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQ_SLOT( setEnabled(bool) ) ); + disconnect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQ_SLOT( setEnabled(bool) ) ); + disconnect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQ_SLOT( setEnabled(bool) ) ); actionEditFormSettings->setEnabled( FALSE ); actionEditSource->setEnabled( FALSE ); actionEditConnections->setEnabled( FALSE ); @@ -3733,11 +3728,11 @@ void MainWindow::showGUIStuff( bool b ) menubar->insertItem( i18n( "&Tools" ), toolsMenu, toolsMenuId, toolsMenuIndex ); menubar->insertItem( i18n( "&Layout" ), layoutMenu, toolsMenuId + 1, toolsMenuIndex + 1 ); menubar->insertItem( i18n( "&Preview" ), previewMenu, toolsMenuId + 2, toolsMenuIndex + 2 ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQT_SLOT( setEnabled(bool) ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQT_SLOT( setEnabled(bool) ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQT_SLOT( setEnabled(bool) ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQT_SLOT( setEnabled(bool) ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQT_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQ_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQ_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQ_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQ_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQ_SLOT( setEnabled(bool) ) ); actionEditFormSettings->setEnabled( TRUE ); actionEditSource->setEnabled( TRUE ); actionEditConnections->setEnabled( TRUE ); diff --git a/kdevdesigner/designer/mainwindow.h b/kdevdesigner/designer/mainwindow.h index 1b68c14d..605aa578 100644 --- a/kdevdesigner/designer/mainwindow.h +++ b/kdevdesigner/designer/mainwindow.h @@ -79,7 +79,7 @@ class KDevDesignerPart; class MainWindow : public TQMainWindow { - Q_OBJECT + TQ_OBJECT public: @@ -408,9 +408,6 @@ private: TQAction* actionCurrentTool; DesignerAction *actionHelpContents, *actionHelpAbout, *actionHelpAboutTQt, *actionHelpWhatsThis; DesignerAction *actionHelpManual; -#if defined(TQT_NON_COMMERCIAL) - DesignerAction *actionHelpRegister; -#endif DesignerAction *actionToolsCustomWidget, *actionEditPreferences; DesignerAction *actionWindowTile, *actionWindowCascade, *actionWindowClose, *actionWindowCloseAll; DesignerAction *actionWindowNext, *actionWindowPrevious; @@ -490,7 +487,7 @@ friend class KDevDesignerPart; class SenderObject : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp index 7917de8b..86837088 100644 --- a/kdevdesigner/designer/mainwindowactions.cpp +++ b/kdevdesigner/designer/mainwindowactions.cpp @@ -124,104 +124,104 @@ static TQIconSet createIconSet( const TQString &name ) void MainWindow::setupEditActions() { - actionEditUndo = new DesignerAction( i18n("Undo"), createIconSet( "designer_undo.png" ),i18n("&Undo: Not Available"), CTRL + Key_Z, TQT_TQOBJECT(this), 0 ); + actionEditUndo = new DesignerAction( i18n("Undo"), createIconSet( "designer_undo.png" ),i18n("&Undo: Not Available"), CTRL + Key_Z, this, 0 ); actionEditUndo->setStatusTip( i18n( "Undoes the last action" ) ); actionEditUndo->setWhatsThis( whatsThisFrom( "Edit|Undo" ) ); - connect( actionEditUndo, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editUndo() ) ); + connect( actionEditUndo, TQ_SIGNAL( activated() ), this, TQ_SLOT( editUndo() ) ); actionEditUndo->setEnabled( FALSE ); - actionEditRedo = new DesignerAction( i18n( "Redo" ), createIconSet("designer_redo.png"), i18n( "&Redo: Not Available" ), CTRL + Key_Y, TQT_TQOBJECT(this), 0 ); + actionEditRedo = new DesignerAction( i18n( "Redo" ), createIconSet("designer_redo.png"), i18n( "&Redo: Not Available" ), CTRL + Key_Y, this, 0 ); actionEditRedo->setStatusTip( i18n( "Redoes the last undone operation") ); actionEditRedo->setWhatsThis( whatsThisFrom( "Edit|Redo" ) ); - connect( actionEditRedo, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editRedo() ) ); + connect( actionEditRedo, TQ_SIGNAL( activated() ), this, TQ_SLOT( editRedo() ) ); actionEditRedo->setEnabled( FALSE ); - actionEditCut = new DesignerAction( i18n( "Cut" ), createIconSet("designer_editcut.png"), i18n( "Cu&t" ), CTRL + Key_X, TQT_TQOBJECT(this), 0 ); + actionEditCut = new DesignerAction( i18n( "Cut" ), createIconSet("designer_editcut.png"), i18n( "Cu&t" ), CTRL + Key_X, this, 0 ); actionEditCut->setStatusTip( i18n( "Cuts the selected widgets and puts them on the clipboard" ) ); actionEditCut->setWhatsThis( whatsThisFrom( "Edit|Cut" ) ); - connect( actionEditCut, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editCut() ) ); + connect( actionEditCut, TQ_SIGNAL( activated() ), this, TQ_SLOT( editCut() ) ); actionEditCut->setEnabled( FALSE ); - actionEditCopy = new DesignerAction( i18n( "Copy" ), createIconSet("designer_editcopy.png"), i18n( "&Copy" ), CTRL + Key_C, TQT_TQOBJECT(this), 0 ); + actionEditCopy = new DesignerAction( i18n( "Copy" ), createIconSet("designer_editcopy.png"), i18n( "&Copy" ), CTRL + Key_C, this, 0 ); actionEditCopy->setStatusTip( i18n( "Copies the selected widgets to the clipboard" ) ); actionEditCopy->setWhatsThis( whatsThisFrom( "Edit|Copy" ) ); - connect( actionEditCopy, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editCopy() ) ); + connect( actionEditCopy, TQ_SIGNAL( activated() ), this, TQ_SLOT( editCopy() ) ); actionEditCopy->setEnabled( FALSE ); - actionEditPaste = new DesignerAction( i18n( "Paste" ), createIconSet("designer_editpaste.png"), i18n( "&Paste" ), CTRL + Key_V, TQT_TQOBJECT(this), 0 ); + actionEditPaste = new DesignerAction( i18n( "Paste" ), createIconSet("designer_editpaste.png"), i18n( "&Paste" ), CTRL + Key_V, this, 0 ); actionEditPaste->setStatusTip( i18n( "Pastes the clipboard's contents" ) ); actionEditPaste->setWhatsThis( whatsThisFrom( "Edit|Paste" ) ); - connect( actionEditPaste, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editPaste() ) ); + connect( actionEditPaste, TQ_SIGNAL( activated() ), this, TQ_SLOT( editPaste() ) ); actionEditPaste->setEnabled( FALSE ); - actionEditDelete = new DesignerAction( i18n( "Delete" ), TQPixmap(), i18n( "&Delete" ), Key_Delete, TQT_TQOBJECT(this), 0 ); + actionEditDelete = new DesignerAction( i18n( "Delete" ), TQPixmap(), i18n( "&Delete" ), Key_Delete, this, 0 ); actionEditDelete->setStatusTip( i18n( "Deletes the selected widgets" ) ); actionEditDelete->setWhatsThis( whatsThisFrom( "Edit|Delete" ) ); - connect( actionEditDelete, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editDelete() ) ); + connect( actionEditDelete, TQ_SIGNAL( activated() ), this, TQ_SLOT( editDelete() ) ); actionEditDelete->setEnabled( FALSE ); #ifdef TQ_WS_MAC - TQAction *macDelete = new DesignerAction( i18n( "Delete" ), TQPixmap(), i18n( "&Delete" ), Key_Backspace, TQT_TQOBJECT(this), 0 ); - connect( macDelete, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editDelete() ) ); + TQAction *macDelete = new DesignerAction( i18n( "Delete" ), TQPixmap(), i18n( "&Delete" ), Key_Backspace, this, 0 ); + connect( macDelete, TQ_SIGNAL( activated() ), this, TQ_SLOT( editDelete() ) ); #endif - actionEditSelectAll = new DesignerAction( i18n( "Select All" ), TQPixmap(), i18n( "Select &All" ), CTRL + Key_A, TQT_TQOBJECT(this), 0 ); + actionEditSelectAll = new DesignerAction( i18n( "Select All" ), TQPixmap(), i18n( "Select &All" ), CTRL + Key_A, this, 0 ); actionEditSelectAll->setStatusTip( i18n( "Selects all widgets" ) ); actionEditSelectAll->setWhatsThis( whatsThisFrom( "Edit|Select All" ) ); - connect( actionEditSelectAll, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editSelectAll() ) ); + connect( actionEditSelectAll, TQ_SIGNAL( activated() ), this, TQ_SLOT( editSelectAll() ) ); actionEditSelectAll->setEnabled( TRUE ); - actionEditRaise = new DesignerAction( i18n( "Bring to Front" ), createIconSet("designer_editraise.png"), i18n( "Bring to &Front" ), 0, TQT_TQOBJECT(this), 0 ); + actionEditRaise = new DesignerAction( i18n( "Bring to Front" ), createIconSet("designer_editraise.png"), i18n( "Bring to &Front" ), 0, this, 0 ); actionEditRaise->setStatusTip( i18n( "Raises the selected widgets" ) ); actionEditRaise->setWhatsThis( i18n( "Raises the selected widgets" ) ); - connect( actionEditRaise, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editRaise() ) ); + connect( actionEditRaise, TQ_SIGNAL( activated() ), this, TQ_SLOT( editRaise() ) ); actionEditRaise->setEnabled( FALSE ); - actionEditLower = new DesignerAction( i18n( "Send to Back" ), createIconSet("designer_editlower.png"), i18n( "Send to &Back" ), 0, TQT_TQOBJECT(this), 0 ); + actionEditLower = new DesignerAction( i18n( "Send to Back" ), createIconSet("designer_editlower.png"), i18n( "Send to &Back" ), 0, this, 0 ); actionEditLower->setStatusTip( i18n( "Lowers the selected widgets" ) ); actionEditLower->setWhatsThis( i18n( "Lowers the selected widgets" ) ); - connect( actionEditLower, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLower() ) ); + connect( actionEditLower, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLower() ) ); actionEditLower->setEnabled( FALSE ); actionEditAccels = new DesignerAction( i18n( "Check Accelerators" ), TQPixmap(), - i18n( "Chec&k Accelerators" ), ALT + Key_R, TQT_TQOBJECT(this), 0 ); + i18n( "Chec&k Accelerators" ), ALT + Key_R, this, 0 ); actionEditAccels->setStatusTip( i18n("Checks if the accelerators used in the form are unique") ); actionEditAccels->setWhatsThis( whatsThisFrom( "Edit|Check Accelerator" ) ); - connect( actionEditAccels, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editAccels() ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQT_SLOT( setEnabled(bool) ) ); + connect( actionEditAccels, TQ_SIGNAL( activated() ), this, TQ_SLOT( editAccels() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQ_SLOT( setEnabled(bool) ) ); actionEditFunctions = new DesignerAction( i18n( "Slots" ), createIconSet("designer_editslots.png"), - i18n( "S&lots..." ), 0, TQT_TQOBJECT(this), 0 ); + i18n( "S&lots..." ), 0, this, 0 ); actionEditFunctions->setStatusTip( i18n("Opens a dialog for editing slots") ); actionEditFunctions->setWhatsThis( whatsThisFrom( "Edit|Slots" ) ); - connect( actionEditFunctions, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editFunctions() ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQT_SLOT( setEnabled(bool) ) ); + connect( actionEditFunctions, TQ_SIGNAL( activated() ), this, TQ_SLOT( editFunctions() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQ_SLOT( setEnabled(bool) ) ); actionEditConnections = new DesignerAction( i18n( "Connections" ), createIconSet("designer_connecttool.png"), - i18n( "Co&nnections..." ), 0, TQT_TQOBJECT(this), 0 ); + i18n( "Co&nnections..." ), 0, this, 0 ); actionEditConnections->setStatusTip( i18n("Opens a dialog for editing connections") ); actionEditConnections->setWhatsThis( whatsThisFrom( "Edit|Connections" ) ); - connect( actionEditConnections, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editConnections() ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQT_SLOT( setEnabled(bool) ) ); + connect( actionEditConnections, TQ_SIGNAL( activated() ), this, TQ_SLOT( editConnections() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQ_SLOT( setEnabled(bool) ) ); actionEditSource = new DesignerAction( i18n( "Source" ), TQIconSet(), - i18n( "&Source..." ), CTRL + Key_E, TQT_TQOBJECT(this), 0 ); + i18n( "&Source..." ), CTRL + Key_E, this, 0 ); actionEditSource->setStatusTip( i18n("Opens an editor to edit the form's source code") ); actionEditSource->setWhatsThis( whatsThisFrom( "Edit|Source" ) ); - connect( actionEditSource, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editSource() ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQT_SLOT( setEnabled(bool) ) ); + connect( actionEditSource, TQ_SIGNAL( activated() ), this, TQ_SLOT( editSource() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQ_SLOT( setEnabled(bool) ) ); actionEditFormSettings = new DesignerAction( i18n( "Form Settings" ), TQPixmap(), - i18n( "&Form Settings..." ), 0, TQT_TQOBJECT(this), 0 ); + i18n( "&Form Settings..." ), 0, this, 0 ); actionEditFormSettings->setStatusTip( i18n("Opens a dialog to change the form's settings") ); actionEditFormSettings->setWhatsThis( whatsThisFrom( "Edit|Form Settings" ) ); - connect( actionEditFormSettings, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editFormSettings() ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQT_SLOT( setEnabled(bool) ) ); + connect( actionEditFormSettings, TQ_SIGNAL( activated() ), this, TQ_SLOT( editFormSettings() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQ_SLOT( setEnabled(bool) ) ); actionEditPreferences = new DesignerAction( i18n( "Preferences" ), TQPixmap(), - i18n( "Preferences..." ), 0, TQT_TQOBJECT(this), 0 ); + i18n( "Preferences..." ), 0, this, 0 ); actionEditPreferences->setStatusTip( i18n("Opens a dialog to change preferences") ); actionEditPreferences->setWhatsThis( whatsThisFrom( "Edit|Preferences" ) ); - connect( actionEditPreferences, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editPreferences() ) ); + connect( actionEditPreferences, TQ_SIGNAL( activated() ), this, TQ_SLOT( editPreferences() ) ); /* TQToolBar *tb = new TQToolBar( this, "Edit" ); tb->setCloseMode( TQDockWindow::Undocked ); @@ -240,7 +240,7 @@ void MainWindow::setupEditActions() #endif TQPopupMenu *menu = new TQPopupMenu( this, "Edit" ); - connect( menu, TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( updateEditorUndoRedo() ) ); + connect( menu, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( updateEditorUndoRedo() ) ); menubar->insertItem( i18n( "&Edit" ), menu ); actionEditUndo->addTo( menu ); actionEditRedo->addTo( menu ); @@ -269,26 +269,26 @@ void MainWindow::setupEditActions() void MainWindow::setupSearchActions() { actionSearchFind = new DesignerAction( i18n( "Find" ), createIconSet( "designer_searchfind.png" ), - i18n( "&Find..." ), CTRL + Key_F, TQT_TQOBJECT(this), 0 ); - connect( actionSearchFind, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( searchFind() ) ); + i18n( "&Find..." ), CTRL + Key_F, this, 0 ); + connect( actionSearchFind, TQ_SIGNAL( activated() ), this, TQ_SLOT( searchFind() ) ); actionSearchFind->setEnabled( FALSE ); actionSearchFind->setWhatsThis( whatsThisFrom( "Search|Find" ) ); actionSearchIncremetal = new DesignerAction( i18n( "Find Incremental" ), TQIconSet(), - i18n( "Find &Incremental" ), ALT + Key_I, TQT_TQOBJECT(this), 0 ); - connect( actionSearchIncremetal, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( searchIncremetalFindMenu() ) ); + i18n( "Find &Incremental" ), ALT + Key_I, this, 0 ); + connect( actionSearchIncremetal, TQ_SIGNAL( activated() ), this, TQ_SLOT( searchIncremetalFindMenu() ) ); actionSearchIncremetal->setEnabled( FALSE ); actionSearchIncremetal->setWhatsThis( whatsThisFrom( "Search|Find Incremental" ) ); actionSearchReplace = new DesignerAction( i18n( "Replace" ), TQIconSet(), - i18n( "&Replace..." ), CTRL + Key_R, TQT_TQOBJECT(this), 0 ); - connect( actionSearchReplace, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( searchReplace() ) ); + i18n( "&Replace..." ), CTRL + Key_R, this, 0 ); + connect( actionSearchReplace, TQ_SIGNAL( activated() ), this, TQ_SLOT( searchReplace() ) ); actionSearchReplace->setEnabled( FALSE ); actionSearchReplace->setWhatsThis( whatsThisFrom( "Search|Replace" ) ); actionSearchGotoLine = new DesignerAction( i18n( "Goto Line" ), TQIconSet(), - i18n( "&Goto Line..." ), ALT + Key_G, TQT_TQOBJECT(this), 0 ); - connect( actionSearchGotoLine, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( searchGotoLine() ) ); + i18n( "&Goto Line..." ), ALT + Key_G, this, 0 ); + connect( actionSearchGotoLine, TQ_SIGNAL( activated() ), this, TQ_SLOT( searchGotoLine() ) ); actionSearchGotoLine->setEnabled( FALSE ); actionSearchGotoLine->setWhatsThis( whatsThisFrom( "Search|Goto line" ) ); @@ -300,10 +300,10 @@ void MainWindow::setupSearchActions() incrementalSearch = new TQLineEdit( 0 ); incrementalSearch->hide(); TQToolTip::add( incrementalSearch, i18n( "Incremental search (Alt+I)" ) ); - connect( incrementalSearch, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( searchIncremetalFind() ) ); - connect( incrementalSearch, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( searchIncremetalFindNext() ) ); + connect( incrementalSearch, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( searchIncremetalFind() ) ); + connect( incrementalSearch, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( searchIncremetalFindNext() ) ); incrementalSearch->setEnabled( FALSE ); TQPopupMenu *menu = new TQPopupMenu( this, "Search" ); @@ -320,56 +320,56 @@ void MainWindow::setupLayoutActions() if ( !actionGroupTools ) { actionGroupTools = new TQActionGroup( this ); actionGroupTools->setExclusive( TRUE ); - connect( actionGroupTools, TQT_SIGNAL( selected(TQAction*) ), TQT_TQOBJECT(this), TQT_SLOT( toolSelected(TQAction*) ) ); + connect( actionGroupTools, TQ_SIGNAL( selected(TQAction*) ), this, TQ_SLOT( toolSelected(TQAction*) ) ); } actionEditAdjustSize = new DesignerAction( i18n( "Adjust Size" ), createIconSet("designer_adjustsize.png"), - i18n( "Adjust &Size" ), CTRL + Key_J, TQT_TQOBJECT(this), 0 ); + i18n( "Adjust &Size" ), CTRL + Key_J, this, 0 ); actionEditAdjustSize->setStatusTip(i18n("Adjusts the size of the selected widget") ); actionEditAdjustSize->setWhatsThis( whatsThisFrom( "Layout|Adjust Size" ) ); - connect( actionEditAdjustSize, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editAdjustSize() ) ); + connect( actionEditAdjustSize, TQ_SIGNAL( activated() ), this, TQ_SLOT( editAdjustSize() ) ); actionEditAdjustSize->setEnabled( FALSE ); actionEditHLayout = new DesignerAction( i18n( "Lay Out Horizontally" ), createIconSet("designer_edithlayout.png"), - i18n( "Lay Out &Horizontally" ), CTRL + Key_H, TQT_TQOBJECT(this), 0 ); + i18n( "Lay Out &Horizontally" ), CTRL + Key_H, this, 0 ); actionEditHLayout->setStatusTip(i18n("Lays out the selected widgets horizontally") ); actionEditHLayout->setWhatsThis( whatsThisFrom( "Layout|Lay Out Horizontally" ) ); - connect( actionEditHLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutHorizontal() ) ); + connect( actionEditHLayout, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLayoutHorizontal() ) ); actionEditHLayout->setEnabled( FALSE ); actionEditVLayout = new DesignerAction( i18n( "Lay Out Vertically" ), createIconSet("designer_editvlayout.png"), - i18n( "Lay Out &Vertically" ), CTRL + Key_L, TQT_TQOBJECT(this), 0 ); + i18n( "Lay Out &Vertically" ), CTRL + Key_L, this, 0 ); actionEditVLayout->setStatusTip(i18n("Lays out the selected widgets vertically") ); actionEditVLayout->setWhatsThis( whatsThisFrom( "Layout|Lay Out Vertically" ) ); - connect( actionEditVLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutVertical() ) ); + connect( actionEditVLayout, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLayoutVertical() ) ); actionEditVLayout->setEnabled( FALSE ); actionEditGridLayout = new DesignerAction( i18n( "Lay Out in a Grid" ), createIconSet("designer_editgrid.png"), - i18n( "Lay Out in a &Grid" ), CTRL + Key_G, TQT_TQOBJECT(this), 0 ); + i18n( "Lay Out in a &Grid" ), CTRL + Key_G, this, 0 ); actionEditGridLayout->setStatusTip(i18n("Lays out the selected widgets in a grid") ); actionEditGridLayout->setWhatsThis( whatsThisFrom( "Layout|Lay Out in a Grid" ) ); - connect( actionEditGridLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutGrid() ) ); + connect( actionEditGridLayout, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLayoutGrid() ) ); actionEditGridLayout->setEnabled( FALSE ); actionEditSplitHorizontal = new DesignerAction( i18n( "Lay Out Horizontally (in Splitter)" ), createIconSet("designer_editvlayoutsplit.png"), - i18n( "Lay Out Horizontally (in S&plitter)" ), 0, TQT_TQOBJECT(this), 0 ); + i18n( "Lay Out Horizontally (in S&plitter)" ), 0, this, 0 ); actionEditSplitHorizontal->setStatusTip(i18n("Lays out the selected widgets horizontally in a splitter") ); actionEditSplitHorizontal->setWhatsThis( whatsThisFrom( "Layout|Lay Out Horizontally (in Splitter)" ) ); - connect( actionEditSplitHorizontal, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutHorizontalSplit() ) ); + connect( actionEditSplitHorizontal, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLayoutHorizontalSplit() ) ); actionEditSplitHorizontal->setEnabled( FALSE ); actionEditSplitVertical = new DesignerAction( i18n( "Lay Out Vertically (in Splitter)" ), createIconSet("designer_edithlayoutsplit.png"), - i18n( "Lay Out Vertically (in Sp&litter)" ), 0, TQT_TQOBJECT(this), 0 ); + i18n( "Lay Out Vertically (in Sp&litter)" ), 0, this, 0 ); actionEditSplitVertical->setStatusTip(i18n("Lays out the selected widgets vertically in a splitter") ); actionEditSplitVertical->setWhatsThis( whatsThisFrom( "Layout|Lay Out Vertically (in Splitter)" ) ); - connect( actionEditSplitVertical, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutVerticalSplit() ) ); + connect( actionEditSplitVertical, TQ_SIGNAL( activated() ), this, TQ_SLOT( editLayoutVerticalSplit() ) ); actionEditSplitVertical->setEnabled( FALSE ); actionEditBreakLayout = new DesignerAction( i18n( "Break Layout" ), createIconSet("designer_editbreaklayout.png"), - i18n( "&Break Layout" ), CTRL + Key_B, TQT_TQOBJECT(this), 0 ); + i18n( "&Break Layout" ), CTRL + Key_B, this, 0 ); actionEditBreakLayout->setStatusTip(i18n("Breaks the selected layout") ); actionEditBreakLayout->setWhatsThis( whatsThisFrom( "Layout|Break Layout" ) ); - connect( actionEditBreakLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editBreakLayout() ) ); + connect( actionEditBreakLayout, TQ_SIGNAL( activated() ), this, TQ_SLOT( editBreakLayout() ) ); actionEditBreakLayout->setEnabled( FALSE ); int id = WidgetDatabase::idFromClassName( "Spacer" ); @@ -424,8 +424,8 @@ void MainWindow::setupToolActions() if ( !actionGroupTools ) { actionGroupTools = new TQActionGroup( this ); actionGroupTools->setExclusive( TRUE ); - connect( actionGroupTools, TQT_SIGNAL( selected(TQAction*) ), - this, TQT_SLOT( toolSelected(TQAction*) ) ); + connect( actionGroupTools, TQ_SIGNAL( selected(TQAction*) ), + this, TQ_SLOT( toolSelected(TQAction*) ) ); } actionPointerTool = new DesignerAction( i18n("Pointer"), createIconSet("designer_pointer.png"), @@ -487,13 +487,13 @@ void MainWindow::setupToolActions() actionToolsCustomWidget = new DesignerAction( i18n("Custom Widgets"), createIconSet( "designer_customwidget.png" ), - i18n("Edit &Custom Widgets..."), 0, TQT_TQOBJECT(this), 0 ); + i18n("Edit &Custom Widgets..."), 0, this, 0 ); actionToolsCustomWidget->setStatusTip( i18n("Opens a dialog to add and change " "custom widgets") ); actionToolsCustomWidget->setWhatsThis( whatsThisFrom( "Tools|Custom|Edit Custom" "Widgets" ) ); - connect( actionToolsCustomWidget, TQT_SIGNAL( activated() ), - this, TQT_SLOT( toolsCustomWidget() ) ); + connect( actionToolsCustomWidget, TQ_SIGNAL( activated() ), + this, TQ_SLOT( toolsCustomWidget() ) ); for ( int j = 0; j < WidgetDatabase::numWidgetGroups(); ++j ) { TQString grp = WidgetDatabase::widgetGroup( j ); @@ -520,7 +520,7 @@ void MainWindow::setupToolActions() TQToolBar *tb2 = new TQToolBar( grp, 0, toolBox, FALSE, grp.latin1() ); tb2->setFrameStyle( TQFrame::NoFrame ); - tb2->setOrientation( Qt::Vertical ); + tb2->setOrientation( TQt::Vertical ); tb2->setBackgroundMode( PaletteBase ); toolBox->addItem( tb2, grp ); @@ -596,16 +596,16 @@ void MainWindow::setupToolActions() TQToolBar *tb2 = new TQToolBar( "Custom Widgets", 0, toolBox, FALSE, "Custom Widgets" ); tb2->setBackgroundMode(PaletteBase); - tb2->setOrientation( Qt::Vertical ); + tb2->setOrientation( TQt::Vertical ); tb2->setFrameStyle( TQFrame::NoFrame ); toolBox->addItem( tb2, "Custom Widgets" ); customWidgetToolBar2 = tb2; } - TQAction *a = new DesignerAction( i18n( "Configure Toolbox" ), i18n( "Configure Toolbox..." ), 0, TQT_TQOBJECT(this) ); + TQAction *a = new DesignerAction( i18n( "Configure Toolbox" ), i18n( "Configure Toolbox..." ), 0, this ); a->setStatusTip( i18n( "Opens a dialog to configure the common " "widgets page of the toolbox") ); - connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( toolsConfigure() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( toolsConfigure() ) ); mmenu->insertSeparator(); a->addTo( mmenu ); resetTool(); @@ -625,7 +625,7 @@ void MainWindow::setupFileActions() DesignerAction *a = 0; if ( !singleProject ) { - DesignerAction *a = new DesignerAction( TQT_TQOBJECT(this), 0 ); + DesignerAction *a = new DesignerAction( this, 0 ); a->setText( i18n( "New" ) ); a->setToolTip( i18n( "New dialog or file" ) ); a->setMenuText( i18n( "&New..." ) ); @@ -633,7 +633,7 @@ void MainWindow::setupFileActions() a->setAccel( CTRL + Key_N ); a->setStatusTip( i18n( "Creates a new project, form or source file." ) ); a->setWhatsThis( whatsThisFrom( "File|New" ) ); - connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileNew() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileNew() ) ); a->addTo( tb ); a->addTo( fileMenu ); actionNewFile = a; @@ -653,15 +653,15 @@ void MainWindow::setupFileActions() newForm->setIconSet( createIconSet("designer_form.png") ); newForm->setAccel( CTRL + Key_N ); newForm->setStatusTip( i18n( "Creates a new dialog." ) ); - connect( newForm, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileNewDialog() ) ); + connect( newForm, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileNewDialog() ) ); - DesignerAction *newFile = new DesignerAction( TQT_TQOBJECT(a), 0 ); + DesignerAction *newFile = new DesignerAction( a, 0 ); newFile->setText( i18n( "New File" ) ); newFile->setMenuText( i18n( "&File..." ) ); newFile->setIconSet( createIconSet("designer_filenew.png") ); newFile->setAccel( ALT + Key_N ); newFile->setStatusTip( i18n( "Creates a new file." ) ); - connect( newFile, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileNewFile() ) ); + connect( newFile, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileNewFile() ) ); actionNewFile = newFile; a->addTo( tb ); @@ -670,14 +670,14 @@ void MainWindow::setupFileActions() fileMenu->insertSeparator(); } - a = new DesignerAction( TQT_TQOBJECT(this), 0 ); + a = new DesignerAction( this, 0 ); a->setText( i18n( "Open" ) ); a->setMenuText( i18n( "&Open..." ) ); a->setIconSet( createIconSet("designer_fileopen.png") ); a->setAccel( CTRL + Key_O ); a->setStatusTip( i18n( "Opens an existing project, form or source file ") ); a->setWhatsThis( whatsThisFrom( "File|Open" ) ); - connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileOpen() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileOpen() ) ); if ( !singleProject ) { a->addTo( tb ); a->addTo( fileMenu ); @@ -685,20 +685,20 @@ void MainWindow::setupFileActions() } - a = new DesignerAction( TQT_TQOBJECT(this), 0 ); + a = new DesignerAction( this, 0 ); actionFileClose = a; a->setText( i18n( "Close" ) ); a->setMenuText( i18n( "&Close" ) ); a->setStatusTip( i18n( "Closes the current project or document" ) ); a->setWhatsThis(whatsThisFrom( "File|Close" ) ); - connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileClose() ) ); - connect( this, TQT_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileClose() ) ); + connect( this, TQ_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); if ( !singleProject ) { a->addTo( fileMenu ); fileMenu->insertSeparator(); } - a = new DesignerAction( TQT_TQOBJECT(this), 0 ); + a = new DesignerAction( this, 0 ); actionFileSave = a; a->setText( i18n( "Save" ) ); a->setMenuText( i18n( "&Save" ) ); @@ -706,41 +706,41 @@ void MainWindow::setupFileActions() a->setAccel( CTRL + Key_S ); a->setStatusTip( i18n( "Saves the current project or document" ) ); a->setWhatsThis(whatsThisFrom( "File|Save" ) ); - connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileSave() ) ); - connect( this, TQT_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileSave() ) ); + connect( this, TQ_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); a->addTo( tb ); a->addTo( fileMenu ); - a = new DesignerAction( TQT_TQOBJECT(this), 0 ); + a = new DesignerAction( this, 0 ); actionFileSaveAs = a; a->setText( i18n( "Save As" ) ); a->setMenuText( i18n( "Save &As..." ) ); a->setStatusTip( i18n( "Saves the current form with a new filename" ) ); a->setWhatsThis( whatsThisFrom( "File|Save As" ) ); - connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileSaveAs() ) ); - connect( this, TQT_SIGNAL( hasActiveWindow(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileSaveAs() ) ); + connect( this, TQ_SIGNAL( hasActiveWindow(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); if ( !singleProject ) a->addTo( fileMenu ); - a = new DesignerAction( TQT_TQOBJECT(this), 0 ); + a = new DesignerAction( this, 0 ); actionFileSaveAll = a; a->setText( i18n( "Save All" ) ); a->setMenuText( i18n( "Sa&ve All" ) ); a->setStatusTip( i18n( "Saves all open documents" ) ); a->setWhatsThis( whatsThisFrom( "File|Save All" ) ); - connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileSaveAll() ) ); - connect( this, TQT_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileSaveAll() ) ); + connect( this, TQ_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); if ( !singleProject ) { a->addTo( fileMenu ); fileMenu->insertSeparator(); } - a = new DesignerAction( TQT_TQOBJECT(this), 0 ); + a = new DesignerAction( this, 0 ); a->setText( i18n( "Create Template" ) ); a->setMenuText( i18n( "Create &Template..." ) ); a->setStatusTip( i18n( "Creates a new template" ) ); a->setWhatsThis( whatsThisFrom( "File|Create Template" ) ); - connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileCreateTemplate() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileCreateTemplate() ) ); if ( !singleProject ) a->addTo( fileMenu ); @@ -755,19 +755,19 @@ void MainWindow::setupFileActions() fileMenu->insertItem( i18n( "Recently Opened Projects" ), recentlyProjectsMenu ); } - connect( recentlyFilesMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( setupRecentlyFilesMenu() ) ); - connect( recentlyProjectsMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( setupRecentlyProjectsMenu() ) ); - connect( recentlyFilesMenu, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( recentlyFilesMenuActivated( int ) ) ); - connect( recentlyProjectsMenu, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( recentlyProjectsMenuActivated( int ) ) ); + connect( recentlyFilesMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( setupRecentlyFilesMenu() ) ); + connect( recentlyProjectsMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( setupRecentlyProjectsMenu() ) ); + connect( recentlyFilesMenu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( recentlyFilesMenuActivated( int ) ) ); + connect( recentlyProjectsMenu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( recentlyProjectsMenuActivated( int ) ) ); if ( !singleProject ) fileMenu->insertSeparator(); - a = new DesignerAction( TQT_TQOBJECT(this), 0 ); + a = new DesignerAction( this, 0 ); actionFileExit = a; if ( !singleProjectMode() ) { a->setText( i18n( "Exit" ) ); @@ -778,7 +778,7 @@ void MainWindow::setupFileActions() a->setText( i18n( "Close" ) ); a->setMenuText( i18n( "&Close" ) ); } - connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileQuit() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( fileQuit() ) ); a->addTo( fileMenu ); } @@ -792,8 +792,8 @@ void MainWindow::setupProjectActions() ag->setMenuText( i18n( "Active Project" ) ); ag->setExclusive( TRUE ); ag->setUsesDropDown( TRUE ); - connect( ag, TQT_SIGNAL( selected( TQAction * ) ), TQT_TQOBJECT(this), TQT_SLOT( projectSelected( TQAction * ) ) ); - connect( ag, TQT_SIGNAL( selected( TQAction * ) ), TQT_TQOBJECT(this), TQT_SIGNAL( projectChanged() ) ); + connect( ag, TQ_SIGNAL( selected( TQAction * ) ), this, TQ_SLOT( projectSelected( TQAction * ) ) ); + connect( ag, TQ_SIGNAL( selected( TQAction * ) ), this, TQ_SIGNAL( projectChanged() ) ); DesignerAction *a = new DesignerAction( i18n( "<No Project>" ), i18n( "<No Project>" ), 0, ag, 0, TRUE ); eProject = new Project( "", i18n( "<No Project>" ), projectSettingsPluginManager, TRUE ); projects.insert( a, eProject ); @@ -805,44 +805,44 @@ void MainWindow::setupProjectActions() if ( !singleProject ) projectMenu->insertSeparator(); - a = new DesignerAction( i18n( "Add File" ), TQPixmap(), i18n( "&Add File..." ), 0, TQT_TQOBJECT(this), 0 ); + a = new DesignerAction( i18n( "Add File" ), TQPixmap(), i18n( "&Add File..." ), 0, this, 0 ); actionProjectAddFile = a; a->setStatusTip( i18n("Adds a file to the current project") ); a->setWhatsThis( whatsThisFrom( "Project|Add File" ) ); - connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( projectInsertFile() ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( projectInsertFile() ) ); a->setEnabled( FALSE ); - connect( this, TQT_SIGNAL( hasNonDummyProject(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasNonDummyProject(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); if ( !singleProject ) a->addTo( projectMenu ); actionEditPixmapCollection = new DesignerAction( i18n( "Image Collection..." ), TQPixmap(), - i18n( "&Image Collection..." ), 0, TQT_TQOBJECT(this), 0 ); + i18n( "&Image Collection..." ), 0, this, 0 ); actionEditPixmapCollection->setStatusTip( i18n("Opens a dialog for editing the current project's image collection") ); actionEditPixmapCollection->setWhatsThis( whatsThisFrom( "Project|Image Collection" ) ); - connect( actionEditPixmapCollection, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editPixmapCollection() ) ); + connect( actionEditPixmapCollection, TQ_SIGNAL( activated() ), this, TQ_SLOT( editPixmapCollection() ) ); actionEditPixmapCollection->setEnabled( FALSE ); - connect( this, TQT_SIGNAL( hasNonDummyProject(bool) ), actionEditPixmapCollection, TQT_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasNonDummyProject(bool) ), actionEditPixmapCollection, TQ_SLOT( setEnabled(bool) ) ); actionEditPixmapCollection->addTo( projectMenu ); #ifndef TQT_NO_SQL actionEditDatabaseConnections = new DesignerAction( i18n( "Database Connections..." ), TQPixmap(), - i18n( "&Database Connections..." ), 0, TQT_TQOBJECT(this), 0 ); + i18n( "&Database Connections..." ), 0, this, 0 ); actionEditDatabaseConnections->setStatusTip( i18n("Opens a dialog for editing the current project's database connections") ); actionEditDatabaseConnections->setWhatsThis( whatsThisFrom( "Project|Database Connections" ) ); - connect( actionEditDatabaseConnections, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editDatabaseConnections() ) ); + connect( actionEditDatabaseConnections, TQ_SIGNAL( activated() ), this, TQ_SLOT( editDatabaseConnections() ) ); //actionEditDatabaseConnections->setEnabled( FALSE ); - //connect( this, TQT_SIGNAL( hasNonDummyProject(bool) ), actionEditDatabaseConnections, TQT_SLOT( setEnabled(bool) ) ); + //connect( this, TQ_SIGNAL( hasNonDummyProject(bool) ), actionEditDatabaseConnections, TQ_SLOT( setEnabled(bool) ) ); if ( !singleProject ) actionEditDatabaseConnections->addTo( projectMenu ); #endif actionEditProjectSettings = new DesignerAction( i18n( "Project Settings..." ), TQPixmap(), - i18n( "&Project Settings..." ), 0, TQT_TQOBJECT(this), 0 ); + i18n( "&Project Settings..." ), 0, this, 0 ); actionEditProjectSettings->setStatusTip( i18n("Opens a dialog to change the project's settings") ); actionEditProjectSettings->setWhatsThis( whatsThisFrom( "Project|Project Settings" ) ); - connect( actionEditProjectSettings, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editProjectSettings() ) ); + connect( actionEditProjectSettings, TQ_SIGNAL( activated() ), this, TQ_SLOT( editProjectSettings() ) ); actionEditProjectSettings->setEnabled( FALSE ); - connect( this, TQT_SIGNAL( hasNonDummyProject(bool) ), actionEditProjectSettings, TQT_SLOT( setEnabled(bool) ) ); + connect( this, TQ_SIGNAL( hasNonDummyProject(bool) ), actionEditProjectSettings, TQ_SLOT( setEnabled(bool) ) ); actionEditProjectSettings->addTo( projectMenu ); } @@ -854,19 +854,19 @@ void MainWindow::setupPreviewActions() layoutMenu = menu; menubar->insertItem( i18n( "&Preview" ), menu, toolsMenuId + 2 ); - a = new DesignerAction( i18n( "Preview Form" ), TQPixmap(), i18n( "Preview &Form" ), 0, TQT_TQOBJECT(this), 0 ); + a = new DesignerAction( i18n( "Preview Form" ), TQPixmap(), i18n( "Preview &Form" ), 0, this, 0 ); actionPreview = a; a->setAccel( CTRL + Key_T ); a->setStatusTip( i18n("Opens a preview") ); a->setWhatsThis( whatsThisFrom( "Preview|Preview Form" ) ); - connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( previewForm() ) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL( activated() ), this, TQ_SLOT( previewForm() ) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); a->addTo( menu ); menu->insertSeparator(); - TQSignalMapper *mapper = new TQSignalMapper( TQT_TQOBJECT(this) ); - connect( mapper, TQT_SIGNAL(mapped(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(previewForm(const TQString&)) ); + TQSignalMapper *mapper = new TQSignalMapper( this ); + connect( mapper, TQ_SIGNAL(mapped(const TQString&)), this, TQ_SLOT(previewForm(const TQString&)) ); TQStringList styles = TQStyleFactory::keys(); for ( TQStringList::Iterator it = styles.begin(); it != styles.end(); ++it ) { TQString info; @@ -884,14 +884,14 @@ void MainWindow::setupPreviewActions() info = i18n( "The preview will use the advanced Motif look and feel used by the GIMP toolkit (GTK) on Linux." ); a = new DesignerAction( i18n( "Preview Form in %1 Style" ).arg( *it ), TQPixmap(), - i18n( "... in %1 Style" ).arg( *it ), 0, TQT_TQOBJECT(this), 0 ); + i18n( "... in %1 Style" ).arg( *it ), 0, this, 0 ); a->setStatusTip( i18n("Opens a preview in %1 style").arg( *it ) ); a->setWhatsThis( i18n("<b>Open a preview in %1 style.</b>" "<p>Use the preview to test the design and " "signal-slot connections of the current form. %2</p>").arg( *it ).arg( info ) ); mapper->setMapping( a, *it ); - connect( a, TQT_SIGNAL(activated()), mapper, TQT_SLOT(map()) ); - connect( this, TQT_SIGNAL( hasActiveForm(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); + connect( a, TQ_SIGNAL(activated()), mapper, TQ_SLOT(map()) ); + connect( this, TQ_SIGNAL( hasActiveForm(bool) ), a, TQ_SLOT( setEnabled(bool) ) ); a->addTo( menu ); } } @@ -902,41 +902,41 @@ void MainWindow::setupWindowActions() if ( !windowActionsSetup ) { windowActionsSetup = TRUE; */ - actionWindowTile = new DesignerAction( i18n( "Tile" ), i18n( "&Tile" ), 0, TQT_TQOBJECT(this) ); + actionWindowTile = new DesignerAction( i18n( "Tile" ), i18n( "&Tile" ), 0, this ); actionWindowTile->setStatusTip( i18n("Tiles the windows so that they are all visible") ); actionWindowTile->setWhatsThis( whatsThisFrom( "Window|Tile" ) ); - connect( actionWindowTile, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( tile() ) ); - actionWindowCascade = new DesignerAction( i18n( "Cascade" ), i18n( "&Cascade" ), 0, TQT_TQOBJECT(this) ); + connect( actionWindowTile, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( tile() ) ); + actionWindowCascade = new DesignerAction( i18n( "Cascade" ), i18n( "&Cascade" ), 0, this ); actionWindowCascade->setStatusTip( i18n("Cascades the windows so that all their title bars are visible") ); actionWindowCascade->setWhatsThis( whatsThisFrom( "Window|Cascade" ) ); - connect( actionWindowCascade, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( cascade() ) ); + connect( actionWindowCascade, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( cascade() ) ); - actionWindowClose = new DesignerAction( i18n( "Close" ), i18n( "Cl&ose" ), CTRL + Key_F4, TQT_TQOBJECT(this) ); + actionWindowClose = new DesignerAction( i18n( "Close" ), i18n( "Cl&ose" ), CTRL + Key_F4, this ); actionWindowClose->setStatusTip( i18n( "Closes the active window") ); actionWindowClose->setWhatsThis( whatsThisFrom( "Window|Close" ) ); - connect( actionWindowClose, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( closeActiveWindow() ) ); + connect( actionWindowClose, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( closeActiveWindow() ) ); - actionWindowCloseAll = new DesignerAction( i18n( "Close All" ), i18n( "Close Al&l" ), 0, TQT_TQOBJECT(this) ); + actionWindowCloseAll = new DesignerAction( i18n( "Close All" ), i18n( "Close Al&l" ), 0, this ); actionWindowCloseAll->setStatusTip( i18n( "Closes all form windows") ); actionWindowCloseAll->setWhatsThis( whatsThisFrom( "Window|Close All" ) ); - connect( actionWindowCloseAll, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( closeAllWindows() ) ); + connect( actionWindowCloseAll, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( closeAllWindows() ) ); - actionWindowNext = new DesignerAction( i18n( "Next" ), i18n( "Ne&xt" ), CTRL + Key_F6, TQT_TQOBJECT(this) ); + actionWindowNext = new DesignerAction( i18n( "Next" ), i18n( "Ne&xt" ), CTRL + Key_F6, this ); actionWindowNext->setStatusTip( i18n( "Activates the next window" ) ); actionWindowNext->setWhatsThis( whatsThisFrom( "Window|Next" ) ); - connect( actionWindowNext, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( activateNextWindow() ) ); + connect( actionWindowNext, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( activateNextWindow() ) ); - actionWindowPrevious = new DesignerAction( i18n( "Previous" ), i18n( "Pre&vious" ), CTRL + SHIFT + Key_F6, TQT_TQOBJECT(this) ); + actionWindowPrevious = new DesignerAction( i18n( "Previous" ), i18n( "Pre&vious" ), CTRL + SHIFT + Key_F6, this ); actionWindowPrevious->setStatusTip( i18n( "Activates the previous window" ) ); actionWindowPrevious->setWhatsThis( whatsThisFrom( "Window|Previous" ) ); - connect( actionWindowPrevious, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( activatePreviousWindow() ) ); + connect( actionWindowPrevious, TQ_SIGNAL( activated() ), qworkspace, TQ_SLOT( activatePreviousWindow() ) ); // } if ( !windowMenu ) { windowMenu = new TQPopupMenu( this, "Window" ); menubar->insertItem( i18n( "&Window" ), windowMenu ); - connect( windowMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( setupWindowActions() ) ); + connect( windowMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( setupWindowActions() ) ); } else { windowMenu->clear(); } @@ -958,20 +958,20 @@ void MainWindow::setupWindowActions() int j = 0; for ( int i = 0; i < int( windows.count() ); ++i ) { TQWidget *w = windows.at( i ); - if ( !::tqqt_cast<FormWindow*>(w) && !::tqqt_cast<SourceEditor*>(w) ) + if ( !::tqt_cast<FormWindow*>(w) && !::tqt_cast<SourceEditor*>(w) ) continue; - if ( ::tqqt_cast<FormWindow*>(w) && ( ( (FormWindow*)w )->isFake() ) ) + if ( ::tqt_cast<FormWindow*>(w) && ( ( (FormWindow*)w )->isFake() ) ) continue; j++; TQString itemText; if ( j < 10 ) itemText = TQString("&%1 ").arg( j ); - if ( ::tqqt_cast<FormWindow*>(w) ) + if ( ::tqt_cast<FormWindow*>(w) ) itemText += w->name(); else itemText += w->caption(); - int id = windowMenu->insertItem( itemText, TQT_TQOBJECT(this), TQT_SLOT( windowsMenuActivated( int ) ) ); + int id = windowMenu->insertItem( itemText, this, TQ_SLOT( windowsMenuActivated( int ) ) ); windowMenu->setItemParameter( id, i ); windowMenu->setItemChecked( id, qworkspace->activeWindow() == windows.at( i ) ); } @@ -979,39 +979,31 @@ void MainWindow::setupWindowActions() void MainWindow::setupHelpActions() { - actionHelpContents = new DesignerAction( i18n( "Contents" ), i18n( "&Contents" ), Key_F1, TQT_TQOBJECT(this), 0 ); + actionHelpContents = new DesignerAction( i18n( "Contents" ), i18n( "&Contents" ), Key_F1, this, 0 ); actionHelpContents->setStatusTip( i18n("Opens the online help") ); actionHelpContents->setWhatsThis( whatsThisFrom( "Help|Contents" ) ); - connect( actionHelpContents, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( helpContents() ) ); + connect( actionHelpContents, TQ_SIGNAL( activated() ), this, TQ_SLOT( helpContents() ) ); - actionHelpManual = new DesignerAction( i18n( "Manual" ), i18n( "&Manual" ), CTRL + Key_M, TQT_TQOBJECT(this), 0 ); + actionHelpManual = new DesignerAction( i18n( "Manual" ), i18n( "&Manual" ), CTRL + Key_M, this, 0 ); actionHelpManual->setStatusTip( i18n("Opens the TQt Designer manual") ); actionHelpManual->setWhatsThis( whatsThisFrom( "Help|Manual" ) ); - connect( actionHelpManual, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( helpManual() ) ); + connect( actionHelpManual, TQ_SIGNAL( activated() ), this, TQ_SLOT( helpManual() ) ); - actionHelpAbout = new DesignerAction( i18n("About"), TQPixmap(), i18n("&About"), 0, TQT_TQOBJECT(this), 0 ); + actionHelpAbout = new DesignerAction( i18n("About"), TQPixmap(), i18n("&About"), 0, this, 0 ); actionHelpAbout->setStatusTip( i18n("Displays information about TQt Designer") ); actionHelpAbout->setWhatsThis( whatsThisFrom( "Help|About" ) ); - connect( actionHelpAbout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( helpAbout() ) ); + connect( actionHelpAbout, TQ_SIGNAL( activated() ), this, TQ_SLOT( helpAbout() ) ); - actionHelpAboutTQt = new DesignerAction( i18n("About TQt"), TQPixmap(), i18n("About &TQt"), 0, TQT_TQOBJECT(this), 0 ); + actionHelpAboutTQt = new DesignerAction( i18n("About TQt"), TQPixmap(), i18n("About &TQt"), 0, this, 0 ); actionHelpAboutTQt->setStatusTip( i18n("Displays information about the TQt Toolkit") ); actionHelpAboutTQt->setWhatsThis( whatsThisFrom( "Help|About TQt" ) ); - connect( actionHelpAboutTQt, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( helpAboutTQt() ) ); - -#if 0 //defined(TQT_NON_COMMERCIAL) - // ### not used anymore -- should be deleted? - actionHelpRegister = new DesignerAction( i18n("Register TQt"), TQPixmap(), i18n("&Register TQt..."), 0, TQT_TQOBJECT(this), 0 ); - actionHelpRegister->setStatusTip( i18n("Opens a web browser at the evaluation form on www.trolltech.com") ); - actionHelpRegister->setWhatsThis( i18n("Register with Trolltech") ); - connect( actionHelpRegister, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( helpRegister() ) ); -#endif + connect( actionHelpAboutTQt, TQ_SIGNAL( activated() ), this, TQ_SLOT( helpAboutTQt() ) ); actionHelpWhatsThis = new DesignerAction( i18n("What's This?"), TQIconSet( whatsthis_image, whatsthis_image ), - i18n("What's This?"), SHIFT + Key_F1, TQT_TQOBJECT(this), 0 ); + i18n("What's This?"), SHIFT + Key_F1, this, 0 ); actionHelpWhatsThis->setStatusTip( i18n("\"What's This?\" context sensitive help") ); actionHelpWhatsThis->setWhatsThis( whatsThisFrom( "Help|What's This?" ) ); - connect( actionHelpWhatsThis, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( whatsThis() ) ); + connect( actionHelpWhatsThis, TQ_SIGNAL( activated() ), this, TQ_SLOT( whatsThis() ) ); /* TQToolBar *tb = new TQToolBar( this, "Help" ); tb->setCloseMode( TQDockWindow::Undocked ); @@ -1027,11 +1019,6 @@ void MainWindow::setupHelpActions() menu->insertSeparator(); actionHelpAbout->addTo( menu ); actionHelpAboutTQt->addTo( menu ); -#if 0 //defined(TQT_NON_COMMERCIAL) - // ### not used anymore -- should be deleted? - actionHelpRegister->addTo( menu ); -#endif - menu->insertSeparator(); actionHelpWhatsThis->addTo( menu ); } @@ -1057,13 +1044,13 @@ void MainWindow::fileNewDialog() currentProject->setModified( TRUE ); workspace()->update(); fw->setProject( currentProject ); - MetaDataBase::addEntry( TQT_TQOBJECT(fw) ); - TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQDIALOG_OBJECT_NAME_STRING ), fw, n.latin1() ); + MetaDataBase::addEntry( fw ); + TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQDialog" ), fw, n.latin1() ); fw->setMainContainer( w ); fw->setCaption( n ); fw->resize( 600, 480 ); insertFormWindow( fw ); - fw->killAccels( TQT_TQOBJECT(fw) ); + fw->killAccels( fw ); fw->project()->setModified( TRUE ); fw->setFocus(); fw->setSavePixmapInProject( TRUE ); @@ -1098,9 +1085,9 @@ void MainWindow::fileClose() } else { TQWidget *w = qworkspace->activeWindow(); if ( w ) { - if ( ::tqqt_cast<FormWindow*>(w) ) + if ( ::tqt_cast<FormWindow*>(w) ) ( (FormWindow*)w )->formFile()->close(); - else if ( ::tqqt_cast<SourceEditor*>(w) ) + else if ( ::tqt_cast<SourceEditor*>(w) ) ( (SourceEditor*)w )->close(); } } @@ -1145,14 +1132,14 @@ void MainWindow::fileCloseProject() while ( wit.current() ) { TQWidget *w = wit.current(); ++wit; - if ( ::tqqt_cast<FormWindow*>(w) ) { + if ( ::tqt_cast<FormWindow*>(w) ) { if ( ( (FormWindow*)w )->project() == pro ) { if ( ( (FormWindow*)w )->formFile()->editor() ) windows.removeRef( ( (FormWindow*)w )->formFile()->editor() ); if ( !( (FormWindow*)w )->formFile()->close() ) return; } - } else if ( ::tqqt_cast<SourceEditor*>(w) ) { + } else if ( ::tqt_cast<SourceEditor*>(w) ) { if ( !( (SourceEditor*)w )->close() ) return; } @@ -1170,7 +1157,7 @@ void MainWindow::fileCloseProject() } if ( !windows.isEmpty() ) { for ( TQWidget *w = windows.first(); w; w = windows.next() ) { - if ( !::tqqt_cast<FormWindow*>(w) ) + if ( !::tqt_cast<FormWindow*>(w) ) continue; w->setFocus(); activeWindowChanged( w ); @@ -1358,7 +1345,7 @@ bool MainWindow::fileSave() bool MainWindow::fileSaveForm() { for ( SourceEditor *e = sourceEditors.first(); e; e = sourceEditors.next() ) { - if ( TQT_BASE_OBJECT(e->object()) == formWindow() || e == qWorkspace()->activeWindow() ) { + if ( e->object() == formWindow() || e == qWorkspace()->activeWindow() ) { e->save(); } } @@ -1367,7 +1354,7 @@ bool MainWindow::fileSaveForm() TQWidget *w = qWorkspace()->activeWindow(); if ( w ) { - if ( ::tqqt_cast<SourceEditor*>(w) ) { + if ( ::tqt_cast<SourceEditor*>(w) ) { SourceEditor *se = (SourceEditor*)w; if ( se->formWindow() ) fw = se->formWindow(); @@ -1400,9 +1387,9 @@ bool MainWindow::fileSaveAs() TQWidget *w = qworkspace->activeWindow(); if ( !w ) return TRUE; - if ( ::tqqt_cast<FormWindow*>(w) ) + if ( ::tqt_cast<FormWindow*>(w) ) return ( (FormWindow*)w )->formFile()->saveAs(); - else if ( ::tqqt_cast<SourceEditor*>(w) ) + else if ( ::tqt_cast<SourceEditor*>(w) ) return ( (SourceEditor*)w )->saveAs(); return FALSE; } @@ -1425,7 +1412,7 @@ void MainWindow::fileCreateTemplate() } for ( i = 0; i < WidgetDatabase::count(); ++i ) { if ( WidgetDatabase::isContainer( i ) && !WidgetDatabase::isForm(i) && - WidgetDatabase::className( i ) != TQTABWIDGET_OBJECT_NAME_STRING && WidgetDatabase::group( i ) != "Temp" ) { + WidgetDatabase::className( i ) != "TQTabWidget" && WidgetDatabase::group( i ) != "Temp" ) { dia.listClass->insertItem( WidgetDatabase::className( i ) ); } } @@ -1437,14 +1424,14 @@ void MainWindow::fileCreateTemplate() } dia.editName->setText( i18n( "NewTemplate" ) ); - connect( dia.buttonCreate, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( createNewTemplate() ) ); + connect( dia.buttonCreate, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( createNewTemplate() ) ); dia.exec(); } void MainWindow::createNewTemplate() { - CreateTemplate *dia = (CreateTemplate*)TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->parent(); + CreateTemplate *dia = (CreateTemplate*)sender()->parent(); TQString fn = dia->editName->text(); TQString cn = dia->listClass->currentText(); if ( fn.isEmpty() || cn.isEmpty() ) { @@ -1499,7 +1486,7 @@ void MainWindow::createNewTemplate() void MainWindow::editUndo() { if ( qWorkspace()->activeWindow() && - ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) { + ::tqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) { ( (SourceEditor*)qWorkspace()->activeWindow() )->editUndo(); return; } @@ -1510,7 +1497,7 @@ void MainWindow::editUndo() void MainWindow::editRedo() { if ( qWorkspace()->activeWindow() && - ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) { + ::tqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) { ( (SourceEditor*)qWorkspace()->activeWindow() )->editRedo(); return; } @@ -1521,7 +1508,7 @@ void MainWindow::editRedo() void MainWindow::editCut() { if ( qWorkspace()->activeWindow() && - ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) { + ::tqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) { ( (SourceEditor*)qWorkspace()->activeWindow() )->editCut(); return; } @@ -1532,7 +1519,7 @@ void MainWindow::editCut() void MainWindow::editCopy() { if ( qWorkspace()->activeWindow() && - ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) { + ::tqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) { ( (SourceEditor*)qWorkspace()->activeWindow() )->editCopy(); return; } @@ -1543,7 +1530,7 @@ void MainWindow::editCopy() void MainWindow::editPaste() { if ( qWorkspace()->activeWindow() && - ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) { + ::tqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) { ( (SourceEditor*)qWorkspace()->activeWindow() )->editPaste(); return; } @@ -1555,7 +1542,7 @@ void MainWindow::editPaste() if ( l.count() == 1 ) { w = l.first(); if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout || - ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) && + ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) && w != formWindow()->mainContainer() ) ) w = formWindow()->mainContainer(); } @@ -1582,7 +1569,7 @@ void MainWindow::editDelete() void MainWindow::editSelectAll() { if ( qWorkspace()->activeWindow() && - ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) { + ::tqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) { ( (SourceEditor*)qWorkspace()->activeWindow() )->editSelectAll(); return; } @@ -1774,7 +1761,7 @@ SourceEditor *MainWindow::openSourceEditor() } if ( !editor ) -editor = createSourceEditor( TQT_TQOBJECT(formWindow()), formWindow()->project(), lang ); +editor = createSourceEditor( formWindow(), formWindow()->project(), lang ); return editor; } @@ -1870,7 +1857,7 @@ void MainWindow::editPreferences() statusMessage( i18n( "Edit preferences..." ) ); Preferences *dia = new Preferences( this, 0, TRUE ); prefDia = dia; - connect( dia->helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( dia->helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); dia->buttonColor->setEditor( StyledButton::ColorEditor ); dia->buttonPixmap->setEditor( StyledButton::PixmapEditor ); dia->groupBoxGrid->setChecked( sGrid ); @@ -1904,11 +1891,11 @@ void MainWindow::editPreferences() Tab t = *it; dia->tabWidget->addTab( t.w, t.title ); if ( t.receiver ) { - connect( dia->buttonOk, TQT_SIGNAL( clicked() ), senderObject, TQT_SLOT( emitAcceptSignal() ) ); - connect( senderObject, TQT_SIGNAL( acceptSignal( TQUnknownInterface * ) ), t.receiver, t.accept_slot ); - connect( senderObject, TQT_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); + connect( dia->buttonOk, TQ_SIGNAL( clicked() ), senderObject, TQ_SLOT( emitAcceptSignal() ) ); + connect( senderObject, TQ_SIGNAL( acceptSignal( TQUnknownInterface * ) ), t.receiver, t.accept_slot ); + connect( senderObject, TQ_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); senderObject->emitInitSignal(); - disconnect( senderObject, TQT_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); + disconnect( senderObject, TQ_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot ); } } @@ -1961,7 +1948,7 @@ void MainWindow::editPreferences() void MainWindow::searchFind() { if ( !qWorkspace()->activeWindow() || - !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) + !::tqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) return; if ( !findDialog ) @@ -1983,7 +1970,7 @@ void MainWindow::searchIncremetalFindMenu() void MainWindow::searchIncremetalFind() { if ( !qWorkspace()->activeWindow() || - !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) + !::tqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) return; ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->find( incrementalSearch->text(), @@ -1993,7 +1980,7 @@ void MainWindow::searchIncremetalFind() void MainWindow::searchIncremetalFindNext() { if ( !qWorkspace()->activeWindow() || - !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) + !::tqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) return; ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->find( incrementalSearch->text(), @@ -2003,7 +1990,7 @@ void MainWindow::searchIncremetalFindNext() void MainWindow::searchReplace() { if ( !qWorkspace()->activeWindow() || - !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) + !::tqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) return; if ( !replaceDialog ) @@ -2019,7 +2006,7 @@ void MainWindow::searchReplace() void MainWindow::searchGotoLine() { if ( !qWorkspace()->activeWindow() || - !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) + !::tqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) return; if ( !gotoLineDialog ) diff --git a/kdevdesigner/designer/menubareditor.cpp b/kdevdesigner/designer/menubareditor.cpp index f62e15e0..a3e53973 100644 --- a/kdevdesigner/designer/menubareditor.cpp +++ b/kdevdesigner/designer/menubareditor.cpp @@ -152,7 +152,7 @@ MenuBarEditor::MenuBarEditor( FormWindow * fw, TQWidget * parent, const char * n hasSeparator( FALSE ) { setAcceptDrops( TRUE ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); addItem.setMenuText( i18n("new menu") ); addSeparator.setMenuText( i18n("new separator") ); @@ -571,7 +571,7 @@ void MenuBarEditor::paste() bool MenuBarEditor::eventFilter( TQObject * o, TQEvent * e ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lineEdit) && e->type() == TQEvent::FocusOut ) { + if ( o == lineEdit && e->type() == TQEvent::FocusOut ) { leaveEditMode(); lineEdit->hide(); update(); @@ -585,7 +585,7 @@ void MenuBarEditor::paintEvent( TQPaintEvent * ) { TQPainter p( this ); TQRect r = rect(); - style().tqdrawPrimitive( TQStyle::PE_PanelMenuBar, &p, + style().drawPrimitive( TQStyle::PE_PanelMenuBar, &p, r, colorGroup() ); drawItems( p ); } @@ -616,7 +616,7 @@ void MenuBarEditor::mouseDoubleClickEvent( TQMouseEvent * e ) void MenuBarEditor::mouseMoveEvent( TQMouseEvent * e ) { - if ( e->state() & Qt::LeftButton ) { + if ( e->state() & TQt::LeftButton ) { if ( ( e->pos() - mousePressPos ).manhattanLength() > 3 ) { bool itemCreated = FALSE; bool isSeparator = FALSE; @@ -818,7 +818,7 @@ void MenuBarEditor::keyPressEvent( TQKeyEvent * e ) void MenuBarEditor::focusOutEvent( TQFocusEvent * e ) { TQWidget * fw = tqApp->focusWidget(); - if ( e->lostFocus() && !::tqqt_cast<PopupMenuEditor*>(fw) ) + if ( e->lostFocus() && !::tqt_cast<PopupMenuEditor*>(fw) ) hideItem(); update(); } diff --git a/kdevdesigner/designer/menubareditor.h b/kdevdesigner/designer/menubareditor.h index f6279f2b..11277258 100644 --- a/kdevdesigner/designer/menubareditor.h +++ b/kdevdesigner/designer/menubareditor.h @@ -36,7 +36,7 @@ class TQActionGroup; class MenuBarEditorItem : public TQObject { - Q_OBJECT + TQ_OBJECT friend class MenuBarEditor; @@ -81,7 +81,7 @@ class FormWindow; class MenuBarEditor : public TQMenuBar { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/metadatabase.cpp b/kdevdesigner/designer/metadatabase.cpp index 39711a64..2639639b 100644 --- a/kdevdesigner/designer/metadatabase.cpp +++ b/kdevdesigner/designer/metadatabase.cpp @@ -321,8 +321,8 @@ int MetaDataBase::spacing( TQObject *o ) if ( !o ) return -1; setupDataBase(); - if ( ::tqqt_cast<TQMainWindow*>(o) ) - o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget()); + if ( ::tqt_cast<TQMainWindow*>(o) ) + o = ( (TQMainWindow*)o )->centralWidget(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", @@ -352,9 +352,9 @@ void MetaDataBase::setMargin( TQObject *o, int margin ) bool isInnerLayout = TRUE; TQWidget *widget = (TQWidget*)o; - if ( widget && !::tqqt_cast<TQLayoutWidget*>(widget) && - ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ) ) || - widget && widget->parentWidget() && ::tqqt_cast<FormWindow*>(widget->parentWidget()) ) ) + if ( widget && !::tqt_cast<TQLayoutWidget*>(widget) && + ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( widget ) ) ) || + widget && widget->parentWidget() && ::tqt_cast<FormWindow*>(widget->parentWidget()) ) ) isInnerLayout = FALSE; @@ -378,8 +378,8 @@ int MetaDataBase::margin( TQObject *o ) if ( !o ) return -1; setupDataBase(); - if ( ::tqqt_cast<TQMainWindow*>(o) ) - o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget()); + if ( ::tqt_cast<TQMainWindow*>(o) ) + o = ( (TQMainWindow*)o )->centralWidget(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", @@ -409,8 +409,8 @@ TQString MetaDataBase::resizeMode( TQObject *o ) if ( !o ) return TQString(); setupDataBase(); - if ( ::tqqt_cast<TQMainWindow*>(o) ) - o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget()); + if ( ::tqt_cast<TQMainWindow*>(o) ) + o = ( (TQMainWindow*)o )->centralWidget(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", @@ -440,15 +440,15 @@ void MetaDataBase::addConnection( TQObject *o, TQObject *sender, const TQCString r->connections.append( conn ); if ( addCode ) { TQString rec = receiver->name(); - if ( ::tqqt_cast<FormWindow*>(o) && TQT_BASE_OBJECT(receiver) ==( (FormWindow*)o )->mainContainer() ) + if ( ::tqt_cast<FormWindow*>(o) && receiver ==( (FormWindow*)o )->mainContainer() ) rec = "this"; TQString sen = sender->name(); - if ( ::tqqt_cast<FormWindow*>(o) && TQT_BASE_OBJECT(sender) ==( (FormWindow*)o )->mainContainer() ) + if ( ::tqt_cast<FormWindow*>(o) && sender ==( (FormWindow*)o )->mainContainer() ) sen = "this"; FormFile *ff = 0; - if ( ::tqqt_cast<FormFile*>(o) ) + if ( ::tqt_cast<FormFile*>(o) ) ff = (FormFile*)o; - else if ( ::tqqt_cast<FormWindow*>(o) ) + else if ( ::tqt_cast<FormWindow*>(o) ) ff = ( (FormWindow*)o )->formFile(); ff->addConnection( sen, signal, rec, slot ); } @@ -468,17 +468,17 @@ void MetaDataBase::removeConnection( TQObject *o, TQObject *sender, const TQCStr return; for ( TQValueList<Connection>::Iterator it = r->connections.begin(); it != r->connections.end(); ++it ) { Connection conn = *it; - if ( TQT_BASE_OBJECT(conn.sender) ==sender && + if ( conn.sender ==sender && conn.signal == signal && - TQT_BASE_OBJECT(conn.receiver) ==receiver && + conn.receiver ==receiver && conn.slot == slot ) { r->connections.remove( it ); break; } } - if ( ::tqqt_cast<FormWindow*>(o) ) { + if ( ::tqt_cast<FormWindow*>(o) ) { TQString rec = receiver->name(); - if ( TQT_BASE_OBJECT(receiver) ==( (FormWindow*)o )->mainContainer() ) + if ( receiver ==( (FormWindow*)o )->mainContainer() ) rec = "this"; ( (FormWindow*)o )->formFile()->removeConnection( sender->name(), signal, rec, slot ); } @@ -494,7 +494,7 @@ void MetaDataBase::setupConnections( TQObject *o, const TQValueList<LanguageInte return; } - if ( !::tqqt_cast<FormFile*>(o) ) + if ( !::tqt_cast<FormFile*>(o) ) return; FormFile *formfile = (FormFile*)o; @@ -514,8 +514,8 @@ void MetaDataBase::setupConnections( TQObject *o, const TQValueList<LanguageInte sender = formfile->project()->objectForFakeFormFile( formfile ); if ( !sender && senderName == "this" ) sender = formfile->formWindow() ? - TQT_TQOBJECT(formfile->formWindow()->mainContainer()) : - TQT_TQOBJECT(formfile->project()->objectForFakeFormFile( formfile )); + formfile->formWindow()->mainContainer() : + formfile->project()->objectForFakeFormFile( formfile ); if ( !sender ) continue; MetaDataBase::addConnection( formfile->formWindow() ? @@ -524,8 +524,8 @@ void MetaDataBase::setupConnections( TQObject *o, const TQValueList<LanguageInte sender, (*cit).signal.latin1(), formfile->formWindow() ? - TQT_TQOBJECT(formfile->formWindow()->mainContainer()) : - TQT_TQOBJECT(formfile->project()->objectForFakeFormFile( formfile )), + formfile->formWindow()->mainContainer() : + formfile->project()->objectForFakeFormFile( formfile ), (*cit).slot.latin1(), FALSE ); } @@ -544,9 +544,9 @@ bool MetaDataBase::hasConnection( TQObject *o, TQObject *sender, const TQCString for ( TQValueList<Connection>::Iterator it = r->connections.begin(); it != r->connections.end(); ++it ) { Connection conn = *it; - if ( TQT_BASE_OBJECT(conn.sender) ==sender && + if ( conn.sender ==sender && conn.signal == signal && - TQT_BASE_OBJECT(conn.receiver) ==receiver && + conn.receiver ==receiver && conn.slot == slot ) return TRUE; } @@ -581,8 +581,8 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQ TQValueList<Connection>::Iterator conn; while ( ( conn = it ) != r->connections.end() ) { ++it; - if ( TQT_BASE_OBJECT((*conn).sender) ==sender && - TQT_BASE_OBJECT((*conn).receiver) ==receiver ) + if ( (*conn).sender ==sender && + (*conn).receiver ==receiver ) ret << *conn; } @@ -603,8 +603,8 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQ TQValueList<Connection>::Iterator conn; while ( ( conn = it ) != r->connections.end() ) { ++it; - if ( TQT_BASE_OBJECT((*conn).sender) ==object || - TQT_BASE_OBJECT((*conn).receiver) ==object ) + if ( (*conn).sender ==object || + (*conn).receiver ==object ) ret << *conn; } return ret; @@ -679,14 +679,14 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom if ( slotList.find( slot ) != -1 ) return TRUE; - if ( ::tqqt_cast<FormWindow*>(o) ) { - o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer()); + if ( ::tqt_cast<FormWindow*>(o) ) { + o = ( (FormWindow*)o )->mainContainer(); slotList = o->metaObject()->slotNames( TRUE ); if ( slotList.find( slot ) != -1 ) return TRUE; } - //if ( ::tqqt_cast<CustomWidget*>(o) ) { + //if ( ::tqt_cast<CustomWidget*>(o) ) { if ( o->inherits( "CustomWidget" ) ) { MetaDataBase::CustomWidget *w = ( (::CustomWidget*)o )->customWidget(); for ( TQValueList<Function>::Iterator it = w->lstSlots.begin(); it != w->lstSlots.end(); ++it ) { @@ -909,14 +909,14 @@ bool MetaDataBase::hasFunction( TQObject *o, const TQCString &function, bool onl if ( functionList.find( function ) != -1 ) return TRUE; - if ( ::tqqt_cast<FormWindow*>(o) ) { - o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer()); + if ( ::tqt_cast<FormWindow*>(o) ) { + o = ( (FormWindow*)o )->mainContainer(); functionList = o->metaObject()->slotNames( TRUE ); if ( functionList.find( function ) != -1 ) return TRUE; } - //if ( ::tqqt_cast<CustomWidget*>(o) ) { + //if ( ::tqt_cast<CustomWidget*>(o) ) { if ( o->inherits( "CustomWidget" ) ) { MetaDataBase::CustomWidget *w = ( (::CustomWidget*)o )->customWidget(); for ( TQValueList<Function>::Iterator it = w->lstSlots.begin(); it != w->lstSlots.end(); ++it ) { diff --git a/kdevdesigner/designer/multilineeditor.ui b/kdevdesigner/designer/multilineeditor.ui index f0ff2129..83579b04 100644 --- a/kdevdesigner/designer/multilineeditor.ui +++ b/kdevdesigner/designer/multilineeditor.ui @@ -172,10 +172,10 @@ <slot>cancelClicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>applyClicked()</slot> <slot>okClicked()</slot> <slot>cancelClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/multilineeditorimpl.cpp b/kdevdesigner/designer/multilineeditorimpl.cpp index ef06f77b..dbe5bcd8 100644 --- a/kdevdesigner/designer/multilineeditorimpl.cpp +++ b/kdevdesigner/designer/multilineeditorimpl.cpp @@ -56,7 +56,7 @@ ToolBarItem::ToolBarItem( TQWidget *parent, TQWidget *toolBar, setAccel( key ); addTo( toolBar ); tag = tagstr; - connect( this, TQT_SIGNAL( activated() ), this, TQT_SLOT( wasActivated() ) ); + connect( this, TQ_SIGNAL( activated() ), this, TQ_SLOT( wasActivated() ) ); } ToolBarItem::~ToolBarItem() @@ -103,26 +103,26 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget ToolBarItem *it = new ToolBarItem( this, basicToolBar, i18n( "Italic" ), "i", BarIcon( "designer_textitalic.png", KDevDesignerPartFactory::instance() ), CTRL+Key_I ); it->addTo( stylesMenu ); - connect( it, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( it, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *b = new ToolBarItem( this, basicToolBar, i18n( "Bold" ), "b", BarIcon( "designer_textbold.png", KDevDesignerPartFactory::instance() ), CTRL+Key_B ); b->addTo( stylesMenu ); - connect( b, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( b, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *ul = new ToolBarItem( this, basicToolBar, i18n( "Underline" ), "u", BarIcon( "designer_textunderline.png" , KDevDesignerPartFactory::instance()), CTRL+Key_U ); ul->addTo( stylesMenu ); - connect( ul, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( ul, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *tt = new ToolBarItem( this, basicToolBar, i18n( "Typewriter" ), "tt", BarIcon( "designer_textteletext.png", KDevDesignerPartFactory::instance() ) ); tt->addTo( stylesMenu ); - connect( tt, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( tt, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); basicToolBar->addSeparator(); @@ -134,39 +134,39 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget brAction->setText( i18n("Break" ) ); brAction->addTo( basicToolBar ); brAction->addTo( layoutMenu ); - connect( brAction, TQT_SIGNAL( activated() ) , this, TQT_SLOT( insertBR() ) ); + connect( brAction, TQ_SIGNAL( activated() ) , this, TQ_SLOT( insertBR() ) ); ToolBarItem *p = new ToolBarItem( this, basicToolBar, i18n( "Paragraph" ), "p", BarIcon( "designer_textparagraph.png", KDevDesignerPartFactory::instance() ) ); p->addTo( layoutMenu ); - connect( p, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( p, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); layoutMenu->insertSeparator(); basicToolBar->addSeparator(); ToolBarItem *al = new ToolBarItem( this, basicToolBar, i18n( "Align left" ), "p align=\"left\"", BarIcon( "designer_textleft.png", KDevDesignerPartFactory::instance() ) ); al->addTo( layoutMenu ); - connect( al, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( al, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *ac = new ToolBarItem( this, basicToolBar, i18n( "Align center" ), "p align=\"center\"", BarIcon( "designer_textcenter.png", KDevDesignerPartFactory::instance() ) ); ac->addTo( layoutMenu ); - connect( ac, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( ac, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *ar = new ToolBarItem( this, basicToolBar, i18n( "Align right" ), "p align=\"right\"", BarIcon( "designer_textright.png", KDevDesignerPartFactory::instance() ) ); ar->addTo( layoutMenu ); - connect( ar, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( ar, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *block = new ToolBarItem( this, basicToolBar, i18n( "Blockquote" ), "blockquote", BarIcon( "designer_textjustify.png", KDevDesignerPartFactory::instance() ) ); block->addTo( layoutMenu ); - connect( block, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( block, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); TQPopupMenu *fontMenu = new TQPopupMenu( this ); @@ -179,33 +179,33 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget fontAction->setText( i18n("Font" ) ); fontAction->addTo( fontToolBar ); fontAction->addTo( fontMenu ); - connect( fontAction, TQT_SIGNAL( activated() ) , this, TQT_SLOT( showFontDialog() ) ); + connect( fontAction, TQ_SIGNAL( activated() ) , this, TQ_SLOT( showFontDialog() ) ); ToolBarItem *fp1 = new ToolBarItem( this, fontToolBar, i18n( "Fontsize +1" ), "font size=\"+1\"", BarIcon( "designer_textlarger.png", KDevDesignerPartFactory::instance() ) ); - connect( fp1, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( fp1, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *fm1 = new ToolBarItem( this, fontToolBar, i18n( "Fontsize -1" ), "font size=\"-1\"", BarIcon( "designer_textsmaller.png", KDevDesignerPartFactory::instance() ) ); - connect( fm1, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( fm1, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *h1 = new ToolBarItem( this, fontToolBar, i18n( "Headline 1" ), "h1", BarIcon( "designer_texth1.png", KDevDesignerPartFactory::instance() ) ); - connect( h1, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( h1, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *h2 = new ToolBarItem( this, fontToolBar, i18n( "Headline 2" ), "h2", BarIcon( "designer_texth2.png", KDevDesignerPartFactory::instance() ) ); - connect( h2, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( h2, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); ToolBarItem *h3 = new ToolBarItem( this, fontToolBar, i18n( "Headline 3" ), "h3", BarIcon( "designer_texth3.png", KDevDesignerPartFactory::instance() ) ); - connect( h3, TQT_SIGNAL( clicked( const TQString& ) ), - this, TQT_SLOT( insertTags( const TQString& ))); + connect( h3, TQ_SIGNAL( clicked( const TQString& ) ), + this, TQ_SLOT( insertTags( const TQString& ))); TQPopupMenu *optionsMenu = new TQPopupMenu( this ); menuBar->insertItem( i18n( "O&ptions" ), optionsMenu ); @@ -217,17 +217,17 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget wrapAction->setText( i18n( "Word Wrapping" ) ); wrapAction->addTo( optionsToolBar ); wrapAction->addTo( optionsMenu ); - connect( wrapAction, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( changeWrapMode( bool ) ) ); + connect( wrapAction, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( changeWrapMode( bool ) ) ); oldDoWrap = doWrap; wrapAction->setOn( doWrap ); - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); textEdit->document()->setFormatter( new TQTextFormatterBreakInWords ); textEdit->document()->setUseFormatCollection( FALSE ); textEdit->document()->setPreProcessor( new SyntaxHighlighter_HTML ); - if ( !callStatic && ::tqqt_cast<TQTextEdit*>(editWidget) ) { + if ( !callStatic && ::tqt_cast<TQTextEdit*>(editWidget) ) { mlined = (TQTextEdit*)editWidget; mlined->setReadOnly( TRUE ); @@ -286,13 +286,13 @@ void MultiLineEditor::applyClicked() SetPropertyCommand *propcmd; if ( doWrap ) propcmd = new SetPropertyCommand( pn, formwindow, - TQT_TQOBJECT(mlined), MainWindow::self->propertyeditor(), - "wordWrap", WidgetFactory::property( TQT_TQOBJECT(mlined), "wordWrap" ), + mlined, MainWindow::self->propertyeditor(), + "wordWrap", WidgetFactory::property( mlined, "wordWrap" ), TQVariant( 1 ), "WidgetWidth", oldWrapString ); else propcmd = new SetPropertyCommand( pn, formwindow, - TQT_TQOBJECT(mlined), MainWindow::self->propertyeditor(), - "wordWrap", WidgetFactory::property( TQT_TQOBJECT(mlined), "wordWrap" ), + mlined, MainWindow::self->propertyeditor(), + "wordWrap", WidgetFactory::property( mlined, "wordWrap" ), TQVariant( 0 ), "NoWrap", oldWrapString ); propcmd->execute(); diff --git a/kdevdesigner/designer/multilineeditorimpl.h b/kdevdesigner/designer/multilineeditorimpl.h index 34d47b3e..75ac330f 100644 --- a/kdevdesigner/designer/multilineeditorimpl.h +++ b/kdevdesigner/designer/multilineeditorimpl.h @@ -38,7 +38,7 @@ class TQTextDocument; class TextEdit : public TQTextEdit { - Q_OBJECT + TQ_OBJECT public: @@ -50,7 +50,7 @@ public: class ToolBarItem : public TQAction { - Q_OBJECT + TQ_OBJECT public: @@ -70,7 +70,7 @@ private: class MultiLineEditor : public MultiLineEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/newform.ui b/kdevdesigner/designer/newform.ui index 81cb4fa5..7b95ee55 100644 --- a/kdevdesigner/designer/newform.ui +++ b/kdevdesigner/designer/newform.ui @@ -230,9 +230,9 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">itemChanged( TQIconViewItem * )</slot> <slot access="protected">projectChanged( const TQString & )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/newformimpl.cpp b/kdevdesigner/designer/newformimpl.cpp index 17dfc1b7..629d53ff 100644 --- a/kdevdesigner/designer/newformimpl.cpp +++ b/kdevdesigner/designer/newformimpl.cpp @@ -77,20 +77,20 @@ void FormItem::insert( Project *pro ) FormFile *ff = new FormFile( FormFile::createUnnamedFileName(), TRUE, pro ); fw = new FormWindow( ff, MainWindow::self, MainWindow::self->qWorkspace(), n ); fw->setProject( pro ); - MetaDataBase::addEntry( TQT_TQOBJECT(fw) ); + MetaDataBase::addEntry( fw ); if ( fType == Widget ) { - TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQWIDGET_OBJECT_NAME_STRING ), + TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQWidget" ), fw, n.latin1() ); fw->setMainContainer( w ); } else if ( fType == Dialog ) { - TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQDIALOG_OBJECT_NAME_STRING ), fw, n.latin1() ); + TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQDialog" ), fw, n.latin1() ); fw->setMainContainer( w ); } else if ( fType == Wizard ) { - TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQWIZARD_OBJECT_NAME_STRING ), + TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQWizard" ), fw, n.latin1() ); fw->setMainContainer( w ); } else if ( fType == MainWindow ) { - TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQMAINWINDOW_OBJECT_NAME_STRING ), + TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQMainWindow" ), fw, n.latin1() ); fw->setMainContainer( w ); } @@ -109,10 +109,10 @@ void FormItem::insert( Project *pro ) // the wizard might have changed a lot, lets update everything MainWindow::self->actioneditor()->setFormWindow( fw ); - MainWindow::self->objectHierarchy()->setFormWindow( fw, TQT_TQOBJECT(fw) ); + MainWindow::self->objectHierarchy()->setFormWindow( fw, fw ); MainWindow::self->objectHierarchy()->formDefinitionView()->refresh(); MainWindow::self->objectHierarchy()->rebuild(); - fw->killAccels( TQT_TQOBJECT(fw) ); + fw->killAccels( fw ); fw->project()->setModified( TRUE ); fw->setFocus(); if ( !pro->isDummy() ) { @@ -368,7 +368,7 @@ NewForm::NewForm( TQWidget *parent, const TQStringList& projects, const TQString& currentProject, const TQString &templatePath ) : NewFormBase( parent, 0, TRUE ) { - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); projectCombo->insertStringList( projects ); projectCombo->setCurrentText( currentProject ); diff --git a/kdevdesigner/designer/newformimpl.h b/kdevdesigner/designer/newformimpl.h index 863f5b9d..6f32cd8a 100644 --- a/kdevdesigner/designer/newformimpl.h +++ b/kdevdesigner/designer/newformimpl.h @@ -142,7 +142,7 @@ private: class NewForm : public NewFormBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/orderindicator.h b/kdevdesigner/designer/orderindicator.h index 33e486d4..401554f0 100644 --- a/kdevdesigner/designer/orderindicator.h +++ b/kdevdesigner/designer/orderindicator.h @@ -33,7 +33,7 @@ class FormWindow; class OrderIndicator : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/outputwindow.cpp b/kdevdesigner/designer/outputwindow.cpp index a23c14a7..84087f01 100644 --- a/kdevdesigner/designer/outputwindow.cpp +++ b/kdevdesigner/designer/outputwindow.cpp @@ -57,24 +57,24 @@ OutputWindow::~OutputWindow() debugoutput = debugView = 0; errorView = 0; if ( !debugToStderr ) - tqInstallMsgHandler( oldMsgHandler ); + qInstallMsgHandler( oldMsgHandler ); delete iface; } void OutputWindow::shuttingDown() { if ( !debugToStderr ) - tqInstallMsgHandler( oldMsgHandler ); + qInstallMsgHandler( oldMsgHandler ); } void OutputWindow::setupError() { errorView = new TQListView( this, "OutputWindow::errorView" ); errorView->setSorting( -1 ); - connect( errorView, TQT_SIGNAL( currentChanged( TQListViewItem* ) ), - this, TQT_SLOT( currentErrorChanged( TQListViewItem* ) ) ); - connect( errorView, TQT_SIGNAL( clicked( TQListViewItem* ) ), - this, TQT_SLOT( currentErrorChanged( TQListViewItem* ) ) ); + connect( errorView, TQ_SIGNAL( currentChanged( TQListViewItem* ) ), + this, TQ_SLOT( currentErrorChanged( TQListViewItem* ) ) ); + connect( errorView, TQ_SIGNAL( clicked( TQListViewItem* ) ), + this, TQ_SLOT( currentErrorChanged( TQListViewItem* ) ) ); if ( MetaDataBase::languages().count() > 1 ) addTab( errorView, i18n( "Warnings/Errors" ) ); @@ -119,7 +119,7 @@ void OutputWindow::setupDebug() addTab( debugView, "Debug Output" ); if ( !debugToStderr ) - oldMsgHandler = tqInstallMsgHandler( debugMessageOutput ); + oldMsgHandler = qInstallMsgHandler( debugMessageOutput ); } void OutputWindow::setErrorMessages( const TQStringList &errors, const TQValueList<uint> &lines, diff --git a/kdevdesigner/designer/outputwindow.h b/kdevdesigner/designer/outputwindow.h index 79b3e79a..d3190e0e 100644 --- a/kdevdesigner/designer/outputwindow.h +++ b/kdevdesigner/designer/outputwindow.h @@ -61,7 +61,7 @@ private: class OutputWindow : public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/paletteeditoradvancedimpl.cpp b/kdevdesigner/designer/paletteeditoradvancedimpl.cpp index 903c1a4f..e27d3a21 100644 --- a/kdevdesigner/designer/paletteeditoradvancedimpl.cpp +++ b/kdevdesigner/designer/paletteeditoradvancedimpl.cpp @@ -69,7 +69,7 @@ PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) : PaletteEditorAdvancedBase( parent, name, modal, f ), formWindow( fw ), selectedPalette(0) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); buttonPixmap->setEditor( StyledButton::PixmapEditor ); diff --git a/kdevdesigner/designer/paletteeditoradvancedimpl.h b/kdevdesigner/designer/paletteeditoradvancedimpl.h index 1fb59912..70d0baa4 100644 --- a/kdevdesigner/designer/paletteeditoradvancedimpl.h +++ b/kdevdesigner/designer/paletteeditoradvancedimpl.h @@ -33,7 +33,7 @@ class FormWindow; class PaletteEditorAdvanced : public PaletteEditorAdvancedBase { - Q_OBJECT + TQ_OBJECT public: PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent=0, const char * name=0, diff --git a/kdevdesigner/designer/paletteeditorimpl.cpp b/kdevdesigner/designer/paletteeditorimpl.cpp index ae0cf7fd..fca7fe90 100644 --- a/kdevdesigner/designer/paletteeditorimpl.cpp +++ b/kdevdesigner/designer/paletteeditorimpl.cpp @@ -39,7 +39,7 @@ PaletteEditor::PaletteEditor( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) : PaletteEditorBase( parent, name, modal, f ), formWindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); editPalette = TQApplication::palette(); setPreviewPalette( editPalette ); diff --git a/kdevdesigner/designer/paletteeditorimpl.h b/kdevdesigner/designer/paletteeditorimpl.h index c1943a61..ac1cf229 100644 --- a/kdevdesigner/designer/paletteeditorimpl.h +++ b/kdevdesigner/designer/paletteeditorimpl.h @@ -33,7 +33,7 @@ class FormWindow; class PaletteEditor : public PaletteEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/pixmapchooser.cpp b/kdevdesigner/designer/pixmapchooser.cpp index 92d68ac1..bf521b48 100644 --- a/kdevdesigner/designer/pixmapchooser.cpp +++ b/kdevdesigner/designer/pixmapchooser.cpp @@ -174,31 +174,31 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T TQPixmap pix( dlg.selectedURL().path() ); if ( fn ) *fn = dlg.selectedURL().path(); - MetaDataBase::setPixmapArgument( TQT_TQOBJECT(fw), pix.serialNumber(), dlg.selectedURL().path() ); + MetaDataBase::setPixmapArgument( fw, pix.serialNumber(), dlg.selectedURL().path() ); return pix; } } else if ( fw && fw->savePixmapInProject() ) { PixmapCollectionEditor dia( parent, 0, TRUE ); dia.setProject( fw->project() ); dia.setChooserMode( TRUE ); - dia.setCurrentItem( MetaDataBase::pixmapKey( TQT_TQOBJECT(fw), old.serialNumber() ) ); + dia.setCurrentItem( MetaDataBase::pixmapKey( fw, old.serialNumber() ) ); if ( dia.exec() == TQDialog::Accepted ) { TQPixmap pix( fw->project()->pixmapCollection()->pixmap( dia.viewPixmaps->currentItem()->text() ) ); - MetaDataBase::setPixmapKey( TQT_TQOBJECT(fw), pix.serialNumber(), dia.viewPixmaps->currentItem()->text() ); + MetaDataBase::setPixmapKey( fw, pix.serialNumber(), dia.viewPixmaps->currentItem()->text() ); return pix; } } else { PixmapFunction dia( parent, 0, TRUE ); - TQObject::connect( dia.helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + TQObject::connect( dia.helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); dia.labelFunction->setText( fw->pixmapLoaderFunction() + "(" ); - dia.editArguments->setText( MetaDataBase::pixmapArgument( TQT_TQOBJECT(fw), old.serialNumber() ) ); + dia.editArguments->setText( MetaDataBase::pixmapArgument( fw, old.serialNumber() ) ); dia.editArguments->setFocus(); if ( dia.exec() == TQDialog::Accepted ) { TQPixmap pix; // we have to force the pixmap to get a new and unique serial number. Unfortunately detatch() doesn't do that pix.convertFromImage( BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ).convertToImage() ); - MetaDataBase::setPixmapArgument( TQT_TQOBJECT(fw), pix.serialNumber(), dia.editArguments->text() ); + MetaDataBase::setPixmapArgument( fw, pix.serialNumber(), dia.editArguments->text() ); return pix; } } @@ -211,7 +211,7 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T } ImageIconProvider::ImageIconProvider( TQWidget *parent, const char *name ) - : TQFileIconProvider( TQT_TQOBJECT(parent), name ), imagepm( BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ) ) + : TQFileIconProvider( parent, name ), imagepm( BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ) ) { fmts = TQImage::inputFormats(); } diff --git a/kdevdesigner/designer/pixmapchooser.h b/kdevdesigner/designer/pixmapchooser.h index c6523488..0f1ac04a 100644 --- a/kdevdesigner/designer/pixmapchooser.h +++ b/kdevdesigner/designer/pixmapchooser.h @@ -37,7 +37,7 @@ class FormWindow; class PixmapView : public TQScrollView, public TQFilePreview { - Q_OBJECT + TQ_OBJECT public: @@ -53,7 +53,7 @@ private: class ImageIconProvider : public TQFileIconProvider { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/pixmapcollectioneditor.ui b/kdevdesigner/designer/pixmapcollectioneditor.ui index 30f74183..e939397f 100644 --- a/kdevdesigner/designer/pixmapcollectioneditor.ui +++ b/kdevdesigner/designer/pixmapcollectioneditor.ui @@ -202,7 +202,7 @@ <variable>Project *project;</variable> <variable>bool chooser;</variable> </variables> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>addPixmap()</slot> @@ -213,6 +213,6 @@ <slot>setCurrentItem(const TQString & name)</slot> <slot>setProject(Project * pro)</slot> <slot returnType="TQPixmap">scaledPixmap(const TQPixmap & p)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/pixmapcollectioneditor.ui.h b/kdevdesigner/designer/pixmapcollectioneditor.ui.h index 82bd7929..c32fc135 100644 --- a/kdevdesigner/designer/pixmapcollectioneditor.ui.h +++ b/kdevdesigner/designer/pixmapcollectioneditor.ui.h @@ -110,8 +110,8 @@ void PixmapCollectionEditor::setChooserMode( bool c ) buttonCancel->show(); buttonOk->setEnabled( FALSE ); buttonOk->setDefault( TRUE ); - connect( viewPixmaps, TQT_SIGNAL( doubleClicked( TQIconViewItem * ) ), buttonOk, TQT_SIGNAL( clicked() ) ); - connect( viewPixmaps, TQT_SIGNAL( returnPressed( TQIconViewItem * ) ), buttonOk, TQT_SIGNAL( clicked() ) ); + connect( viewPixmaps, TQ_SIGNAL( doubleClicked( TQIconViewItem * ) ), buttonOk, TQ_SIGNAL( clicked() ) ); + connect( viewPixmaps, TQ_SIGNAL( returnPressed( TQIconViewItem * ) ), buttonOk, TQ_SIGNAL( clicked() ) ); setCaption( i18n( "Choose Image" ) ); } else { buttonClose->show(); diff --git a/kdevdesigner/designer/popupmenueditor.cpp b/kdevdesigner/designer/popupmenueditor.cpp index da6289dd..bf60b215 100644 --- a/kdevdesigner/designer/popupmenueditor.cpp +++ b/kdevdesigner/designer/popupmenueditor.cpp @@ -105,7 +105,7 @@ PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, TQObject * par { init(); a = new TQAction( this ); - TQObject::connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( selfDestruct() ) ); + TQObject::connect( a, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( selfDestruct() ) ); } @@ -119,7 +119,7 @@ PopupMenuEditorItem::PopupMenuEditorItem( TQAction * action, PopupMenuEditor * m removable( TRUE ) { init(); - if ( /*a->name() == "qt_separator_action" ||*/ ::tqqt_cast<QSeparatorAction*>(a) ) + if ( /*a->name() == "qt_separator_action" ||*/ ::tqt_cast<QSeparatorAction*>(a) ) separator = TRUE; if ( a && !a->childrenListObject().isEmpty() ) a->installEventFilter( this ); @@ -135,7 +135,7 @@ PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditorItem * item, PopupMenuE removable( item->removable ) { init(); - if ( ::tqqt_cast<TQActionGroup*>(a) ) + if ( ::tqt_cast<TQActionGroup*>(a) ) a->installEventFilter( this ); } @@ -147,13 +147,13 @@ PopupMenuEditorItem::~PopupMenuEditorItem() void PopupMenuEditorItem::init() { if ( a ) { - TQObject::connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( selfDestruct() ) ); + TQObject::connect( a, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( selfDestruct() ) ); if ( m && !isSeparator() ) { s = new PopupMenuEditor( m->formWindow(), m ); TQString n = "PopupMenuEditor"; - m->formWindow()->unify( TQT_TQOBJECT(s), n, TRUE ); + m->formWindow()->unify( s, n, TRUE ); s->setName( n ); - MetaDataBase::addEntry( TQT_TQOBJECT(s) ); + MetaDataBase::addEntry( s ); } } } @@ -175,7 +175,7 @@ void PopupMenuEditorItem::setVisible( bool enable ) bool PopupMenuEditorItem::isVisible() const { - TQActionGroup *g = ::tqqt_cast<TQActionGroup*>(a); + TQActionGroup *g = ::tqt_cast<TQActionGroup*>(a); if ( g ) return ( g->isVisible() && g->usesDropDown() ); else if ( a ) @@ -212,7 +212,7 @@ int PopupMenuEditorItem::count() const { if ( s ) { return s->count(); - } else if ( ::tqqt_cast<TQActionGroup*>(a) ) { + } else if ( ::tqt_cast<TQActionGroup*>(a) ) { const TQObjectList l = a->childrenListObject(); if ( !l.isEmpty() ) return l.count(); @@ -222,15 +222,15 @@ int PopupMenuEditorItem::count() const bool PopupMenuEditorItem::eventFilter( TQObject * o, TQEvent * event ) { - if ( ! ::tqqt_cast<TQActionGroup*>( o ) ) + if ( ! ::tqt_cast<TQActionGroup*>( o ) ) return FALSE; if ( event->type() == TQEvent::ChildInserted ) { TQChildEvent * ce = ( TQChildEvent * ) event; - TQObject * c = TQT_TQOBJECT(ce->child()); - TQAction * action = ::tqqt_cast<TQAction*>( c ); + TQObject * c = ce->child(); + TQAction * action = ::tqt_cast<TQAction*>( c ); if ( s->find( action ) != -1 ) // avoid duplicates return FALSE; - TQActionGroup * actionGroup = ::tqqt_cast<TQActionGroup*>( c ); + TQActionGroup * actionGroup = ::tqt_cast<TQActionGroup*>( c ); if ( actionGroup ) s->insert( actionGroup ); else if ( action ) @@ -304,7 +304,7 @@ void PopupMenuEditor::init() addSeparator.action()->setMenuText( i18n("new separator") ); setAcceptDrops( TRUE ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); lineEdit = new TQLineEdit( this ); lineEdit->hide(); @@ -357,11 +357,11 @@ void PopupMenuEditor::insert( TQActionGroup * actionGroup, int index ) PopupMenuEditorItem *i = new PopupMenuEditorItem( (TQAction *)actionGroup, this, 0, TQString( actionGroup->name() ) + "Menu" ); TQActionGroup *g = 0; - TQObjectList *l = actionGroup->queryList( TQACTION_OBJECT_NAME_STRING, 0, FALSE, FALSE ); + TQObjectList *l = actionGroup->queryList( "TQAction", 0, FALSE, FALSE ); TQObjectListIterator it( *l ); insert( i, index ); for ( ; it.current(); ++it ) { - g = ::tqqt_cast<TQActionGroup*>(it.current()); + g = ::tqt_cast<TQActionGroup*>(it.current()); if ( g ) { if ( dropdown ) i->s->insert( g ); @@ -714,7 +714,7 @@ void PopupMenuEditor::setFocusAt( const TQPoint & pos ) bool PopupMenuEditor::eventFilter( TQObject * o, TQEvent * e ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lineEdit) && e->type() == TQEvent::FocusOut ) { + if ( o == lineEdit && e->type() == TQEvent::FocusOut ) { leaveEditMode( 0 ); update(); } @@ -730,7 +730,7 @@ void PopupMenuEditor::paintEvent( TQPaintEvent * ) rect().width() - borderSize * 2, rect().height() - borderSize * 2 ); reg -= mid; p.setClipRegion( reg ); - style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, rect(), colorGroup() ); + style().drawPrimitive( TQStyle::PE_PanelPopup, &p, rect(), colorGroup() ); p.restore(); drawItems( &p ); } @@ -761,7 +761,7 @@ void PopupMenuEditor::mouseDoubleClickEvent( TQMouseEvent * ) void PopupMenuEditor::mouseMoveEvent( TQMouseEvent * e ) { - if ( e->state() & Qt::LeftButton ) { + if ( e->state() & TQt::LeftButton ) { if ( ( e->pos() - mousePressPos ).manhattanLength() > 3 ) { draggedItem = itemAt( mousePressPos.y() ); if ( draggedItem == &addItem ) { @@ -847,7 +847,7 @@ void PopupMenuEditor::dropEvent( TQDropEvent * e ) // Hide the sub menu of the current item, but do it later if ( currentIndex < (int)itemList.count() ) { PopupMenuEditor *s = itemList.at( currentIndex )->s; - TQTimer::singleShot( 0, s, TQT_SLOT( hide() ) ); + TQTimer::singleShot( 0, s, TQ_SLOT( hide() ) ); } draggedItem = 0; @@ -857,16 +857,16 @@ void PopupMenuEditor::dropEvent( TQDropEvent * e ) PopupMenuEditorItemPtrDrag::decode( e, &i ); } else { if ( e->provides( "application/x-designer-actiongroup" ) ) { - TQActionGroup * g = ::tqqt_cast<QDesignerActionGroup*>(ActionDrag::action()); + TQActionGroup * g = ::tqt_cast<QDesignerActionGroup*>(ActionDrag::action()); if ( g->usesDropDown() ) { i = new PopupMenuEditorItem( g, this ); TQString n = TQString( g->name() ) + "Item"; formWindow()->unify( i, n, FALSE ); i->setName( n ); - TQObjectList *l = g->queryList( TQACTION_OBJECT_NAME_STRING, 0, FALSE, FALSE ); + TQObjectList *l = g->queryList( "TQAction", 0, FALSE, FALSE ); TQObjectListIterator it( *l ); for ( ; it.current(); ++it ) { - g = ::tqqt_cast<TQActionGroup*>(it.current()); + g = ::tqt_cast<TQActionGroup*>(it.current()); if ( g ) i->s->insert( g ); else @@ -877,18 +877,18 @@ void PopupMenuEditor::dropEvent( TQDropEvent * e ) dropInPlace( g, e->pos().y() ); } } else if ( e->provides( "application/x-designer-actions" ) ) { - TQAction *a = ::tqqt_cast<QDesignerAction*>(ActionDrag::action()); + TQAction *a = ::tqt_cast<QDesignerAction*>(ActionDrag::action()); i = new PopupMenuEditorItem( a, this ); } } if ( i ) { dropInPlace( i, e->pos().y() ); - TQTimer::singleShot( 0, this, TQT_SLOT( resizeToContents() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( resizeToContents() ) ); } - TQTimer::singleShot( 0, this, TQT_SLOT( showSubMenu() ) ); - TQTimer::singleShot( 0, this, TQT_SLOT( setFocus() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( showSubMenu() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( setFocus() ) ); dropLine->hide(); e->accept(); } @@ -1012,12 +1012,12 @@ void PopupMenuEditor::focusInEvent( TQFocusEvent * ) void PopupMenuEditor::focusOutEvent( TQFocusEvent * ) { TQWidget * fw = tqApp->focusWidget(); - if ( !fw || ( !::tqqt_cast<PopupMenuEditor*>(fw) && fw != lineEdit ) ) { + if ( !fw || ( !::tqt_cast<PopupMenuEditor*>(fw) && fw != lineEdit ) ) { hideSubMenu(); - if ( fw && ::tqqt_cast<MenuBarEditor*>(fw) ) + if ( fw && ::tqt_cast<MenuBarEditor*>(fw) ) return; TQWidget * w = this; - while ( w && w != fw && ::tqqt_cast<PopupMenuEditor*>(w) ) { // hide all popups + while ( w && w != fw && ::tqt_cast<PopupMenuEditor*>(w) ) { // hide all popups w->hide(); w = ((PopupMenuEditor *)w)->parentEditor(); } @@ -1034,7 +1034,7 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i, p->fillRect( r, colorGroup().brush( TQColorGroup::Background ) ); if ( i->isSeparator() ) { - style().tqdrawPrimitive( TQStyle::PE_Separator, p, + style().drawPrimitive( TQStyle::PE_Separator, p, TQRect( r.x(), r.y() + 2, r.width(), 1 ), colorGroup(), TQStyle::Style_Sunken | f ); return; @@ -1042,7 +1042,7 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i, const TQAction * a = i->action(); if ( a->isToggleAction() && a->isOn() ) { - style().tqdrawPrimitive( TQStyle::PE_CheckMark, p, + style().drawPrimitive( TQStyle::PE_CheckMark, p, TQRect( x , y, iconWidth, h ), colorGroup(), f ); } else { @@ -1064,7 +1064,7 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i, TQPainter::AlignLeft | TQPainter::AlignVCenter, a->accel() ); if ( i->count() ) // Item has submenu - style().tqdrawPrimitive( TQStyle::PE_ArrowRight, p, + style().drawPrimitive( TQStyle::PE_ArrowRight, p, TQRect( r.width() - arrowWidth, r.y(), arrowWidth, r.height() ), colorGroup(), f ); } @@ -1243,8 +1243,8 @@ void PopupMenuEditor::dropInPlace( TQActionGroup * g, int y ) if (l.isEmpty()) return; for ( int i = 0; i < (int)l.count(); ++i ) { - TQAction *a = ::tqqt_cast<TQAction*>(l.at(i)); - TQActionGroup *g = ::tqqt_cast<TQActionGroup*>(l.at(i)); + TQAction *a = ::tqt_cast<TQAction*>(l.at(i)); + TQActionGroup *g = ::tqt_cast<TQActionGroup*>(l.at(i)); if ( g ) dropInPlace( g, y ); else if ( a ) @@ -1449,13 +1449,13 @@ TQString PopupMenuEditor::constructName( PopupMenuEditorItem *item ) TQString s; TQString name = item->action()->menuText(); TQWidget *e = parentEditor(); - PopupMenuEditor *p = ::tqqt_cast<PopupMenuEditor*>(e); + PopupMenuEditor *p = ::tqt_cast<PopupMenuEditor*>(e); if ( p ) { int idx = p->find( item->m ); PopupMenuEditorItem * i = ( idx > -1 ? p->at( idx ) : 0 ); s = ( i ? TQString( i->action()->name() ).remove( "Action" ) : TQString( "" ) ); } else { - MenuBarEditor *b = ::tqqt_cast<MenuBarEditor*>(e); + MenuBarEditor *b = ::tqt_cast<MenuBarEditor*>(e); if ( b ) { int idx = b->findItem( item->m ); MenuBarEditorItem * i = ( idx > -1 ? b->item( idx ) : 0 ); diff --git a/kdevdesigner/designer/popupmenueditor.h b/kdevdesigner/designer/popupmenueditor.h index 714ecf42..cfb42749 100644 --- a/kdevdesigner/designer/popupmenueditor.h +++ b/kdevdesigner/designer/popupmenueditor.h @@ -36,7 +36,7 @@ class TQMenuItem; class PopupMenuEditorItem : public TQObject { - Q_OBJECT + TQ_OBJECT friend class PopupMenuEditor; @@ -100,7 +100,7 @@ class TQLineEdit; class PopupMenuEditor : public TQWidget { - Q_OBJECT + TQ_OBJECT friend class PopupMenuEditorItem; diff --git a/kdevdesigner/designer/preferences.ui b/kdevdesigner/designer/preferences.ui index c00cf82a..c5ee2847 100644 --- a/kdevdesigner/designer/preferences.ui +++ b/kdevdesigner/designer/preferences.ui @@ -636,9 +636,9 @@ <tabstop>checkBoxTextLabels</tabstop> <tabstop>helpButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/previewframe.h b/kdevdesigner/designer/previewframe.h index 1883a062..9c479b06 100644 --- a/kdevdesigner/designer/previewframe.h +++ b/kdevdesigner/designer/previewframe.h @@ -34,7 +34,7 @@ class PreviewWorkspace : public TQWorkspace { - Q_OBJECT + TQ_OBJECT public: PreviewWorkspace( TQWidget* parent = 0, const char* name = 0 ) @@ -47,7 +47,7 @@ protected: class PreviewFrame : public TQVBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/previewwidgetimpl.cpp b/kdevdesigner/designer/previewwidgetimpl.cpp index d574f9ae..c3c16e32 100644 --- a/kdevdesigner/designer/previewwidgetimpl.cpp +++ b/kdevdesigner/designer/previewwidgetimpl.cpp @@ -31,13 +31,13 @@ PreviewWidget::PreviewWidget( TQWidget *parent, const char *name ) : PreviewWidgetBase( parent, name ) { // install event filter on child widgets - TQObjectList *l = queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *l = queryList("TQWidget"); TQObjectListIt it(*l); TQObject * obj; while ((obj = it.current()) != 0) { ++it; obj->installEventFilter(this); - ((TQWidget*)obj)->setFocusPolicy(TQ_NoFocus); + ((TQWidget*)obj)->setFocusPolicy(TQWidget::NoFocus); } } diff --git a/kdevdesigner/designer/previewwidgetimpl.h b/kdevdesigner/designer/previewwidgetimpl.h index d8887bee..9a4c092c 100644 --- a/kdevdesigner/designer/previewwidgetimpl.h +++ b/kdevdesigner/designer/previewwidgetimpl.h @@ -31,7 +31,7 @@ class PreviewWidget : public PreviewWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/project.cpp b/kdevdesigner/designer/project.cpp index 0ab26894..8dcf8b28 100644 --- a/kdevdesigner/designer/project.cpp +++ b/kdevdesigner/designer/project.cpp @@ -1066,7 +1066,7 @@ TQObjectList *Project::formList( bool resolveFakeObjects ) const if ( resolveFakeObjects && f->formWindow()->isFake() ) l->append( objectForFakeForm( f->formWindow() ) ); else - l->append( f->formWindow()->child( 0, TQWIDGET_OBJECT_NAME_STRING ) ); + l->append( f->formWindow()->child( 0, "TQWidget" ) ); } else if ( f->isFake() ) { l->append( objectForFakeFormFile( f ) ); } @@ -1311,9 +1311,9 @@ void Project::addObject( TQObject *o ) if ( MainWindow::self ) { TQApplication::sendPostedEvents( MainWindow::self->qWorkspace(), TQEvent::ChildInserted ); connect( fw, - TQT_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), + TQ_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), MainWindow::self, - TQT_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) + TQ_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) ); } if ( fw->parentWidget() ) { @@ -1487,9 +1487,9 @@ void Project::designerCreated() if ( !fw || fw->mainWindow() ) continue; fw->setMainWindow( MainWindow::self ); - connect( fw, TQT_SIGNAL( undoRedoChanged( bool, bool, const TQString &, + connect( fw, TQ_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ), - MainWindow::self, TQT_SLOT( updateUndoRedo( bool, bool, + MainWindow::self, TQ_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) ) ); fw->reparent( MainWindow::self->qWorkspace(), TQPoint( 0, 0 ), FALSE ); TQApplication::sendPostedEvents( MainWindow::self->qWorkspace(), @@ -1514,8 +1514,8 @@ TQString Project::locationOfObject( TQObject *o ) if ( MainWindow::self ) { TQWidgetList windows = MainWindow::self->qWorkspace()->windowList(); for ( TQWidget *w = windows.first(); w; w = windows.next() ) { - FormWindow *fw = ::tqqt_cast<FormWindow*>(w); - SourceEditor *se = ::tqqt_cast<SourceEditor*>(w); + FormWindow *fw = ::tqt_cast<FormWindow*>(w); + SourceEditor *se = ::tqt_cast<SourceEditor*>(w); if ( fw ) { if ( fw->isFake() ) return objectForFakeForm( fw )->name() + TQString( " [Source]" ); @@ -1532,7 +1532,7 @@ TQString Project::locationOfObject( TQObject *o ) } } - if ( ::tqqt_cast<SourceFile*>(o) ) { + if ( ::tqt_cast<SourceFile*>(o) ) { for ( TQPtrListIterator<SourceFile> sources = sourceFiles(); sources.current(); ++sources ) { SourceFile* f = sources.current(); diff --git a/kdevdesigner/designer/project.h b/kdevdesigner/designer/project.h index 3e80428f..e2d4ef2d 100644 --- a/kdevdesigner/designer/project.h +++ b/kdevdesigner/designer/project.h @@ -110,7 +110,7 @@ private: class Project : public TQObject { - Q_OBJECT + TQ_OBJECT friend class DatabaseConnection; diff --git a/kdevdesigner/designer/projectsettings.ui b/kdevdesigner/designer/projectsettings.ui index 2e03d928..cac4e813 100644 --- a/kdevdesigner/designer/projectsettings.ui +++ b/kdevdesigner/designer/projectsettings.ui @@ -288,7 +288,7 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">chooseDatabaseFile()</slot> <slot access="protected">chooseProjectFile()</slot> <slot access="protected">destroy()</slot> @@ -296,7 +296,7 @@ <slot access="protected">init()</slot> <slot access="protected">languageChanged( const TQString & )</slot> <slot access="protected">okClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kdevdesigner/designer/projectsettingsimpl.cpp b/kdevdesigner/designer/projectsettingsimpl.cpp index 99bb800d..77ac4f25 100644 --- a/kdevdesigner/designer/projectsettingsimpl.cpp +++ b/kdevdesigner/designer/projectsettingsimpl.cpp @@ -57,7 +57,7 @@ ProjectSettings::ProjectSettings( Project *pro, TQWidget* parent, const char* name, bool modal, WFlags fl ) : ProjectSettingsBase( parent, name, modal, fl ), project( pro ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); editProjectFile->setFocus(); diff --git a/kdevdesigner/designer/projectsettingsimpl.h b/kdevdesigner/designer/projectsettingsimpl.h index c1b7fb0c..ad784a3c 100644 --- a/kdevdesigner/designer/projectsettingsimpl.h +++ b/kdevdesigner/designer/projectsettingsimpl.h @@ -36,7 +36,7 @@ class SourceFile; class ProjectSettings : public ProjectSettingsBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp index 10fd4aaf..af1d26d7 100644 --- a/kdevdesigner/designer/propertyeditor.cpp +++ b/kdevdesigner/designer/propertyeditor.cpp @@ -294,7 +294,7 @@ void PropertyItem::paintBranches( TQPainter * p, const TQColorGroup & cg, void PropertyItem::paintFocus( TQPainter *p, const TQColorGroup &cg, const TQRect &r ) { p->save(); - TQApplication::style().tqdrawPrimitive(TQStyle::PE_Panel, p, r, cg, + TQApplication::style().drawPrimitive(TQStyle::PE_Panel, p, r, cg, TQStyle::Style_Sunken, TQStyleOption(1,1) ); p->restore(); } @@ -417,8 +417,8 @@ void PropertyItem::createResetButton() hbox->layout()->setAlignment( TQt::AlignRight ); listview->addChild( hbox ); hbox->hide(); - TQObject::connect( resetButton, TQT_SIGNAL( clicked() ), - listview, TQT_SLOT( resetProperty() ) ); + TQObject::connect( resetButton, TQ_SIGNAL( clicked() ), + listview, TQ_SLOT( resetProperty() ) ); TQToolTip::add( resetButton, i18n( "Reset the property to its default value" ) ); TQWhatsThis::add( resetButton, i18n( "Click this button to reset the property to its default value" ) ); updateResetButtonState(); @@ -555,7 +555,7 @@ void PropertyItem::setFocus( TQWidget *w ) { if ( !tqApp->focusWidget() || listview->propertyEditor()->formWindow() && - ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->focusWidget()) ) && + ( !MainWindow::self->isAFormWindowChild( tqApp->focusWidget() ) && !tqApp->focusWidget()->inherits( "Editor" ) ) ) w->setFocus(); } @@ -598,7 +598,7 @@ TQLineEdit *PropertyTextItem::lined() if ( asciiOnly ) { if ( PropertyItem::name() == "name" ) { - lin->setValidator( new AsciiValidator( TQString(":"), TQT_TQOBJECT(lin), "ascii_validator" ) ); + lin->setValidator( new AsciiValidator( TQString(":"), lin, "ascii_validator" ) ); if ( listview->propertyEditor()->formWindow()->isFake() ) lin->setEnabled( FALSE ); } else { @@ -606,7 +606,7 @@ TQLineEdit *PropertyTextItem::lined() "\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9" "\xaa\xab\xac\xad\xae\xaf\xb1\xb2\xb3" "\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc" - "\xbd\xbe\xbf"), TQT_TQOBJECT(lin), "ascii_validator" ) ); + "\xbd\xbe\xbf"), lin, "ascii_validator" ) ); } } if ( !hasMultiLines ) { lin->hide(); @@ -614,18 +614,18 @@ TQLineEdit *PropertyTextItem::lined() button = new TQPushButton( "...", box ); setupStyle( button ); button->setFixedWidth( 20 ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getText() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getText() ) ); lin->setFrame( FALSE ); } - connect( lin, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( setValue() ) ); - connect( lin, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( setValue() ) ); if ( PropertyItem::name() == "name" || PropertyItem::name() == "itemName" ) - connect( lin, TQT_SIGNAL( returnPressed() ), + connect( lin, TQ_SIGNAL( returnPressed() ), listview->propertyEditor()->formWindow()->commandHistory(), - TQT_SLOT( checkCompressedCommand() ) ); + TQ_SLOT( checkCompressedCommand() ) ); lin->installEventFilter( listview ); return lin; } @@ -753,7 +753,7 @@ void PropertyTextItem::setValue() void PropertyTextItem::getText() { - bool richText = !::tqqt_cast<TQButton*>(listview->propertyEditor()->widget()) || + bool richText = !::tqt_cast<TQButton*>(listview->propertyEditor()->widget()) || ( text( 0 ) == "whatsThis" ); bool doWrap = FALSE; TQString txt = MultiLineEditor::getText( listview, value().toString(), richText, &doWrap ); @@ -781,12 +781,12 @@ TQLineEdit *PropertyDoubleItem::lined() if ( lin ) return lin; lin = new TQLineEdit( listview->viewport() ); - lin->setValidator( new TQDoubleValidator( TQT_TQOBJECT(lin), "double_validator" ) ); + lin->setValidator( new TQDoubleValidator( lin, "double_validator" ) ); - connect( lin, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( setValue() ) ); - connect( lin, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( setValue() ) ); lin->installEventFilter( listview ); return lin; } @@ -861,12 +861,12 @@ TQDateEdit *PropertyDateItem::lined() if ( lin ) return lin; lin = new TQDateEdit( listview->viewport() ); - TQObjectList *l = lin->queryList( TQLINEEDIT_OBJECT_NAME_STRING ); + TQObjectList *l = lin->queryList( "TQLineEdit" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); delete l; - connect( lin, TQT_SIGNAL( valueChanged( const TQDate & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( valueChanged( const TQDate & ) ), + this, TQ_SLOT( setValue() ) ); return lin; } @@ -910,13 +910,13 @@ void PropertyDateItem::setValue( const TQVariant &v ) lined()->setDate( v.toDate() ); lined()->blockSignals( FALSE ); } - setText( 1, v.toDate().toString( ::Qt::ISODate ) ); + setText( 1, v.toDate().toString( ::TQt::ISODate ) ); PropertyItem::setValue( v ); } void PropertyDateItem::setValue() { - setText( 1, lined()->date().toString( ::Qt::ISODate ) ); + setText( 1, lined()->date().toString( ::TQt::ISODate ) ); TQVariant v; v = lined()->date(); PropertyItem::setValue( v ); @@ -936,9 +936,9 @@ TQTimeEdit *PropertyTimeItem::lined() if ( lin ) return lin; lin = new TQTimeEdit( listview->viewport() ); - connect( lin, TQT_SIGNAL( valueChanged( const TQTime & ) ), - this, TQT_SLOT( setValue() ) ); - TQObjectList *l = lin->queryList( TQLINEEDIT_OBJECT_NAME_STRING ); + connect( lin, TQ_SIGNAL( valueChanged( const TQTime & ) ), + this, TQ_SLOT( setValue() ) ); + TQObjectList *l = lin->queryList( "TQLineEdit" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); delete l; @@ -985,13 +985,13 @@ void PropertyTimeItem::setValue( const TQVariant &v ) lined()->setTime( v.toTime() ); lined()->blockSignals( FALSE ); } - setText( 1, v.toTime().toString( ::Qt::ISODate ) ); + setText( 1, v.toTime().toString( ::TQt::ISODate ) ); PropertyItem::setValue( v ); } void PropertyTimeItem::setValue() { - setText( 1, lined()->time().toString( ::Qt::ISODate ) ); + setText( 1, lined()->time().toString( ::TQt::ISODate ) ); TQVariant v; v = lined()->time(); PropertyItem::setValue( v ); @@ -1011,9 +1011,9 @@ TQDateTimeEdit *PropertyDateTimeItem::lined() if ( lin ) return lin; lin = new TQDateTimeEdit( listview->viewport() ); - connect( lin, TQT_SIGNAL( valueChanged( const TQDateTime & ) ), - this, TQT_SLOT( setValue() ) ); - TQObjectList *l = lin->queryList( TQLINEEDIT_OBJECT_NAME_STRING ); + connect( lin, TQ_SIGNAL( valueChanged( const TQDateTime & ) ), + this, TQ_SLOT( setValue() ) ); + TQObjectList *l = lin->queryList( "TQLineEdit" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); delete l; @@ -1060,13 +1060,13 @@ void PropertyDateTimeItem::setValue( const TQVariant &v ) lined()->setDateTime( v.toDateTime() ); lined()->blockSignals( FALSE ); } - setText( 1, v.toDateTime().toString( ::Qt::ISODate ) ); + setText( 1, v.toDateTime().toString( ::TQt::ISODate ) ); PropertyItem::setValue( v ); } void PropertyDateTimeItem::setValue() { - setText( 1, lined()->dateTime().toString( ::Qt::ISODate ) ); + setText( 1, lined()->dateTime().toString( ::TQt::ISODate ) ); TQVariant v; v = lined()->dateTime(); PropertyItem::setValue( v ); @@ -1089,8 +1089,8 @@ TQComboBox *PropertyBoolItem::combo() comb->hide(); comb->insertItem( i18n( "False" ) ); comb->insertItem( i18n( "True" ) ); - connect( comb, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); return comb; } @@ -1182,12 +1182,12 @@ TQSpinBox *PropertyIntItem::spinBox() spinBx = new TQSpinBox( 0, INT_MAX, 1, listview->viewport() ); spinBx->hide(); spinBx->installEventFilter( listview ); - TQObjectList *ol = spinBx->queryList( TQLINEEDIT_OBJECT_NAME_STRING ); + TQObjectList *ol = spinBx->queryList( "TQLineEdit" ); if ( ol && ol->first() ) ol->first()->installEventFilter( listview ); delete ol; - connect( spinBx, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( spinBx, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( setValue() ) ); return spinBx; } @@ -1278,12 +1278,12 @@ TQSpinBox* PropertyLayoutItem::spinBox() spinBx->setSpecialValueText( i18n( "default" ) ); spinBx->hide(); spinBx->installEventFilter( listview ); - TQObjectList *ol = spinBx->queryList( TQLINEEDIT_OBJECT_NAME_STRING ); + TQObjectList *ol = spinBx->queryList( "TQLineEdit" ); if ( ol && ol->first() ) ol->first()->installEventFilter( listview ); delete ol; - connect( spinBx, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( spinBx, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( setValue() ) ); return spinBx; } @@ -1347,11 +1347,11 @@ TQComboBox *PropertyListItem::combo() return comb; comb = new TQComboBox( editable, listview->viewport() ); comb->hide(); - connect( comb, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); if ( editable ) { - TQObjectList *ol = comb->queryList( TQLINEEDIT_OBJECT_NAME_STRING ); + TQObjectList *ol = comb->queryList( "TQLineEdit" ); if ( ol && ol->first() ) ol->first()->installEventFilter( listview ); delete ol; @@ -1644,8 +1644,8 @@ PropertyPixmapItem::PropertyPixmapItem( PropertyList *l, PropertyItem *after, Pr box->setLineWidth( 2 ); pixPrev->setFrameStyle( TQFrame::NoFrame ); box->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getPixmap() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getPixmap() ) ); } PropertyPixmapItem::~PropertyPixmapItem() @@ -1747,8 +1747,8 @@ PropertyColorItem::PropertyColorItem( PropertyList *l, PropertyItem *after, Prop pal.setDisabled( cg ); colorPrev->setPalette( pal ); box->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getColor() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getColor() ) ); } void PropertyColorItem::createChildren() @@ -1869,8 +1869,8 @@ PropertyFontItem::PropertyFontItem( PropertyList *l, PropertyItem *after, Proper box->installEventFilter( listview ); lined->installEventFilter( listview ); button->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getFont() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getFont() ) ); } void PropertyFontItem::createChildren() @@ -2026,13 +2026,13 @@ void PropertyDatabaseItem::initChildren() else if ( lst.count() > 0 ) item->setValue( TQStringList( lst[ 0 ] ) ); else if ( withField ) - item->setValue( TQStringList( MetaDataBase::fakeProperty( TQT_TQOBJECT(listview->propertyEditor()->formWindow()->mainContainer()), + item->setValue( TQStringList( MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(), "database" ).toStringList()[ 0 ] ) ); if ( lst.count() > 0 && !lst[ 0 ].isEmpty() ) item->setCurrentItem( lst[ 0 ] ); else if ( !isChanged() && withField ) - item->setCurrentItem( MetaDataBase::fakeProperty( TQT_TQOBJECT(listview->propertyEditor()->formWindow()->mainContainer()), + item->setCurrentItem( MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(), "database" ).toStringList()[ 0 ] ); else item->setCurrentItem( 0 ); @@ -2044,7 +2044,7 @@ void PropertyDatabaseItem::initChildren() else if ( lst.count() > 1 ) item->setValue( TQStringList( lst[ 1 ] ) ); else if ( withField ) { - TQStringList fakeLst = MetaDataBase::fakeProperty( TQT_TQOBJECT(listview->propertyEditor()->formWindow()->mainContainer()), "database" ).toStringList(); + TQStringList fakeLst = MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(), "database" ).toStringList(); if ( fakeLst.count() > 1 ) item->setValue( fakeLst[ 1 ] ); } @@ -2052,7 +2052,7 @@ void PropertyDatabaseItem::initChildren() if ( lst.count() > 1 && !lst[ 1 ].isEmpty() ) item->setCurrentItem( lst[ 1 ] ); else if ( !isChanged() && withField ) { - TQStringList fakeLst = MetaDataBase::fakeProperty( TQT_TQOBJECT(listview->propertyEditor()->formWindow()->mainContainer()), "database" ).toStringList(); + TQStringList fakeLst = MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(), "database" ).toStringList(); if ( fakeLst.count() > 1 ) item->setCurrentItem( fakeLst[ 1 ] ); else @@ -2269,8 +2269,8 @@ PropertyPaletteItem::PropertyPaletteItem( PropertyList *l, PropertyItem *after, box->setLineWidth( 2 ); palettePrev->setFrameStyle( TQFrame::NoFrame ); box->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getPalette() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getPalette() ) ); } PropertyPaletteItem::~PropertyPaletteItem() { @@ -2307,14 +2307,10 @@ void PropertyPaletteItem::getPalette() return; bool ok = FALSE; TQWidget *w = (TQWidget*)listview->propertyEditor()->widget(); - if ( ::tqqt_cast<TQScrollView*>(w) ) + if ( ::tqt_cast<TQScrollView*>(w) ) w = ( (TQScrollView*)w )->viewport(); TQPalette pal = PaletteEditor::getPalette( &ok, val.toPalette(), -#if defined(TQT_NON_COMMERCIAL) - w->backgroundMode(), listview->topLevelWidget(), -#else w->backgroundMode(), listview, -#endif "choose_palette", listview->propertyEditor()->formWindow() ); if ( !ok ) return; @@ -2395,8 +2391,8 @@ TQComboBox *PropertyCursorItem::combo() comb->insertItem( HandPix, i18n("Pointing Hand"), TQObject::PointingHandCursor ); comb->insertItem( NoPix, i18n("Forbidden"), TQObject::ForbiddenCursor ); - connect( comb, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); return comb; } @@ -2463,8 +2459,8 @@ PropertyKeysequenceItem::PropertyKeysequenceItem( PropertyList *l, box = new TQHBox( listview->viewport() ); box->hide(); sequence = new TQLineEdit( box ); - connect( sequence, TQT_SIGNAL(textChanged( const TQString & )), - this, TQT_SLOT(setValue()) ); + connect( sequence, TQ_SIGNAL(textChanged( const TQString & )), + this, TQ_SLOT(setValue()) ); sequence->installEventFilter( this ); } @@ -2658,8 +2654,8 @@ EnumBox::EnumBox( TQWidget *parent, const char *name ) : TQComboBox( parent, name ) { pop = new EnumPopup( this, "popup", TQObject::WType_Popup ); - connect( pop, TQT_SIGNAL( hidden() ), this, TQT_SLOT( popupHidden() ) ); - connect( pop, TQT_SIGNAL( closed() ), this, TQT_SLOT( popupClosed() ) ); + connect( pop, TQ_SIGNAL( hidden() ), this, TQ_SLOT( popupHidden() ) ); + connect( pop, TQ_SIGNAL( closed() ), this, TQ_SLOT( popupClosed() ) ); popupShown = FALSE; arrowDown = FALSE; } @@ -2739,7 +2735,7 @@ void EnumBox::popup() void EnumBox::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() != Qt::LeftButton ) + if ( e->button() != TQt::LeftButton ) return; TQRect arrowRect = style().querySubControlMetrics( TQStyle::CC_ComboBox, this, @@ -2754,14 +2750,14 @@ void EnumBox::mousePressEvent( TQMouseEvent *e ) } popup(); - TQTimer::singleShot( 100, this, TQT_SLOT( restoreArrow() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( restoreArrow() ) ); } void EnumBox::keyPressEvent( TQKeyEvent *e ) { if ( e->key() == Key_Space ) { popup(); - TQTimer::singleShot( 100, this, TQT_SLOT( restoreArrow() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( restoreArrow() ) ); } else if ( e->key() == Key_Enter || e->key() == Key_Return ) { popup(); } @@ -2790,8 +2786,8 @@ PropertyEnumItem::PropertyEnumItem( PropertyList *l, box = new EnumBox( listview->viewport() ); box->hide(); box->installEventFilter( listview ); - connect( box, TQT_SIGNAL( aboutToShowPopup() ), this, TQT_SLOT( insertEnums() ) ); - connect( box, TQT_SIGNAL( valueChanged() ), this, TQT_SLOT( setValue() ) ); + connect( box, TQ_SIGNAL( aboutToShowPopup() ), this, TQ_SLOT( insertEnums() ) ); + connect( box, TQ_SIGNAL( valueChanged() ), this, TQ_SLOT( setValue() ) ); } PropertyEnumItem::~PropertyEnumItem() @@ -2921,16 +2917,16 @@ PropertyList::PropertyList( PropertyEditor *e ) viewport()->installEventFilter( this ); addColumn( i18n( "Property" ) ); addColumn( i18n( "Value" ) ); - connect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ), - this, TQT_SLOT( updateEditorSize() ) ); - disconnect( header(), TQT_SIGNAL( sectionClicked( int ) ), - this, TQT_SLOT( changeSortColumn( int ) ) ); - connect( header(), TQT_SIGNAL( sectionClicked( int ) ), - this, TQT_SLOT( toggleSort() ) ); - connect( this, TQT_SIGNAL( pressed( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( itemPressed( TQListViewItem *, const TQPoint &, int ) ) ); - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( toggleOpen( TQListViewItem * ) ) ); + connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ), + this, TQ_SLOT( updateEditorSize() ) ); + disconnect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( changeSortColumn( int ) ) ); + connect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( toggleSort() ) ); + connect( this, TQ_SIGNAL( pressed( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( itemPressed( TQListViewItem *, const TQPoint &, int ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( toggleOpen( TQListViewItem * ) ) ); setSorting( -1 ); setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); @@ -3023,7 +3019,7 @@ static bool parent_is_data_aware( TQWidget *w ) { TQWidget *p = w ? w->parentWidget() : 0; while ( p && !p->isTopLevel() ) { - if ( ::tqqt_cast<QDesignerDataBrowser*>(p) || ::tqqt_cast<QDesignerDataView*>(p) ) + if ( ::tqt_cast<QDesignerDataBrowser*>(p) || ::tqt_cast<QDesignerDataView*>(p) ) return TRUE; p = p->parentWidget(); } @@ -3039,7 +3035,7 @@ void PropertyList::setupProperties() { if ( !editor->widget() ) return; - bool allProperties = !::tqqt_cast<Spacer*>(editor->widget()); + bool allProperties = !::tqt_cast<Spacer*>(editor->widget()); TQStrList lst = editor->widget()->metaObject()->propertyNames( allProperties ); PropertyItem *item = 0; TQMap<TQString, bool> unique; @@ -3047,7 +3043,7 @@ void PropertyList::setupProperties() TQStringList valueSet; bool parentHasLayout = w->isWidgetType() && - !editor->formWindow()->isMainContainer( TQT_TQOBJECT(w) ) && ( (TQWidget*)w )->parentWidget() && + !editor->formWindow()->isMainContainer( w ) && ( (TQWidget*)w )->parentWidget() && WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout; for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) { const TQMetaProperty* p = @@ -3057,8 +3053,8 @@ void PropertyList::setupProperties() continue; if ( unique.contains( TQString::fromLatin1( it.current() ) ) ) continue; - if ( ::tqqt_cast<QDesignerToolBar*>(editor->widget()) || - ::tqqt_cast<MenuBarEditor*>(editor->widget()) ) { + if ( ::tqt_cast<QDesignerToolBar*>(editor->widget()) || + ::tqt_cast<MenuBarEditor*>(editor->widget()) ) { if ( qstrcmp( p->name(), "minimumHeight" ) == 0 ) continue; if ( qstrcmp( p->name(), "minimumWidth" ) == 0 ) @@ -3078,7 +3074,7 @@ void PropertyList::setupProperties() } unique.insert( TQString::fromLatin1( it.current() ), TRUE ); if ( editor->widget()->isWidgetType() && - editor->formWindow()->isMainContainer( TQT_TQOBJECT(editor->widget()) ) ) { + editor->formWindow()->isMainContainer( editor->widget() ) ) { if ( qstrcmp( p->name(), "geometry" ) == 0 ) continue; } else { // hide some toplevel-only stuff @@ -3094,7 +3090,7 @@ void PropertyList::setupProperties() continue; if ( parentHasLayout && qstrcmp( p->name(), "geometry" ) == 0 ) continue; - if ( ::tqqt_cast<TQLayoutWidget*>(w) || ::tqqt_cast<Spacer*>(w) ) { + if ( ::tqt_cast<TQLayoutWidget*>(w) || ::tqt_cast<Spacer*>(w) ) { if ( qstrcmp( p->name(), "sizePolicy" ) == 0 ) continue; if ( qstrcmp( p->name(), "minimumHeight" ) == 0 ) @@ -3137,7 +3133,7 @@ void PropertyList::setupProperties() continue; } } - if ( ::tqqt_cast<TQActionGroup*>(w) ) { + if ( ::tqt_cast<TQActionGroup*>(w) ) { if ( qstrcmp( p->name(), "usesDropDown" ) == 0 ) continue; if ( qstrcmp( p->name(), "toggleAction" ) == 0 ) @@ -3154,7 +3150,7 @@ void PropertyList::setupProperties() if ( qstrcmp( p->name(), "buttonGroupId" ) == 0 ) { // #### remove this when designable in TQ_PROPERTY can take a function (isInButtonGroup() in this case) if ( !editor->widget()->isWidgetType() || !editor->widget()->parent() || - !::tqqt_cast<TQButtonGroup*>(editor->widget()->parent()) ) + !::tqt_cast<TQButtonGroup*>(editor->widget()->parent()) ) continue; } @@ -3176,7 +3172,7 @@ void PropertyList::setupProperties() setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "hAlign" ) ) item->setChanged( TRUE, FALSE ); - if ( !::tqqt_cast<TQMultiLineEdit*>(editor->widget()) ) { + if ( !::tqt_cast<TQMultiLineEdit*>(editor->widget()) ) { lst.clear(); lst << p->valueToKey( AlignTop ) << p->valueToKey( AlignVCenter ) @@ -3187,7 +3183,7 @@ void PropertyList::setupProperties() if ( MetaDataBase::isPropertyChanged( editor->widget(), "vAlign" ) ) item->setChanged( TRUE, FALSE ); item = new PropertyBoolItem( this, item, 0, "wordwrap" ); - if ( ::tqqt_cast<TQGroupBox*>(w) ) + if ( ::tqt_cast<TQGroupBox*>(w) ) item->setVisible( FALSE ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "wordwrap" ) ) @@ -3235,7 +3231,7 @@ void PropertyList::setupProperties() } } - if ( !::tqqt_cast<TQSplitter*>(w) && !::tqqt_cast<MenuBarEditor*>(w) && !::tqqt_cast<QDesignerToolBar*>(w) && + if ( !::tqt_cast<TQSplitter*>(w) && !::tqt_cast<MenuBarEditor*>(w) && !::tqt_cast<QDesignerToolBar*>(w) && w->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)w ) != WidgetFactory::NoLayout ) { item = new PropertyLayoutItem( this, item, 0, "layoutSpacing" ); setPropertyValue( item ); @@ -3252,8 +3248,8 @@ void PropertyList::setupProperties() else layoutInitValue( item ); TQWidget *widget = (TQWidget*)w; - if ( ( !::tqqt_cast<TQLayoutWidget*>(widget) && - widget->parentWidget() && ::tqqt_cast<FormWindow*>(widget->parentWidget()) ) ) { + if ( ( !::tqt_cast<TQLayoutWidget*>(widget) && + widget->parentWidget() && ::tqt_cast<FormWindow*>(widget->parentWidget()) ) ) { item = new PropertyListItem( this, item, 0, "resizeMode", FALSE ); TQStringList lst; lst << "Auto" << "FreeResize" << "Minimum" << "Fixed"; @@ -3268,8 +3264,8 @@ void PropertyList::setupProperties() } } - if ( !::tqqt_cast<Spacer*>(w) && !::tqqt_cast<TQLayoutWidget*>(w) && - !::tqqt_cast<MenuBarEditor*>(w) && !::tqqt_cast<QDesignerToolBar*>(w) ) { + if ( !::tqt_cast<Spacer*>(w) && !::tqt_cast<TQLayoutWidget*>(w) && + !::tqt_cast<MenuBarEditor*>(w) && !::tqt_cast<QDesignerToolBar*>(w) ) { item = new PropertyTextItem( this, item, 0, "toolTip", TRUE, FALSE ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "toolTip" ) ) @@ -3281,16 +3277,16 @@ void PropertyList::setupProperties() } #ifndef TQT_NO_SQL - if ( !::tqqt_cast<TQDataTable*>(editor->widget()) && !::tqqt_cast<TQDataBrowser*>(editor->widget()) && - !::tqqt_cast<TQDataView*>(editor->widget()) && parent_is_data_aware( ::tqqt_cast<TQWidget*>(editor->widget()) ) ) { - item = new PropertyDatabaseItem( this, item, 0, "database", TQT_BASE_OBJECT(editor->formWindow()->mainContainer()) != TQT_BASE_OBJECT(w) ); + if ( !::tqt_cast<TQDataTable*>(editor->widget()) && !::tqt_cast<TQDataBrowser*>(editor->widget()) && + !::tqt_cast<TQDataView*>(editor->widget()) && parent_is_data_aware( ::tqt_cast<TQWidget*>(editor->widget()) ) ) { + item = new PropertyDatabaseItem( this, item, 0, "database", editor->formWindow()->mainContainer() != w ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "database" ) ) item->setChanged( TRUE, FALSE ); } - if ( ::tqqt_cast<TQDataTable*>(editor->widget()) || ::tqqt_cast<TQDataBrowser*>(editor->widget()) || - ::tqqt_cast<TQDataView*>(editor->widget()) ) { + if ( ::tqt_cast<TQDataTable*>(editor->widget()) || ::tqt_cast<TQDataBrowser*>(editor->widget()) || + ::tqt_cast<TQDataView*>(editor->widget()) ) { item = new PropertyDatabaseItem( this, item, 0, "database", FALSE ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "database" ) ) @@ -3373,14 +3369,14 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name, switch ( t ) { case TQVariant::String: item = new PropertyTextItem( this, item, 0, name, TRUE, - ::tqqt_cast<TQLabel*>(editor->widget()) || - ::tqqt_cast<TQTextView*>(editor->widget()) || - ::tqqt_cast<TQButton*>(editor->widget()) ); + ::tqt_cast<TQLabel*>(editor->widget()) || + ::tqt_cast<TQTextView*>(editor->widget()) || + ::tqt_cast<TQButton*>(editor->widget()) ); break; case TQVariant::CString: item = new PropertyTextItem( this, item, 0, name, name == "name" && - TQT_BASE_OBJECT(editor->widget()) == TQT_BASE_OBJECT(editor->formWindow()->mainContainer()), + editor->widget() == editor->formWindow()->mainContainer(), FALSE, TRUE ); break; case TQVariant::Bool: @@ -3546,15 +3542,15 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) else if ( e->type() == TQEvent::MouseButtonPress ) theLastEvent = MouseEvent; - if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this) &&e->type() == TQEvent::KeyPress ) { + if ( o != this &&e->type() == TQEvent::KeyPress ) { TQKeyEvent *ke = (TQKeyEvent*)e; if ( ( ke->key() == Key_Up || ke->key() == Key_Down ) && - ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(viewport()) ) && + ( o != this || o != viewport() ) && !( ke->state() & ControlButton ) ) { TQApplication::sendEvent( this, (TQKeyEvent*)e ); return TRUE; - } else if ( ( !::tqqt_cast<TQLineEdit*>(o) || - ( ::tqqt_cast<TQLineEdit*>(o) && ( (TQLineEdit*)o )->isReadOnly() ) ) && + } else if ( ( !::tqt_cast<TQLineEdit*>(o) || + ( ::tqt_cast<TQLineEdit*>(o) && ( (TQLineEdit*)o )->isReadOnly() ) ) && i && i->hasSubItems() ) { if ( !i->isOpen() && ( ke->key() == Key_Plus || @@ -3564,21 +3560,21 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) ( ke->key() == Key_Minus || ke->key() == Key_Left ) ) i->setOpen( FALSE ); - } else if ( ( ke->key() == Key_Return || ke->key() == Key_Enter ) && ::tqqt_cast<TQComboBox*>(o) ) { + } else if ( ( ke->key() == Key_Return || ke->key() == Key_Enter ) && ::tqt_cast<TQComboBox*>(o) ) { TQKeyEvent ke2( TQEvent::KeyPress, Key_Space, 0, 0 ); TQApplication::sendEvent( o, &ke2 ); return TRUE; } - } else if ( e->type() == TQEvent::FocusOut && ::tqqt_cast<TQLineEdit*>(o) && editor->formWindow() ) { - TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), TQT_SLOT( checkCompressedCommand() ) ); - } else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) ) { + } else if ( e->type() == TQEvent::FocusOut && ::tqt_cast<TQLineEdit*>(o) && editor->formWindow() ) { + TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), TQ_SLOT( checkCompressedCommand() ) ); + } else if ( o == viewport() ) { TQMouseEvent *me; PropertyListItem* i; switch ( e->type() ) { case TQEvent::MouseButtonPress: me = (TQMouseEvent*)e; i = (PropertyListItem*) itemAt( me->pos() ); - if ( i && ( ::tqqt_cast<PropertyColorItem*>(i) || ::tqqt_cast<PropertyPixmapItem*>(i) ) ) { + if ( i && ( ::tqt_cast<PropertyColorItem*>(i) || ::tqt_cast<PropertyPixmapItem*>(i) ) ) { pressItem = i; pressPos = me->pos(); mousePressed = TRUE; @@ -3586,13 +3582,13 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) break; case TQEvent::MouseMove: me = (TQMouseEvent*)e; - if ( me && me->state() & Qt::LeftButton && mousePressed) { + if ( me && me->state() & TQt::LeftButton && mousePressed) { i = (PropertyListItem*) itemAt( me->pos() ); if ( i && i == pressItem ) { if (( pressPos - me->pos() ).manhattanLength() > TQApplication::startDragDistance() ){ - if ( ::tqqt_cast<PropertyColorItem*>(i) ) { + if ( ::tqt_cast<PropertyColorItem*>(i) ) { TQColor col = i->value().asColor(); TQColorDrag *drg = new TQColorDrag( col, this ); TQPixmap pix( 25, 25 ); @@ -3604,7 +3600,7 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) mousePressed = FALSE; drg->dragCopy(); } - else if ( ::tqqt_cast<PropertyPixmapItem*>(i) ) { + else if ( ::tqt_cast<PropertyPixmapItem*>(i) ) { TQPixmap pix = i->value().asPixmap(); if( !pix.isNull() ) { TQImage img = pix.convertToImage(); @@ -3621,7 +3617,7 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) default: break; } - } else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(header()) ) { + } else if ( o == header() ) { if ( e->type() == TQEvent::ContextMenu ) { ((TQContextMenuEvent *)e)->accept(); TQPopupMenu menu( 0 ); @@ -3716,11 +3712,11 @@ void PropertyList::setPropertyValue( PropertyItem *i ) else i->setValue( TQVariant( false ) ); } else if ( i->name() == "layoutSpacing" ) { - ( (PropertyLayoutItem*)i )->setValue( MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) ) ) )); + ( (PropertyLayoutItem*)i )->setValue( MetaDataBase::spacing( WidgetFactory::containerOfWidget( static_cast<TQWidget*>(editor->widget()) ) )); } else if ( i->name() == "layoutMargin" ) { - ( (PropertyLayoutItem*)i )->setValue( MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) ) ) )); + ( (PropertyLayoutItem*)i )->setValue( MetaDataBase::margin( WidgetFactory::containerOfWidget( static_cast<TQWidget*>(editor->widget()) ) )); } else if ( i->name() == "resizeMode" ) { - ( (PropertyListItem*)i )->setCurrentItem( MetaDataBase::resizeMode( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) ) )) ); + ( (PropertyListItem*)i )->setCurrentItem( MetaDataBase::resizeMode( WidgetFactory::containerOfWidget( static_cast<TQWidget*>(editor->widget()) ) ) ); } else if ( i->name() == "toolTip" || i->name() == "whatsThis" || i->name() == "database" || i->name() == "frameworkCode" ) { i->setValue( MetaDataBase::fakeProperty( editor->widget(), i->name() ) ); } else if ( editor->widget()->inherits( "CustomWidget" ) ) { @@ -3790,9 +3786,9 @@ void PropertyList::viewportDragEnterEvent( TQDragEnterEvent *e ) return; } - if ( ::tqqt_cast<PropertyColorItem*>(i) && TQColorDrag::canDecode( e ) ) + if ( ::tqt_cast<PropertyColorItem*>(i) && TQColorDrag::canDecode( e ) ) e->accept(); - else if ( ::tqqt_cast<PropertyPixmapItem*>(i) && TQImageDrag::canDecode( e ) ) + else if ( ::tqt_cast<PropertyPixmapItem*>(i) && TQImageDrag::canDecode( e ) ) e->accept(); else e->ignore(); @@ -3806,9 +3802,9 @@ void PropertyList::viewportDragMoveEvent ( TQDragMoveEvent *e ) return; } - if ( ::tqqt_cast<PropertyColorItem*>(i) && TQColorDrag::canDecode( e ) ) + if ( ::tqt_cast<PropertyColorItem*>(i) && TQColorDrag::canDecode( e ) ) e->accept(); - else if ( ::tqqt_cast<PropertyPixmapItem*>(i) && TQImageDrag::canDecode( e ) ) + else if ( ::tqt_cast<PropertyPixmapItem*>(i) && TQImageDrag::canDecode( e ) ) e->accept(); else e->ignore(); @@ -3822,14 +3818,14 @@ void PropertyList::viewportDropEvent ( TQDropEvent *e ) return; } - if ( ::tqqt_cast<PropertyColorItem*>(i) && TQColorDrag::canDecode( e ) ) { + if ( ::tqt_cast<PropertyColorItem*>(i) && TQColorDrag::canDecode( e ) ) { TQColor color; TQColorDrag::decode( e, color ); i->setValue( TQVariant( color ) ); valueChanged( i ); e->accept(); } - else if ( ::tqqt_cast<PropertyPixmapItem*>(i) && TQImageDrag::canDecode( e ) ) { + else if ( ::tqt_cast<PropertyPixmapItem*>(i) && TQImageDrag::canDecode( e ) ) { TQImage img; TQImageDrag::decode( e, img ); TQPixmap pm; @@ -3922,8 +3918,8 @@ EventList::EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e ) header()->hide(); removeColumn( 1 ); setRootIsDecorated( TRUE ); - connect( this, TQT_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), - this, TQT_SLOT( renamed( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), + this, TQ_SLOT( renamed( TQListViewItem * ) ) ); } TQString clean_arguments( const TQString &s ) @@ -3970,7 +3966,7 @@ void EventList::setup() it.current(), TQString(), TQString() ); eventItem->setOpen( TRUE ); TQValueList<MetaDataBase::Connection> conns = - MetaDataBase::connections( TQT_TQOBJECT(formWindow), TQT_TQOBJECT(editor->widget()), TQT_TQOBJECT(formWindow->mainContainer()) ); + MetaDataBase::connections( formWindow, editor->widget(), formWindow->mainContainer() ); HierarchyItem *item = 0; for ( TQValueList<MetaDataBase::Connection>::Iterator cit = conns.begin(); cit != conns.end(); ++cit ) { @@ -4046,7 +4042,7 @@ void EventList::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) } else if ( res == DEL_ITEM && i->parent() ) { MetaDataBase::Connection conn; conn.sender = editor->widget(); - conn.receiver = TQT_TQOBJECT(formWindow->mainContainer()); + conn.receiver = formWindow->mainContainer(); conn.signal = i->parent()->text( 0 ); conn.slot = i->text( 0 ); delete i; @@ -4080,7 +4076,7 @@ void EventList::renamed( TQListViewItem *i ) } else { MetaDataBase::Connection conn; conn.sender = editor->widget(); - conn.receiver = TQT_TQOBJECT(formWindow->mainContainer()); + conn.receiver = formWindow->mainContainer(); conn.signal = i->parent()->text( 0 ); conn.slot = i->text( 0 ); AddConnectionCommand *cmd = new AddConnectionCommand( i18n( "Add Connection" ), diff --git a/kdevdesigner/designer/propertyeditor.h b/kdevdesigner/designer/propertyeditor.h index 7b7eccd8..93d8c71b 100644 --- a/kdevdesigner/designer/propertyeditor.h +++ b/kdevdesigner/designer/propertyeditor.h @@ -138,7 +138,7 @@ private: class PropertyTextItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -175,7 +175,7 @@ private: class PropertyBoolItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -200,7 +200,7 @@ private: class PropertyIntItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -226,7 +226,7 @@ private: class PropertyLayoutItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -251,7 +251,7 @@ private: class PropertyDoubleItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -275,7 +275,7 @@ private: class PropertyListItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -311,7 +311,7 @@ private: class PropertyFontItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -341,7 +341,7 @@ private: class PropertyCoordItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -371,7 +371,7 @@ private: class PropertyColorItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -406,7 +406,7 @@ private: class PropertyPixmapItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -439,7 +439,7 @@ private: class PropertySizePolicyItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -466,7 +466,7 @@ private: class PropertyPaletteItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -495,7 +495,7 @@ private: class PropertyCursorItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -520,7 +520,7 @@ private: class PropertyKeysequenceItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -551,7 +551,7 @@ private: class PropertyDatabaseItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -589,7 +589,7 @@ struct EnumItem { class EnumPopup : public TQFrame { - Q_OBJECT + TQ_OBJECT public: @@ -614,7 +614,7 @@ private: class EnumBox : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: @@ -649,7 +649,7 @@ private: class PropertyEnumItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -676,7 +676,7 @@ private: class PropertyList : public TQListView { - Q_OBJECT + TQ_OBJECT public: @@ -739,7 +739,7 @@ private: class EventList : public HierarchyList { - Q_OBJECT + TQ_OBJECT public: @@ -767,7 +767,7 @@ private: class PropertyEditor : public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: @@ -819,7 +819,7 @@ private: class PropertyDateItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -843,7 +843,7 @@ private: class PropertyTimeItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -867,7 +867,7 @@ private: class PropertyDateTimeItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/propertyobject.cpp b/kdevdesigner/designer/propertyobject.cpp index 1bd1883f..70629f31 100644 --- a/kdevdesigner/designer/propertyobject.cpp +++ b/kdevdesigner/designer/propertyobject.cpp @@ -38,7 +38,7 @@ PropertyObject::PropertyObject( const TQWidgetList &objs ) v.resize( objects.count() ); v.setAutoDelete( TRUE ); - for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) { + for ( TQObject *o = objects.first(); o; o = objects.next() ) { const TQMetaObject *m = o->metaObject(); TQPtrList<TQMetaObject> *mol = new TQPtrList<TQMetaObject>; while ( m ) { @@ -74,7 +74,7 @@ PropertyObject::PropertyObject( const TQWidgetList &objs ) bool PropertyObject::setProperty( const char *name, const TQVariant& value ) { - for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) + for ( TQObject *o = objects.first(); o; o = objects.next() ) o->setProperty( name, value ); return TRUE; @@ -87,13 +87,13 @@ TQVariant PropertyObject::property( const char *name ) const void PropertyObject::mdPropertyChanged( const TQString &property, bool changed ) { - for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) + for ( TQObject *o = objects.first(); o; o = objects.next() ) MetaDataBase::setPropertyChanged( o, property, changed ); } bool PropertyObject::mdIsPropertyChanged( const TQString &property ) { - for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) { + for ( TQObject *o = objects.first(); o; o = objects.next() ) { if ( MetaDataBase::isPropertyChanged( o, property ) ) return TRUE; } @@ -102,29 +102,29 @@ bool PropertyObject::mdIsPropertyChanged( const TQString &property ) void PropertyObject::mdSetPropertyComment( const TQString &property, const TQString &comment ) { - for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) + for ( TQObject *o = objects.first(); o; o = objects.next() ) MetaDataBase::setPropertyComment( o, property, comment ); } TQString PropertyObject::mdPropertyComment( const TQString &property ) { - return MetaDataBase::propertyComment( TQT_TQOBJECT(objects.first()), property ); + return MetaDataBase::propertyComment( objects.first(), property ); } void PropertyObject::mdSetFakeProperty( const TQString &property, const TQVariant &value ) { - for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) + for ( TQObject *o = objects.first(); o; o = objects.next() ) MetaDataBase::setFakeProperty( o, property, value ); } TQVariant PropertyObject::mdFakeProperty( const TQString &property ) { - return MetaDataBase::fakeProperty( TQT_TQOBJECT(objects.first()), property ); + return MetaDataBase::fakeProperty( objects.first(), property ); } void PropertyObject::mdSetCursor( const TQCursor &c ) { - for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) { + for ( TQObject *o = objects.first(); o; o = objects.next() ) { if ( o->isWidgetType() ) MetaDataBase::setCursor( (TQWidget*)o, c ); } @@ -137,22 +137,22 @@ TQCursor PropertyObject::mdCursor() void PropertyObject::mdSetPixmapKey( int pixmap, const TQString &arg ) { - for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) + for ( TQObject *o = objects.first(); o; o = objects.next() ) MetaDataBase::setPixmapKey( o, pixmap, arg ); } TQString PropertyObject::mdPixmapKey( int pixmap ) { - return MetaDataBase::pixmapKey( TQT_TQOBJECT(objects.first()), pixmap ); + return MetaDataBase::pixmapKey( objects.first(), pixmap ); } void PropertyObject::mdSetExportMacro( const TQString ¯o ) { - for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) + for ( TQObject *o = objects.first(); o; o = objects.next() ) MetaDataBase::setExportMacro( o, macro ); } TQString PropertyObject::mdExportMacro() { - return MetaDataBase::exportMacro( TQT_TQOBJECT(objects.first()) ); + return MetaDataBase::exportMacro( objects.first() ); } diff --git a/kdevdesigner/designer/qcompletionedit.cpp b/kdevdesigner/designer/qcompletionedit.cpp index ed0c986e..87a40ecf 100644 --- a/kdevdesigner/designer/qcompletionedit.cpp +++ b/kdevdesigner/designer/qcompletionedit.cpp @@ -45,8 +45,8 @@ QCompletionEdit::QCompletionEdit( TQWidget *parent, const char *name ) listbox->setHScrollBarMode( TQScrollView::AlwaysOn ); listbox->setVScrollBarMode( TQScrollView::AlwaysOn ); listbox->setCornerWidget( new TQSizeGrip( listbox, "completion sizegrip" ) ); - connect( this, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( textDidChange( const TQString & ) ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( textDidChange( const TQString & ) ) ); popup->setFocusProxy( listbox ); installEventFilter( this ); } @@ -116,7 +116,7 @@ void QCompletionEdit::updateListBox() bool QCompletionEdit::eventFilter( TQObject *o, TQEvent *e ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(popup) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(listbox) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(listbox->viewport()) ) { + if ( o == popup || o == listbox || o == listbox->viewport() ) { if ( e->type() == TQEvent::KeyPress ) { TQKeyEvent *ke = (TQKeyEvent*)e; if ( ke->key() == Key_Enter || ke->key() == Key_Return || ke->key() == Key_Tab ) { @@ -159,7 +159,7 @@ bool QCompletionEdit::eventFilter( TQObject *o, TQEvent *e ) emit chosen( text() ); return TRUE; } - } else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) { + } else if ( o == this ) { if ( e->type() == TQEvent::KeyPress ) { TQKeyEvent *ke = (TQKeyEvent*)e; if ( ke->key() == Key_Up || diff --git a/kdevdesigner/designer/qcompletionedit.h b/kdevdesigner/designer/qcompletionedit.h index 5c3f7fe1..c16644e8 100644 --- a/kdevdesigner/designer/qcompletionedit.h +++ b/kdevdesigner/designer/qcompletionedit.h @@ -35,7 +35,7 @@ class TQVBox; class QCompletionEdit : public TQLineEdit { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool autoAdd READ autoAdd WRITE setAutoAdd ) TQ_PROPERTY( bool caseSensitive READ isCaseSensitive WRITE setCaseSensitive ) diff --git a/kdevdesigner/designer/replacedialog.ui b/kdevdesigner/designer/replacedialog.ui index 27d01a58..e983e9d3 100644 --- a/kdevdesigner/designer/replacedialog.ui +++ b/kdevdesigner/designer/replacedialog.ui @@ -307,12 +307,12 @@ <variable>EditorInterface *editor;</variable> <variable>TQObject *formWindow;</variable> </variables> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>doReplace()</slot> <slot>doReplaceAll()</slot> <slot>setEditor( EditorInterface * e, TQObject * fw )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/resource.cpp b/kdevdesigner/designer/resource.cpp index f86490c4..18b00d30 100644 --- a/kdevdesigner/designer/resource.cpp +++ b/kdevdesigner/designer/resource.cpp @@ -112,87 +112,87 @@ static struct { int key; const char* name; } keyname[] = { - { TQt::Key_Space, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Space" ) }, - { TQt::Key_Escape, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Esc" ) }, - { TQt::Key_Tab, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Tab" ) }, - { TQt::Key_Backtab, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Backtab" ) }, - { TQt::Key_Backspace, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Backspace" ) }, - { TQt::Key_Return, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Return" ) }, - { TQt::Key_Enter, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Enter" ) }, - { TQt::Key_Insert, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Ins" ) }, - { TQt::Key_Delete, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Del" ) }, - { TQt::Key_Pause, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Pause" ) }, - { TQt::Key_Print, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Print" ) }, - { TQt::Key_SysReq, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "SysReq" ) }, - { TQt::Key_Home, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Home" ) }, - { TQt::Key_End, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "End" ) }, - { TQt::Key_Left, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Left" ) }, - { TQt::Key_Up, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Up" ) }, - { TQt::Key_Right, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Right" ) }, - { TQt::Key_Down, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Down" ) }, - { TQt::Key_Prior, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "PgUp" ) }, - { TQt::Key_Next, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "PgDown" ) }, - { TQt::Key_CapsLock, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "CapsLock" ) }, - { TQt::Key_NumLock, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "NumLock" ) }, - { TQt::Key_ScrollLock, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "ScrollLock" ) }, - { TQt::Key_Menu, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Menu" ) }, - { TQt::Key_Help, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Help" ) }, + { TQt::Key_Space, TQT_TRANSLATE_NOOP( "TQAccel", "Space" ) }, + { TQt::Key_Escape, TQT_TRANSLATE_NOOP( "TQAccel", "Esc" ) }, + { TQt::Key_Tab, TQT_TRANSLATE_NOOP( "TQAccel", "Tab" ) }, + { TQt::Key_Backtab, TQT_TRANSLATE_NOOP( "TQAccel", "Backtab" ) }, + { TQt::Key_Backspace, TQT_TRANSLATE_NOOP( "TQAccel", "Backspace" ) }, + { TQt::Key_Return, TQT_TRANSLATE_NOOP( "TQAccel", "Return" ) }, + { TQt::Key_Enter, TQT_TRANSLATE_NOOP( "TQAccel", "Enter" ) }, + { TQt::Key_Insert, TQT_TRANSLATE_NOOP( "TQAccel", "Ins" ) }, + { TQt::Key_Delete, TQT_TRANSLATE_NOOP( "TQAccel", "Del" ) }, + { TQt::Key_Pause, TQT_TRANSLATE_NOOP( "TQAccel", "Pause" ) }, + { TQt::Key_Print, TQT_TRANSLATE_NOOP( "TQAccel", "Print" ) }, + { TQt::Key_SysReq, TQT_TRANSLATE_NOOP( "TQAccel", "SysReq" ) }, + { TQt::Key_Home, TQT_TRANSLATE_NOOP( "TQAccel", "Home" ) }, + { TQt::Key_End, TQT_TRANSLATE_NOOP( "TQAccel", "End" ) }, + { TQt::Key_Left, TQT_TRANSLATE_NOOP( "TQAccel", "Left" ) }, + { TQt::Key_Up, TQT_TRANSLATE_NOOP( "TQAccel", "Up" ) }, + { TQt::Key_Right, TQT_TRANSLATE_NOOP( "TQAccel", "Right" ) }, + { TQt::Key_Down, TQT_TRANSLATE_NOOP( "TQAccel", "Down" ) }, + { TQt::Key_Prior, TQT_TRANSLATE_NOOP( "TQAccel", "PgUp" ) }, + { TQt::Key_Next, TQT_TRANSLATE_NOOP( "TQAccel", "PgDown" ) }, + { TQt::Key_CapsLock, TQT_TRANSLATE_NOOP( "TQAccel", "CapsLock" ) }, + { TQt::Key_NumLock, TQT_TRANSLATE_NOOP( "TQAccel", "NumLock" ) }, + { TQt::Key_ScrollLock, TQT_TRANSLATE_NOOP( "TQAccel", "ScrollLock" ) }, + { TQt::Key_Menu, TQT_TRANSLATE_NOOP( "TQAccel", "Menu" ) }, + { TQt::Key_Help, TQT_TRANSLATE_NOOP( "TQAccel", "Help" ) }, // Multimedia keys - { TQt::Key_Back, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Back" ) }, - { TQt::Key_Forward, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Forward" ) }, - { TQt::Key_Stop, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Stop" ) }, - { TQt::Key_Refresh, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Refresh" ) }, - { TQt::Key_VolumeDown, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Volume Down" ) }, - { TQt::Key_VolumeMute, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Volume Mute" ) }, - { TQt::Key_VolumeUp, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Volume Up" ) }, - { TQt::Key_BassBoost, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Bass Boost" ) }, - { TQt::Key_BassUp, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Bass Up" ) }, - { TQt::Key_BassDown, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Bass Down" ) }, - { TQt::Key_TrebleUp, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Treble Up" ) }, - { TQt::Key_TrebleDown, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Treble Down" ) }, - { TQt::Key_MediaPlay, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Play" ) }, - { TQt::Key_MediaStop, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Stop" ) }, - { TQt::Key_MediaPrev, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Previous" ) }, - { TQt::Key_MediaNext, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Next" ) }, - { TQt::Key_MediaRecord, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Record" ) }, - { TQt::Key_HomePage, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Home" ) }, - { TQt::Key_Favorites, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Favorites" ) }, - { TQt::Key_Search, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Search" ) }, - { TQt::Key_Standby, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Standby" ) }, - { TQt::Key_OpenUrl, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Open URL" ) }, - { TQt::Key_LaunchMail, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch Mail" ) }, - { TQt::Key_LaunchMedia, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch Media" ) }, - { TQt::Key_Launch0, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (0)" ) }, - { TQt::Key_Launch1, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (1)" ) }, - { TQt::Key_Launch2, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (2)" ) }, - { TQt::Key_Launch3, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (3)" ) }, - { TQt::Key_Launch4, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (4)" ) }, - { TQt::Key_Launch5, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (5)" ) }, - { TQt::Key_Launch6, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (6)" ) }, - { TQt::Key_Launch7, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (7)" ) }, - { TQt::Key_Launch8, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (8)" ) }, - { TQt::Key_Launch9, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (9)" ) }, - { TQt::Key_LaunchA, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (A)" ) }, - { TQt::Key_LaunchB, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (B)" ) }, - { TQt::Key_LaunchC, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (C)" ) }, - { TQt::Key_LaunchD, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (D)" ) }, - { TQt::Key_LaunchE, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (E)" ) }, - { TQt::Key_LaunchF, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (F)" ) }, + { TQt::Key_Back, TQT_TRANSLATE_NOOP( "TQAccel", "Back" ) }, + { TQt::Key_Forward, TQT_TRANSLATE_NOOP( "TQAccel", "Forward" ) }, + { TQt::Key_Stop, TQT_TRANSLATE_NOOP( "TQAccel", "Stop" ) }, + { TQt::Key_Refresh, TQT_TRANSLATE_NOOP( "TQAccel", "Refresh" ) }, + { TQt::Key_VolumeDown, TQT_TRANSLATE_NOOP( "TQAccel", "Volume Down" ) }, + { TQt::Key_VolumeMute, TQT_TRANSLATE_NOOP( "TQAccel", "Volume Mute" ) }, + { TQt::Key_VolumeUp, TQT_TRANSLATE_NOOP( "TQAccel", "Volume Up" ) }, + { TQt::Key_BassBoost, TQT_TRANSLATE_NOOP( "TQAccel", "Bass Boost" ) }, + { TQt::Key_BassUp, TQT_TRANSLATE_NOOP( "TQAccel", "Bass Up" ) }, + { TQt::Key_BassDown, TQT_TRANSLATE_NOOP( "TQAccel", "Bass Down" ) }, + { TQt::Key_TrebleUp, TQT_TRANSLATE_NOOP( "TQAccel", "Treble Up" ) }, + { TQt::Key_TrebleDown, TQT_TRANSLATE_NOOP( "TQAccel", "Treble Down" ) }, + { TQt::Key_MediaPlay, TQT_TRANSLATE_NOOP( "TQAccel", "Media Play" ) }, + { TQt::Key_MediaStop, TQT_TRANSLATE_NOOP( "TQAccel", "Media Stop" ) }, + { TQt::Key_MediaPrev, TQT_TRANSLATE_NOOP( "TQAccel", "Media Previous" ) }, + { TQt::Key_MediaNext, TQT_TRANSLATE_NOOP( "TQAccel", "Media Next" ) }, + { TQt::Key_MediaRecord, TQT_TRANSLATE_NOOP( "TQAccel", "Media Record" ) }, + { TQt::Key_HomePage, TQT_TRANSLATE_NOOP( "TQAccel", "Home" ) }, + { TQt::Key_Favorites, TQT_TRANSLATE_NOOP( "TQAccel", "Favorites" ) }, + { TQt::Key_Search, TQT_TRANSLATE_NOOP( "TQAccel", "Search" ) }, + { TQt::Key_Standby, TQT_TRANSLATE_NOOP( "TQAccel", "Standby" ) }, + { TQt::Key_OpenUrl, TQT_TRANSLATE_NOOP( "TQAccel", "Open URL" ) }, + { TQt::Key_LaunchMail, TQT_TRANSLATE_NOOP( "TQAccel", "Launch Mail" ) }, + { TQt::Key_LaunchMedia, TQT_TRANSLATE_NOOP( "TQAccel", "Launch Media" ) }, + { TQt::Key_Launch0, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (0)" ) }, + { TQt::Key_Launch1, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (1)" ) }, + { TQt::Key_Launch2, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (2)" ) }, + { TQt::Key_Launch3, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (3)" ) }, + { TQt::Key_Launch4, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (4)" ) }, + { TQt::Key_Launch5, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (5)" ) }, + { TQt::Key_Launch6, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (6)" ) }, + { TQt::Key_Launch7, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (7)" ) }, + { TQt::Key_Launch8, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (8)" ) }, + { TQt::Key_Launch9, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (9)" ) }, + { TQt::Key_LaunchA, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (A)" ) }, + { TQt::Key_LaunchB, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (B)" ) }, + { TQt::Key_LaunchC, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (C)" ) }, + { TQt::Key_LaunchD, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (D)" ) }, + { TQt::Key_LaunchE, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (E)" ) }, + { TQt::Key_LaunchF, TQT_TRANSLATE_NOOP( "TQAccel", "Launch (F)" ) }, // -------------------------------------------------------------- // More consistent namings - { TQt::Key_Print, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Print Screen" ) }, - { TQt::Key_Prior, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Page Up" ) }, - { TQt::Key_Next, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Page Down" ) }, - { TQt::Key_CapsLock, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Caps Lock" ) }, - { TQt::Key_NumLock, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Num Lock" ) }, - { TQt::Key_NumLock, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Number Lock" ) }, - { TQt::Key_ScrollLock, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Scroll Lock" ) }, - { TQt::Key_Insert, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Insert" ) }, - { TQt::Key_Delete, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Delete" ) }, - { TQt::Key_Escape, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Escape" ) }, - { TQt::Key_SysReq, TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "System Request" ) }, + { TQt::Key_Print, TQT_TRANSLATE_NOOP( "TQAccel", "Print Screen" ) }, + { TQt::Key_Prior, TQT_TRANSLATE_NOOP( "TQAccel", "Page Up" ) }, + { TQt::Key_Next, TQT_TRANSLATE_NOOP( "TQAccel", "Page Down" ) }, + { TQt::Key_CapsLock, TQT_TRANSLATE_NOOP( "TQAccel", "Caps Lock" ) }, + { TQt::Key_NumLock, TQT_TRANSLATE_NOOP( "TQAccel", "Num Lock" ) }, + { TQt::Key_NumLock, TQT_TRANSLATE_NOOP( "TQAccel", "Number Lock" ) }, + { TQt::Key_ScrollLock, TQT_TRANSLATE_NOOP( "TQAccel", "Scroll Lock" ) }, + { TQt::Key_Insert, TQT_TRANSLATE_NOOP( "TQAccel", "Insert" ) }, + { TQt::Key_Delete, TQT_TRANSLATE_NOOP( "TQAccel", "Delete" ) }, + { TQt::Key_Escape, TQT_TRANSLATE_NOOP( "TQAccel", "Escape" ) }, + { TQt::Key_SysReq, TQT_TRANSLATE_NOOP( "TQAccel", "System Request" ) }, { 0, 0 } }; @@ -319,7 +319,7 @@ bool Resource::load( FormFile *ff, Project *defProject ) TQFile f( ff->absFileName() ); f.open( IO_ReadOnly | IO_Translate ); - bool b = load( ff, TQT_TQIODEVICE(&f), defProject ); + bool b = load( ff, &f, defProject ); f.close(); return b; @@ -347,7 +347,7 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) formwindow->setProject( MainWindow::self->currProject() ); if ( mainwindow ) formwindow->setMainWindow( mainwindow ); - MetaDataBase::addEntry( TQT_TQOBJECT(formwindow) ); + MetaDataBase::addEntry( formwindow ); if ( !langIface ) { TQString lang = "TQt Script"; @@ -429,7 +429,20 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) inc.implDecl = "in implementation"; inc.header = e.firstChild().toText().data(); if ( inc.header.right( 5 ) != ".ui.h" ) { - metaIncludes.append( inc ); + bool found = false; + TQValueList<MetaDataBase::Include>::Iterator it; + for ( it = metaIncludes.begin(); it != metaIncludes.end(); ++it ) { + MetaDataBase::Include currInc = *it; + if ( currInc.location == inc.location && currInc.implDecl == inc.implDecl && + currInc.header == inc.header) { + found = true; + break; + } + } + if ( !found ) + { + metaIncludes.append( inc ); + } } else { if ( formwindow->formFile() ) formwindow->formFile()->setCodeFileState( FormFile::Ok ); @@ -478,17 +491,8 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) if ( !customWidgets.isNull() ) loadCustomWidgets( customWidgets, this ); -#if defined (TQT_NON_COMMERCIAL) - bool previewMode = MainWindow::self ? MainWindow::self->isPreviewing() : FALSE; - TQWidget *w = (TQWidget*)createObject( widget, !previewMode ? (TQWidget*)formwindow : MainWindow::self ); - if ( !w ) - return FALSE; - if ( previewMode ) - w->reparent( MainWindow::self, TQt::WType_TopLevel, w->pos(), TRUE ); -#else if ( !createObject( widget, formwindow) ) return FALSE; -#endif if ( !forwards.isNull() ) { for ( TQDomElement n = forwards.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) @@ -509,7 +513,20 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) inc.implDecl = "in implementation"; inc.header = n.firstChild().toText().data(); if ( inc.header.right( 5 ) != ".ui.h" ) { - metaIncludes.append( inc ); + bool found = false; + TQValueList<MetaDataBase::Include>::Iterator it; + for ( it = metaIncludes.begin(); it != metaIncludes.end(); ++it ) { + MetaDataBase::Include currInc = *it; + if ( currInc.location == inc.location && currInc.implDecl == inc.implDecl && + currInc.header == inc.header) { + found = true; + break; + } + } + if ( !found ) + { + metaIncludes.append( inc ); + } } else { if ( formwindow->formFile() ) formwindow->formFile()->setCodeFileState( FormFile::Ok ); @@ -552,11 +569,11 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) function.returnType = "void"; function.type = "slot"; function.function = n.firstChild().toText().data(); - if ( !MetaDataBase::hasFunction( TQT_TQOBJECT(formwindow), function.function, TRUE ) ) - MetaDataBase::addFunction( TQT_TQOBJECT(formwindow), function.function, function.specifier, + if ( !MetaDataBase::hasFunction( formwindow, function.function, TRUE ) ) + MetaDataBase::addFunction( formwindow, function.function, function.specifier, function.access, "slot", function.language, function.returnType ); else - MetaDataBase::changeFunctionAttributes( TQT_TQOBJECT(formwindow), function.function, function.function, + MetaDataBase::changeFunctionAttributes( formwindow, function.function, function.function, function.specifier, function.access, "slot", function.language, function.returnType ); @@ -580,12 +597,12 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) if ( function.returnType.isEmpty() ) function.returnType = "void"; function.function = n.firstChild().toText().data(); - if ( !MetaDataBase::hasFunction( TQT_TQOBJECT(formwindow), function.function, TRUE ) ) - MetaDataBase::addFunction( TQT_TQOBJECT(formwindow), function.function, function.specifier, + if ( !MetaDataBase::hasFunction( formwindow, function.function, TRUE ) ) + MetaDataBase::addFunction( formwindow, function.function, function.specifier, function.access, function.type, function.language, function.returnType ); else - MetaDataBase::changeFunctionAttributes( TQT_TQOBJECT(formwindow), function.function, function.function, + MetaDataBase::changeFunctionAttributes( formwindow, function.function, function.function, function.specifier, function.access, function.type, function.language, function.returnType ); } @@ -606,13 +623,13 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) loadTabOrder( tabOrder ); if ( formwindow ) { - MetaDataBase::setIncludes( TQT_TQOBJECT(formwindow), metaIncludes ); - MetaDataBase::setForwards( TQT_TQOBJECT(formwindow), metaForwards ); - MetaDataBase::setVariables( TQT_TQOBJECT(formwindow), metaVariables ); - MetaDataBase::setSignalList( TQT_TQOBJECT(formwindow), metaSignals ); + MetaDataBase::setIncludes( formwindow, metaIncludes ); + MetaDataBase::setForwards( formwindow, metaForwards ); + MetaDataBase::setVariables( formwindow, metaVariables ); + MetaDataBase::setSignalList( formwindow, metaSignals ); metaInfo.classNameChanged = metaInfo.className != TQString( formwindow->name() ); - MetaDataBase::setMetaInfo( TQT_TQOBJECT(formwindow), metaInfo ); - MetaDataBase::setExportMacro( TQT_TQOBJECT(formwindow->mainContainer()), exportMacro ); + MetaDataBase::setMetaInfo( formwindow, metaInfo ); + MetaDataBase::setExportMacro( formwindow->mainContainer(), exportMacro ); } loadExtraSource( formwindow->formFile(), currFileName, langIface, hasFunctions ); @@ -621,7 +638,7 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) mainwindow->insertFormWindow( formwindow ); if ( formwindow ) { - formwindow->killAccels( TQT_TQOBJECT(formwindow) ); + formwindow->killAccels( formwindow ); if ( formwindow->layout() ) formwindow->layout()->activate(); if ( hadGeometry ) @@ -678,7 +695,7 @@ bool Resource::save( const TQString& filename, bool formCodeOnly ) TQFile f( filename ); if ( !f.open( IO_WriteOnly | IO_Translate ) ) return FALSE; - bool b = save( TQT_TQIODEVICE(&f) ); + bool b = save( &f ); f.close(); return b; } @@ -702,23 +719,22 @@ bool Resource::save( TQIODevice* dev ) ts << "<!DOCTYPE UI><UI version=\"3.3\" stdsetdef=\"1\">" << endl; saveMetaInfoBefore( ts, 0 ); - saveObject( TQT_TQOBJECT(formwindow->mainContainer()), 0, ts, 0 ); - if ( ::tqqt_cast<TQMainWindow*>(formwindow->mainContainer()) ) { + saveObject( formwindow->mainContainer(), 0, ts, 0 ); + if ( ::tqt_cast<TQMainWindow*>(formwindow->mainContainer()) ) { saveMenuBar( (TQMainWindow*)formwindow->mainContainer(), ts, 0 ); saveToolBars( (TQMainWindow*)formwindow->mainContainer(), ts, 0 ); } if ( !MetaDataBase::customWidgets()->isEmpty() && !usedCustomWidgets.isEmpty() ) saveCustomWidgets( ts, 0 ); - if ( ::tqqt_cast<TQMainWindow*>(formwindow->mainContainer()) ) + if ( ::tqt_cast<TQMainWindow*>(formwindow->mainContainer()) ) saveActions( formwindow->actionList(), ts, 0 ); if ( !images.isEmpty() ) saveImageCollection( ts, 0 ); - if ( !MetaDataBase::connections( TQT_TQOBJECT(formwindow) ).isEmpty() || - !MetaDataBase::slotList( TQT_TQOBJECT(formwindow) ).isEmpty() ) + if ( !MetaDataBase::connections( formwindow ).isEmpty() || + !MetaDataBase::slotList( formwindow ).isEmpty() ) saveConnections( ts, 0 ); saveTabOrder( ts, 0 ); saveMetaInfoAfter( ts, 0 ); - saveIncludeHints( ts, 0 ); ts << "</UI>" << endl; bool ok = saveFormCode( formwindow->formFile(), langIface ); images.clear(); @@ -749,7 +765,7 @@ TQString Resource::copy() p = p->parentWidget(); } if ( save ) - saveObject( TQT_TQOBJECT(w), 0, ts, 0 ); + saveObject( w, 0, ts, 0 ); } if ( !MetaDataBase::customWidgets()->isEmpty() && !usedCustomWidgets.isEmpty() ) saveCustomWidgets( ts, 0 ); @@ -807,9 +823,9 @@ void Resource::paste( const TQString &cb, TQWidget *parent ) y = TQMAX( 0, parent->height() - w->height() ); if ( x != w->x() || y != w->y() ) w->move( x, y ); - formwindow->selectWidget( TQT_TQOBJECT(w) ); + formwindow->selectWidget( w ); } else if ( firstWidget.tagName() == "spacer" ) { - TQWidget *w = createSpacer( firstWidget, parent, 0, firstWidget.tagName() == "vspacer" ? Qt::Vertical : Qt::Horizontal ); + TQWidget *w = createSpacer( firstWidget, parent, 0, firstWidget.tagName() == "vspacer" ? TQt::Vertical : TQt::Horizontal ); if ( !w ) continue; widgets.append( w ); @@ -821,7 +837,7 @@ void Resource::paste( const TQString &cb, TQWidget *parent ) y = TQMAX( 0, parent->height() - w->height() ); if ( x != w->x() || y != w->y() ) w->move( x, y ); - formwindow->selectWidget( TQT_TQOBJECT(w) ); + formwindow->selectWidget( w ); } firstWidget = firstWidget.nextSibling().toElement(); } @@ -843,10 +859,29 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea if ( obj->isWidgetType() ) { if ( obj->isA("CustomWidget") || isPlugin ) { usedCustomWidgets << TQString( className ); - includeHints << WidgetDatabase::includeFile( classID ); + MetaDataBase::Include inc; + inc.location = "global"; + inc.implDecl = "in implementation"; + inc.header = WidgetDatabase::includeFile( classID ); + bool found = false; + TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( formwindow ); + TQValueList<MetaDataBase::Include>::Iterator it; + for ( it = includes.begin(); it != includes.end(); ++it ) { + MetaDataBase::Include currInc = *it; + if ( currInc.location == inc.location && currInc.implDecl == inc.implDecl && + currInc.header == inc.header) { + found = true; + break; + } + } + if ( !found ) + { + includes << inc; + } + MetaDataBase::setIncludes( formwindow, includes ); } - if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(formwindow) && !formwindow->widgets()->find( (TQWidget*)obj ) ) + if ( obj != formwindow && !formwindow->widgets()->find( (TQWidget*)obj ) ) return; // we don't know anything about this thing TQString attributes; @@ -879,9 +914,9 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea QDesignerWidgetStack* ws = 0; - if ( ::tqqt_cast<TQTabWidget*>(obj) ) { + if ( ::tqt_cast<TQTabWidget*>(obj) ) { TQTabWidget* tw = (TQTabWidget*) obj; - TQObjectList* tmpl = tw->queryList( TQWIDGETSTACK_OBJECT_NAME_STRING ); + TQObjectList* tmpl = tw->queryList( "TQWidgetStack" ); TQWidgetStack *ws = (TQWidgetStack*)tmpl->first(); TQTabBar *tb = ( (QDesignerTabWidget*)obj )->tabBar(); for ( int i = 0; i < tb->count(); ++i ) { @@ -891,7 +926,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea TQWidget *w = ws->widget( t->identifier() ); if ( !w ) continue; - if ( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT(w)) ) == -1 ) + if ( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(w) ) == -1 ) continue; // we don't know this widget ts << makeIndent( indent ) << "<widget class=\"TQWidget\">" << endl; ++indent; @@ -906,17 +941,17 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea ts << makeIndent( indent ) << "<string>" << entitize( t->text() ) << "</string>" << endl; indent--; ts << makeIndent( indent ) << "</attribute>" << endl; - saveChildrenOf( TQT_TQOBJECT(w), ts, indent ); + saveChildrenOf( w, ts, indent ); --indent; ts << makeIndent( indent ) << "</widget>" << endl; } delete tmpl; - } else if ( (ws = ::tqqt_cast<QDesignerWidgetStack*>(obj)) != 0 ) { + } else if ( (ws = ::tqt_cast<QDesignerWidgetStack*>(obj)) != 0 ) { for ( int i = 0; i < ws->count(); ++i ) { TQWidget *w = ws->page( i ); if ( !w ) continue; - if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))) == -1 ) + if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)) == -1 ) continue; // we don't know this widget ts << makeIndent( indent ) << "<widget class=\"TQWidget\">" << endl; ++indent; @@ -930,17 +965,17 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea ts << makeIndent( indent ) << "<number>" << TQString::number(i) << "</number>" << endl; indent--; ts << makeIndent( indent ) << "</attribute>" << endl; - saveChildrenOf( TQT_TQOBJECT(w), ts, indent ); + saveChildrenOf( w, ts, indent ); --indent; ts << makeIndent( indent ) << "</widget>" << endl; } - } else if ( ::tqqt_cast<TQToolBox*>(obj) ) { + } else if ( ::tqt_cast<TQToolBox*>(obj) ) { TQToolBox* tb = (TQToolBox*)obj; for ( int i = 0; i < tb->count(); ++i ) { TQWidget *w = tb->item( i ); if ( !w ) continue; - if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))) == -1 ) + if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)) == -1 ) continue; // we don't know this widget ts << makeIndent( indent ) << "<widget class=\"TQWidget\">" << endl; ++indent; @@ -951,7 +986,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea ts << makeIndent( indent ) << "</property>" << endl; ts << makeIndent( indent ) << "<property name=\"backgroundMode\">" << endl; indent++; - saveEnumProperty( TQT_TQOBJECT(w), "backgroundMode", TQVariant::Invalid, ts, indent ); + saveEnumProperty( w, "backgroundMode", TQVariant::Invalid, ts, indent ); indent--; ts << makeIndent( indent ) << "</property>" << endl; ts << makeIndent( indent ) << "<attribute name=\"label\">" << endl; @@ -959,17 +994,17 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea ts << makeIndent( indent ) << "<string>" << entitize( tb->itemLabel( tb->indexOf(w) ) ) << "</string>" << endl; indent--; ts << makeIndent( indent ) << "</attribute>" << endl; - saveChildrenOf( TQT_TQOBJECT(w), ts, indent ); + saveChildrenOf( w, ts, indent ); --indent; ts << makeIndent( indent ) << "</widget>" << endl; } - } else if ( ::tqqt_cast<TQWizard*>(obj) ) { + } else if ( ::tqt_cast<TQWizard*>(obj) ) { TQWizard* wiz = (TQWizard*)obj; for ( int i = 0; i < wiz->pageCount(); ++i ) { TQWidget *w = wiz->page( i ); if ( !w ) continue; - if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))) == -1 ) + if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)) == -1 ) continue; // we don't know this widget ts << makeIndent( indent ) << "<widget class=\"TQWidget\">" << endl; ++indent; @@ -984,12 +1019,12 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea ts << makeIndent( indent ) << "<string>" << entitize( wiz->title( w ) ) << "</string>" << endl; indent--; ts << makeIndent( indent ) << "</attribute>" << endl; - saveChildrenOf( TQT_TQOBJECT(w), ts, indent ); + saveChildrenOf( w, ts, indent ); --indent; ts << makeIndent( indent ) << "</widget>" << endl; } - } else if ( ::tqqt_cast<TQMainWindow*>(obj) ) { - saveChildrenOf( TQT_TQOBJECT(( (TQMainWindow*)obj )->centralWidget()), ts, indent ); + } else if ( ::tqt_cast<TQMainWindow*>(obj) ) { + saveChildrenOf( ( (TQMainWindow*)obj )->centralWidget(), ts, indent ); } else { bool saved = FALSE; #ifdef TQT_CONTAINER_CUSTOM_WIDGETS @@ -1007,10 +1042,10 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea int i = 0; for ( TQWidget *w = containers.first(); w; w = containers.next(), ++i ) { if ( WidgetDatabase:: - idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) == -1 ) + idFromClassName( WidgetFactory::classNameOf( w ) ) == -1 ) continue; // we don't know this widget ts << makeIndent( indent ) << "<widget class=\"" - << WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) + << WidgetFactory::classNameOf( w ) << "\">" << endl; ++indent; ts << makeIndent( indent ) << "<property name=\"name\">" << endl; @@ -1036,7 +1071,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea TQWidget *w = iface2->containerOfWidget( className, (TQWidget*)obj ); if ( obj != w ) { ts << makeIndent( indent ) << "<widget class=\"" - << WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) + << WidgetFactory::classNameOf( w ) << "\">" << endl; ++indent; ts << makeIndent( indent ) << "<property name=\"name\">" << endl; @@ -1123,9 +1158,9 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) { - if ( ::tqqt_cast<TQListBox*>(obj) || ::tqqt_cast<TQComboBox*>(obj) ) { + if ( ::tqt_cast<TQListBox*>(obj) || ::tqt_cast<TQComboBox*>(obj) ) { TQListBox *lb = 0; - if ( ::tqqt_cast<TQListBox*>(obj) ) + if ( ::tqt_cast<TQListBox*>(obj) ) lb = (TQListBox*)obj; else lb = ( (TQComboBox*)obj )->listBox(); @@ -1143,7 +1178,7 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) indent--; ts << makeIndent( indent ) << "</item>" << endl; } - } else if ( ::tqqt_cast<TQIconView*>(obj) ) { + } else if ( ::tqt_cast<TQIconView*>(obj) ) { TQIconView *iv = (TQIconView*)obj; TQIconViewItem *i = iv->firstItem(); @@ -1159,7 +1194,7 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) indent--; ts << makeIndent( indent ) << "</item>" << endl; } - } else if ( ::tqqt_cast<TQListView*>(obj) ) { + } else if ( ::tqt_cast<TQListView*>(obj) ) { TQListView *lv = (TQListView*)obj; int i; for ( i = 0; i < lv->header()->count(); ++i ) { @@ -1185,15 +1220,18 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) indent--; ts << makeIndent( indent ) << "</column>" << endl; } - saveItem( lv->firstChild(), ts, indent - 1 ); + if (lv->firstChild()) + { + saveItem( lv->firstChild(), ts, indent - 1 ); + } } #if !defined (TQT_NO_TABLE) - else if ( ::tqqt_cast<TQTable*>(obj) ) { + else if ( ::tqt_cast<TQTable*>(obj) ) { TQTable *table = (TQTable*)obj; int i; - TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( TQT_TQOBJECT(table) ); + TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( table ); # ifndef TQT_NO_SQL - bool isDataTable = ::tqqt_cast<TQDataTable*>(table); + bool isDataTable = ::tqt_cast<TQDataTable*>(table); # else bool isDataTable = false; # endif @@ -1245,6 +1283,10 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) void Resource::saveItem( TQListViewItem *i, TQTextStream &ts, int indent ) { + if (!i) + { + return; + } TQListView *lv = i->listView(); while ( i ) { ts << makeIndent( indent ) << "<item>" << endl; @@ -1277,10 +1319,10 @@ void Resource::savePixmap( const TQPixmap &p, TQTextStream &ts, int indent, cons if ( formwindow && formwindow->savePixmapInline() ) ts << makeIndent( indent ) << "<" << tagname << ">" << saveInCollection( p ) << "</" << tagname << ">" << endl; else if ( formwindow && formwindow->savePixmapInProject() ) - ts << makeIndent( indent ) << "<" << tagname << ">" << MetaDataBase::pixmapKey( TQT_TQOBJECT(formwindow), p.serialNumber() ) + ts << makeIndent( indent ) << "<" << tagname << ">" << MetaDataBase::pixmapKey( formwindow, p.serialNumber() ) << "</" << tagname << ">" << endl; else - ts << makeIndent( indent ) << "<" << tagname << ">" << MetaDataBase::pixmapArgument( TQT_TQOBJECT(formwindow), p.serialNumber() ) + ts << makeIndent( indent ) << "<" << tagname << ">" << MetaDataBase::pixmapArgument( formwindow, p.serialNumber() ) << "</" << tagname << ">" << endl; } @@ -1292,7 +1334,7 @@ TQPixmap Resource::loadPixmap( const TQDomElement &e, const TQString &/*tagname* TQImage img = loadFromCollection( arg ); TQPixmap pix; pix.convertFromImage( img ); - MetaDataBase::setPixmapArgument( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg ); + MetaDataBase::setPixmapArgument( formwindow, pix.serialNumber(), arg ); return pix; } else if ( formwindow && formwindow->savePixmapInProject() ) { TQPixmap pix; @@ -1304,13 +1346,13 @@ TQPixmap Resource::loadPixmap( const TQDomElement &e, const TQString &/*tagname* pix.convertFromImage( pix.convertToImage() ); } - MetaDataBase::setPixmapKey( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg ); + MetaDataBase::setPixmapKey( formwindow, pix.serialNumber(), arg ); return pix; } TQPixmap pix = BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ); // we have to force the pixmap to get a new and unique serial number. Unfortunately detatch() doesn't do that pix.convertFromImage( pix.convertToImage() ); - MetaDataBase::setPixmapArgument( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg ); + MetaDataBase::setPixmapArgument( formwindow, pix.serialNumber(), arg ); return pix; } @@ -1350,7 +1392,7 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent ) // if the widget has a layout we pretend that all widget's childs are childs of the layout - makes the structure nicer TQLayout *layout = 0; QDesignerGridLayout* grid = 0; - if ( !::tqqt_cast<TQSplitter*>(obj) && + if ( !::tqt_cast<TQSplitter*>(obj) && WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( obj ) ) ) && obj->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)obj, layout ) != WidgetFactory::NoLayout ) { @@ -1378,7 +1420,7 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent ) // save properties of layout if ( lay != WidgetFactory::NoLayout ) - saveObjectProperties( TQT_TQOBJECT(layout), ts, indent ); + saveObjectProperties( layout, ts, indent ); } @@ -1398,28 +1440,28 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) TQStringList changed; changed = MetaDataBase::changedProperties( w ); if ( w->isWidgetType() ) { - if ( ::tqqt_cast<Spacer*>(w) ) { + if ( ::tqt_cast<Spacer*>(w) ) { if ( !changed.contains( "sizeHint" ) ) changed << "sizeHint"; if ( !changed.contains( "geometry" ) ) changed << "geometry"; } else { - TQToolButton *tb = ::tqqt_cast<TQToolButton*>(w); + TQToolButton *tb = ::tqt_cast<TQToolButton*>(w); if ( tb && !tb->iconSet().isNull() ) { changed << "iconSet"; } } - } else if ( ::tqqt_cast<TQLayout*>(w) ) { - if ( MetaDataBase::spacing( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) ) > -1 ) + } else if ( ::tqt_cast<TQLayout*>(w) ) { + if ( MetaDataBase::spacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) > -1 ) changed << "spacing"; - if ( MetaDataBase::margin( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) ) > -1 ) + if ( MetaDataBase::margin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) > -1 ) changed << "margin"; - if ( MetaDataBase::resizeMode( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) ) != "Auto" - && !MetaDataBase::resizeMode( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) ).isEmpty() ) + if ( MetaDataBase::resizeMode( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) != "Auto" + && !MetaDataBase::resizeMode( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ).isEmpty() ) changed << "resizeMode"; } - if ( TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(formwindow->mainContainer()) ) { + if ( w == formwindow->mainContainer() ) { if ( changed.findIndex( "geometry" ) == -1 ) changed << "geometry"; if ( changed.findIndex( "caption" ) == -1 ) @@ -1429,10 +1471,10 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) if ( changed.isEmpty() ) return; - bool inLayout = TQT_BASE_OBJECT(w) != TQT_BASE_OBJECT(formwindow->mainContainer()) && !copying && w->isWidgetType() && ( (TQWidget*)w )->parentWidget() && + bool inLayout = w != formwindow->mainContainer() && !copying && w->isWidgetType() && ( (TQWidget*)w )->parentWidget() && WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout; - TQStrList lst = w->metaObject()->propertyNames( !::tqqt_cast<Spacer*>(w) ); + TQStrList lst = w->metaObject()->propertyNames( !::tqt_cast<Spacer*>(w) ); for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) { if ( changed.find( TQString::fromLatin1( it.current() ) ) == changed.end() ) continue; @@ -1443,10 +1485,10 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) property( w->metaObject()->findProperty( it.current(), TRUE ), TRUE ); if ( !p || !p->stored( w ) || ( inLayout && qstrcmp( p->name(), "geometry" ) == 0 ) ) continue; - if ( ::tqqt_cast<TQLabel*>(w) && qstrcmp( p->name(), "pixmap" ) == 0 && + if ( ::tqt_cast<TQLabel*>(w) && qstrcmp( p->name(), "pixmap" ) == 0 && ( !( (TQLabel*)w )->pixmap() || ( (TQLabel*)w )->pixmap()->isNull() ) ) continue; - if ( ::tqqt_cast<MenuBarEditor*>(w) && + if ( ::tqt_cast<MenuBarEditor*>(w) && ( qstrcmp( p->name(), "itemName" ) == 0 || qstrcmp( p->name(), "itemNumber" ) == 0 || qstrcmp( p->name(), "itemText" ) == 0 ) ) continue; @@ -1460,7 +1502,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) ts << " stdset=\"0\""; ts << ">" << endl; indent++; - if ( strcmp( it.current(), "resizeMode" ) == 0 && ::tqqt_cast<TQLayout*>(w) ) { + if ( strcmp( it.current(), "resizeMode" ) == 0 && ::tqt_cast<TQLayout*>(w) ) { saveProperty( w, it.current(), "", TQVariant::String, ts, indent ); } else if ( p->isSetType() ) { saveSetProperty( w, it.current(), TQVariant::nameToType( p->type() ), ts, indent ); @@ -1527,7 +1569,7 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant switch ( t ) { case TQVariant::String: if ( name == "resizeMode" ) { - TQString resmod = MetaDataBase::resizeMode( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) ); + TQString resmod = MetaDataBase::resizeMode( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ); if ( !resmod.isNull() && resmod != "Auto" ) { ts << makeIndent( indent ) << "<enum>"; ts << resmod; @@ -1547,12 +1589,12 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant ts << makeIndent( indent ) << "<bool>" << mkBool( value.toBool() ) << "</bool>" << endl; break; case TQVariant::Int: - if ( ::tqqt_cast<TQLayout*>(w) ) { + if ( ::tqt_cast<TQLayout*>(w) ) { num = -1; if ( name == "spacing" ) - num = MetaDataBase::spacing( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) ); + num = MetaDataBase::spacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ); else if ( name == "margin" ) - num = MetaDataBase::margin( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ) ); + num = MetaDataBase::margin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(w) ) ) ); if ( num != -1 ) ts << makeIndent( indent ) << "<number>" << TQString::number( num ) << "</number>" << endl; } else { @@ -1772,7 +1814,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay if ( colspan < 1 ) colspan = 1; - TQString className = e.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ); + TQString className = e.attribute( "class", "TQWidget" ); #ifdef TQT_CONTAINER_CUSTOM_WIDGETS TQString parentClassName = WidgetFactory::classNameOf( parent ); bool isPlugin = @@ -1782,7 +1824,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay // ### TODO loading for custom container widgets without pages #endif if ( !className.isNull() ) { - obj = TQT_TQOBJECT(WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, 0, FALSE )); + obj = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, 0, FALSE ); if ( !obj ) { TQMessageBox::critical( MainWindow::self, i18n( "Loading File" ), i18n( "Error loading %1.\n" @@ -1796,7 +1838,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay mainContainerSet = TRUE; } w = (TQWidget*)obj; - if ( ::tqqt_cast<TQMainWindow*>(w) ) + if ( ::tqt_cast<TQMainWindow*>(w) ) w = ( (TQMainWindow*)w )->centralWidget(); if ( layout ) { switch ( WidgetFactory::layoutType( layout ) ) { @@ -1821,25 +1863,25 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay if ( w && formwindow ) { if ( !parent || - ( !::tqqt_cast<TQTabWidget*>(parent) && - !::tqqt_cast<TQWidgetStack*>(parent) && - !::tqqt_cast<TQToolBox*>(parent) && - !::tqqt_cast<TQWizard*>(parent) + ( !::tqt_cast<TQTabWidget*>(parent) && + !::tqt_cast<TQWidgetStack*>(parent) && + !::tqt_cast<TQToolBox*>(parent) && + !::tqt_cast<TQWizard*>(parent) #ifdef TQT_CONTAINER_CUSTOM_WIDGETS && !isPlugin #endif ) ) formwindow->insertWidget( w, pasting ); else if ( parent && - ( ::tqqt_cast<TQTabWidget*>(parent) || - ::tqqt_cast<TQWidgetStack*>(parent) || - ::tqqt_cast<TQToolBox*>(parent) || - ::tqqt_cast<TQWizard*>(parent) + ( ::tqt_cast<TQTabWidget*>(parent) || + ::tqt_cast<TQWidgetStack*>(parent) || + ::tqt_cast<TQToolBox*>(parent) || + ::tqt_cast<TQWizard*>(parent) #ifdef TQT_CONTAINER_CUSTOM_WIDGETS || isPlugin #endif ) ) - MetaDataBase::addEntry( TQT_TQOBJECT(w) ); + MetaDataBase::addEntry( w ); } } @@ -1848,22 +1890,22 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay while ( !n.isNull() ) { if ( n.tagName() == "spacer" ) { - createSpacer( n, w, layout, Qt::Horizontal ); + createSpacer( n, w, layout, TQt::Horizontal ); } else if ( n.tagName() == "widget" ) { createObject( n, w, layout ); } else if ( n.tagName() == "hbox" ) { layout = WidgetFactory::createLayout( w, layout, WidgetFactory::HBox ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); continue; } else if ( n.tagName() == "grid" ) { layout = WidgetFactory::createLayout( w, layout, WidgetFactory::Grid ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); continue; } else if ( n.tagName() == "vbox" ) { layout = WidgetFactory::createLayout( w, layout, WidgetFactory::VBox ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); continue; } else if ( n.tagName() == "property" && obj ) { @@ -1877,16 +1919,16 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay } else if ( n.tagName() == "attribute" && w ) { TQString attrib = n.attribute( "name" ); TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); - if ( ::tqqt_cast<TQTabWidget*>(parent) ) { + if ( ::tqt_cast<TQTabWidget*>(parent) ) { if ( attrib == "title" ) ( (TQTabWidget*)parent )->insertTab( w, v.toString() ); - } else if ( ::tqqt_cast<TQWidgetStack*>(parent) ) { + } else if ( ::tqt_cast<TQWidgetStack*>(parent) ) { if ( attrib == "id" ) ( (QDesignerWidgetStack*)parent )->insertPage( w, v.toInt() ); - } else if ( ::tqqt_cast<TQToolBox*>(parent) ) { + } else if ( ::tqt_cast<TQToolBox*>(parent) ) { if ( attrib == "label" ) ( (TQToolBox*)parent )->addItem( w, v.toString() ); - } else if ( ::tqqt_cast<TQWizard*>(parent) ) { + } else if ( ::tqt_cast<TQWizard*>(parent) ) { if ( attrib == "title" ) ( (TQWizard*)parent )->addPage( w, v.toString() ); #ifdef TQT_CONTAINER_CUSTOM_WIDGETS @@ -1926,7 +1968,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay if ( w->isWidgetType() ) widgets.insert( w->name(), w ); - return TQT_TQOBJECT(w); + return w; } void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) @@ -1934,7 +1976,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) if ( !widget ) return; - if ( ::tqqt_cast<TQListView*>(widget) && e.tagName() == "column" ) { + if ( ::tqt_cast<TQListView*>(widget) && e.tagName() == "column" ) { TQListView *lv = (TQListView*)widget; TQDomElement n = e.firstChild().toElement(); TQPixmap pix; @@ -1968,7 +2010,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) lv->header()->setResizeEnabled( resizable, i ); } #ifndef TQT_NO_TABLE - else if ( ::tqqt_cast<TQTable*>(widget) ) { + else if ( ::tqt_cast<TQTable*>(widget) ) { TQTable *table = (TQTable*)widget; bool isRow; if ( ( isRow = e.tagName() == "row" ) ) @@ -1981,7 +2023,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) bool hasPixmap = FALSE; TQString txt; TQString field; - TQMap<TQString, TQString> fieldMap = MetaDataBase::columnFields( TQT_TQOBJECT(table) ); + TQMap<TQString, TQString> fieldMap = MetaDataBase::columnFields( table ); while ( !n.isNull() ) { if ( n.tagName() == "property" ) { TQString attrib = n.attribute( "name" ); @@ -2006,7 +2048,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) h->setLabel( i, txt ); if ( !isRow && !field.isEmpty() ) fieldMap.insert( txt, field ); - MetaDataBase::setColumnFields( TQT_TQOBJECT(table), fieldMap ); + MetaDataBase::setColumnFields( table, fieldMap ); } #endif } @@ -2032,17 +2074,17 @@ void Resource::loadItem( const TQDomElement &e, TQPixmap &pix, TQString &txt, bo void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i ) { - if ( !widget || !WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ), TQT_TQOBJECT(widget) ) ) + if ( !widget || !WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( widget ) ), widget ) ) return; - if ( ::tqqt_cast<TQListBox*>(widget) || ::tqqt_cast<TQComboBox*>(widget) ) { + if ( ::tqt_cast<TQListBox*>(widget) || ::tqt_cast<TQComboBox*>(widget) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; bool hasPixmap = FALSE; TQString txt; loadItem( n, pix, txt, hasPixmap ); TQListBox *lb = 0; - if ( ::tqqt_cast<TQListBox*>(widget) ) + if ( ::tqt_cast<TQListBox*>(widget) ) lb = (TQListBox*)widget; else lb = ( (TQComboBox*)widget)->listBox(); @@ -2051,7 +2093,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt } else { new TQListBoxText( lb, txt ); } - } else if ( ::tqqt_cast<TQIconView*>(widget) ) { + } else if ( ::tqt_cast<TQIconView*>(widget) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; bool hasPixmap = FALSE; @@ -2062,7 +2104,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt new TQIconViewItem( iv, txt, pix ); else new TQIconViewItem( iv, txt ); - } else if ( ::tqqt_cast<TQListView*>(widget) ) { + } else if ( ::tqt_cast<TQListView*>(widget) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; TQValueList<TQPixmap> pixmaps; @@ -2104,7 +2146,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt } } -TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, Qt::Orientation o ) +TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, TQt::Orientation o ) { TQDomElement n = e.firstChild().toElement(); int row = e.attribute( "row" ).toInt(); @@ -2122,14 +2164,14 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay spacer->setInteraciveMode( FALSE ); while ( !n.isNull() ) { if ( n.tagName() == "property" ) - setObjectProperty( TQT_TQOBJECT(spacer), n.attribute( "name" ), n.firstChild().toElement() ); + setObjectProperty( spacer, n.attribute( "name" ), n.firstChild().toElement() ); n = n.nextSibling().toElement(); } spacer->setInteraciveMode( TRUE ); if ( formwindow ) formwindow->insertWidget( spacer, pasting ); if ( layout ) { - if ( ::tqqt_cast<TQBoxLayout*>(layout) ) + if ( ::tqt_cast<TQBoxLayout*>(layout) ) ( (TQBoxLayout*)layout )->addWidget( spacer, 0, spacer->alignment() ); else ( (QDesignerGridLayout*)layout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1, @@ -2145,7 +2187,7 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD { const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop, TRUE ), TRUE ); - if ( !::tqqt_cast<TQLayout*>(obj) ) {// no layouts in metadatabase... (RS) + if ( !::tqt_cast<TQLayout*>(obj) ) {// no layouts in metadatabase... (RS) if ( obj->inherits( "CustomWidget" ) ) { MetaDataBase::CustomWidget *cw = ( (CustomWidget*)obj )->customWidget(); if ( cw && !cw->hasProperty( prop.latin1() ) && !p && prop != "toolTip" && prop != "whatsThis" ) @@ -2187,7 +2229,7 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD if ( !p ) { MetaDataBase::setFakeProperty( obj, prop, v ); if ( obj->isWidgetType() ) { - if ( prop == "database" && TQT_TQOBJECT(obj) != TQT_TQOBJECT(toplevel) ) { + if ( prop == "database" && obj != toplevel ) { TQStringList lst = MetaDataBase::fakeProperty( obj, "database" ).toStringList(); if ( lst.count() > 2 ) dbControls.insert( obj->name(), lst[ 2 ] ); @@ -2241,32 +2283,32 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD } if ( prop == "icon" ) { formwindow->setIcon( v.toPixmap() ); - TQString pmk = MetaDataBase::pixmapKey( TQT_TQOBJECT(formwindow), v.toPixmap().serialNumber() ); - MetaDataBase::setPixmapKey( TQT_TQOBJECT(formwindow), + TQString pmk = MetaDataBase::pixmapKey( formwindow, v.toPixmap().serialNumber() ); + MetaDataBase::setPixmapKey( formwindow, formwindow->icon()->serialNumber(), pmk ); } if ( prop == "geometry" ) { - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(toplevel) ) { + if ( obj == toplevel ) { hadGeometry = TRUE; toplevel->resize( v.toRect().size() ); return; - } else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(formwindow->mainContainer()) ) { + } else if ( obj == formwindow->mainContainer() ) { hadGeometry = TRUE; formwindow->resize( v.toRect().size() ); return; } } - if ( ::tqqt_cast<TQLayout*>(obj) ) { + if ( ::tqt_cast<TQLayout*>(obj) ) { if ( prop == "spacing" ) { - MetaDataBase::setSpacing( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(obj) ) ) ), v.toInt() ); + MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(obj) ) ) , v.toInt() ); return; } else if ( prop == "margin" ) { - MetaDataBase::setMargin( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(obj) ) ) ), v.toInt() ); + MetaDataBase::setMargin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(obj) ) ) , v.toInt() ); return; } else if ( e.tagName() == "enum" && prop == "resizeMode" ) { - MetaDataBase::setResizeMode( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(obj) ) ) ), v.toString() ); + MetaDataBase::setResizeMode( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)(obj) ) ) , v.toString() ); return; } } @@ -2274,10 +2316,10 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD if ( prop == "name" ) { if ( pasting ) { TQString s = v.toString(); - formwindow->unify( TQT_TQOBJECT(obj), s, TRUE ); + formwindow->unify( obj, s, TRUE ); obj->setName( s ); return; - } else if ( formwindow && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(formwindow->mainContainer()) ) { + } else if ( formwindow && obj == formwindow->mainContainer() ) { formwindow->setName( v.toCString() ); } } @@ -2443,7 +2485,7 @@ TQImage Resource::loadFromCollection( const TQString &name ) void Resource::saveConnections( TQTextStream &ts, int indent ) { - TQValueList<MetaDataBase::Connection> connections = MetaDataBase::connections( TQT_TQOBJECT(formwindow) ); + TQValueList<MetaDataBase::Connection> connections = MetaDataBase::connections( formwindow ); if ( connections.isEmpty() ) return; ts << makeIndent( indent ) << "<connections>" << endl; @@ -2456,8 +2498,8 @@ void Resource::saveConnections( TQTextStream &ts, int indent ) ( knownNames.findIndex( TQString( conn.receiver->name() ) ) == -1 && qstrcmp( conn.receiver->name(), "this" ) != 0 ) ) continue; - if ( formwindow->isMainContainer( TQT_TQOBJECT((*it).receiver) ) && - !MetaDataBase::hasSlot( TQT_TQOBJECT(formwindow), MetaDataBase::normalizeFunction( (*it).slot ).latin1() ) ) + if ( formwindow->isMainContainer( (*it).receiver ) && + !MetaDataBase::hasSlot( formwindow, MetaDataBase::normalizeFunction( (*it).slot ).latin1() ) ) continue; if ( conn.sender->inherits( "CustomWidget" ) ) { @@ -2500,7 +2542,7 @@ void Resource::loadConnections( const TQDomElement &e ) conn.sender = 0; TQString name = n2.firstChild().toText().data(); if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) { - conn.sender = TQT_TQOBJECT(toplevel); + conn.sender = toplevel; } else { if ( name == "this" ) name = toplevel->name(); @@ -2520,7 +2562,7 @@ void Resource::loadConnections( const TQDomElement &e ) conn.receiver = 0; TQString name = n2.firstChild().toText().data(); if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) { - conn.receiver = TQT_TQOBJECT(toplevel); + conn.receiver = toplevel; } else { TQObjectList *l = toplevel->queryList( 0, name, FALSE ); if ( l ) { @@ -2538,14 +2580,14 @@ void Resource::loadConnections( const TQDomElement &e ) n2 = n2.nextSibling().toElement(); } if ( formwindow ) { - if ( TQT_BASE_OBJECT(conn.sender) == TQT_BASE_OBJECT(formwindow) ) - conn.sender = TQT_TQOBJECT(formwindow->mainContainer()); - if ( TQT_BASE_OBJECT(conn.receiver) == TQT_BASE_OBJECT(formwindow) ) - conn.receiver = TQT_TQOBJECT(formwindow->mainContainer()); + if ( conn.sender == formwindow ) + conn.sender = formwindow->mainContainer(); + if ( conn.receiver == formwindow ) + conn.receiver = formwindow->mainContainer(); } if ( conn.sender && conn.receiver ) { if ( lang == "C++" ) { - MetaDataBase::addConnection( TQT_TQOBJECT(formwindow ? formwindow : toplevel), + MetaDataBase::addConnection( formwindow ? formwindow : toplevel, conn.sender, conn.signal, conn.receiver, conn.slot ); } } @@ -2562,11 +2604,11 @@ void Resource::loadConnections( const TQDomElement &e ) if ( slot.returnType.isEmpty() ) slot.returnType = "void"; slot.function = n.firstChild().toText().data(); - if ( !MetaDataBase::hasFunction( TQT_TQOBJECT(formwindow), slot.function, TRUE ) ) - MetaDataBase::addFunction( TQT_TQOBJECT(formwindow), slot.function, slot.specifier, + if ( !MetaDataBase::hasFunction( formwindow, slot.function, TRUE ) ) + MetaDataBase::addFunction( formwindow, slot.function, slot.specifier, slot.access, "slot", slot.language, slot.returnType ); else - MetaDataBase::changeFunctionAttributes( TQT_TQOBJECT(formwindow), slot.function, slot.function, + MetaDataBase::changeFunctionAttributes( formwindow, slot.function, slot.function, slot.specifier, slot.access, "slot", slot.language, slot.returnType ); } @@ -2756,7 +2798,7 @@ void Resource::loadTabOrder( const TQDomElement &e ) void Resource::saveMetaInfoBefore( TQTextStream &ts, int indent ) { - MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( TQT_TQOBJECT(formwindow) ); + MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( formwindow ); TQString cn; if ( info.classNameChanged && !info.className.isEmpty() ) cn = info.className; @@ -2771,9 +2813,9 @@ void Resource::saveMetaInfoBefore( TQTextStream &ts, int indent ) void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) { - MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( TQT_TQOBJECT(formwindow) ); + MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( formwindow ); if ( !langIface || formwindow->project()->isCpp() ) { - TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( TQT_TQOBJECT(formwindow) ); + TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( formwindow ); TQString extensionInclude; bool needExtensionInclude = FALSE; if ( langIface && @@ -2800,7 +2842,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) ts << makeIndent( indent ) << "</includes>" << endl; } - TQStringList forwards = MetaDataBase::forwards( TQT_TQOBJECT(formwindow) ); + TQStringList forwards = MetaDataBase::forwards( formwindow ); if ( !forwards.isEmpty() ) { ts << makeIndent( indent ) << "<forwards>" << endl; indent++; @@ -2809,7 +2851,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) indent--; ts << makeIndent( indent ) << "</forwards>" << endl; } - TQValueList<MetaDataBase::Variable> varLst = MetaDataBase::variables( TQT_TQOBJECT(formwindow) ); + TQValueList<MetaDataBase::Variable> varLst = MetaDataBase::variables( formwindow ); if ( !varLst.isEmpty() ) { ts << makeIndent( indent ) << "<variables>" << endl; indent++; @@ -2825,7 +2867,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) indent--; ts << makeIndent( indent ) << "</variables>" << endl; } - TQStringList sigs = MetaDataBase::signalList( TQT_TQOBJECT(formwindow) ); + TQStringList sigs = MetaDataBase::signalList( formwindow ); if ( !sigs.isEmpty() ) { ts << makeIndent( indent ) << "<signals>" << endl; indent++; @@ -2835,7 +2877,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) ts << makeIndent( indent ) << "</signals>" << endl; } - TQValueList<MetaDataBase::Function> slotList = MetaDataBase::slotList( TQT_TQOBJECT(formwindow) ); + TQValueList<MetaDataBase::Function> slotList = MetaDataBase::slotList( formwindow ); if ( !slotList.isEmpty() ) { ts << makeIndent( indent ) << "<slots>" << endl; indent++; @@ -2858,7 +2900,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) ts << makeIndent( indent ) << "</slots>" << endl; } - TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(formwindow), TRUE ); + TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( formwindow, TRUE ); if ( !functionList.isEmpty() ) { ts << makeIndent( indent ) << "<functions>" << endl; indent++; @@ -2888,7 +2930,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) ts << makeIndent( indent ) << "<pixmapinproject/>" << endl; else ts << makeIndent( indent ) << "<pixmapfunction>" << formwindow->pixmapLoaderFunction() << "</pixmapfunction>" << endl; - if ( !( exportMacro = MetaDataBase::exportMacro( TQT_TQOBJECT(formwindow->mainContainer()) ) ).isEmpty() ) + if ( !( exportMacro = MetaDataBase::exportMacro( formwindow->mainContainer() ) ).isEmpty() ) ts << makeIndent( indent ) << "<exportmacro>" << exportMacro << "</exportmacro>" << endl; if ( formwindow ) { ts << makeIndent( indent ) << "<layoutdefaults spacing=\"" << formwindow->layoutDefaultSpacing() @@ -2905,18 +2947,6 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) } } -void Resource::saveIncludeHints( TQTextStream &ts, int indent ) -{ - if ( includeHints.isEmpty() ) - return; - ts << makeIndent( indent ) << "<includehints>" << endl; - indent++; - for ( TQStringList::Iterator it = includeHints.begin(); it != includeHints.end(); ++it ) - ts << makeIndent( indent ) << "<includehint>" << *it << "</includehint>" << endl; - indent--; - ts << makeIndent( indent ) << "</includehints>" << endl; -} - TQColorGroup Resource::loadColorGroup( const TQDomElement &e ) { TQColorGroup cg; @@ -2945,10 +2975,10 @@ void Resource::saveChildActions( TQAction *a, TQTextStream &ts, int indent ) while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !::tqqt_cast<TQAction*>(o) ) + if ( !::tqt_cast<TQAction*>(o) ) continue; TQAction *ac = (TQAction*)o; - bool isGroup = ::tqqt_cast<TQActionGroup*>(ac); + bool isGroup = ::tqt_cast<TQActionGroup*>(ac); if ( isGroup ) ts << makeIndent( indent ) << "<actiongroup>" << endl; else @@ -2977,7 +3007,7 @@ void Resource::saveActions( const TQPtrList<TQAction> &actions, TQTextStream &ts TQPtrListIterator<TQAction> it( actions ); while ( it.current() ) { TQAction *a = it.current(); - bool isGroup = ::tqqt_cast<TQActionGroup*>(a); + bool isGroup = ::tqt_cast<TQActionGroup*>(a); if ( isGroup ) ts << makeIndent( indent ) << "<actiongroup>" << endl; else @@ -3022,7 +3052,7 @@ void Resource::loadChildAction( TQObject *parent, const TQDomElement &e ) } n2 = n2.nextSibling().toElement(); } - if ( !::tqqt_cast<TQAction*>(parent) ) + if ( !::tqt_cast<TQAction*>(parent) ) formwindow->actionList().append( a ); } else if ( n.tagName() == "actiongroup" ) { a = new QDesignerActionGroup( parent ); @@ -3045,7 +3075,7 @@ void Resource::loadChildAction( TQObject *parent, const TQDomElement &e ) } n2 = n2.nextSibling().toElement(); } - if ( !::tqqt_cast<TQAction*>(parent) ) + if ( !::tqt_cast<TQAction*>(parent) ) formwindow->actionList().append( a ); } } @@ -3055,9 +3085,9 @@ void Resource::loadActions( const TQDomElement &e ) TQDomElement n = e.firstChild().toElement(); while ( !n.isNull() ) { if ( n.tagName() == "action" ) { - loadChildAction( TQT_TQOBJECT(formwindow), n ); + loadChildAction( formwindow, n ); } else if ( n.tagName() == "actiongroup" ) { - loadChildAction( TQT_TQOBJECT(formwindow), n ); + loadChildAction( formwindow, n ); } n = n.nextSibling().toElement(); } @@ -3078,23 +3108,23 @@ void Resource::saveToolBars( TQMainWindow *mw, TQTextStream &ts, int indent ) continue; ts << makeIndent( indent ) << "<toolbar dock=\"" << i << "\">" << endl; indent++; - saveObjectProperties( TQT_TQOBJECT(tb), ts, indent ); + saveObjectProperties( tb, ts, indent ); TQPtrList<TQAction> actionList = ( (QDesignerToolBar*)tb )->insertedActions(); for ( TQAction *a = actionList.first(); a; a = actionList.next() ) { - if ( ::tqqt_cast<QSeparatorAction*>(a) ) { + if ( ::tqt_cast<QSeparatorAction*>(a) ) { ts << makeIndent( indent ) << "<separator/>" << endl; } else { - if ( ::tqqt_cast<QDesignerAction*>(a) && !( (QDesignerAction*)a )->supportsMenu() ) { + if ( ::tqt_cast<QDesignerAction*>(a) && !( (QDesignerAction*)a )->supportsMenu() ) { TQWidget *w = ( (QDesignerAction*)a )->widget(); ts << makeIndent( indent ) << "<widget class=\"" - << WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) << "\">" << endl; + << WidgetFactory::classNameOf( w ) << "\">" << endl; indent++; - const char *className = WidgetFactory::classNameOf( TQT_TQOBJECT(w) ); + const char *className = WidgetFactory::classNameOf( w ); if ( w->isA( "CustomWidget" ) ) usedCustomWidgets << TQString( className ); - if ( WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), TQT_TQOBJECT(w) ) ) - saveItems( TQT_TQOBJECT(w), ts, indent ); - saveObjectProperties( TQT_TQOBJECT(w), ts, indent ); + if ( WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ), w ) ) + saveItems( w, ts, indent ); + saveObjectProperties( w, ts, indent ); indent--; ts << makeIndent( indent ) << "</widget>" << endl; } else { @@ -3117,8 +3147,8 @@ void Resource::saveMenuBar( TQMainWindow *mw, TQTextStream &ts, int indent ) return; ts << makeIndent( indent ) << "<menubar>" << endl; indent++; - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(mb), "name", TRUE ); // FIXME: remove - saveObjectProperties( TQT_TQOBJECT(mb), ts, indent ); + MetaDataBase::setPropertyChanged( mb, "name", TRUE ); // FIXME: remove + saveObjectProperties( mb, ts, indent ); for ( int i = 0; i < (int)mb->count(); ++i ) { MenuBarEditorItem *m = mb->item( i ); @@ -3143,11 +3173,11 @@ void Resource::savePopupMenu( PopupMenuEditor *pm, TQMainWindow *mw, TQTextStrea { for ( PopupMenuEditorItem *i = pm->items()->first(); i; i = pm->items()->next() ) { TQAction *a = i->action(); - if ( ::tqqt_cast<QSeparatorAction*>(a) ) + if ( ::tqt_cast<QSeparatorAction*>(a) ) ts << makeIndent( indent ) << "<separator/>" << endl; - else if ( ::tqqt_cast<QDesignerAction*>(a) ) + else if ( ::tqt_cast<QDesignerAction*>(a) ) ts << makeIndent( indent ) << "<action name=\"" << a->name() << "\"/>" << endl; - else if ( ::tqqt_cast<QDesignerActionGroup*>(a) ) + else if ( ::tqt_cast<QDesignerActionGroup*>(a) ) ts << makeIndent( indent ) << "<actiongroup name=\"" << a->name() << "\"/>" << endl; PopupMenuEditor *s = i->subMenu(); if ( s && s->count() ) { @@ -3187,12 +3217,12 @@ void Resource::loadToolBars( const TQDomElement &e ) tb->addAction( a ); } else if ( n2.tagName() == "widget" ) { TQWidget *w = (TQWidget*)createObject( n2, tb ); - QDesignerAction *a = new QDesignerAction( w, TQT_TQOBJECT(tb) ); + QDesignerAction *a = new QDesignerAction( w, tb ); a->addTo( tb ); tb->addAction( a ); tb->installEventFilters( w ); } else if ( n2.tagName() == "property" ) { - setObjectProperty( TQT_TQOBJECT(tb), n2.attribute( "name" ), n2.firstChild().toElement() ); + setObjectProperty( tb, n2.attribute( "name" ), n2.firstChild().toElement() ); } n2 = n2.nextSibling().toElement(); } @@ -3206,16 +3236,16 @@ void Resource::loadMenuBar( const TQDomElement &e ) TQDomElement n = e.firstChild().toElement(); TQMainWindow *mw = (TQMainWindow*)formwindow->mainContainer(); MenuBarEditor *mb = new MenuBarEditor( formwindow, mw ); - MetaDataBase::addEntry( TQT_TQOBJECT(mb) ); + MetaDataBase::addEntry( mb ); while ( !n.isNull() ) { if ( n.tagName() == "item" ) { PopupMenuEditor * popup = new PopupMenuEditor( formwindow, mw ); loadPopupMenu( popup, n ); popup->setName( n.attribute( "name" ) ); mb->insertItem( n.attribute( "text" ), popup ); - MetaDataBase::addEntry( TQT_TQOBJECT(popup) ); + MetaDataBase::addEntry( popup ); } else if ( n.tagName() == "property" ) { - setObjectProperty( TQT_TQOBJECT(mb), n.attribute( "name" ), n.firstChild().toElement() ); + setObjectProperty( mb, n.attribute( "name" ), n.firstChild().toElement() ); } else if ( n.tagName() == "separator" ) { mb->insertSeparator(); } @@ -3225,7 +3255,7 @@ void Resource::loadMenuBar( const TQDomElement &e ) void Resource::loadPopupMenu( PopupMenuEditor *p, const TQDomElement &e ) { - MetaDataBase::addEntry( TQT_TQOBJECT(p) ); + MetaDataBase::addEntry( p ); TQDomElement n = e.firstChild().toElement(); TQAction *a = 0; while ( !n.isNull() ) { diff --git a/kdevdesigner/designer/resource.h b/kdevdesigner/designer/resource.h index 06598254..7d32cf65 100644 --- a/kdevdesigner/designer/resource.h +++ b/kdevdesigner/designer/resource.h @@ -103,7 +103,6 @@ private: void saveColor( TQTextStream &ts, int indent, const TQColor &c ); void saveMetaInfoBefore( TQTextStream &ts, int indent ); void saveMetaInfoAfter( TQTextStream &ts, int indent ); - void saveIncludeHints( TQTextStream &ts, int indent ); void savePixmap( const TQPixmap &p, TQTextStream &ts, int indent, const TQString &tagname = "pixmap" ); void saveActions( const TQPtrList<TQAction> &actions, TQTextStream &ts, int indent ); void saveChildActions( TQAction *a, TQTextStream &ts, int indent ); @@ -112,7 +111,7 @@ private: void savePopupMenu( PopupMenuEditor *pm, TQMainWindow *mw, TQTextStream &ts, int indent ); TQObject *createObject( const TQDomElement &e, TQWidget *parent, TQLayout* layout = 0 ); - TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, Qt::Orientation o ); + TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, TQt::Orientation o ); void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 ); void createColumn( const TQDomElement &e, TQWidget *widget ); void setObjectProperty( TQObject* widget, const TQString &prop, const TQDomElement &e); @@ -157,7 +156,6 @@ private: TQString currFileName; LanguageInterface *langIface; bool hasFunctions; - TQStringList includeHints; TQString uiFileVersion; }; diff --git a/kdevdesigner/designer/richtextfontdialog.ui b/kdevdesigner/designer/richtextfontdialog.ui index d7d6c5a7..bebb31f5 100644 --- a/kdevdesigner/designer/richtextfontdialog.ui +++ b/kdevdesigner/designer/richtextfontdialog.ui @@ -330,11 +330,11 @@ <include location="local" impldecl="in implementation">richtextfontdialog.ui.h</include> </includes> <variables> - <variable>QString font</variable> - <variable>QColor color</variable> - <variable>QString size</variable> + <variable>TQString font</variable> + <variable>TQColor color</variable> + <variable>TQString size</variable> </variables> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>selectColor()</slot> <slot>accept()</slot> @@ -342,6 +342,6 @@ <slot returnType="TQString">getSize()</slot> <slot returnType="TQString">getColor()</slot> <slot returnType="TQString">getFont()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/sizehandle.cpp b/kdevdesigner/designer/sizehandle.cpp index d60f223b..a3433003 100644 --- a/kdevdesigner/designer/sizehandle.cpp +++ b/kdevdesigner/designer/sizehandle.cpp @@ -107,7 +107,7 @@ void SizeHandle::paintEvent( TQPaintEvent * ) void SizeHandle::mousePressEvent( TQMouseEvent *e ) { - if ( !widget || e->button() != Qt::LeftButton || !active ) + if ( !widget || e->button() != TQt::LeftButton || !active ) return; oldPressPos = e->pos(); geom = origGeom = TQRect( widget->pos(), widget->size() ); @@ -115,7 +115,7 @@ void SizeHandle::mousePressEvent( TQMouseEvent *e ) void SizeHandle::mouseMoveEvent( TQMouseEvent *e ) { - if ( !widget || ( e->state() & Qt::LeftButton ) != Qt::LeftButton || !active ) + if ( !widget || ( e->state() & TQt::LeftButton ) != TQt::LeftButton || !active ) return; TQPoint rp = mapFromGlobal( e->globalPos() ); TQPoint d = oldPressPos - rp; @@ -227,7 +227,7 @@ void SizeHandle::mouseMoveEvent( TQMouseEvent *e ) void SizeHandle::mouseReleaseEvent( TQMouseEvent *e ) { - if ( e->button() != Qt::LeftButton || !active ) + if ( e->button() != TQt::LeftButton || !active ) return; formWindow->sizePreview()->hide(); @@ -236,7 +236,7 @@ void SizeHandle::mouseReleaseEvent( TQMouseEvent *e ) formWindow, widget, origGeom, widget->geometry() ) ); - formWindow->emitUpdateProperties( TQT_TQOBJECT(widget) ); + formWindow->emitUpdateProperties( widget ); } void SizeHandle::trySetGeometry( TQWidget *w, int x, int y, int width, int height ) diff --git a/kdevdesigner/designer/sizehandle.h b/kdevdesigner/designer/sizehandle.h index 44917884..d022c4e5 100644 --- a/kdevdesigner/designer/sizehandle.h +++ b/kdevdesigner/designer/sizehandle.h @@ -38,7 +38,7 @@ class TQPaintEvent; class SizeHandle : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/sourceeditor.cpp b/kdevdesigner/designer/sourceeditor.cpp index 2850e20e..82ebc991 100644 --- a/kdevdesigner/designer/sourceeditor.cpp +++ b/kdevdesigner/designer/sourceeditor.cpp @@ -47,7 +47,7 @@ SourceEditor::SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageIn lIface->addRef(); editor = iFace->editor( MainWindow::self->areEditorsReadOnly(), this, MainWindow::self->designerInterface() ); - iFace->onBreakPointChange( TQT_TQOBJECT(MainWindow::self), TQT_SLOT( breakPointsChanged() ) ); + iFace->onBreakPointChange( MainWindow::self, TQ_SLOT( breakPointsChanged() ) ); resize( 600, 400 ); setIcon( SmallIcon( "designer_filenew.png" , KDevDesignerPartFactory::instance()) ); } @@ -77,7 +77,7 @@ void SourceEditor::setObject( TQObject *o, Project *p ) formWindow()->formFile()->setCodeEdited( FALSE ); formWindow()->formFile()->setEditor( 0 ); } - if ( ::tqqt_cast<FormWindow*>(o) ) + if ( ::tqt_cast<FormWindow*>(o) ) ( (FormWindow*)o )->formFile()->setCodeEdited( TRUE ); save(); bool changed = FALSE; @@ -104,7 +104,7 @@ void SourceEditor::setObject( TQObject *o, Project *p ) if ( formWindow()->isFake() ) iFace->setContext( pro->objectForFakeFormFile( formWindow()->formFile() ) ); else - iFace->setContext( TQT_TQOBJECT(formWindow()->mainContainer()) ); + iFace->setContext( formWindow()->mainContainer() ); } else { iFace->setContext( 0 ); } @@ -119,9 +119,9 @@ TQString SourceEditor::sourceOfObject( TQObject *o, const TQString &, TQString txt; if ( !o ) return txt; - if ( ::tqqt_cast<FormWindow*>(o) ) + if ( ::tqt_cast<FormWindow*>(o) ) txt = ( (FormWindow*)o )->formFile()->code(); - else if ( ::tqqt_cast<SourceFile*>(o) ) + else if ( ::tqt_cast<SourceFile*>(o) ) txt = ( (SourceFile*)o )->text(); return txt; } @@ -235,7 +235,7 @@ void SourceEditor::resetContext() if ( formWindow()->isFake() ) iFace->setContext( pro->objectForFakeFormFile( formWindow()->formFile() ) ); else - iFace->setContext( TQT_TQOBJECT(formWindow()->mainContainer()) ); + iFace->setContext( formWindow()->mainContainer() ); } else { iFace->setContext( 0 ); } @@ -307,14 +307,14 @@ bool SourceEditor::saveAs() SourceFile *SourceEditor::sourceFile() const { - if ( !::tqqt_cast<SourceFile*>((TQObject *)obj) ) + if ( !::tqt_cast<SourceFile*>((TQObject *)obj) ) return 0; return (SourceFile*)(TQObject*)obj; } FormWindow *SourceEditor::formWindow() const { - if ( !::tqqt_cast<FormWindow*>((TQObject *)obj) ) + if ( !::tqt_cast<FormWindow*>((TQObject *)obj) ) return 0; return (FormWindow*)(TQObject*)obj; } diff --git a/kdevdesigner/designer/sourceeditor.h b/kdevdesigner/designer/sourceeditor.h index 3dde636e..0f14c5f6 100644 --- a/kdevdesigner/designer/sourceeditor.h +++ b/kdevdesigner/designer/sourceeditor.h @@ -39,7 +39,7 @@ class SourceFile; class SourceEditor : public TQVBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/sourcefile.h b/kdevdesigner/designer/sourcefile.h index ef4d31db..81fe540a 100644 --- a/kdevdesigner/designer/sourcefile.h +++ b/kdevdesigner/designer/sourcefile.h @@ -36,7 +36,7 @@ class Project; class SourceFile : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/startdialog.ui b/kdevdesigner/designer/startdialog.ui index 383fdfda..ef1d96f3 100644 --- a/kdevdesigner/designer/startdialog.ui +++ b/kdevdesigner/designer/startdialog.ui @@ -199,9 +199,6 @@ <property name="text"> <string>&Help</string> </property> - <property name="accel"> - <number>4144</number> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -230,9 +227,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <number>0</number> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -247,9 +241,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <number>0</number> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -314,11 +305,11 @@ <slot>recentItemChanged(TQIconViewItem*)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>recentItemChanged( TQIconViewItem * )</slot> <slot>clearFileInfo()</slot> <slot>accept()</slot> <slot>reject()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/startdialogimpl.cpp b/kdevdesigner/designer/startdialogimpl.cpp index adff44fd..d5d10d84 100644 --- a/kdevdesigner/designer/startdialogimpl.cpp +++ b/kdevdesigner/designer/startdialogimpl.cpp @@ -45,13 +45,13 @@ StartDialog::StartDialog( TQWidget *parent, const TQString &templatePath ) initFileOpen(); showInFuture = TRUE; - connect( buttonHelp, TQT_SIGNAL( clicked() ), - MainWindow::self, TQT_SLOT( showDialogHelp() ) ); - connect( recentView, TQT_SIGNAL( doubleClicked(TQIconViewItem*) ), - this, TQT_SLOT( accept() ) ); - connect( recentView, TQT_SIGNAL( returnPressed(TQIconViewItem*) ), - this, TQT_SLOT( accept() ) ); - connect( fd, TQT_SIGNAL( fileSelected() ), this, TQT_SLOT( accept() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), + MainWindow::self, TQ_SLOT( showDialogHelp() ) ); + connect( recentView, TQ_SIGNAL( doubleClicked(TQIconViewItem*) ), + this, TQ_SLOT( accept() ) ); + connect( recentView, TQ_SIGNAL( returnPressed(TQIconViewItem*) ), + this, TQ_SLOT( accept() ) ); + connect( fd, TQ_SIGNAL( fileSelected() ), this, TQ_SLOT( accept() ) ); } void StartDialog::accept() @@ -151,7 +151,7 @@ void StartDialog::initFileOpen() TQPoint point( 0, 0 ); fd->reparent( tab, point ); - TQObjectList *l = fd->queryList( TQPUSHBUTTON_OBJECT_NAME_STRING ); + TQObjectList *l = fd->queryList( "TQPushButton" ); TQObjectListIt it( *l ); TQObject *obj; while ( (obj = it.current()) != 0 ) { diff --git a/kdevdesigner/designer/startdialogimpl.h b/kdevdesigner/designer/startdialogimpl.h index 8fb574d0..bd250d4b 100644 --- a/kdevdesigner/designer/startdialogimpl.h +++ b/kdevdesigner/designer/startdialogimpl.h @@ -39,7 +39,7 @@ class FileDialog : public TQFileDialog { - Q_OBJECT + TQ_OBJECT public: @@ -55,7 +55,7 @@ signals: class StartDialog : public StartDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/styledbutton.cpp b/kdevdesigner/designer/styledbutton.cpp index 82c9ddb8..8ea02a98 100644 --- a/kdevdesigner/designer/styledbutton.cpp +++ b/kdevdesigner/designer/styledbutton.cpp @@ -44,7 +44,7 @@ StyledButton::StyledButton(TQWidget* parent, const char* name) setMinimumSize( minimumSizeHint() ); setAcceptDrops( TRUE ); - connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(onEditor())); + connect( this, TQ_SIGNAL(clicked()), TQ_SLOT(onEditor())); setEditor( ColorEditor ); } @@ -151,12 +151,12 @@ void StyledButton::resizeEvent( TQResizeEvent* e ) void StyledButton::drawButton( TQPainter *paint ) { - style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), colorGroup(), + style().drawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), colorGroup(), isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Raised); drawButtonLabel(paint); if (hasFocus()) - style().tqdrawPrimitive(TQStyle::PE_FocusRect, paint, + style().drawPrimitive(TQStyle::PE_FocusRect, paint, style().subRect(TQStyle::SR_PushButtonFocusRect, this), colorGroup(), TQStyle::Style_Default); } diff --git a/kdevdesigner/designer/styledbutton.h b/kdevdesigner/designer/styledbutton.h index 8065fe84..70e97608 100644 --- a/kdevdesigner/designer/styledbutton.h +++ b/kdevdesigner/designer/styledbutton.h @@ -36,7 +36,7 @@ class FormWindow; class StyledButton : public TQButton { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQColor color READ color WRITE setColor ) diff --git a/kdevdesigner/designer/tableeditor.ui b/kdevdesigner/designer/tableeditor.ui index 21874754..86995ec0 100644 --- a/kdevdesigner/designer/tableeditor.ui +++ b/kdevdesigner/designer/tableeditor.ui @@ -793,7 +793,7 @@ <tabstop>buttonRowDown</tabstop> <tabstop>buttonHelp</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot access="protected">applyClicked()</slot> @@ -815,7 +815,7 @@ <slot access="protected">rowTextChanged( const TQString & )</slot> <slot access="protected">rowUpClicked()</slot> <slot access="protected">columnDownClicked()</slot> -</Q_SLOTS> +</slots> <pixmapfunction>BarIcon2</pixmapfunction> <layoutdefaults spacing="6" margin="11"/> <includes> diff --git a/kdevdesigner/designer/tableeditorimpl.cpp b/kdevdesigner/designer/tableeditorimpl.cpp index 060611f6..19fe6e48 100644 --- a/kdevdesigner/designer/tableeditorimpl.cpp +++ b/kdevdesigner/designer/tableeditorimpl.cpp @@ -53,13 +53,13 @@ TableEditor::TableEditor( TQWidget* parent, TQWidget *editWidget, FormWindow *f #endif formWindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); #ifndef TQT_NO_TABLE labelColumnPixmap->setText( "" ); labelRowPixmap->setText( "" ); #ifndef TQT_NO_SQL - if ( !::tqqt_cast<TQDataTable*>(editTable) ) + if ( !::tqt_cast<TQDataTable*>(editTable) ) #endif { labelFields->hide(); @@ -68,7 +68,7 @@ TableEditor::TableEditor( TQWidget* parent, TQWidget *editWidget, FormWindow *f labelTableValue->hide(); } #ifndef TQT_NO_SQL - if ( ::tqqt_cast<TQDataTable*>(editTable) ) { + if ( ::tqt_cast<TQDataTable*>(editTable) ) { // ## why does this behave weird? // TabWidget->removePage( rows_tab ); // rows_tab->hide(); @@ -76,8 +76,8 @@ TableEditor::TableEditor( TQWidget* parent, TQWidget *editWidget, FormWindow *f TabWidget->setTabEnabled( rows_tab, FALSE ); } - if ( formWindow->project() && ::tqqt_cast<TQDataTable*>(editTable) ) { - TQStringList lst = MetaDataBase::fakeProperty( TQT_TQOBJECT(editTable), "database" ).toStringList(); + if ( formWindow->project() && ::tqt_cast<TQDataTable*>(editTable) ) { + TQStringList lst = MetaDataBase::fakeProperty( editTable, "database" ).toStringList(); if ( lst.count() == 2 && !lst[ 0 ].isEmpty() && !lst[ 1 ].isEmpty() ) { TQStringList fields; fields << "<no field>"; @@ -159,7 +159,7 @@ void TableEditor::currentColumnChanged( TQListBoxItem *i ) editColumnText->blockSignals( FALSE ); #ifndef TQT_NO_SQL - if ( ::tqqt_cast<TQDataTable*>(editTable) ) { + if ( ::tqt_cast<TQDataTable*>(editTable) ) { TQString s = *fieldMap.find( listColumns->index( i ) ); if ( s.isEmpty() ) comboFields->setCurrentItem( 0 ); @@ -244,7 +244,7 @@ void TableEditor::newColumnClicked() listColumns->setCurrentItem( item ); listColumns->setSelected( item, TRUE ); #ifndef TQT_NO_SQL - if ( ::tqqt_cast<TQDataTable*>(editTable) ) { + if ( ::tqt_cast<TQDataTable*>(editTable) ) { comboFields->setFocus(); } else #endif @@ -412,7 +412,7 @@ void TableEditor::readFromTable() #ifndef TQT_NO_TABLE TQHeader *cols = editTable->horizontalHeader(); table->setNumCols( cols->count() ); - TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( TQT_TQOBJECT(editTable) ); + TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( editTable ); for ( int i = 0; i < cols->count(); ++i ) { if ( editTable->horizontalHeader()->iconSet( i ) ) { table->horizontalHeader()->setLabel( i, *editTable->horizontalHeader()->iconSet( i ), diff --git a/kdevdesigner/designer/tableeditorimpl.h b/kdevdesigner/designer/tableeditorimpl.h index 7729f33e..f6889bc3 100644 --- a/kdevdesigner/designer/tableeditorimpl.h +++ b/kdevdesigner/designer/tableeditorimpl.h @@ -36,7 +36,7 @@ class FormWindow; class TableEditor : public TableEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/timestamp.cpp b/kdevdesigner/designer/timestamp.cpp index 553d9e3f..79a51e67 100644 --- a/kdevdesigner/designer/timestamp.cpp +++ b/kdevdesigner/designer/timestamp.cpp @@ -34,7 +34,7 @@ TimeStamp::TimeStamp( TQObject *parent, const TQString &f ) : TQObject( parent ), filename( f ), autoCheck( FALSE ) { timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( autoCheckTimeStamp() ) ); + connect( timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( autoCheckTimeStamp() ) ); update(); } diff --git a/kdevdesigner/designer/timestamp.h b/kdevdesigner/designer/timestamp.h index 078a925d..1ac0d13a 100644 --- a/kdevdesigner/designer/timestamp.h +++ b/kdevdesigner/designer/timestamp.h @@ -33,7 +33,7 @@ class TimeStamp : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/variabledialog.ui b/kdevdesigner/designer/variabledialog.ui index d9cdc7ef..721c45c4 100644 --- a/kdevdesigner/designer/variabledialog.ui +++ b/kdevdesigner/designer/variabledialog.ui @@ -282,14 +282,14 @@ <tabstop>okButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>addVariable()</slot> <slot>deleteVariable()</slot> <slot>accessChanged()</slot> <slot>nameChanged()</slot> <slot>okClicked()</slot> <slot>currentItemChanged( TQListViewItem * i )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kdevdesigner/designer/variabledialogimpl.cpp b/kdevdesigner/designer/variabledialogimpl.cpp index d2d7ef67..c35fb300 100644 --- a/kdevdesigner/designer/variabledialogimpl.cpp +++ b/kdevdesigner/designer/variabledialogimpl.cpp @@ -44,7 +44,7 @@ VariableDialog::VariableDialog( FormWindow *fw, TQWidget *parent ) : VariableDialogBase( parent ), formWindow( fw ) { varView->setSorting( -1 ); - TQValueList<MetaDataBase::Variable> varLst = MetaDataBase::variables( TQT_TQOBJECT(formWindow) ); + TQValueList<MetaDataBase::Variable> varLst = MetaDataBase::variables( formWindow ); TQValueList<MetaDataBase::Variable>::Iterator it = varLst.begin(); for ( ; it != varLst.end(); ++it ) { TQListViewItem *i = new TQListViewItem( varView ); diff --git a/kdevdesigner/designer/variabledialogimpl.h b/kdevdesigner/designer/variabledialogimpl.h index 65295073..ba258bed 100644 --- a/kdevdesigner/designer/variabledialogimpl.h +++ b/kdevdesigner/designer/variabledialogimpl.h @@ -34,7 +34,7 @@ class TQListView; class VariableDialog : public VariableDialogBase { - Q_OBJECT + TQ_OBJECT public: VariableDialog( FormWindow *fw, TQWidget* parent = 0 ); diff --git a/kdevdesigner/designer/widgetaction.cpp b/kdevdesigner/designer/widgetaction.cpp index c2ce0721..1d71f4e0 100644 --- a/kdevdesigner/designer/widgetaction.cpp +++ b/kdevdesigner/designer/widgetaction.cpp @@ -35,7 +35,7 @@ static TQStyle *windowsStyle = 0; void WidgetAction::addedTo( TQWidget *w, TQWidget *container ) { - if ( ::tqqt_cast<TQToolButton*>(w) && ::tqqt_cast<TQScrollView*>(container->parent()->parent()) ) { + if ( ::tqt_cast<TQToolButton*>(w) && ::tqt_cast<TQScrollView*>(container->parent()->parent()) ) { if ( !windowsStyle ) windowsStyle = TQStyleFactory::create( "windows" ); w->setStyle( windowsStyle ); diff --git a/kdevdesigner/designer/widgetaction.h b/kdevdesigner/designer/widgetaction.h index 161bc8a0..2e0c8e26 100644 --- a/kdevdesigner/designer/widgetaction.h +++ b/kdevdesigner/designer/widgetaction.h @@ -31,7 +31,7 @@ class WidgetAction : public TQAction { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/widgetfactory.cpp b/kdevdesigner/designer/widgetfactory.cpp index 9423b6a6..7db821df 100644 --- a/kdevdesigner/designer/widgetfactory.cpp +++ b/kdevdesigner/designer/widgetfactory.cpp @@ -107,7 +107,7 @@ FormWindow *find_formwindow( TQWidget *w ) if ( !w ) return 0; for (;;) { - if ( ::tqqt_cast<FormWindow*>(w) ) + if ( ::tqt_cast<FormWindow*>(w) ) return (FormWindow*)w; if ( !w->parentWidget() ) return 0; @@ -170,7 +170,7 @@ int QDesignerTabWidget::count() const bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) { - if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(tabBar()) ) return FALSE; + if ( o != tabBar() ) return FALSE; switch ( e->type() ) { case TQEvent::MouseButtonPress: { @@ -301,8 +301,8 @@ QDesignerWidgetStack::QDesignerWidgetStack( TQWidget *parent, const char *name ) next->setAutoRaise( TRUE ); next->setAutoRepeat( TRUE ); next->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) ); - connect( prev, TQT_SIGNAL( clicked() ), this, TQT_SLOT( prevPage() ) ); - connect( next, TQT_SIGNAL( clicked() ), this, TQT_SLOT( nextPage() ) ); + connect( prev, TQ_SIGNAL( clicked() ), this, TQ_SLOT( prevPage() ) ); + connect( next, TQ_SIGNAL( clicked() ), this, TQ_SLOT( nextPage() ) ); updateButtons(); } @@ -522,7 +522,7 @@ void WidgetFactory::saveChangedProperties( TQObject *w, int id ) created. */ -TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, bool init, const TQRect *r, Qt::Orientation orient ) +TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, bool init, const TQRect *r, TQt::Orientation orient ) { TQString n = WidgetDatabase::className( id ); if ( n.isEmpty() ) @@ -537,18 +537,18 @@ TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, boo TQString str = WidgetDatabase::createWidgetName( id ); const char *s = str.latin1(); w = createWidget( n, parent, name ? name : s, init, r, orient ); - if ( ::tqqt_cast<TQScrollView*>(w) ) + if ( ::tqt_cast<TQScrollView*>(w) ) ( (TQScrollView*)w )->disableSizeHintCaching(); if ( !w && WidgetDatabase::isCustomWidget( id ) ) w = createCustomWidget( parent, name ? name : s, MetaDataBase::customWidget( id ) ); if ( !w ) return 0; - MetaDataBase::addEntry( TQT_TQOBJECT(w) ); + MetaDataBase::addEntry( w ); if ( !defaultProperties->contains( id ) ) - saveDefaultProperties( TQT_TQOBJECT(w), id ); + saveDefaultProperties( w, id ); if ( !changedProperties->contains( id ) ) - saveChangedProperties( TQT_TQOBJECT(w), id ); + saveChangedProperties( w, id ); return w; } @@ -562,36 +562,36 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou int spacing = MainWindow::self->currentLayoutDefaultSpacing(); int margin = 0; - int metaspacing = MetaDataBase::spacing( TQT_TQOBJECT(widget) ); - int metamargin = MetaDataBase::margin( TQT_TQOBJECT(widget) ); + int metaspacing = MetaDataBase::spacing( widget ); + int metamargin = MetaDataBase::margin( widget ); - if ( ::tqqt_cast<TQLayoutWidget*>(widget) && - ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ) ) || - widget && ::tqqt_cast<FormWindow*>(widget->parentWidget()) ) ) + if ( ::tqt_cast<TQLayoutWidget*>(widget) && + ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( widget ) ) ) || + widget && ::tqt_cast<FormWindow*>(widget->parentWidget()) ) ) margin = MainWindow::self->currentLayoutDefaultMargin(); - if ( !layout && ::tqqt_cast<TQTabWidget*>(widget) ) + if ( !layout && ::tqt_cast<TQTabWidget*>(widget) ) widget = ((TQTabWidget*)widget)->currentPage(); - if ( !layout && ::tqqt_cast<TQWizard*>(widget) ) + if ( !layout && ::tqt_cast<TQWizard*>(widget) ) widget = ((TQWizard*)widget)->currentPage(); - if ( !layout && ::tqqt_cast<TQMainWindow*>(widget) ) + if ( !layout && ::tqt_cast<TQMainWindow*>(widget) ) widget = ((TQMainWindow*)widget)->centralWidget(); - if ( !layout && ::tqqt_cast<TQWidgetStack*>(widget) ) + if ( !layout && ::tqt_cast<TQWidgetStack*>(widget) ) widget = ((TQWidgetStack*)widget)->visibleWidget(); - if ( !layout && ::tqqt_cast<TQToolBox*>(widget) ) + if ( !layout && ::tqt_cast<TQToolBox*>(widget) ) widget = ((TQToolBox*)widget)->currentItem(); - MetaDataBase::addEntry( TQT_TQOBJECT(widget) ); + MetaDataBase::addEntry( widget ); TQLayout *l = 0; int align = 0; - if ( !layout && ::tqqt_cast<TQGroupBox*>(widget) ) { + if ( !layout && ::tqt_cast<TQGroupBox*>(widget) ) { TQGroupBox *gb = (TQGroupBox*)widget; - gb->setColumnLayout( 0, Qt::Vertical ); + gb->setColumnLayout( 0, TQt::Vertical ); layout = gb->layout(); layout->setMargin( 0 ); layout->setSpacing( 0 ); @@ -609,8 +609,8 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou return 0; } align = TQt::AlignTop; - MetaDataBase::setMargin( TQT_TQOBJECT(gb), metamargin ); - MetaDataBase::setSpacing( TQT_TQOBJECT(gb), metaspacing ); + MetaDataBase::setMargin( gb, metamargin ); + MetaDataBase::setSpacing( gb, metaspacing ); } else { if ( layout ) { switch ( type ) { @@ -626,7 +626,7 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou default: return 0; } - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); l->setSpacing( spacing ); l->setMargin( margin ); } else { @@ -643,10 +643,10 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou default: return 0; } - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); if ( widget ) { - MetaDataBase::setMargin( TQT_TQOBJECT(widget), metamargin ); - MetaDataBase::setSpacing( TQT_TQOBJECT(widget), metaspacing ); + MetaDataBase::setMargin( widget, metamargin ); + MetaDataBase::setSpacing( widget, metaspacing ); } else { l->setMargin( margin ); l->setSpacing( spacing ); @@ -654,7 +654,7 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou } } l->setAlignment( align ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); return l; } @@ -663,15 +663,15 @@ void WidgetFactory::deleteLayout( TQWidget *widget ) if ( !widget ) return; - if ( ::tqqt_cast<TQTabWidget*>(widget) ) + if ( ::tqt_cast<TQTabWidget*>(widget) ) widget = ((TQTabWidget*)widget)->currentPage(); - if ( ::tqqt_cast<TQWizard*>(widget) ) + if ( ::tqt_cast<TQWizard*>(widget) ) widget = ((TQWizard*)widget)->currentPage(); - if ( ::tqqt_cast<TQMainWindow*>(widget) ) + if ( ::tqt_cast<TQMainWindow*>(widget) ) widget = ((TQMainWindow*)widget)->centralWidget(); - if ( ::tqqt_cast<TQWidgetStack*>(widget) ) + if ( ::tqt_cast<TQWidgetStack*>(widget) ) widget = ((TQWidgetStack*)widget)->visibleWidget(); - if ( ::tqqt_cast<TQToolBox*>(widget) ) + if ( ::tqt_cast<TQToolBox*>(widget) ) widget = ((TQToolBox*)widget)->currentItem(); delete widget->layout(); } @@ -684,9 +684,9 @@ void WidgetFactory::deleteLayout( TQWidget *widget ) */ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name, bool init, - const TQRect *r, Qt::Orientation orient ) + const TQRect *r, TQt::Orientation orient ) { - if ( className == TQPUSHBUTTON_OBJECT_NAME_STRING ) { + if ( className == "TQPushButton" ) { TQPushButton *b = 0; if ( init ) { b = new QDesignerPushButton( parent, name ); @@ -695,12 +695,12 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare b = new QDesignerPushButton( parent, name ); } TQWidget *w = find_formwindow( b ); - b->setAutoDefault( w && ::tqqt_cast<TQDialog*>(((FormWindow*)w)->mainContainer()) ); + b->setAutoDefault( w && ::tqt_cast<TQDialog*>(((FormWindow*)w)->mainContainer()) ); return b; - } else if ( className == TQTOOLBUTTON_OBJECT_NAME_STRING ) { + } else if ( className == "TQToolButton" ) { if ( init ) { QDesignerToolButton *tb = new QDesignerToolButton( parent, name ); - if ( ::tqqt_cast<TQToolBox*>(widgetOfContainer(parent))) { + if ( ::tqt_cast<TQToolBox*>(widgetOfContainer(parent))) { tb->setUsesTextLabel(TRUE); tb->setTextLabel("..."); tb->setAutoRaise(TRUE); @@ -711,29 +711,29 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare return tb; } return new QDesignerToolButton( parent, name ); - } else if ( className == TQCHECKBOX_OBJECT_NAME_STRING ) { + } else if ( className == "TQCheckBox" ) { if ( init ) { QDesignerCheckBox *cb = new QDesignerCheckBox( parent, name ); cb->setText( TQString::fromLatin1( name ) ); return cb; } return new QDesignerCheckBox( parent, name ); - } else if ( className == TQRADIOBUTTON_OBJECT_NAME_STRING ) { + } else if ( className == "TQRadioButton" ) { if ( init ) { QDesignerRadioButton *rb = new QDesignerRadioButton( parent, name ); rb->setText( TQString::fromLatin1( name ) ); return rb; } return new QDesignerRadioButton( parent, name ); - } else if ( className == TQGROUPBOX_OBJECT_NAME_STRING ) { + } else if ( className == "TQGroupBox" ) { if ( init ) return new TQGroupBox( TQString::fromLatin1( name ), parent, name ); return new TQGroupBox( parent, name ); - } else if ( className == TQBUTTONGROUP_OBJECT_NAME_STRING ) { + } else if ( className == "TQButtonGroup" ) { if ( init ) return new TQButtonGroup( TQString::fromLatin1( name ), parent, name ); return new TQButtonGroup( parent, name ); - } else if ( className == TQICONVIEW_OBJECT_NAME_STRING ) { + } else if ( className == "TQIconView" ) { #if !defined(TQT_NO_ICONVIEW) TQIconView* iv = new TQIconView( parent, name ); if ( init ) @@ -742,7 +742,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare #else return 0; #endif - } else if ( className == TQTABLE_OBJECT_NAME_STRING ) { + } else if ( className == "TQTable" ) { #if !defined(TQT_NO_TABLE) if ( init ) return new TQTable( 3, 3, parent, name ); @@ -751,24 +751,24 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare return 0; #endif #ifndef TQT_NO_SQL - } else if ( className == TQDATATABLE_OBJECT_NAME_STRING ) { + } else if ( className == "TQDataTable" ) { return new TQDataTable( parent, name ); #endif //TQT_NO_SQL - } else if ( className == TQDATEEDIT_OBJECT_NAME_STRING ) { + } else if ( className == "TQDateEdit" ) { return new TQDateEdit( parent, name ); - } else if ( className == TQTIMEEDIT_OBJECT_NAME_STRING ) { + } else if ( className == "TQTimeEdit" ) { return new TQTimeEdit( parent, name ); - } else if ( className == TQDATETIMEEDIT_OBJECT_NAME_STRING ) { + } else if ( className == "TQDateTimeEdit" ) { return new TQDateTimeEdit( parent, name ); } - else if ( className == TQLISTBOX_OBJECT_NAME_STRING ) { + else if ( className == "TQListBox" ) { TQListBox* lb = new TQListBox( parent, name ); if ( init ) { lb->insertItem( i18n( "New Item" ) ); lb->setCurrentItem( 0 ); } return lb; - } else if ( className == TQLISTVIEW_OBJECT_NAME_STRING ) { + } else if ( className == "TQListView" ) { TQListView *lv = new TQListView( parent, name ); lv->setSorting( -1 ); if ( init ) { @@ -776,22 +776,22 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare lv->setCurrentItem( new TQListViewItem( lv, i18n( "New Item" ) ) ); } return lv; - } else if ( className == TQLINEEDIT_OBJECT_NAME_STRING ) + } else if ( className == "TQLineEdit" ) return new TQLineEdit( parent, name ); - else if ( className == TQSPINBOX_OBJECT_NAME_STRING ) + else if ( className == "TQSpinBox" ) return new TQSpinBox( parent, name ); - else if ( className == TQSPLITTER_OBJECT_NAME_STRING ) + else if ( className == "TQSplitter" ) return new TQSplitter( parent, name ); - else if ( className == TQMULTILINEEDIT_OBJECT_NAME_STRING ) + else if ( className == "TQMultiLineEdit" ) return new TQMultiLineEdit( parent, name ); - else if ( className == TQTEXTEDIT_OBJECT_NAME_STRING ) + else if ( className == "TQTextEdit" ) return new TQTextEdit( parent, name ); - else if ( className == TQLABEL_OBJECT_NAME_STRING || className == "TextLabel" ) { + else if ( className == "TQLabel" || className == "TextLabel" ) { QDesignerLabel *l = new QDesignerLabel( parent, name ); if ( init ) { l->setText( TQString::fromLatin1( name ) ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "text", TRUE ); + MetaDataBase::addEntry( l ); + MetaDataBase::setPropertyChanged( l, "text", TRUE ); } return l; } else if ( className == "PixmapLabel" ) { @@ -799,129 +799,121 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare if ( init ) { l->setPixmap( BarIcon( "designer_qtlogo.png", KDevDesignerPartFactory::instance() ) ); l->setScaledContents( TRUE ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "pixmap", TRUE ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "scaledContents", TRUE ); + MetaDataBase::addEntry( l ); + MetaDataBase::setPropertyChanged( l, "pixmap", TRUE ); + MetaDataBase::setPropertyChanged( l, "scaledContents", TRUE ); } return l; - } else if ( className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) + } else if ( className == "TQLayoutWidget" ) return new TQLayoutWidget( parent, name ); - else if ( className == TQTABWIDGET_OBJECT_NAME_STRING ) { + else if ( className == "TQTabWidget" ) { TQTabWidget *tw = new QDesignerTabWidget( parent, name ); if ( init ) { FormWindow *fw = find_formwindow( parent ); TQWidget *w = fw ? new QDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" ); tw->addTab( w, i18n("Tab 1") ); - MetaDataBase::addEntry( TQT_TQOBJECT(w) ); + MetaDataBase::addEntry( w ); w = fw ? new QDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" ); tw->addTab( w, i18n("Tab 2") ); - MetaDataBase::addEntry( TQT_TQOBJECT(tw) ); - MetaDataBase::addEntry( TQT_TQOBJECT(w) ); + MetaDataBase::addEntry( tw ); + MetaDataBase::addEntry( w ); } return tw; - } else if ( className == TQWIDGETSTACK_OBJECT_NAME_STRING ) { + } else if ( className == "TQWidgetStack" ) { QDesignerWidgetStack *ws = new QDesignerWidgetStack( parent, name ); if ( init ) { FormWindow *fw = find_formwindow( parent ); TQWidget *w = fw ? new QDesignerWidget( fw, ws, "WStackPage" ) : new TQWidget( ws, "WStackPage" ); ws->insertPage( w ); - MetaDataBase::addEntry( TQT_TQOBJECT(w) ); - MetaDataBase::addEntry( TQT_TQOBJECT(ws) ); + MetaDataBase::addEntry( w ); + MetaDataBase::addEntry( ws ); } return ws; - } else if ( className == TQCOMBOBOX_OBJECT_NAME_STRING ) { + } else if ( className == "TQComboBox" ) { return new TQComboBox( FALSE, parent, name ); - } else if ( className == TQWIDGET_OBJECT_NAME_STRING ) { + } else if ( className == "TQWidget" ) { if ( parent && - ( ::tqqt_cast<FormWindow*>(parent) || - ::tqqt_cast<TQWizard*>(parent) || - ::tqqt_cast<TQTabWidget*>(parent) || - ::tqqt_cast<TQWidgetStack*>(parent) || - ::tqqt_cast<TQToolBox*>(parent) || - ::tqqt_cast<TQMainWindow*>(parent) ) ) { + ( ::tqt_cast<FormWindow*>(parent) || + ::tqt_cast<TQWizard*>(parent) || + ::tqt_cast<TQTabWidget*>(parent) || + ::tqt_cast<TQWidgetStack*>(parent) || + ::tqt_cast<TQToolBox*>(parent) || + ::tqt_cast<TQMainWindow*>(parent) ) ) { FormWindow *fw = find_formwindow( parent ); if ( fw ) { QDesignerWidget *dw = new QDesignerWidget( fw, parent, name ); - MetaDataBase::addEntry( TQT_TQOBJECT(dw) ); + MetaDataBase::addEntry( dw ); return dw; } } return new TQWidget( parent, name ); - } else if ( className == TQDIALOG_OBJECT_NAME_STRING ) { + } else if ( className == "TQDialog" ) { TQDialog *dia = 0; - if ( ::tqqt_cast<FormWindow*>(parent) ) + if ( ::tqt_cast<FormWindow*>(parent) ) dia = new QDesignerDialog( (FormWindow*)parent, parent, name ); else dia = new TQDialog( parent, name ); -#if defined(TQT_NON_COMMERCIAL) - if ( ::tqqt_cast<MainWindow*>(parent) ) -#else if ( parent ) -#endif dia->reparent( parent, TQPoint( 0, 0 ), TRUE ); return dia; - } else if ( className == TQWIZARD_OBJECT_NAME_STRING ) { + } else if ( className == "TQWizard" ) { TQWizard *wiz = new QDesignerWizard( parent, name ); -#if defined(TQT_NON_COMMERCIAL) - if ( ::tqqt_cast<MainWindow*>(parent) ) -#else if ( parent ) -#endif wiz->reparent( parent, TQPoint( 0, 0 ), TRUE ); - if ( init && ::tqqt_cast<FormWindow*>(parent) ) { + if ( init && ::tqt_cast<FormWindow*>(parent) ) { QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)parent, wiz, "WizardPage" ); - MetaDataBase::addEntry( TQT_TQOBJECT(dw) ); + MetaDataBase::addEntry( dw ); wiz->addPage( dw, i18n( "Page" ) ); - TQTimer::singleShot( 0, wiz, TQT_SLOT( next() ) ); + TQTimer::singleShot( 0, wiz, TQ_SLOT( next() ) ); } return wiz; } else if ( className == "Spacer" ) { Spacer *s = new Spacer( parent, name ); - MetaDataBase::addEntry( TQT_TQOBJECT(s) ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "orientation", TRUE ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "sizeType", TRUE ); + MetaDataBase::addEntry( s ); + MetaDataBase::setPropertyChanged( s, "orientation", TRUE ); + MetaDataBase::setPropertyChanged( s, "sizeType", TRUE ); if ( !r ) return s; if ( !r->isValid() || r->width() < 2 && r->height() < 2 ) s->setOrientation( orient ); else if ( r->width() < r->height() ) - s->setOrientation( Qt::Vertical ); + s->setOrientation( TQt::Vertical ); else - s->setOrientation( Qt::Horizontal ); + s->setOrientation( TQt::Horizontal ); return s; - } else if ( className == TQLCDNUMBER_OBJECT_NAME_STRING ) + } else if ( className == "TQLCDNumber" ) return new TQLCDNumber( parent, name ); - else if ( className == TQPROGRESSBAR_OBJECT_NAME_STRING ) + else if ( className == "TQProgressBar" ) return new TQProgressBar( parent, name ); - else if ( className == TQTEXTVIEW_OBJECT_NAME_STRING ) + else if ( className == "TQTextView" ) return new TQTextView( parent, name ); - else if ( className == TQTEXTBROWSER_OBJECT_NAME_STRING ) + else if ( className == "TQTextBrowser" ) return new TQTextBrowser( parent, name ); - else if ( className == TQDIAL_OBJECT_NAME_STRING ) + else if ( className == "TQDial" ) return new TQDial( parent, name ); - else if ( className == TQSLIDER_OBJECT_NAME_STRING ) { + else if ( className == "TQSlider" ) { TQSlider *s = new TQSlider( parent, name ); if ( !r ) return s; if ( !r->isValid() || r->width() < 2 && r->height() < 2 ) s->setOrientation( orient ); else if ( r->width() > r->height() ) - s->setOrientation( Qt::Horizontal ); - MetaDataBase::addEntry( TQT_TQOBJECT(s) ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "orientation", TRUE ); + s->setOrientation( TQt::Horizontal ); + MetaDataBase::addEntry( s ); + MetaDataBase::setPropertyChanged( s, "orientation", TRUE ); return s; - } else if ( className == TQSCROLLBAR_OBJECT_NAME_STRING ) { + } else if ( className == "TQScrollBar" ) { TQScrollBar *s = new TQScrollBar( parent, name ); if ( !r ) return s; if ( !r->isValid() || r->width() < 2 && r->height() < 2 ) s->setOrientation( orient ); else if ( r->width() > r->height() ) - s->setOrientation( Qt::Horizontal ); - MetaDataBase::addEntry( TQT_TQOBJECT(s) ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "orientation", TRUE ); + s->setOrientation( TQt::Horizontal ); + MetaDataBase::addEntry( s ); + MetaDataBase::setPropertyChanged( s, "orientation", TRUE ); return s; - } else if ( className == TQFRAME_OBJECT_NAME_STRING ) { + } else if ( className == "TQFrame" ) { if ( !init ) return new TQFrame( parent, name ); TQFrame *f = new TQFrame( parent, name ); @@ -929,28 +921,28 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare return f; } else if ( className == "Line" ) { Line *l = new Line( parent, name ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "orientation", TRUE ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "frameShadow", TRUE ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "frameShape", TRUE ); + MetaDataBase::addEntry( l ); + MetaDataBase::setPropertyChanged( l, "orientation", TRUE ); + MetaDataBase::setPropertyChanged( l, "frameShadow", TRUE ); + MetaDataBase::setPropertyChanged( l, "frameShape", TRUE ); if ( !r ) return l; if ( !r->isValid() || r->width() < 2 && r->height() < 2 ) l->setOrientation( orient ); else if ( r->width() < r->height() ) - l->setOrientation( Qt::Vertical ); + l->setOrientation( TQt::Vertical ); return l; - } else if ( className == TQMAINWINDOW_OBJECT_NAME_STRING ) { + } else if ( className == "TQMainWindow" ) { TQMainWindow *mw = new TQMainWindow( parent, name, 0 ); mw->setDockEnabled( TQt::DockMinimized, FALSE ); QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)parent, mw, "central widget" ); mw->setDockMenuEnabled( FALSE ); - MetaDataBase::addEntry( TQT_TQOBJECT(dw) ); + MetaDataBase::addEntry( dw ); mw->setCentralWidget( dw ); (void)mw->statusBar(); dw->show(); return mw; - } else if ( className == TQTOOLBOX_OBJECT_NAME_STRING ) { + } else if ( className == "TQToolBox" ) { if ( !init ) return new QDesignerToolBox( parent, name ); TQToolBox *tb = new QDesignerToolBox( parent, name ); @@ -958,20 +950,20 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare TQWidget *w = fw ? new QDesignerWidget( fw, tb, "page1" ) : new TQWidget( tb, "page1" ); tb->addItem( w, i18n("Page 1") ); - MetaDataBase::addEntry( TQT_TQOBJECT(w) ); + MetaDataBase::addEntry( w ); w = fw ? new QDesignerWidget( fw, tb, "page2" ) : new TQWidget( tb, "page2" ); tb->addItem( w, i18n("Page 2") ); - MetaDataBase::addEntry( TQT_TQOBJECT(tb) ); - MetaDataBase::addEntry( TQT_TQOBJECT(w) ); + MetaDataBase::addEntry( tb ); + MetaDataBase::addEntry( w ); return tb; } #ifndef TQT_NO_SQL - else if ( className == TQDATABROWSER_OBJECT_NAME_STRING ) { + else if ( className == "TQDataBrowser" ) { TQWidget *w = new QDesignerDataBrowser( parent, name ); if ( parent ) w->reparent( parent, TQPoint( 0, 0 ), TRUE ); return w; - } else if ( className == TQDATAVIEW_OBJECT_NAME_STRING ) { + } else if ( className == "TQDataView" ) { TQWidget *w = new QDesignerDataView( parent, name ); if ( parent ) w->reparent( parent, TQPoint( 0, 0 ), TRUE ); @@ -1010,37 +1002,37 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&lay { layout = 0; - if ( ::tqqt_cast<TQTabWidget*>(w) ) + if ( ::tqt_cast<TQTabWidget*>(w) ) w = ((TQTabWidget*)w)->currentPage(); - if ( ::tqqt_cast<TQWizard*>(w) ) + if ( ::tqt_cast<TQWizard*>(w) ) w = ((TQWizard*)w)->currentPage(); - if ( ::tqqt_cast<TQMainWindow*>(w) ) + if ( ::tqt_cast<TQMainWindow*>(w) ) w = ((TQMainWindow*)w)->centralWidget(); - if ( ::tqqt_cast<TQWidgetStack*>(w) ) + if ( ::tqt_cast<TQWidgetStack*>(w) ) w = ((TQWidgetStack*)w)->visibleWidget(); - if ( ::tqqt_cast<TQToolBox*>(w) ) + if ( ::tqt_cast<TQToolBox*>(w) ) w = ((TQToolBox*)w)->currentItem(); - if ( ::tqqt_cast<TQSplitter*>(w) ) - return ( (TQSplitter*)w )->orientation() ==Qt::Horizontal ? HBox : VBox; + if ( ::tqt_cast<TQSplitter*>(w) ) + return ( (TQSplitter*)w )->orientation() ==TQt::Horizontal ? HBox : VBox; if ( !w || !w->layout() ) return NoLayout; TQLayout *lay = w->layout(); - if ( ::tqqt_cast<TQGroupBox*>(w) ) { - TQObjectList *l = TQT_TQOBJECT(lay)->queryList( TQLAYOUT_OBJECT_NAME_STRING ); + if ( ::tqt_cast<TQGroupBox*>(w) ) { + TQObjectList *l = lay->queryList( "TQLayout" ); if ( l && l->first() ) lay = (TQLayout*)l->first(); delete l; } layout = lay; - if ( ::tqqt_cast<TQHBoxLayout*>(lay) ) + if ( ::tqt_cast<TQHBoxLayout*>(lay) ) return HBox; - else if ( ::tqqt_cast<TQVBoxLayout*>(lay) ) + else if ( ::tqt_cast<TQVBoxLayout*>(lay) ) return VBox; - else if ( ::tqqt_cast<TQGridLayout*>(lay) ) + else if ( ::tqt_cast<TQGridLayout*>(lay) ) return Grid; return NoLayout; } @@ -1050,11 +1042,11 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&lay */ WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *layout ) { - if ( ::tqqt_cast<TQHBoxLayout*>(layout) ) + if ( ::tqt_cast<TQHBoxLayout*>(layout) ) return HBox; - else if ( ::tqqt_cast<TQVBoxLayout*>(layout) ) + else if ( ::tqt_cast<TQVBoxLayout*>(layout) ) return VBox; - else if ( ::tqqt_cast<TQGridLayout*>(layout) ) + else if ( ::tqt_cast<TQGridLayout*>(layout) ) return Grid; return NoLayout; } @@ -1071,7 +1063,7 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w ) TQWidget *WidgetFactory::layoutParent( TQLayout *layout ) { - TQObject *o = TQT_TQOBJECT(layout); + TQObject *o = layout; while ( o ) { if ( o->isWidgetType() ) return (TQWidget*)o; @@ -1093,15 +1085,15 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *w ) { if ( !w ) return w; - if ( ::tqqt_cast<TQTabWidget*>(w) ) + if ( ::tqt_cast<TQTabWidget*>(w) ) return ((TQTabWidget*)w)->currentPage(); - if ( ::tqqt_cast<TQWizard*>(w) ) + if ( ::tqt_cast<TQWizard*>(w) ) return ((TQWizard*)w)->currentPage(); - if ( ::tqqt_cast<TQWidgetStack*>(w) ) + if ( ::tqt_cast<TQWidgetStack*>(w) ) return ((TQWidgetStack*)w)->visibleWidget(); - if ( ::tqqt_cast<TQToolBox*>(w) ) + if ( ::tqt_cast<TQToolBox*>(w) ) return ((TQToolBox*)w)->currentItem(); - if ( ::tqqt_cast<TQMainWindow*>(w) ) + if ( ::tqt_cast<TQMainWindow*>(w) ) return ((TQMainWindow*)w)->centralWidget(); #ifdef TQT_CONTAINER_CUSTOM_WIDGETS if ( !WidgetDatabase::isCustomPluginWidget( WidgetDatabase::idFromClassName( classNameOf( w ) ) ) ) @@ -1133,16 +1125,16 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *w ) TQWidget* WidgetFactory::widgetOfContainer( TQWidget *w ) { - if ( w && ::tqqt_cast<TQWidgetStack*>(w->parentWidget()) ) + if ( w && ::tqt_cast<TQWidgetStack*>(w->parentWidget()) ) w = w->parentWidget(); if ( w->parentWidget() && w->parentWidget()->parentWidget() && w->parentWidget()->parentWidget()->parentWidget() && - ::tqqt_cast<TQToolBox*>(w->parentWidget()->parentWidget()->parentWidget()) ) + ::tqt_cast<TQToolBox*>(w->parentWidget()->parentWidget()->parentWidget()) ) return w->parentWidget()->parentWidget()->parentWidget(); while ( w ) { - int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ); + int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ); if ( WidgetDatabase::isContainer( id ) || - w && ::tqqt_cast<FormWindow*>(w->parentWidget()) ) + w && ::tqt_cast<FormWindow*>(w->parentWidget()) ) return w; w = w->parentWidget(); } @@ -1165,22 +1157,22 @@ bool WidgetFactory::isPassiveInteractor( TQObject* o ) if ( TQApplication::activePopupWidget() ) // if a popup is open, we have to make sure that this one is closed, else X might do funny things return ( lastWasAPassiveInteractor = TRUE ); - if ( ::tqqt_cast<TQTabBar*>(o) ) + if ( ::tqt_cast<TQTabBar*>(o) ) return ( lastWasAPassiveInteractor = TRUE ); - else if ( ::tqqt_cast<TQSizeGrip*>(o) ) + else if ( ::tqt_cast<TQSizeGrip*>(o) ) return ( lastWasAPassiveInteractor = TRUE ); - else if ( ::tqqt_cast<TQButton*>(o) && - ( ::tqqt_cast<TQTabBar*>(o->parent()) || ::tqqt_cast<TQToolBox*>(o->parent()) ) ) + else if ( ::tqt_cast<TQButton*>(o) && + ( ::tqt_cast<TQTabBar*>(o->parent()) || ::tqt_cast<TQToolBox*>(o->parent()) ) ) return ( lastWasAPassiveInteractor = TRUE ); - else if ( ::tqqt_cast<TQPushButton*>(o) && ::tqqt_cast<TQWizard*>(o->parent()) ) + else if ( ::tqt_cast<TQPushButton*>(o) && ::tqt_cast<TQWizard*>(o->parent()) ) return ( lastWasAPassiveInteractor = TRUE ); - else if ( ::tqqt_cast<TQMenuBar*>(o) && ::tqqt_cast<TQMainWindow*>(o->parent()) ) + else if ( ::tqt_cast<TQMenuBar*>(o) && ::tqt_cast<TQMainWindow*>(o->parent()) ) return ( lastWasAPassiveInteractor = TRUE ); -// else if ( ::tqqt_cast<TQDockWindowHandle*>(o) ) - else if ( o->inherits( TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING ) ) +// else if ( ::tqt_cast<TQDockWindowHandle*>(o) ) + else if ( o->inherits( "TQDockWindowHandle" ) ) return ( lastWasAPassiveInteractor = TRUE ); -// else if ( ::tqqt_cast<TQHideDock*>(o) ) - else if ( o->inherits( TQHIDEDOCK_OBJECT_NAME_STRING ) ) +// else if ( ::tqt_cast<TQHideDock*>(o) ) + else if ( o->inherits( "TQHideDock" ) ) return ( lastWasAPassiveInteractor = TRUE ); else if ( qstrcmp( o->name(), "designer_wizardstack_button" ) == 0 ) return ( lastWasAPassiveInteractor = TRUE ); @@ -1189,7 +1181,7 @@ bool WidgetFactory::isPassiveInteractor( TQObject* o ) return ( lastWasAPassiveInteractor = FALSE ); WidgetInterface *iface = 0; TQWidget *w = (TQWidget*)o; - while ( !iface && w && !::tqqt_cast<FormWindow*>(w) ) { + while ( !iface && w && !::tqt_cast<FormWindow*>(w) ) { widgetManager()->queryInterface( classNameOf( w ), &iface ); w = w->parentWidget(); } @@ -1222,76 +1214,76 @@ const char* WidgetFactory::classNameOf( TQObject* o ) return o->className(); if (WidgetDatabase::isCustomPluginWidget(WidgetDatabase::idFromClassName(o->className()))) return o->className(); - else if ( ::tqqt_cast<QDesignerTabWidget*>(o) ) - return TQTABWIDGET_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<QDesignerWidgetStack*>(o) ) - return TQWIDGETSTACK_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<TQWidgetStack*>(o) ) + else if ( ::tqt_cast<QDesignerTabWidget*>(o) ) + return "TQTabWidget"; + else if ( ::tqt_cast<QDesignerWidgetStack*>(o) ) + return "TQWidgetStack"; + else if ( ::tqt_cast<TQWidgetStack*>(o) ) return "TQWeDoNotWantToBreakTabWidget"; - else if ( ::tqqt_cast<QDesignerDialog*>(o) ) - return TQDIALOG_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<QDesignerWidget*>(o) ) - return TQWIDGET_OBJECT_NAME_STRING; + else if ( ::tqt_cast<QDesignerDialog*>(o) ) + return "TQDialog"; + else if ( ::tqt_cast<QDesignerWidget*>(o) ) + return "TQWidget"; else if ( o->inherits( "CustomWidget" ) ) return ( (CustomWidget*)o )->realClassName().latin1(); - else if ( ::tqqt_cast<QDesignerLabel*>(o) ) - return TQLABEL_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<QDesignerWizard*>(o) ) - return TQWIZARD_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<QDesignerPushButton*>(o) ) - return TQPUSHBUTTON_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<QDesignerToolButton*>(o) ) - return TQTOOLBUTTON_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<QDesignerRadioButton*>(o) ) - return TQRADIOBUTTON_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<QDesignerCheckBox*>(o) ) - return TQCHECKBOX_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<MenuBarEditor*>(o) ) - return TQMENUBAR_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<QDesignerToolBar*>(o) ) - return TQTOOLBAR_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<QDesignerAction*>(o) ) - return TQACTION_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<QDesignerActionGroup*>(o) ) - return TQACTIONGROUP_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<PopupMenuEditor*>(o) ) - return TQPOPUPMENU_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<QDesignerToolBox*>(o) ) - return TQTOOLBOX_OBJECT_NAME_STRING; + else if ( ::tqt_cast<QDesignerLabel*>(o) ) + return "TQLabel"; + else if ( ::tqt_cast<QDesignerWizard*>(o) ) + return "TQWizard"; + else if ( ::tqt_cast<QDesignerPushButton*>(o) ) + return "TQPushButton"; + else if ( ::tqt_cast<QDesignerToolButton*>(o) ) + return "TQToolButton"; + else if ( ::tqt_cast<QDesignerRadioButton*>(o) ) + return "TQRadioButton"; + else if ( ::tqt_cast<QDesignerCheckBox*>(o) ) + return "TQCheckBox"; + else if ( ::tqt_cast<MenuBarEditor*>(o) ) + return "TQMenuBar"; + else if ( ::tqt_cast<QDesignerToolBar*>(o) ) + return "TQToolBar"; + else if ( ::tqt_cast<QDesignerAction*>(o) ) + return "TQAction"; + else if ( ::tqt_cast<QDesignerActionGroup*>(o) ) + return "TQActionGroup"; + else if ( ::tqt_cast<PopupMenuEditor*>(o) ) + return "TQPopupMenu"; + else if ( ::tqt_cast<QDesignerToolBox*>(o) ) + return "TQToolBox"; #ifndef TQT_NO_SQL - else if ( ::tqqt_cast<QDesignerDataBrowser*>(o) ) - return TQDATABROWSER_OBJECT_NAME_STRING; - else if ( ::tqqt_cast<QDesignerDataView*>(o) ) - return TQDATAVIEW_OBJECT_NAME_STRING; + else if ( ::tqt_cast<QDesignerDataBrowser*>(o) ) + return "TQDataBrowser"; + else if ( ::tqt_cast<QDesignerDataView*>(o) ) + return "TQDataView"; #endif return o->className(); } TQString WidgetFactory::defaultSignal( TQObject *w ) { - if ( ::tqqt_cast<TQRadioButton*>(w) || ::tqqt_cast<TQCheckBox*>(w) ) + if ( ::tqt_cast<TQRadioButton*>(w) || ::tqt_cast<TQCheckBox*>(w) ) return "toggled"; - else if ( ::tqqt_cast<TQButton*>(w) || ::tqqt_cast<TQButtonGroup*>(w) ) + else if ( ::tqt_cast<TQButton*>(w) || ::tqt_cast<TQButtonGroup*>(w) ) return "clicked"; - else if ( ::tqqt_cast<TQTextBrowser*>(w) ) + else if ( ::tqt_cast<TQTextBrowser*>(w) ) return "linkClicked"; - else if ( ::tqqt_cast<TQLineEdit*>(w) || ::tqqt_cast<TQTextEdit*>(w) ) + else if ( ::tqt_cast<TQLineEdit*>(w) || ::tqt_cast<TQTextEdit*>(w) ) return "textChanged"; - else if ( ::tqqt_cast<TQListView*>(w) || ::tqqt_cast<TQIconView*>(w) || - ::tqqt_cast<TQListBox*>(w) || ::tqqt_cast<TQTable*>(w) ) + else if ( ::tqt_cast<TQListView*>(w) || ::tqt_cast<TQIconView*>(w) || + ::tqt_cast<TQListBox*>(w) || ::tqt_cast<TQTable*>(w) ) return "selectionChanged"; - else if ( ::tqqt_cast<TQTabWidget*>(w) ) + else if ( ::tqt_cast<TQTabWidget*>(w) ) return "selected"; - else if ( ::tqqt_cast<TQToolBox*>(w) ) + else if ( ::tqt_cast<TQToolBox*>(w) ) return "currentChanged"; - else if ( ::tqqt_cast<TQWidgetStack*>(w) ) + else if ( ::tqt_cast<TQWidgetStack*>(w) ) return "aboutToShow"; - else if ( ::tqqt_cast<TQSpinBox*>(w) || ::tqqt_cast<TQSlider*>(w) || - ::tqqt_cast<TQScrollBar*>(w) || ::tqqt_cast<TQDateEdit*>(w) || - ::tqqt_cast<TQTimeEdit*>(w) || ::tqqt_cast<TQDateTimeEdit*>(w) || - ::tqqt_cast<TQDial*>(w) ) + else if ( ::tqt_cast<TQSpinBox*>(w) || ::tqt_cast<TQSlider*>(w) || + ::tqt_cast<TQScrollBar*>(w) || ::tqt_cast<TQDateEdit*>(w) || + ::tqt_cast<TQTimeEdit*>(w) || ::tqt_cast<TQDateTimeEdit*>(w) || + ::tqt_cast<TQDial*>(w) ) return "valueChanged"; - else if ( ::tqqt_cast<TQComboBox*>(w) ) + else if ( ::tqt_cast<TQComboBox*>(w) ) return "activated"; return TQString(); } @@ -1307,14 +1299,14 @@ void WidgetFactory::initChangedProperties( TQObject *o ) MainWindow::self->currProject()->fakeFormFileFor( o ) ) return; MetaDataBase::setPropertyChanged( o, "name", TRUE ); - if ( !::tqqt_cast<QDesignerToolBar*>(o) && !::tqqt_cast<MenuBarEditor*>(o) ) + if ( !::tqt_cast<QDesignerToolBar*>(o) && !::tqt_cast<MenuBarEditor*>(o) ) MetaDataBase::setPropertyChanged( o, "geometry", TRUE ); - if ( ::tqqt_cast<TQPushButton*>(o) || - ::tqqt_cast<TQRadioButton*>(o) || - ::tqqt_cast<TQCheckBox*>(o) || - ::tqqt_cast<TQToolButton*>(o) ) { - if (::tqqt_cast<TQToolButton*>(o) && ::tqqt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->parent()))) { + if ( ::tqt_cast<TQPushButton*>(o) || + ::tqt_cast<TQRadioButton*>(o) || + ::tqt_cast<TQCheckBox*>(o) || + ::tqt_cast<TQToolButton*>(o) ) { + if (::tqt_cast<TQToolButton*>(o) && ::tqt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->parent()))) { MetaDataBase::setPropertyChanged( o, "usesTextLabel", TRUE ); MetaDataBase::setPropertyChanged( o, "textLabel", TRUE ); MetaDataBase::setPropertyChanged( o, "autoRaise", TRUE ); @@ -1323,19 +1315,19 @@ void WidgetFactory::initChangedProperties( TQObject *o ) MetaDataBase::setPropertyChanged( o, "text", TRUE ); } } - else if ( ::tqqt_cast<TQGroupBox*>(o) ) + else if ( ::tqt_cast<TQGroupBox*>(o) ) MetaDataBase::setPropertyChanged( o, "title", TRUE ); - else if ( o->isA( TQFRAME_OBJECT_NAME_STRING ) ) { + else if ( o->isA( "TQFrame" ) ) { MetaDataBase::setPropertyChanged( o, "frameShadow", TRUE ); MetaDataBase::setPropertyChanged( o, "frameShape", TRUE ); - } else if ( ::tqqt_cast<TQTabWidget*>(o) || ::tqqt_cast<TQWizard*>(o) ) { + } else if ( ::tqt_cast<TQTabWidget*>(o) || ::tqt_cast<TQWizard*>(o) ) { MetaDataBase::setPropertyChanged( o, "pageTitle", TRUE ); MetaDataBase::setPropertyChanged( o, "pageName", TRUE ); MetaDataBase::setPropertyChanged( o, "currentPage", TRUE ); - } else if ( ::tqqt_cast<TQWidgetStack*>(o) ) { + } else if ( ::tqt_cast<TQWidgetStack*>(o) ) { MetaDataBase::setPropertyChanged( o, "currentPage", TRUE ); MetaDataBase::setPropertyChanged( o, "pageName", TRUE ); - } else if ( ::tqqt_cast<TQToolBox*>(o) ) { + } else if ( ::tqt_cast<TQToolBox*>(o) ) { MetaDataBase::setPropertyChanged( o, "currentIndex", TRUE ); MetaDataBase::setPropertyChanged( o, "itemName", TRUE ); MetaDataBase::setPropertyChanged( o, "itemLabel", TRUE ); @@ -1343,9 +1335,9 @@ void WidgetFactory::initChangedProperties( TQObject *o ) MetaDataBase::setPropertyChanged( o, "itemToolTip", TRUE ); MetaDataBase::setPropertyChanged( o, "itemBackgroundMode", TRUE ); #ifndef TQT_NO_TABLE - } else if ( ::tqqt_cast<TQTable*>(o) ) { + } else if ( ::tqt_cast<TQTable*>(o) ) { # ifndef TQT_NO_SQL - if (!::tqqt_cast<TQDataTable*>(o) ) + if (!::tqt_cast<TQDataTable*>(o) ) # endif { MetaDataBase::setPropertyChanged( o, "numRows", TRUE ); @@ -1357,11 +1349,11 @@ void WidgetFactory::initChangedProperties( TQObject *o ) } } #endif - } else if ( ::tqqt_cast<TQSplitter*>(o) ) { + } else if ( ::tqt_cast<TQSplitter*>(o) ) { MetaDataBase::setPropertyChanged( o, "orientation", TRUE ); - } else if ( ::tqqt_cast<QDesignerToolBar*>(o) ) { + } else if ( ::tqt_cast<QDesignerToolBar*>(o) ) { MetaDataBase::setPropertyChanged( o, "label", TRUE ); - } else if ( ::tqqt_cast<MenuBarEditor*>(o) ) { + } else if ( ::tqt_cast<MenuBarEditor*>(o) ) { MetaDataBase::setPropertyChanged( o, "itemName", TRUE ); MetaDataBase::setPropertyChanged( o, "itemNumber", TRUE ); MetaDataBase::setPropertyChanged( o, "itemText", TRUE ); @@ -1380,9 +1372,9 @@ bool WidgetFactory::hasSpecialEditor( int id, TQObject *editorWidget ) return TRUE; if ( className.contains( "IconView" ) ) return TRUE; - if ( className == TQTEXTEDIT_OBJECT_NAME_STRING || className == TQMULTILINEEDIT_OBJECT_NAME_STRING ) + if ( className == "TQTextEdit" || className == "TQMultiLineEdit" ) return TRUE; - if ( ::tqqt_cast<TQTable*>(editorWidget) != 0 ) + if ( ::tqt_cast<TQTable*>(editorWidget) != 0 ) return TRUE; return FALSE; @@ -1394,7 +1386,7 @@ bool WidgetFactory::hasItems( int id, TQObject *editorWidget ) if ( className.contains( "ListBox" ) || className.contains( "ListView" ) || className.contains( "IconView" ) || className.contains( "ComboBox" ) || - ::tqqt_cast<TQTable*>(editorWidget) != 0 ) + ::tqt_cast<TQTable*>(editorWidget) != 0 ) return TRUE; return FALSE; @@ -1405,7 +1397,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, TQString className = WidgetDatabase::className( id ); if ( className.contains( "ListBox" ) ) { - if ( !::tqqt_cast<TQListBox*>(editWidget) ) + if ( !::tqt_cast<TQListBox*>(editWidget) ) return; ListBoxEditor *e = new ListBoxEditor( parent, editWidget, fw ); e->exec(); @@ -1414,7 +1406,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, } if ( className.contains( "ComboBox" ) ) { - if ( !::tqqt_cast<TQComboBox*>(editWidget) ) + if ( !::tqt_cast<TQComboBox*>(editWidget) ) return; TQComboBox *cb = (TQComboBox*)editWidget; ListBoxEditor *e = new ListBoxEditor( parent, cb->listBox(), fw ); @@ -1425,7 +1417,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, } if ( className.contains( "ListView" ) ) { - if ( !::tqqt_cast<TQListView*>(editWidget) ) + if ( !::tqt_cast<TQListView*>(editWidget) ) return; TQListView *lv = (TQListView*)editWidget; ListViewEditor *e = new ListViewEditor( parent, lv, fw ); @@ -1435,7 +1427,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, } if ( className.contains( "IconView" ) ) { - if ( !::tqqt_cast<TQIconView*>(editWidget) ) + if ( !::tqt_cast<TQIconView*>(editWidget) ) return; IconViewEditor *e = new IconViewEditor( parent, editWidget, fw ); e->exec(); @@ -1443,14 +1435,14 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, return; } - if ( className == TQMULTILINEEDIT_OBJECT_NAME_STRING || className == TQTEXTEDIT_OBJECT_NAME_STRING ) { + if ( className == "TQMultiLineEdit" || className == "TQTextEdit" ) { MultiLineEditor *e = new MultiLineEditor( FALSE, TRUE, parent, editWidget, fw ); e->exec(); delete e; return; } #ifndef TQT_NO_TABLE - if (::tqqt_cast<TQTable*>(editWidget) != 0) { + if (::tqt_cast<TQTable*>(editWidget) != 0) { TableEditor *e = new TableEditor( parent, editWidget, fw ); e->exec(); delete e; @@ -1549,7 +1541,7 @@ void QDesignerLabel::updateBuddy() if ( myBuddy.isEmpty() ) return; - TQObjectList *l = topLevelWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, myBuddy, FALSE, TRUE ); + TQObjectList *l = topLevelWidget()->queryList( "TQWidget", myBuddy, FALSE, TRUE ); if ( !l || !l->first() ) { delete l; return; @@ -1633,15 +1625,15 @@ void TQLayoutWidget::updateSizePolicy() if ( parent() && parent()->isWidgetType() ) { parentLayout = ((TQWidget *)parent())->layout(); if ( parentLayout && - ::tqqt_cast<TQLayoutWidget*>(parentLayout->mainWidget()) ) + ::tqt_cast<TQLayoutWidget*>(parentLayout->mainWidget()) ) parentLayout = 0; } TQObjectListIt it( childrenListObject() ); TQObject *o; - if ( ::tqqt_cast<TQVBoxLayout*>(layout()) ) { - if ( ::tqqt_cast<TQHBoxLayout*>(parentLayout) ) + if ( ::tqt_cast<TQVBoxLayout*>(layout()) ) { + if ( ::tqt_cast<TQHBoxLayout*>(parentLayout) ) vt = TQSizePolicy::Minimum; else vt = TQSizePolicy::Fixed; @@ -1661,8 +1653,8 @@ void TQLayoutWidget::updateSizePolicy() if ( w->sizePolicy().mayShrinkVertically() ) vt |= TQSizePolicy::Maximum; } - } else if ( ::tqqt_cast<TQHBoxLayout*>(layout()) ) { - if ( ::tqqt_cast<TQVBoxLayout*>(parentLayout) ) + } else if ( ::tqt_cast<TQHBoxLayout*>(layout()) ) { + if ( ::tqt_cast<TQVBoxLayout*>(parentLayout) ) ht = TQSizePolicy::Minimum; else ht = TQSizePolicy::Fixed; @@ -1682,13 +1674,13 @@ void TQLayoutWidget::updateSizePolicy() if ( !w->sizePolicy().mayShrinkVertically() ) vt &= ~TQSizePolicy::Maximum; } - } else if ( ::tqqt_cast<TQGridLayout*>(layout()) ) { + } else if ( ::tqt_cast<TQGridLayout*>(layout()) ) { ht = TQSizePolicy::Fixed; vt = TQSizePolicy::Fixed; if ( parentLayout ) { - if ( ::tqqt_cast<TQVBoxLayout*>(parentLayout) ) + if ( ::tqt_cast<TQVBoxLayout*>(parentLayout) ) ht = TQSizePolicy::Minimum; - else if ( ::tqqt_cast<TQHBoxLayout*>(parentLayout) ) + else if ( ::tqt_cast<TQHBoxLayout*>(parentLayout) ) vt = TQSizePolicy::Minimum; } @@ -1708,17 +1700,9 @@ void TQLayoutWidget::updateSizePolicy() vt |= TQSizePolicy::Maximum; } } -#ifdef USE_QT4 - if ( layout()->expanding() & TQSizePolicy::Horizontally ) -#else // USE_QT4 if ( layout()->expanding() & TQSizePolicy::Horizontally ) -#endif // USE_QT4 ht = TQSizePolicy::Expanding; -#ifdef USE_QT4 - if ( layout()->expanding() & TQSizePolicy::Vertically ) -#else // USE_QT4 if ( layout()->expanding() & TQSizePolicy::Vertically ) -#endif // USE_QT4 vt = TQSizePolicy::Expanding; layout()->invalidate(); @@ -1730,7 +1714,7 @@ void TQLayoutWidget::updateSizePolicy() void CustomWidget::paintEvent( TQPaintEvent *e ) { - if ( ::tqqt_cast<FormWindow*>(parentWidget()) ) { + if ( ::tqt_cast<FormWindow*>(parentWidget()) ) { ( (FormWindow*)parentWidget() )->paintGrid( this, e ); } else { TQPainter p( this ); diff --git a/kdevdesigner/designer/widgetfactory.h b/kdevdesigner/designer/widgetfactory.h index feebe9c7..b120313b 100644 --- a/kdevdesigner/designer/widgetfactory.h +++ b/kdevdesigner/designer/widgetfactory.h @@ -121,7 +121,7 @@ private: class QDesignerTabWidget : public TQTabWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true ) TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true ) @@ -151,7 +151,7 @@ private: class QDesignerWidgetStack : public TQWidgetStack { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true ) TQ_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true ) @@ -195,7 +195,7 @@ private: class QDesignerWizard : public TQWizard { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int currentPage READ currentPageNum WRITE setCurrentPage STORED false DESIGNABLE true ) TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true ) @@ -238,7 +238,7 @@ private: class TQLayoutWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -257,7 +257,7 @@ protected: class CustomWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -290,7 +290,7 @@ protected: class Line : public TQFrame { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation ) @@ -317,7 +317,7 @@ public: class QDesignerLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQCString buddy READ buddyWidget WRITE setBuddyWidget ) @@ -350,7 +350,7 @@ private: class QDesignerWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -371,7 +371,7 @@ private: class QDesignerDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT TQ_OVERRIDE( bool modal READ isModal WRITE setModal ) @@ -393,7 +393,7 @@ private: class QDesignerToolButton : public TQToolButton { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) @@ -402,13 +402,13 @@ public: : TQToolButton( parent, name ) {} bool isInButtonGroup() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); } int buttonGroupId() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { + if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) { ( (TQButtonGroup*)parentWidget() )->remove( this ); ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } @@ -417,7 +417,7 @@ public: class QDesignerRadioButton : public TQRadioButton { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) @@ -426,13 +426,13 @@ public: : TQRadioButton( parent, name ) {} bool isInButtonGroup() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); } int buttonGroupId() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { + if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) { ( (TQButtonGroup*)parentWidget() )->remove( this ); ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } @@ -442,7 +442,7 @@ public: class QDesignerPushButton : public TQPushButton { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) @@ -451,13 +451,13 @@ public: : TQPushButton( parent, name ) {} bool isInButtonGroup() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); } int buttonGroupId() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { + if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) { ( (TQButtonGroup*)parentWidget() )->remove( this ); ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } @@ -467,7 +467,7 @@ public: class QDesignerCheckBox : public TQCheckBox { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) @@ -476,13 +476,13 @@ public: : TQCheckBox( parent, name ) {} bool isInButtonGroup() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); } int buttonGroupId() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { + if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) { ( (TQButtonGroup*)parentWidget() )->remove( this ); ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } @@ -492,7 +492,7 @@ public: class QDesignerToolBox : public TQToolBox { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString itemLabel READ itemLabel WRITE setItemLabel STORED false DESIGNABLE true ) TQ_PROPERTY( TQCString itemName READ itemName WRITE setItemName STORED false DESIGNABLE true ) diff --git a/kdevdesigner/designer/wizardeditor.ui b/kdevdesigner/designer/wizardeditor.ui index 84302d09..8885a825 100644 --- a/kdevdesigner/designer/wizardeditor.ui +++ b/kdevdesigner/designer/wizardeditor.ui @@ -319,7 +319,7 @@ <slot>cancelClicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot access="protected">addClicked()</slot> @@ -332,7 +332,7 @@ <slot access="protected">okClicked()</slot> <slot access="protected">removeClicked()</slot> <slot access="protected">upClicked()</slot> -</Q_SLOTS> +</slots> <includes> <include location="local" impldecl="in implementation">myiconloader.h</include> </includes> diff --git a/kdevdesigner/designer/wizardeditorimpl.cpp b/kdevdesigner/designer/wizardeditorimpl.cpp index c4c4f83d..1342c3ac 100644 --- a/kdevdesigner/designer/wizardeditorimpl.cpp +++ b/kdevdesigner/designer/wizardeditorimpl.cpp @@ -41,19 +41,19 @@ WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw ) : WizardEditorBase( parent, 0 ), formwindow( fw ), wizard( w ), draggedItem( 0 ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); fillListBox(); // Add drag and drop ListBoxDnd *listBoxDnd = new ListBoxDnd( listBox ); listBoxDnd->setDragMode( ListBoxDnd::Internal | ListBoxDnd::Move ); - TQObject::connect( listBoxDnd, TQT_SIGNAL( dropped( TQListBoxItem * ) ), - listBoxDnd, TQT_SLOT( confirmDrop( TQListBoxItem * ) ) ); + TQObject::connect( listBoxDnd, TQ_SIGNAL( dropped( TQListBoxItem * ) ), + listBoxDnd, TQ_SLOT( confirmDrop( TQListBoxItem * ) ) ); - TQObject::connect( listBoxDnd, TQT_SIGNAL( dragged( TQListBoxItem * ) ), - this, TQT_SLOT( itemDragged( TQListBoxItem * ) ) ); - TQObject::connect( listBoxDnd, TQT_SIGNAL( dropped( TQListBoxItem * ) ), - this, TQT_SLOT( itemDropped( TQListBoxItem * ) ) ); + TQObject::connect( listBoxDnd, TQ_SIGNAL( dragged( TQListBoxItem * ) ), + this, TQ_SLOT( itemDragged( TQListBoxItem * ) ) ); + TQObject::connect( listBoxDnd, TQ_SIGNAL( dropped( TQListBoxItem * ) ), + this, TQ_SLOT( itemDropped( TQListBoxItem * ) ) ); // Add in-place rename new ListBoxRename( listBox ); diff --git a/kdevdesigner/designer/wizardeditorimpl.h b/kdevdesigner/designer/wizardeditorimpl.h index f49a6b6c..844739a3 100644 --- a/kdevdesigner/designer/wizardeditorimpl.h +++ b/kdevdesigner/designer/wizardeditorimpl.h @@ -37,7 +37,7 @@ class FormWindow; class WizardEditor : public WizardEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/designer/workspace.cpp b/kdevdesigner/designer/workspace.cpp index b806cc6c..4cd0c26f 100644 --- a/kdevdesigner/designer/workspace.cpp +++ b/kdevdesigner/designer/workspace.cpp @@ -80,8 +80,8 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, TQObject *o, Project *p ) project = p; t = ObjectType; setPixmap( 0, SmallIcon( "designer_object.png" , KDevDesignerPartFactory::instance()) ); - TQObject::connect( p->fakeFormFileFor( o ), TQT_SIGNAL( somethingChanged(FormFile*) ), - listView(), TQT_SLOT( update() ) ); + TQObject::connect( p->fakeFormFileFor( o ), TQ_SIGNAL( somethingChanged(FormFile*) ), + listView(), TQ_SLOT( update() ) ); } WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type ) @@ -92,7 +92,7 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type ) t = type; if ( type == FormFileType ) { setPixmap( 0, SmallIcon( "designer_form.png" , KDevDesignerPartFactory::instance()) ); - TQObject::connect( ff, TQT_SIGNAL( somethingChanged(FormFile*) ), listView(), TQT_SLOT( update(FormFile*) ) ); + TQObject::connect( ff, TQ_SIGNAL( somethingChanged(FormFile*) ), listView(), TQ_SLOT( update(FormFile*) ) ); if ( formFile->supportsCodeFile() ) { (void) new WorkspaceItem( this, formFile, FormSourceType ); } @@ -292,12 +292,12 @@ Workspace::Workspace( TQWidget *parent, MainWindow *mw ) #endif addColumn( i18n( "Files" ) ); setAllColumnsShowFocus( TRUE ); - connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( itemClicked( int, TQListViewItem *, const TQPoint& ) ) ), - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( itemDoubleClicked( TQListViewItem * ) ) ), - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( rmbClicked( TQListViewItem *, const TQPoint& ) ) ), + connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( itemClicked( int, TQListViewItem *, const TQPoint& ) ) ), + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( itemDoubleClicked( TQListViewItem * ) ) ), + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( rmbClicked( TQListViewItem *, const TQPoint& ) ) ), setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); viewport()->setAcceptDrops( TRUE ); @@ -319,23 +319,23 @@ void Workspace::setCurrentProject( Project *pro ) if ( project == pro ) return; if ( project ) { - disconnect( project, TQT_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQT_SLOT( sourceFileAdded(SourceFile*) ) ); - disconnect( project, TQT_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQT_SLOT( sourceFileRemoved(SourceFile*) ) ); - disconnect( project, TQT_SIGNAL( formFileAdded(FormFile*) ), this, TQT_SLOT( formFileAdded(FormFile*) ) ); - disconnect( project, TQT_SIGNAL( formFileRemoved(FormFile*) ), this, TQT_SLOT( formFileRemoved(FormFile*) ) ); - disconnect( project, TQT_SIGNAL( objectAdded(TQObject*) ), this, TQT_SLOT( objectAdded(TQObject*) ) ); - disconnect( project, TQT_SIGNAL( objectRemoved(TQObject*) ), this, TQT_SLOT( objectRemoved(TQObject*) ) ); - disconnect( project, TQT_SIGNAL( projectModified() ), this, TQT_SLOT( update() ) ); + disconnect( project, TQ_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQ_SLOT( sourceFileAdded(SourceFile*) ) ); + disconnect( project, TQ_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQ_SLOT( sourceFileRemoved(SourceFile*) ) ); + disconnect( project, TQ_SIGNAL( formFileAdded(FormFile*) ), this, TQ_SLOT( formFileAdded(FormFile*) ) ); + disconnect( project, TQ_SIGNAL( formFileRemoved(FormFile*) ), this, TQ_SLOT( formFileRemoved(FormFile*) ) ); + disconnect( project, TQ_SIGNAL( objectAdded(TQObject*) ), this, TQ_SLOT( objectAdded(TQObject*) ) ); + disconnect( project, TQ_SIGNAL( objectRemoved(TQObject*) ), this, TQ_SLOT( objectRemoved(TQObject*) ) ); + disconnect( project, TQ_SIGNAL( projectModified() ), this, TQ_SLOT( update() ) ); } project = pro; - connect( project, TQT_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQT_SLOT( sourceFileAdded(SourceFile*) ) ); - connect( project, TQT_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQT_SLOT( sourceFileRemoved(SourceFile*) ) ); - connect( project, TQT_SIGNAL( formFileAdded(FormFile*) ), this, TQT_SLOT( formFileAdded(FormFile*) ) ); - connect( project, TQT_SIGNAL( formFileRemoved(FormFile*) ), this, TQT_SLOT( formFileRemoved(FormFile*) ) ); - connect( project, TQT_SIGNAL( destroyed(TQObject*) ), this, TQT_SLOT( projectDestroyed(TQObject*) ) ); - connect( project, TQT_SIGNAL( objectAdded(TQObject*) ), this, TQT_SLOT( objectAdded(TQObject*) ) ); - connect( project, TQT_SIGNAL( objectRemoved(TQObject*) ), this, TQT_SLOT( objectRemoved(TQObject*) ) ); - connect( project, TQT_SIGNAL( projectModified() ), this, TQT_SLOT( update() ) ); + connect( project, TQ_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQ_SLOT( sourceFileAdded(SourceFile*) ) ); + connect( project, TQ_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQ_SLOT( sourceFileRemoved(SourceFile*) ) ); + connect( project, TQ_SIGNAL( formFileAdded(FormFile*) ), this, TQ_SLOT( formFileAdded(FormFile*) ) ); + connect( project, TQ_SIGNAL( formFileRemoved(FormFile*) ), this, TQ_SLOT( formFileRemoved(FormFile*) ) ); + connect( project, TQ_SIGNAL( destroyed(TQObject*) ), this, TQ_SLOT( projectDestroyed(TQObject*) ) ); + connect( project, TQ_SIGNAL( objectAdded(TQObject*) ), this, TQ_SLOT( objectAdded(TQObject*) ) ); + connect( project, TQ_SIGNAL( objectRemoved(TQObject*) ), this, TQ_SLOT( objectRemoved(TQObject*) ) ); + connect( project, TQ_SIGNAL( projectModified() ), this, TQ_SLOT( update() ) ); clear(); if ( bufferEdit ) @@ -523,7 +523,7 @@ void Workspace::itemDoubleClicked( TQListViewItem *i ) void Workspace::itemClicked( int button, TQListViewItem *i, const TQPoint& ) { - if ( !i || button != Qt::LeftButton ) + if ( !i || button != TQt::LeftButton ) return; closeAutoOpenItems(); @@ -640,7 +640,7 @@ void Workspace::rmbClicked( TQListViewItem *i, const TQPoint& pos ) case OPEN_SOURCE: case OPEN_FORM: case OPEN_FORM_SOURCE: - itemClicked( Qt::LeftButton, i, pos ); + itemClicked( TQt::LeftButton, i, pos ); break; } } @@ -648,7 +648,7 @@ void Workspace::rmbClicked( TQListViewItem *i, const TQPoint& pos ) bool Workspace::eventFilter( TQObject *o, TQEvent * e ) { // Reggie, on what type of events do we have to execute updateBufferEdit() - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(bufferEdit) && e->type() != TQEvent::ChildRemoved ) + if ( o == bufferEdit && e->type() != TQEvent::ChildRemoved ) updateBufferEdit(); return TQListView::eventFilter( o, e ); } @@ -656,8 +656,8 @@ bool Workspace::eventFilter( TQObject *o, TQEvent * e ) void Workspace::setBufferEdit( QCompletionEdit *edit ) { bufferEdit = edit; - connect( bufferEdit, TQT_SIGNAL( chosen( const TQString & ) ), - this, TQT_SLOT( bufferChosen( const TQString & ) ) ); + connect( bufferEdit, TQ_SIGNAL( chosen( const TQString & ) ), + this, TQ_SLOT( bufferChosen( const TQString & ) ) ); bufferEdit->installEventFilter( this ); } @@ -689,7 +689,7 @@ void Workspace::bufferChosen( const TQString &buffer ) TQListViewItemIterator it( this ); while ( it.current() ) { if ( ( (WorkspaceItem*)it.current())->checkCompletion( buffer ) ) { - itemClicked( Qt::LeftButton, it.current(), TQPoint() ); + itemClicked( TQt::LeftButton, it.current(), TQPoint() ); break; } ++it; diff --git a/kdevdesigner/designer/workspace.h b/kdevdesigner/designer/workspace.h index 052a1b87..f16e9fcf 100644 --- a/kdevdesigner/designer/workspace.h +++ b/kdevdesigner/designer/workspace.h @@ -86,7 +86,7 @@ private: class Workspace : public TQListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/interfaces/widgetinterface.h b/kdevdesigner/interfaces/widgetinterface.h index 5f0312f8..6f8e1247 100644 --- a/kdevdesigner/interfaces/widgetinterface.h +++ b/kdevdesigner/interfaces/widgetinterface.h @@ -30,6 +30,6 @@ #include <tqwidgetinterface_p.h> #define WidgetInterface TQWidgetFactoryInterface -#define IID_Widget IID_TQWidgetFactory +#define IID_Widget IID_QWidgetFactory #endif diff --git a/kdevdesigner/plugins/languageinterfaceimpl.cpp b/kdevdesigner/plugins/languageinterfaceimpl.cpp index 2e4f9f20..99fa5f2f 100644 --- a/kdevdesigner/plugins/languageinterfaceimpl.cpp +++ b/kdevdesigner/plugins/languageinterfaceimpl.cpp @@ -59,7 +59,7 @@ TQRESULT LanguageInterfaceImpl::queryInterface( const TQUuid &uuid, TQUnknownInt return parent->queryInterface( uuid, iface ); *iface = 0; - if ( uuid == IID_TQUnknown ) + if ( uuid == IID_QUnknown ) *iface = (TQUnknownInterface*)this; else if ( uuid == IID_Language ) *iface = (LanguageInterface*)this; diff --git a/kdevdesigner/shared/ui2uib.cpp b/kdevdesigner/shared/ui2uib.cpp index 5cff46e0..e2b8665f 100644 --- a/kdevdesigner/shared/ui2uib.cpp +++ b/kdevdesigner/shared/ui2uib.cpp @@ -137,13 +137,13 @@ static TQCString layoutForTag( const TQString& tag ) { if ( tag == "grid" ) { - return TQGRIDLAYOUT_OBJECT_NAME_STRING; + return "TQGridLayout"; } else if ( tag == "hbox" ) { - return TQHBOXLAYOUT_OBJECT_NAME_STRING; + return "TQHBoxLayout"; } else if ( tag == "vbox" ) { - return TQVBOXLAYOUT_OBJECT_NAME_STRING; + return "TQVBoxLayout"; } else { - return TQLAYOUT_OBJECT_NAME_STRING; + return "TQLayout"; } } @@ -490,9 +490,9 @@ static int outputObject( TQMap<int, TQStringList>& buddies, { bool isTQObject = !className.isEmpty(); - if ( className == TQTOOLBAR_OBJECT_NAME_STRING ) + if ( className == "TQToolBar" ) out << (TQ_UINT8) elem.attribute( "dock", "0" ).toInt(); - if ( className == TQWIDGET_OBJECT_NAME_STRING ) + if ( className == "TQWidget" ) className = elem.attribute( "class", className ).latin1(); int objectNo = -1; @@ -504,7 +504,7 @@ static int outputObject( TQMap<int, TQStringList>& buddies, outputGridCell( out, elem ); // optimization: insert '&Foo' into string-table before 'Foo' - if ( className == TQACTION_OBJECT_NAME_STRING || className == TQACTIONGROUP_OBJECT_NAME_STRING ) { + if ( className == "TQAction" || className == "TQActionGroup" ) { TQVariant value = DomTool::readProperty( elem, "menuText", TQVariant() ); if ( value.asString().startsWith("&") ) strings.insertString( value.asString() ); @@ -523,11 +523,11 @@ static int outputObject( TQMap<int, TQStringList>& buddies, } } else { out << (TQ_UINT8) Object_SubAction; - outputObject( buddies, objects, strings, out, f, TQACTION_OBJECT_NAME_STRING ); + outputObject( buddies, objects, strings, out, f, "TQAction" ); } } else if ( tag == "actiongroup" ) { out << (TQ_UINT8) Object_SubAction; - outputObject( buddies, objects, strings, out, f, TQACTIONGROUP_OBJECT_NAME_STRING ); + outputObject( buddies, objects, strings, out, f, "TQActionGroup" ); } else if ( tag == "attribute" ) { out << (TQ_UINT8) Object_Attribute; outputProperty( buddies, objectNo, strings, out, f ); @@ -564,13 +564,13 @@ static int outputObject( TQMap<int, TQStringList>& buddies, out << (TQ_UINT8) Object_Spacer; outputObject( buddies, objects, strings, out, f ); } else if ( tag == "widget" ) { - if ( f.attribute("class") == TQLAYOUTWIDGET_OBJECT_NAME_STRING && + if ( f.attribute("class") == "TQLayoutWidget" && elem.tagName() != "widget" ) { outputLayoutWidgetsSubLayout( buddies, objects, strings, out, f ); } else { out << (TQ_UINT8) Object_SubWidget; - outputObject( buddies, objects, strings, out, f, TQWIDGET_OBJECT_NAME_STRING ); + outputObject( buddies, objects, strings, out, f, "TQWidget" ); } } f = f.nextSibling().toElement(); @@ -747,7 +747,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out ) { TQDataStream out2( widgetBlock, IO_WriteOnly ); widgetNo = outputObject( buddies, objects, strings, out2, widgetElem, - TQWIDGET_OBJECT_NAME_STRING ); + "TQWidget" ); } if ( !tabstopsElem.isNull() ) { @@ -772,7 +772,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out ) if ( !menubarElem.isNull() ) { TQDataStream out2( menubarBlock, IO_WriteOnly ); outputObject( buddies, objects, strings, out2, menubarElem, - TQMENUBAR_OBJECT_NAME_STRING ); + "TQMenuBar" ); } if ( !toolbarsElem.isNull() ) { @@ -780,7 +780,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out ) TQDomElement f = toolbarsElem.firstChild().toElement(); while ( !f.isNull() ) { if ( f.tagName() == "toolbar" ) - outputObject( buddies, objects, strings, out2, f, TQTOOLBAR_OBJECT_NAME_STRING ); + outputObject( buddies, objects, strings, out2, f, "TQToolBar" ); f = f.nextSibling().toElement(); } } diff --git a/kdevdesigner/shared/widgetdatabase.cpp b/kdevdesigner/shared/widgetdatabase.cpp index be4b6091..13e93eb1 100644 --- a/kdevdesigner/shared/widgetdatabase.cpp +++ b/kdevdesigner/shared/widgetdatabase.cpp @@ -135,7 +135,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_pushbutton.png"; - r->name = TQPUSHBUTTON_OBJECT_NAME_STRING; + r->name = "TQPushButton"; r->group = widgetGroup( "Buttons" ); r->toolTip = "Push Button"; r->isCommon = TRUE; @@ -144,7 +144,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_toolbutton.png"; - r->name = TQTOOLBUTTON_OBJECT_NAME_STRING; + r->name = "TQToolButton"; r->group = widgetGroup( "Buttons" ); r->toolTip = "Tool Button"; @@ -152,7 +152,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_radiobutton.png"; - r->name = TQRADIOBUTTON_OBJECT_NAME_STRING; + r->name = "TQRadioButton"; r->group = widgetGroup( "Buttons" ); r->toolTip = "Radio Button"; r->isCommon = TRUE; @@ -161,7 +161,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_checkbox.png"; - r->name = TQCHECKBOX_OBJECT_NAME_STRING; + r->name = "TQCheckBox"; r->group = widgetGroup( "Buttons" ); r->toolTip = "Check Box"; r->isCommon = TRUE; @@ -170,7 +170,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_groupbox.png"; - r->name = TQGROUPBOX_OBJECT_NAME_STRING; + r->name = "TQGroupBox"; r->group = widgetGroup( "Containers" ); r->toolTip = "Group Box"; r->isContainer = TRUE; @@ -179,7 +179,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_buttongroup.png"; - r->name = TQBUTTONGROUP_OBJECT_NAME_STRING; + r->name = "TQButtonGroup"; r->group = widgetGroup( "Containers" ); r->toolTip = "Button Group"; r->isContainer = TRUE; @@ -189,7 +189,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_frame.png"; - r->name = TQFRAME_OBJECT_NAME_STRING; + r->name = "TQFrame"; r->group = widgetGroup( "Containers" ); r->toolTip = "Frame"; r->isContainer = TRUE; @@ -198,7 +198,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_tabwidget.png"; - r->name = TQTABWIDGET_OBJECT_NAME_STRING; + r->name = "TQTabWidget"; r->group = widgetGroup( "Containers" ); r->toolTip = "Tabwidget"; r->isContainer = TRUE; @@ -207,7 +207,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_widgetstack.png"; - r->name = TQWIDGETSTACK_OBJECT_NAME_STRING; + r->name = "TQWidgetStack"; r->group = widgetGroup( "Containers" ); r->toolTip = "Widget Stack"; r->isContainer = TRUE; @@ -216,7 +216,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_toolbox.png"; - r->name = TQTOOLBOX_OBJECT_NAME_STRING; + r->name = "TQToolBox"; r->group = widgetGroup( "Containers" ); r->toolTip = "Tool Box"; r->isContainer = TRUE; @@ -225,7 +225,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_listbox.png"; - r->name = TQLISTBOX_OBJECT_NAME_STRING; + r->name = "TQListBox"; r->group = widgetGroup( "Views" ); r->toolTip = "List Box"; r->isCommon = TRUE; @@ -234,7 +234,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_listview.png"; - r->name = TQLISTVIEW_OBJECT_NAME_STRING; + r->name = "TQListView"; r->group = widgetGroup( "Views" ); r->toolTip = "List View"; @@ -243,7 +243,7 @@ void WidgetDatabase::setupDataBase( int id ) #if !defined(TQT_NO_ICONVIEW) || defined(UIC) r = new WidgetDatabaseRecord; r->iconSet = "designer_iconview.png"; - r->name = TQICONVIEW_OBJECT_NAME_STRING; + r->name = "TQIconView"; r->group = widgetGroup( "Views" ); r->toolTip = "Icon View"; @@ -253,7 +253,7 @@ void WidgetDatabase::setupDataBase( int id ) #if !defined(TQT_NO_TABLE) r = new WidgetDatabaseRecord; r->iconSet = "designer_table.png"; - r->name = TQTABLE_OBJECT_NAME_STRING; + r->name = "TQTable"; r->group = widgetGroup( "Views" ); r->toolTip = "Table"; @@ -264,7 +264,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_datatable.png"; r->includeFile = "tqdatatable.h"; - r->name = TQDATATABLE_OBJECT_NAME_STRING; + r->name = "TQDataTable"; r->group = widgetGroup( "Database" ); r->toolTip = "Data Table"; @@ -273,7 +273,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_lineedit.png"; - r->name = TQLINEEDIT_OBJECT_NAME_STRING; + r->name = "TQLineEdit"; r->group = widgetGroup( "Input" ); r->toolTip = "Line Edit"; r->isCommon = TRUE; @@ -282,7 +282,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_spinbox.png"; - r->name = TQSPINBOX_OBJECT_NAME_STRING; + r->name = "TQSpinBox"; r->group = widgetGroup( "Input" ); r->toolTip = "Spin Box"; r->isCommon = TRUE; @@ -291,7 +291,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_dateedit.png"; - r->name = TQDATEEDIT_OBJECT_NAME_STRING; + r->name = "TQDateEdit"; r->group = widgetGroup( "Input" ); r->toolTip = "Date Edit"; r->includeFile = "tqdatetimeedit.h"; @@ -300,7 +300,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_timeedit.png"; - r->name = TQTIMEEDIT_OBJECT_NAME_STRING; + r->name = "TQTimeEdit"; r->group = widgetGroup( "Input" ); r->toolTip = "Time Edit"; r->includeFile = "tqdatetimeedit.h"; @@ -309,7 +309,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_datetimeedit.png"; - r->name = TQDATETIMEEDIT_OBJECT_NAME_STRING; + r->name = "TQDateTimeEdit"; r->group = widgetGroup( "Input" ); r->toolTip = "Date-Time Edit"; r->includeFile = "tqdatetimeedit.h"; @@ -318,7 +318,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_multilineedit.png"; - r->name = TQMULTILINEEDIT_OBJECT_NAME_STRING; + r->name = "TQMultiLineEdit"; r->group = widgetGroup( "Temp" ); r->toolTip = "Multi Line Edit"; @@ -326,7 +326,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_richtextedit.png"; - r->name = TQTEXTEDIT_OBJECT_NAME_STRING; + r->name = "TQTextEdit"; r->group = widgetGroup( "Input" ); r->toolTip = "Rich Text Edit"; r->isCommon = TRUE; @@ -335,7 +335,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_combobox.png"; - r->name = TQCOMBOBOX_OBJECT_NAME_STRING; + r->name = "TQComboBox"; r->group = widgetGroup( "Input" ); r->toolTip = "Combo Box"; r->isCommon = TRUE; @@ -344,7 +344,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_slider.png"; - r->name = TQSLIDER_OBJECT_NAME_STRING; + r->name = "TQSlider"; r->group = widgetGroup( "Input" ); r->toolTip = "Slider"; @@ -352,7 +352,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_scrollbar.png"; - r->name = TQSCROLLBAR_OBJECT_NAME_STRING; + r->name = "TQScrollBar"; r->group = widgetGroup( "Input" ); r->toolTip = "Scrollbar"; @@ -360,7 +360,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_dial.png"; - r->name = TQDIAL_OBJECT_NAME_STRING; + r->name = "TQDial"; r->group = widgetGroup( "Input" ); r->toolTip = "Dial"; @@ -368,7 +368,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_label.png"; - r->name = TQLABEL_OBJECT_NAME_STRING; + r->name = "TQLabel"; r->group = widgetGroup( "Temp" ); r->toolTip = "Label"; @@ -395,7 +395,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_lcdnumber.png"; - r->name = TQLCDNUMBER_OBJECT_NAME_STRING; + r->name = "TQLCDNumber"; r->group = widgetGroup( "Display" ); r->toolTip = "LCD Number"; @@ -413,7 +413,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_progress.png"; - r->name = TQPROGRESSBAR_OBJECT_NAME_STRING; + r->name = "TQProgressBar"; r->group = widgetGroup( "Display" ); r->toolTip = "Progress Bar"; @@ -421,7 +421,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_textview.png"; - r->name = TQTEXTVIEW_OBJECT_NAME_STRING; + r->name = "TQTextView"; r->group = widgetGroup( "Temp" ); r->toolTip = "Text View"; @@ -429,7 +429,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_textbrowser.png"; - r->name = TQTEXTBROWSER_OBJECT_NAME_STRING; + r->name = "TQTextBrowser"; r->group = widgetGroup( "Display" ); r->toolTip = "Text Browser"; @@ -445,21 +445,21 @@ void WidgetDatabase::setupDataBase( int id ) append( r ); r = new WidgetDatabaseRecord; - r->name = TQWIDGET_OBJECT_NAME_STRING; + r->name = "TQWidget"; r->isForm = TRUE; r->group = widgetGroup( "Forms" ); append( r ); r = new WidgetDatabaseRecord; - r->name = TQDIALOG_OBJECT_NAME_STRING; + r->name = "TQDialog"; r->group = widgetGroup( "Forms" ); r->isForm = TRUE; append( r ); r = new WidgetDatabaseRecord; - r->name = TQWIZARD_OBJECT_NAME_STRING; + r->name = "TQWizard"; r->group = widgetGroup( "Forms" ); r->isContainer = TRUE; @@ -473,7 +473,7 @@ void WidgetDatabase::setupDataBase( int id ) append( r ); r = new WidgetDatabaseRecord; - r->name = TQLAYOUTWIDGET_OBJECT_NAME_STRING; + r->name = "TQLayoutWidget"; r->group = widgetGroup( "Temp" ); r->includeFile = ""; r->isContainer = TRUE; @@ -481,7 +481,7 @@ void WidgetDatabase::setupDataBase( int id ) append( r ); r = new WidgetDatabaseRecord; - r->name = TQSPLITTER_OBJECT_NAME_STRING; + r->name = "TQSplitter"; r->group = widgetGroup( "Temp" ); r->includeFile = "tqsplitter.h"; r->isContainer = TRUE; @@ -514,7 +514,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; - r->name = TQMAINWINDOW_OBJECT_NAME_STRING; + r->name = "TQMainWindow"; r->includeFile = "tqmainwindow.h"; r->group = widgetGroup( "Temp" ); r->isContainer = TRUE; @@ -541,7 +541,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; - r->name = TQSCROLLVIEW_OBJECT_NAME_STRING; + r->name = "TQScrollView"; r->includeFile = "tqscrollview.h"; r->group = widgetGroup( "Temp" ); r->isContainer = TRUE; @@ -551,7 +551,7 @@ void WidgetDatabase::setupDataBase( int id ) #ifndef TQT_NO_SQL r = new WidgetDatabaseRecord; r->iconSet = ""; - r->name = TQDATABROWSER_OBJECT_NAME_STRING; + r->name = "TQDataBrowser"; r->includeFile = "tqdatabrowser.h"; r->group = widgetGroup( "Database" ); r->toolTip = "Data Browser"; @@ -562,7 +562,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; - r->name = TQDATAVIEW_OBJECT_NAME_STRING; + r->name = "TQDataView"; r->includeFile = "tqdataview.h"; r->group = widgetGroup( "Database" ); r->toolTip = "Data View"; @@ -760,7 +760,7 @@ TQString WidgetDatabase::createWidgetName( int id ) { setupDataBase( id ); TQString n = className( id ); - if ( n == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) + if ( n == "TQLayoutWidget" ) n = "Layout"; if ( n[ 0 ] == 'Q' && n[ 1 ].lower() != n[ 1 ] ) n = n.mid( 1 ); @@ -787,7 +787,7 @@ int WidgetDatabase::idFromClassName( const TQString &name ) if ( i ) return *i; if ( name == "FormWindow" ) - return idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ); + return idFromClassName( "TQLayoutWidget" ); #ifdef UIC setupDataBase( -2 ); i = className2Id->find( name ); diff --git a/kdevdesigner/src/kdevdesigner.cpp b/kdevdesigner/src/kdevdesigner.cpp index f846e99b..6ff96718 100644 --- a/kdevdesigner/src/kdevdesigner.cpp +++ b/kdevdesigner/src/kdevdesigner.cpp @@ -59,7 +59,7 @@ KDevDesigner::KDevDesigner() // our hands on it TQStringList args; args.append("in shell"); - m_part = static_cast<KParts::ReadWritePart *>(factory->create(TQT_TQOBJECT(this), + m_part = static_cast<KParts::ReadWritePart *>(factory->create(this, "kdevdesigner_part", "KParts::ReadWritePart", args)); if (m_part) @@ -99,16 +99,16 @@ void KDevDesigner::load(const KURL& url) void KDevDesigner::setupActions() { -/* KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection()); - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());*/ +/* KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());*/ - KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); } void KDevDesigner::saveProperties(TDEConfig* /*config*/) @@ -174,8 +174,8 @@ void KDevDesigner::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } diff --git a/kdevdesigner/src/kdevdesigner.h b/kdevdesigner/src/kdevdesigner.h index a497dc5c..bcb6cb9a 100644 --- a/kdevdesigner/src/kdevdesigner.h +++ b/kdevdesigner/src/kdevdesigner.h @@ -41,7 +41,7 @@ class TDEToggleAction; */ class KDevDesigner : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kdevdesigner/uilib/database.cpp b/kdevdesigner/uilib/database.cpp index 2b1956a9..4e1c8d57 100644 --- a/kdevdesigner/uilib/database.cpp +++ b/kdevdesigner/uilib/database.cpp @@ -62,7 +62,7 @@ void DatabaseSupport::initPreview( const TQString &connection, const TQString &t con = TQSqlDatabase::database(); frm = new TQSqlForm( o, table.ascii() ); for ( TQMap<TQString, TQString>::Iterator it = dbControls.begin(); it != dbControls.end(); ++it ) { - TQObject *chld = parent->child( it.key().ascii(), TQWIDGET_OBJECT_NAME_STRING ); + TQObject *chld = parent->child( it.key().ascii(), "TQWidget" ); if ( !chld ) continue; frm->insert( (TQWidget*)chld, *it ); diff --git a/kdevdesigner/uilib/database2.h b/kdevdesigner/uilib/database2.h index 865a7f8f..9d7647b4 100644 --- a/kdevdesigner/uilib/database2.h +++ b/kdevdesigner/uilib/database2.h @@ -58,7 +58,7 @@ protected: class QDesignerDataBrowser2 : public TQDataBrowser, public DatabaseSupport2 { - Q_OBJECT + TQ_OBJECT public: @@ -70,7 +70,7 @@ protected: class QDesignerDataView2 : public TQDataView, public DatabaseSupport2 { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdevdesigner/uilib/qwidgetfactory.cpp b/kdevdesigner/uilib/qwidgetfactory.cpp index c431253e..9d0d3656 100644 --- a/kdevdesigner/uilib/qwidgetfactory.cpp +++ b/kdevdesigner/uilib/qwidgetfactory.cpp @@ -133,19 +133,19 @@ static void setupWidgetListAndMap() return; setupPluginDir(); availableWidgetList = new TQStringList; - (*availableWidgetList) << TQPUSHBUTTON_OBJECT_NAME_STRING << TQTOOLBUTTON_OBJECT_NAME_STRING << TQCHECKBOX_OBJECT_NAME_STRING << TQRADIOBUTTON_OBJECT_NAME_STRING - << TQGROUPBOX_OBJECT_NAME_STRING << TQBUTTONGROUP_OBJECT_NAME_STRING << TQICONVIEW_OBJECT_NAME_STRING << TQTABLE_OBJECT_NAME_STRING - << TQLISTBOX_OBJECT_NAME_STRING << TQLISTVIEW_OBJECT_NAME_STRING << TQLINEEDIT_OBJECT_NAME_STRING << TQSPINBOX_OBJECT_NAME_STRING - << TQMULTILINEEDIT_OBJECT_NAME_STRING << TQLABEL_OBJECT_NAME_STRING << "TextLabel" << "PixmapLabel" - << TQLAYOUTWIDGET_OBJECT_NAME_STRING << TQTABWIDGET_OBJECT_NAME_STRING << TQCOMBOBOX_OBJECT_NAME_STRING - << TQWIDGET_OBJECT_NAME_STRING << TQDIALOG_OBJECT_NAME_STRING << TQWIZARD_OBJECT_NAME_STRING << TQLCDNUMBER_OBJECT_NAME_STRING; + (*availableWidgetList) << "TQPushButton" << "TQToolButton" << "TQCheckBox" << "TQRadioButton" + << "TQGroupBox" << "TQButtonGroup" << "TQIconView" << "TQTable" + << "TQListBox" << "TQListView" << "TQLineEdit" << "TQSpinBox" + << "TQMultiLineEdit" << "TQLabel" << "TextLabel" << "PixmapLabel" + << "TQLayoutWidget" << "TQTabWidget" << "TQComboBox" + << "TQWidget" << "TQDialog" << "TQWizard" << "TQLCDNumber"; // put less stress on the compiler by limiting the template nesting depth - (*availableWidgetList) << TQPROGRESSBAR_OBJECT_NAME_STRING << TQTEXTVIEW_OBJECT_NAME_STRING << TQTEXTBROWSER_OBJECT_NAME_STRING - << TQDIAL_OBJECT_NAME_STRING << TQSLIDER_OBJECT_NAME_STRING << TQFRAME_OBJECT_NAME_STRING << "Line" << TQTEXTEDIT_OBJECT_NAME_STRING - << TQDATEEDIT_OBJECT_NAME_STRING << TQTIMEEDIT_OBJECT_NAME_STRING << TQDATETIMEEDIT_OBJECT_NAME_STRING << TQSCROLLBAR_OBJECT_NAME_STRING - << TQPOPUPMENU_OBJECT_NAME_STRING << TQWIDGETSTACK_OBJECT_NAME_STRING << TQMAINWINDOW_OBJECT_NAME_STRING - << TQDATATABLE_OBJECT_NAME_STRING << TQDATABROWSER_OBJECT_NAME_STRING << TQDATAVIEW_OBJECT_NAME_STRING - << TQVBOX_OBJECT_NAME_STRING << TQHBOX_OBJECT_NAME_STRING << TQGRID_OBJECT_NAME_STRING << TQTOOLBOX_OBJECT_NAME_STRING; + (*availableWidgetList) << "TQProgressBar" << "TQTextView" << "TQTextBrowser" + << "TQDial" << "TQSlider" << "TQFrame" << "Line" << "TQTextEdit" + << "TQDateEdit" << "TQTimeEdit" << "TQDateTimeEdit" << "TQScrollBar" + << "TQPopupMenu" << "TQWidgetStack" << "TQMainWindow" + << "TQDataTable" << "TQDataBrowser" << "TQDataView" + << "TQVBox" << "TQHBox" << "TQGrid" << "TQToolBox"; if ( !widgetInterfaceManager ) widgetInterfaceManager = @@ -295,7 +295,7 @@ TQWidget *TQWidgetFactory::create( const TQString &uiFile, TQObject *connector, return 0; qwf_currFileName = uiFile; - TQWidget *w = TQWidgetFactory::create( TQT_TQIODEVICE(&f), connector, parent, name ); + TQWidget *w = TQWidgetFactory::create( &f, connector, parent, name ); if ( !qwf_forms ) qwf_forms = new TQMap<TQWidget*, TQString>; qwf_forms->insert( w, uiFile ); @@ -356,15 +356,15 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge continue; if ( cit.key()->inherits( "QDesignerDataBrowser2" ) ) ( (QDesignerDataBrowser2*)cit.key() )->initPreview( (*cit).conn, (*cit).table, - TQT_TQOBJECT(cit.key()), *(*cit).dbControls ); + cit.key(), *(*cit).dbControls ); else if ( cit.key()->inherits( "QDesignerDataView2" ) ) ( (QDesignerDataView2*)cit.key() )->initPreview( (*cit).conn, (*cit).table, - TQT_TQOBJECT(cit.key()), *(*cit).dbControls ); + cit.key(), *(*cit).dbControls ); } for ( TQMap<TQString, TQStringList>::Iterator it = widgetFactory->dbTables.begin(); it != widgetFactory->dbTables.end(); ++it ) { - TQDataTable *table = (TQDataTable*)widgetFactory->toplevel->child( it.key().ascii(), TQDATATABLE_OBJECT_NAME_STRING ); + TQDataTable *table = (TQDataTable*)widgetFactory->toplevel->child( it.key().ascii(), "TQDataTable" ); if ( !table ) continue; if ( widgetFactory->noDatabaseWidgets.find( table->name() ) != @@ -391,8 +391,8 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge for ( TQMap<TQString, TQString>::Iterator it = widgetFactory->buddies.begin(); it != widgetFactory->buddies.end(); ++it ) { - TQLabel *label = (TQLabel*)widgetFactory->toplevel->child( it.key().ascii(), TQLABEL_OBJECT_NAME_STRING ); - TQWidget *buddy = (TQWidget*)widgetFactory->toplevel->child( (*it).ascii(), TQWIDGET_OBJECT_NAME_STRING ); + TQLabel *label = (TQLabel*)widgetFactory->toplevel->child( it.key().ascii(), "TQLabel" ); + TQWidget *buddy = (TQWidget*)widgetFactory->toplevel->child( (*it).ascii(), "TQWidget" ); if ( label && buddy ) label->setBuddy( buddy ); } @@ -466,7 +466,7 @@ TQWidget *TQWidgetFactory::createFromUiFile( TQDomDocument doc, TQObject *connec if ( !imageCollection.isNull() ) loadImageCollection( imageCollection ); - createWidgetInternal( widget, parent, 0, widget.attribute("class", TQWIDGET_OBJECT_NAME_STRING) ); + createWidgetInternal( widget, parent, 0, widget.attribute("class", "TQWidget") ); TQWidget *w = toplevel; if ( !w ) return 0; @@ -703,7 +703,7 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in, spacer = new TQSpacerItem( w, h, sizeType, TQSizePolicy::Minimum ); } - if ( parent->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) { + if ( parent->inherits("TQGridLayout") ) { ((TQGridLayout *) parent)->addMultiCell( spacer, row, row + rowspan - 1, column, column + colspan - 1, vertical ? TQt::AlignHCenter : TQt::AlignVCenter ); @@ -763,11 +763,11 @@ void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings, } if ( parent != 0 ) { - if ( parent->inherits(TQLISTVIEW_OBJECT_NAME_STRING) ) { + if ( parent->inherits("TQListView") ) { createListViewColumn( (TQListView *) parent, text, pixmap, clickable, resizable ); #ifndef TQT_NO_TABLE - } else if ( parent->inherits(TQTABLE_OBJECT_NAME_STRING) ) { + } else if ( parent->inherits("TQTable") ) { createTableColumnOrRow( (TQTable *) parent, text, pixmap, field, isRow ); #endif @@ -786,8 +786,8 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in, TQ_UINT8 objectTag; TQListView *listView = 0; - if ( parent != 0 && parent->inherits(TQLISTVIEW_OBJECT_NAME_STRING) ) - parent = TQT_TQOBJECT((TQListView *) parent); + if ( parent != 0 && parent->inherits("TQListView") ) + parent = (TQListView *) parent; TQListViewItem *item = 0; if ( listView != 0 ) { if ( parentItem == 0 ) { @@ -848,9 +848,9 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in, TQPixmap pixmap = pixmaps.last(); if ( parent != 0 ) { - if ( parent->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || - parent->inherits(TQLISTBOX_OBJECT_NAME_STRING) ) { - TQListBox *listBox = (TQListBox *) parent->tqt_cast( TQLISTBOX_OBJECT_NAME_STRING ); + if ( parent->inherits("TQComboBox") || + parent->inherits("TQListBox") ) { + TQListBox *listBox = (TQListBox *) parent->tqt_cast( "TQListBox" ); if ( listBox == 0 ) listBox = ((TQComboBox *) parent)->listBox(); @@ -860,7 +860,7 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in, (void) new TQListBoxPixmap( listBox, pixmap, text ); } #ifndef TQT_NO_ICONVIEW - } else if ( parent->inherits(TQICONVIEW_OBJECT_NAME_STRING) ) { + } else if ( parent->inherits("TQIconView") ) { (void) new TQIconViewItem( (TQIconView *) parent, text, pixmap ); #endif } @@ -915,53 +915,53 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, if ( isTQObject ) { if ( parent != 0 ) { if ( parent->isWidgetType() ) { - if ( parent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) ) { + if ( parent->inherits("TQMainWindow") ) { parentWidget = ((TQMainWindow *) parent)->centralWidget(); } else { parentWidget = (TQWidget *) parent; } - } else if ( parent->inherits(TQLAYOUT_OBJECT_NAME_STRING) ) { + } else if ( parent->inherits("TQLayout") ) { parentLayout = (TQLayout *) parent; parentWidget = ancestorWidget; } } - if ( className == TQACTION_OBJECT_NAME_STRING ) { + if ( className == "TQAction" ) { unpackCString( strings, in, className ); - if ( className == TQACTIONGROUP_OBJECT_NAME_STRING ) { + if ( className == "TQActionGroup" ) { obj = new TQActionGroup( parent ); } else { obj = new TQAction( parent ); } - } else if ( className == TQLAYOUT_OBJECT_NAME_STRING ) { + } else if ( className == "TQLayout" ) { unpackCString( strings, in, className ); LayoutType type = Grid; - if ( className == TQHBOXLAYOUT_OBJECT_NAME_STRING ) { + if ( className == "TQHBoxLayout" ) { type = HBox; - } else if ( className == TQVBOXLAYOUT_OBJECT_NAME_STRING ) { + } else if ( className == "TQVBoxLayout" ) { type = VBox; } - if ( parentLayout != 0 && parentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) { + if ( parentLayout != 0 && parentLayout->inherits("TQGridLayout") ) { layout = createLayout( 0, 0, type ); } else { layout = createLayout( parentWidget, parentLayout, type ); } - obj = TQT_TQOBJECT(layout); - } else if ( className == TQMENUBAR_OBJECT_NAME_STRING ) { + obj = layout; + } else if ( className == "TQMenuBar" ) { unpackCString( strings, in, className ); widget = ((TQMainWindow *) parent)->menuBar(); - obj = TQT_TQOBJECT(widget); - } else if ( className == TQTOOLBAR_OBJECT_NAME_STRING ) { + obj = widget; + } else if ( className == "TQToolBar" ) { TQ_UINT8 dock; in >> dock; unpackCString( strings, in, className ); widget = new TQToolBar( TQString(), (TQMainWindow *) parent, (TQt::Dock) dock ); - obj = TQT_TQOBJECT(widget); - } else if ( className == TQWIDGET_OBJECT_NAME_STRING ) { + obj = widget; + } else if ( className == "TQWidget" ) { unpackCString( strings, in, className ); widget = createWidget( className, parentWidget, 0 ); - obj = TQT_TQOBJECT(widget); + obj = widget; } if ( widget != 0 ) @@ -1099,15 +1099,15 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, break; case Object_SubAction: inputObject( objects, numObjects, strings, in, parentWidget, - obj != 0 ? obj : parent, TQACTION_OBJECT_NAME_STRING ); + obj != 0 ? obj : parent, "TQAction" ); break; case Object_SubLayout: inputObject( objects, numObjects, strings, in, parentWidget, obj, - TQLAYOUT_OBJECT_NAME_STRING ); + "TQLayout" ); break; case Object_SubWidget: inputObject( objects, numObjects, strings, in, parentWidget, obj, - TQWIDGET_OBJECT_NAME_STRING ); + "TQWidget" ); break; case Object_TextProperty: unpackCString( strings, in, name ); @@ -1118,9 +1118,9 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, if ( metAttribute > 0 ) { if ( name == "title" ) { if ( parent != 0 ) { - if ( parent->inherits(TQTABWIDGET_OBJECT_NAME_STRING) ) { + if ( parent->inherits("TQTabWidget") ) { ((TQTabWidget *) parent)->insertTab( widget, str ); - } else if ( parent->inherits(TQWIZARD_OBJECT_NAME_STRING) ) { + } else if ( parent->inherits("TQWizard") ) { ((TQWizard *) parent)->addPage( widget, str ); } } @@ -1136,7 +1136,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, if ( metAttribute > 0 ) { if ( name == "id" ) { - if ( parent != 0 && parent->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING) ) + if ( parent != 0 && parent->inherits("TQWidgetStack") ) ((TQWidgetStack *) parent)->addWidget( widget, value.toInt() ); } } else { @@ -1153,7 +1153,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, if ( parentLayout != 0 ) { if ( widget != 0 ) { - if ( parentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) { + if ( parentLayout->inherits("TQGridLayout") ) { ((TQGridLayout *) parentLayout)->addMultiCellWidget( widget, row, row + rowspan - 1, column, column + colspan - 1 ); @@ -1161,7 +1161,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, ((TQBoxLayout *) parentLayout)->addWidget( widget ); } } else if ( layout != 0 ) { - if ( parentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) { + if ( parentLayout->inherits("TQGridLayout") ) { ((TQGridLayout *) parentLayout)->addMultiCellLayout( layout, row, row + rowspan - 1, column, column + colspan - 1 ); @@ -1208,7 +1208,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, switch ( blockType ) { case Block_Actions: - inputObject( objects, numObjects, strings, in, toplevel, TQT_TQOBJECT(toplevel) ); + inputObject( objects, numObjects, strings, in, toplevel, toplevel ); break; case Block_Buddies: { @@ -1219,7 +1219,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, unpackUInt16( in, labelNo ); unpackUInt16( in, buddyNo ); TQLabel *label = - (TQLabel *) objects[labelNo]->tqt_cast( TQLABEL_OBJECT_NAME_STRING ); + (TQLabel *) objects[labelNo]->tqt_cast( "TQLabel" ); if ( label != 0 ) label->setBuddy( (TQWidget *) objects[buddyNo] ); } while ( !END_OF_BLOCK() ); @@ -1300,8 +1300,8 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, } break; case Block_Menubar: - inputObject( objects, numObjects, strings, in, toplevel, TQT_TQOBJECT(toplevel), - TQMENUBAR_OBJECT_NAME_STRING ); + inputObject( objects, numObjects, strings, in, toplevel, toplevel, + "TQMenuBar" ); break; case Block_Slots: { @@ -1334,7 +1334,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, case Block_Toolbars: do { inputObject( objects, numObjects, strings, in, toplevel, - TQT_TQOBJECT(toplevel), TQTOOLBAR_OBJECT_NAME_STRING ); + toplevel, "TQToolBar" ); } while ( !END_OF_BLOCK() ); break; case Block_Variables: @@ -1344,8 +1344,8 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, break; case Block_Widget: toplevel = (TQWidget *) - inputObject( objects, numObjects, strings, in, toplevel, TQT_TQOBJECT(parent), - TQWIDGET_OBJECT_NAME_STRING ); + inputObject( objects, numObjects, strings, in, toplevel, parent, + "TQWidget" ); if ( toplevel != 0 ) toplevel->setName( name ); break; @@ -1410,97 +1410,97 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *pa const char *name ) const { // create widgets we know - if ( className == TQPUSHBUTTON_OBJECT_NAME_STRING ) { + if ( className == "TQPushButton" ) { return new TQPushButton( parent, name ); - } else if ( className == TQTOOLBUTTON_OBJECT_NAME_STRING ) { + } else if ( className == "TQToolButton" ) { return new TQToolButton( parent, name ); - } else if ( className == TQCHECKBOX_OBJECT_NAME_STRING ) { + } else if ( className == "TQCheckBox" ) { return new TQCheckBox( parent, name ); - } else if ( className == TQRADIOBUTTON_OBJECT_NAME_STRING ) { + } else if ( className == "TQRadioButton" ) { return new TQRadioButton( parent, name ); - } else if ( className == TQGROUPBOX_OBJECT_NAME_STRING ) { + } else if ( className == "TQGroupBox" ) { return new TQGroupBox( parent, name ); - } else if ( className == TQBUTTONGROUP_OBJECT_NAME_STRING ) { + } else if ( className == "TQButtonGroup" ) { return new TQButtonGroup( parent, name ); - } else if ( className == TQICONVIEW_OBJECT_NAME_STRING ) { + } else if ( className == "TQIconView" ) { #if !defined(TQT_NO_ICONVIEW) return new TQIconView( parent, name ); #endif - } else if ( className == TQTABLE_OBJECT_NAME_STRING ) { + } else if ( className == "TQTable" ) { #if !defined(TQT_NO_TABLE) return new TQTable( parent, name ); #endif - } else if ( className == TQLISTBOX_OBJECT_NAME_STRING ) { + } else if ( className == "TQListBox" ) { return new TQListBox( parent, name ); - } else if ( className == TQLISTVIEW_OBJECT_NAME_STRING ) { + } else if ( className == "TQListView" ) { return new TQListView( parent, name ); - } else if ( className == TQLINEEDIT_OBJECT_NAME_STRING ) { + } else if ( className == "TQLineEdit" ) { return new TQLineEdit( parent, name ); - } else if ( className == TQSPINBOX_OBJECT_NAME_STRING ) { + } else if ( className == "TQSpinBox" ) { return new TQSpinBox( parent, name ); - } else if ( className == TQMULTILINEEDIT_OBJECT_NAME_STRING ) { + } else if ( className == "TQMultiLineEdit" ) { return new TQMultiLineEdit( parent, name ); - } else if ( className == TQLABEL_OBJECT_NAME_STRING || className == "TextLabel" || className == "PixmapLabel" ) { + } else if ( className == "TQLabel" || className == "TextLabel" || className == "PixmapLabel" ) { return new TQLabel( parent, name ); - } else if ( className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) { + } else if ( className == "TQLayoutWidget" ) { return new TQWidget( parent, name ); - } else if ( className == TQTABWIDGET_OBJECT_NAME_STRING ) { + } else if ( className == "TQTabWidget" ) { return new TQTabWidget( parent, name ); - } else if ( className == TQCOMBOBOX_OBJECT_NAME_STRING ) { + } else if ( className == "TQComboBox" ) { return new TQComboBox( FALSE, parent, name ); - } else if ( className == TQWIDGET_OBJECT_NAME_STRING ) { + } else if ( className == "TQWidget" ) { if ( !qwf_stays_on_top ) return new TQWidget( parent, name ); return new TQWidget( parent, name, TQt::WStyle_StaysOnTop ); - } else if ( className == TQDIALOG_OBJECT_NAME_STRING ) { + } else if ( className == "TQDialog" ) { if ( !qwf_stays_on_top ) return new TQDialog( parent, name ); return new TQDialog( parent, name, FALSE, TQt::WStyle_StaysOnTop ); - } else if ( className == TQWIZARD_OBJECT_NAME_STRING ) { + } else if ( className == "TQWizard" ) { return new TQWizard( parent, name ); - } else if ( className == TQLCDNUMBER_OBJECT_NAME_STRING ) { + } else if ( className == "TQLCDNumber" ) { return new TQLCDNumber( parent, name ); - } else if ( className == TQPROGRESSBAR_OBJECT_NAME_STRING ) { + } else if ( className == "TQProgressBar" ) { return new TQProgressBar( parent, name ); - } else if ( className == TQTEXTVIEW_OBJECT_NAME_STRING ) { + } else if ( className == "TQTextView" ) { return new TQTextView( parent, name ); - } else if ( className == TQTEXTBROWSER_OBJECT_NAME_STRING ) { + } else if ( className == "TQTextBrowser" ) { return new TQTextBrowser( parent, name ); - } else if ( className == TQDIAL_OBJECT_NAME_STRING ) { + } else if ( className == "TQDial" ) { return new TQDial( parent, name ); - } else if ( className == TQSLIDER_OBJECT_NAME_STRING ) { + } else if ( className == "TQSlider" ) { return new TQSlider( parent, name ); - } else if ( className == TQFRAME_OBJECT_NAME_STRING ) { + } else if ( className == "TQFrame" ) { return new TQFrame( parent, name ); - } else if ( className == TQSPLITTER_OBJECT_NAME_STRING ) { + } else if ( className == "TQSplitter" ) { return new TQSplitter( parent, name ); } else if ( className == "Line" ) { TQFrame *f = new TQFrame( parent, name ); f->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); return f; - } else if ( className == TQTEXTEDIT_OBJECT_NAME_STRING ) { + } else if ( className == "TQTextEdit" ) { return new TQTextEdit( parent, name ); - } else if ( className == TQDATEEDIT_OBJECT_NAME_STRING ) { + } else if ( className == "TQDateEdit" ) { return new TQDateEdit( parent, name ); - } else if ( className == TQTIMEEDIT_OBJECT_NAME_STRING ) { + } else if ( className == "TQTimeEdit" ) { return new TQTimeEdit( parent, name ); - } else if ( className == TQDATETIMEEDIT_OBJECT_NAME_STRING ) { + } else if ( className == "TQDateTimeEdit" ) { return new TQDateTimeEdit( parent, name ); - } else if ( className == TQSCROLLBAR_OBJECT_NAME_STRING ) { + } else if ( className == "TQScrollBar" ) { return new TQScrollBar( parent, name ); - } else if ( className == TQPOPUPMENU_OBJECT_NAME_STRING ) { + } else if ( className == "TQPopupMenu" ) { return new TQPopupMenu( parent, name ); - } else if ( className == TQWIDGETSTACK_OBJECT_NAME_STRING ) { + } else if ( className == "TQWidgetStack" ) { return new TQWidgetStack( parent, name ); - } else if ( className == TQTOOLBOX_OBJECT_NAME_STRING ) { + } else if ( className == "TQToolBox" ) { return new TQToolBox( parent, name ); - } else if ( className == TQVBOX_OBJECT_NAME_STRING ) { + } else if ( className == "TQVBox" ) { return new TQVBox( parent, name ); - } else if ( className == TQHBOX_OBJECT_NAME_STRING ) { + } else if ( className == "TQHBox" ) { return new TQHBox( parent, name ); - } else if ( className == TQGRID_OBJECT_NAME_STRING ) { + } else if ( className == "TQGrid" ) { return new TQGrid( 4, parent, name ); - } else if ( className == TQMAINWINDOW_OBJECT_NAME_STRING ) { + } else if ( className == "TQMainWindow" ) { TQMainWindow *mw = 0; if ( !qwf_stays_on_top ) mw = new TQMainWindow( parent, name ); @@ -1513,11 +1513,11 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *pa } #if !defined(TQT_NO_SQL) - else if ( className == TQDATATABLE_OBJECT_NAME_STRING ) { + else if ( className == "TQDataTable" ) { return new TQDataTable( parent, name ); - } else if ( className == TQDATABROWSER_OBJECT_NAME_STRING ) { + } else if ( className == "TQDataBrowser" ) { return new QDesignerDataBrowser2( parent, name ); - } else if ( className == TQDATAVIEW_OBJECT_NAME_STRING ) { + } else if ( className == "TQDataView" ) { return new QDesignerDataView2( parent, name ); } #endif @@ -1589,21 +1589,21 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget bool isTQLayoutWidget = FALSE; if ( !className.isEmpty() ) { - if ( !layout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) { - className = TQWIDGET_OBJECT_NAME_STRING; + if ( !layout && className == "TQLayoutWidget" ) { + className = "TQWidget"; isTQLayoutWidget = TRUE; } - if ( layout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) { + if ( layout && className == "TQLayoutWidget" ) { // hide layout widgets w = parent; } else { - obj = TQT_TQOBJECT(TQWidgetFactory::createWidget( className, parent, 0 )); + obj = TQWidgetFactory::createWidget( className, parent, 0 ); if ( !obj ) return 0; w = (TQWidget*)obj; if ( !toplevel ) toplevel = w; - if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQMainWindow" ) ) w = ( (TQMainWindow*)w )->centralWidget(); if ( layout ) { switch( layoutType( layout ) ) { @@ -1639,41 +1639,41 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget createSpacer( n, layout ); } else if ( n.tagName() == "widget" ) { TQMap< TQString, TQString> *oldDbControls = dbControls; - createWidgetInternal( n, w, layout, n.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) ); + createWidgetInternal( n, w, layout, n.attribute( "class", "TQWidget" ) ); dbControls = oldDbControls; } else if ( n.tagName() == "hbox" ) { TQLayout *parentLayout = layout; - if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + if ( layout && layout->inherits( "TQGridLayout" ) ) layout = createLayout( 0, 0, TQWidgetFactory::HBox, isTQLayoutWidget ); else layout = createLayout( w, layout, TQWidgetFactory::HBox, isTQLayoutWidget ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); - if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 ); continue; } else if ( n.tagName() == "grid" ) { TQLayout *parentLayout = layout; - if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + if ( layout && layout->inherits( "TQGridLayout" ) ) layout = createLayout( 0, 0, TQWidgetFactory::Grid, isTQLayoutWidget ); else layout = createLayout( w, layout, TQWidgetFactory::Grid, isTQLayoutWidget ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); - if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 ); continue; } else if ( n.tagName() == "vbox" ) { TQLayout *parentLayout = layout; - if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + if ( layout && layout->inherits( "TQGridLayout" ) ) layout = createLayout( 0, 0, TQWidgetFactory::VBox, isTQLayoutWidget ); else layout = createLayout( w, layout, TQWidgetFactory::VBox, isTQLayoutWidget ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); - if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 ); continue; @@ -1683,16 +1683,16 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget TQString attrib = n.attribute( "name" ); TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); if ( parent ) { - if ( parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { + if ( parent->inherits( "TQTabWidget" ) ) { if ( attrib == "title" ) ( (TQTabWidget*)parent )->insertTab( w, translate( v.toString() ) ); - } else if ( parent->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) { + } else if ( parent->inherits( "TQWidgetStack" ) ) { if ( attrib == "id" ) ( (TQWidgetStack*)parent )->addWidget( w, v.toInt() ); - } else if ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) { + } else if ( parent->inherits( "TQToolBox" ) ) { if ( attrib == "label" ) ( (TQToolBox*)parent )->addItem( w, v.toString() ); - } else if ( parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { + } else if ( parent->inherits( "TQWizard" ) ) { if ( attrib == "title" ) ( (TQWizard*)parent )->addPage( w, translate( v.toString() ) ); #ifdef TQT_CONTAINER_CUSTOM_WIDGETS @@ -1737,23 +1737,23 @@ TQLayout *TQWidgetFactory::createLayout( TQWidget *widget, TQLayout* layout, if ( layout || !widget || isTQLayoutWidget ) margin = 0; - if ( !layout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQTabWidget" ) ) widget = ((TQTabWidget*)widget)->currentPage(); - if ( !layout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQWizard" ) ) widget = ((TQWizard*)widget)->currentPage(); - if ( !layout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQWidgetStack" ) ) widget = ((TQWidgetStack*)widget)->visibleWidget(); - if ( !layout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQToolBox" ) ) widget = ((TQToolBox*)widget)->currentItem(); TQLayout *l = 0; int align = 0; - if ( !layout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) { + if ( !layout && widget && widget->inherits( "TQGroupBox" ) ) { TQGroupBox *gb = (TQGroupBox*)widget; - gb->setColumnLayout( 0, Qt::Vertical ); + gb->setColumnLayout( 0, TQt::Vertical ); layout = gb->layout(); layout->setMargin( 0 ); layout->setSpacing( 0 ); @@ -1796,11 +1796,11 @@ TQLayout *TQWidgetFactory::createLayout( TQWidget *widget, TQLayout* layout, TQWidgetFactory::LayoutType TQWidgetFactory::layoutType( TQLayout *layout ) const { - if ( layout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) ) + if ( layout->inherits( "TQHBoxLayout" ) ) return HBox; - else if ( layout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) ) + else if ( layout->inherits( "TQVBoxLayout" ) ) return VBox; - else if ( layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + else if ( layout->inherits( "TQGridLayout" ) ) return Grid; return NoLayout; } @@ -1811,7 +1811,7 @@ void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop, int offset = obj->metaObject()->findProperty( prop.ascii(), TRUE ); if ( offset != -1 ) { - if ( prop == "geometry" && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(toplevel) ) { + if ( prop == "geometry" && obj == toplevel ) { toplevel->resize( value.toRect().size() ); } else if ( prop == "accel" ) { obj->setProperty( prop.ascii(), TQVariant(value.toKeySequence()) ); @@ -1850,11 +1850,11 @@ void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop, } else if ( prop == "buddy" ) { buddies.insert( obj->name(), value.toCString() ); } else if ( prop == "buttonGroupId" ) { - if ( obj->inherits( TQBUTTON_OBJECT_NAME_STRING ) && obj->parent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) + if ( obj->inherits( "TQButton" ) && obj->parent()->inherits( "TQButtonGroup" ) ) ( (TQButtonGroup*)obj->parent() )->insert( (TQButton*)obj, value.toInt() ); #ifndef TQT_NO_SQL - } else if ( prop == "database" && !obj->inherits( TQDATAVIEW_OBJECT_NAME_STRING ) - && !obj->inherits( TQDATABROWSER_OBJECT_NAME_STRING ) ) { + } else if ( prop == "database" && !obj->inherits( "TQDataView" ) + && !obj->inherits( "TQDataBrowser" ) ) { const TQStringList& lst = value.asStringList(); if ( lst.count() > 2 ) { if ( dbControls ) @@ -1864,7 +1864,7 @@ void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop, } } else if ( prop == "database" ) { const TQStringList& lst = value.asStringList(); - if ( lst.count() == 2 && obj->inherits( TQWIDGET_OBJECT_NAME_STRING ) ) { + if ( lst.count() == 2 && obj->inherits( "TQWidget" ) ) { SqlWidgetConnection conn( lst[ 0 ], lst[ 1 ] ); sqlWidgetConnections.insert( (TQWidget*)obj, conn ); dbControls = conn.dbControls; @@ -1925,7 +1925,7 @@ void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *layout ) int rowspan = e.attribute( "rowspan" ).toInt(); int colspan = e.attribute( "colspan" ).toInt(); - Qt::Orientation orient = Qt::Horizontal; + TQt::Orientation orient = TQt::Horizontal; int w = 0, h = 0; TQSizePolicy::SizeType sizeType = TQSizePolicy::Preferred; while ( !n.isNull() ) { @@ -1933,9 +1933,9 @@ void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *layout ) TQString prop = n.attribute( "name" ); if ( prop == "orientation" ) { if ( n.firstChild().firstChild().toText().data() == "Horizontal" ) - orient = Qt::Horizontal; + orient = TQt::Horizontal; else - orient = Qt::Vertical; + orient = TQt::Vertical; } else if ( prop == "sizeType" ) { sizeType = stringToSizeType( n.firstChild().firstChild().toText().data() ); } else if ( prop == "sizeHint" ) { @@ -1950,14 +1950,14 @@ void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *layout ) rowspan = 1; if ( colspan < 1 ) colspan = 1; - TQSpacerItem *item = new TQSpacerItem( w, h, orient == Qt::Horizontal ? sizeType : TQSizePolicy::Minimum, - orient == Qt::Vertical ? sizeType : TQSizePolicy::Minimum ); + TQSpacerItem *item = new TQSpacerItem( w, h, orient == TQt::Horizontal ? sizeType : TQSizePolicy::Minimum, + orient == TQt::Vertical ? sizeType : TQSizePolicy::Minimum ); if ( layout ) { - if ( layout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) ) + if ( layout->inherits( "TQBoxLayout" ) ) ( (TQBoxLayout*)layout )->addItem( item ); else ( (TQGridLayout*)layout )->addMultiCell( item, row, row + rowspan - 1, col, col + colspan - 1, - orient == Qt::Horizontal ? TQt::AlignVCenter : TQt::AlignHCenter ); + orient == TQt::Horizontal ? TQt::AlignVCenter : TQt::AlignHCenter ); } } @@ -2069,7 +2069,7 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto if ( n2.tagName() == "sender" ) { TQString name = n2.firstChild().toText().data(); if ( name == "this" || qstrcmp( toplevel->name(), name.ascii() ) == 0 ) { - conn.sender = TQT_TQOBJECT(toplevel); + conn.sender = toplevel; } else { if ( name == "this" ) name = toplevel->name(); @@ -2087,7 +2087,7 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto } else if ( n2.tagName() == "receiver" ) { TQString name = n2.firstChild().toText().data(); if ( name == "this" || qstrcmp( toplevel->name(), name.ascii() ) == 0 ) { - conn.receiver = TQT_TQOBJECT(toplevel); + conn.receiver = toplevel; } else { TQObjectList *l = toplevel->queryList( 0, name.ascii(), FALSE ); if ( l ) { @@ -2113,7 +2113,7 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto TQObject *sender = 0, *receiver = 0; TQObjectList *l = toplevel->queryList( 0, conn.sender->name(), FALSE ); if ( qstrcmp( conn.sender->name(), toplevel->name() ) == 0 ) { - sender = TQT_TQOBJECT(toplevel); + sender = toplevel; } else { if ( !l || !l->first() ) { delete l; @@ -2127,7 +2127,7 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto sender = findAction( conn.sender->name() ); if ( qstrcmp( conn.receiver->name(), toplevel->name() ) == 0 ) { - receiver = TQT_TQOBJECT(toplevel); + receiver = toplevel; } else { l = toplevel->queryList( 0, conn.receiver->name(), FALSE ); if ( !l || !l->first() ) { @@ -2148,7 +2148,7 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto TQStrList slotList = receiver->metaObject()->slotNames( TRUE ); // if this is a connection to a custom slot and we have a connector, try this as receiver - if ( slotList.find( conn.slot ) == -1 && (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(toplevel)) && connector ) { + if ( slotList.find( conn.slot ) == -1 && (receiver == toplevel) && connector ) { slotList = connector->metaObject()->slotNames( TRUE ); receiver = connector; } @@ -2212,7 +2212,7 @@ void TQWidgetFactory::createTableColumnOrRow( TQTable *table, const TQString& tx const TQString& field, bool isRow ) { #ifndef TQT_NO_SQL - bool isSql = table->inherits( TQDATATABLE_OBJECT_NAME_STRING ); + bool isSql = table->inherits( "TQDataTable" ); #endif if ( isRow ) table->setNumRows( table->numRows() + 1 ); @@ -2256,7 +2256,7 @@ void TQWidgetFactory::createTableColumnOrRow( TQTable *table, const TQString& tx void TQWidgetFactory::createColumn( const TQDomElement &e, TQWidget *widget ) { - if ( widget->inherits( TQLISTVIEW_OBJECT_NAME_STRING ) && e.tagName() == "column" ) { + if ( widget->inherits( "TQListView" ) && e.tagName() == "column" ) { TQListView *lv = (TQListView*)widget; TQDomElement n = e.firstChild().toElement(); TQPixmap pix; @@ -2280,7 +2280,7 @@ void TQWidgetFactory::createColumn( const TQDomElement &e, TQWidget *widget ) createListViewColumn( lv, txt, pix, clickable, resizable ); } #ifndef TQT_NO_TABLE - else if ( widget->inherits( TQTABLE_OBJECT_NAME_STRING ) ) { + else if ( widget->inherits( "TQTable" ) ) { TQTable *table = (TQTable*)widget; TQDomElement n = e.firstChild().toElement(); @@ -2328,14 +2328,14 @@ void TQWidgetFactory::loadItem( const TQDomElement &e, TQPixmap &pix, TQString & void TQWidgetFactory::createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i ) { - if ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) || widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { + if ( widget->inherits( "TQListBox" ) || widget->inherits( "TQComboBox" ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; bool hasPixmap = FALSE; TQString txt; loadItem( n, pix, txt, hasPixmap ); TQListBox *lb = 0; - if ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) ) + if ( widget->inherits( "TQListBox" ) ) lb = (TQListBox*)widget; else lb = ( (TQComboBox*)widget)->listBox(); @@ -2345,7 +2345,7 @@ void TQWidgetFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLis new TQListBoxText( lb, txt ); } #ifndef TQT_NO_ICONVIEW - } else if ( widget->inherits( TQICONVIEW_OBJECT_NAME_STRING ) ) { + } else if ( widget->inherits( "TQIconView" ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; bool hasPixmap = FALSE; @@ -2355,7 +2355,7 @@ void TQWidgetFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLis TQIconView *iv = (TQIconView*)widget; new TQIconViewItem( iv, txt, pix ); #endif - } else if ( widget->inherits( TQLISTVIEW_OBJECT_NAME_STRING ) ) { + } else if ( widget->inherits( "TQListView" ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; TQValueList<TQPixmap> pixmaps; @@ -2417,7 +2417,7 @@ void TQWidgetFactory::loadChildAction( TQObject *parent, const TQDomElement &e ) } n2 = n2.nextSibling().toElement(); } - if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !parent->inherits( "TQAction" ) ) actionList.append( a ); } else if ( n.tagName() == "actiongroup" ) { a = new TQActionGroup( parent ); @@ -2435,7 +2435,7 @@ void TQWidgetFactory::loadChildAction( TQObject *parent, const TQDomElement &e ) } n2 = n2.nextSibling().toElement(); } - if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !parent->inherits( "TQAction" ) ) actionList.append( a ); } @@ -2448,9 +2448,9 @@ void TQWidgetFactory::loadActions( const TQDomElement &e ) TQDomElement n = e.firstChild().toElement(); while ( !n.isNull() ) { if ( n.tagName() == "action" ) { - loadChildAction( TQT_TQOBJECT(toplevel), n ); + loadChildAction( toplevel, n ); } else if ( n.tagName() == "actiongroup" ) { - loadChildAction( TQT_TQOBJECT(toplevel), n ); + loadChildAction( toplevel, n ); } n = n.nextSibling().toElement(); } @@ -2476,9 +2476,9 @@ void TQWidgetFactory::loadToolBars( const TQDomElement &e ) } else if ( n2.tagName() == "separator" ) { tb->addSeparator(); } else if ( n2.tagName() == "widget" ) { - (void)createWidgetInternal( n2, tb, 0, n2.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) ); + (void)createWidgetInternal( n2, tb, 0, n2.attribute( "class", "TQWidget" ) ); } else if ( n2.tagName() == "property" ) { - setProperty( TQT_TQOBJECT(tb), n2.attribute( "name" ), n2.firstChild().toElement() ); + setProperty( tb, n2.attribute( "name" ), n2.firstChild().toElement() ); } n2 = n2.nextSibling().toElement(); } @@ -2499,7 +2499,7 @@ void TQWidgetFactory::loadMenuBar( const TQDomElement &e ) popup->setName( n.attribute( "name" ).ascii() ); mb->insertItem( translate( n.attribute( "text" ) ), popup ); } else if ( n.tagName() == "property" ) { - setProperty( TQT_TQOBJECT(mb), n.attribute( "name" ), n.firstChild().toElement() ); + setProperty( mb, n.attribute( "name" ), n.firstChild().toElement() ); } else if ( n.tagName() == "separator" ) { mb->insertSeparator(); } @@ -2551,7 +2551,7 @@ TQAction *TQWidgetFactory::findAction( const TQString &name ) for ( TQAction *a = actionList.first(); a; a = actionList.next() ) { if ( TQString( a->name() ) == name ) return a; - TQAction *ac = (TQAction*)a->child( name.latin1(), TQACTION_OBJECT_NAME_STRING ); + TQAction *ac = (TQAction*)a->child( name.latin1(), "TQAction" ); if ( ac ) return ac; } diff --git a/languages/ada/ada.store.g b/languages/ada/ada.store.g index 658bfcfa..b15e5f3e 100644 --- a/languages/ada/ada.store.g +++ b/languages/ada/ada.store.g @@ -30,7 +30,7 @@ options { { private: - QString m_fileName; + TQString m_fileName; QValueList<NamespaceDom> m_scopeStack; CodeModel* m_model; QValueList<QStringList> m_imports; @@ -46,8 +46,8 @@ public: CodeModel* codeModel () { return m_model; } const CodeModel* codeModel () const { return m_model; } - QString fileName () const { return m_fileName; } - void setFileName (const QString& fileName) { m_fileName = fileName; } + TQString fileName () const { return m_fileName; } + void setFileName (const TQString& fileName) { m_fileName = fileName; } void init () { m_scopeStack.clear (); @@ -66,13 +66,13 @@ public: void wipeout () { m_model->wipeout (); } // void out () { m_store->out (); } - void removeWithReferences (const QString& fileName) { + void removeWithReferences (const TQString& fileName) { m_model->removeFile (m_model->fileByName(fileName)); } NamespaceDom insertScopeContainer (NamespaceDom scope, const QStringList & scopes ) { QStringList::ConstIterator it = scopes.begin(); - QString prefix( *it ); + TQString prefix( *it ); NamespaceDom ns = scope->namespaceByName( prefix ); // kdDebug() << "insertScopeContainer begin with prefix " << prefix << endl; if (!ns.data()) { @@ -89,7 +89,7 @@ public: } // kdDebug() << "insertScopeContainer: while" << endl; while ( ++it != scopes.end() ) { - QString nameSegment( *it ); + TQString nameSegment( *it ); prefix += "." + nameSegment; // kdDebug() << "insertScopeContainer: while prefix = " << prefix << endl; NamespaceDom inner = scope->namespaceByName( prefix ); @@ -592,7 +592,7 @@ name_or_qualified package_body : #(PACKAGE_BODY id:def_id /* TBD - { QString name (qtext (id)); + { TQString name (qtext (id)); } */ pkg_body_part) diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp index 1ca3abfd..ab1eac5e 100644 --- a/languages/ada/adasupportpart.cpp +++ b/languages/ada/adasupportpart.cpp @@ -56,8 +56,8 @@ AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStri setInstance (AdaSupportPartFactory::instance ()); d->problemReporter = new ProblemReporter (this); -// connect (core (), TQT_SIGNAL (configWidget (KDialogBase*)), -// d->problemReporter, TQT_SLOT (configWidget (KDialogBase*))); +// connect (core (), TQ_SIGNAL (configWidget (KDialogBase*)), +// d->problemReporter, TQ_SLOT (configWidget (KDialogBase*))); d->problemReporter->setIcon( SmallIcon("application-vnd.tde.info") ); mainWindow( )->embedOutputView( d->problemReporter, i18n("Problems"), i18n("Problem reporter")); TQWhatsThis::add(d->problemReporter, i18n("<b>Problem reporter</b><p>This window shows various \"problems\" in your project. " @@ -65,15 +65,15 @@ AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStri setXMLFile ("adasupportpart.rc"); - connect (core (), TQT_SIGNAL (projectOpened ()), this, TQT_SLOT (projectOpened ())); - connect (core (), TQT_SIGNAL (projectClosed ()), this, TQT_SLOT (projectClosed ())); + connect (core (), TQ_SIGNAL (projectOpened ()), this, TQ_SLOT (projectOpened ())); + connect (core (), TQ_SIGNAL (projectClosed ()), this, TQ_SLOT (projectClosed ())); - connect (partController (), TQT_SIGNAL (savedFile (const KURL&)), - this, TQT_SLOT (savedFile (const KURL&))); + connect (partController (), TQ_SIGNAL (savedFile (const KURL&)), + this, TQ_SLOT (savedFile (const KURL&))); -// connect (core (), TQT_SIGNAL (configWidget (KDialogBase*)), this, TQT_SLOT (configWidget (KDialogBase*))); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), - d->problemReporter, TQT_SLOT(configWidget(KDialogBase*)) ); +// connect (core (), TQ_SIGNAL (configWidget (KDialogBase*)), this, TQ_SLOT (configWidget (KDialogBase*))); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), + d->problemReporter, TQ_SLOT(configWidget(KDialogBase*)) ); // a small hack (robe) //classStore ()->globalScope ()->setName ("(default packages)"); @@ -102,14 +102,14 @@ KDevLanguageSupport::Features AdaSupportPart::features () void AdaSupportPart::projectOpened () { - connect (project (), TQT_SIGNAL (addedFilesToProject (const TQStringList &)), - this, TQT_SLOT (addedFilesToProject (const TQStringList &))); - connect (project (), TQT_SIGNAL (removedFilesFromProject (const TQStringList &)), - this, TQT_SLOT (removedFilesFromProject (const TQStringList &))); - connect( project( ), TQT_SIGNAL( changedFilesInProject( const TQStringList & ) ), - this, TQT_SLOT( changedFilesInProject( const TQStringList & ) ) ); - - TQTimer::singleShot (0, this, TQT_SLOT (initialParse ())); + connect (project (), TQ_SIGNAL (addedFilesToProject (const TQStringList &)), + this, TQ_SLOT (addedFilesToProject (const TQStringList &))); + connect (project (), TQ_SIGNAL (removedFilesFromProject (const TQStringList &)), + this, TQ_SLOT (removedFilesFromProject (const TQStringList &))); + connect( project( ), TQ_SIGNAL( changedFilesInProject( const TQStringList & ) ), + this, TQ_SLOT( changedFilesInProject( const TQStringList & ) ) ); + + TQTimer::singleShot (0, this, TQ_SLOT (initialParse ())); } diff --git a/languages/ada/adasupportpart.h b/languages/ada/adasupportpart.h index eb9e2630..22d66fd8 100644 --- a/languages/ada/adasupportpart.h +++ b/languages/ada/adasupportpart.h @@ -12,7 +12,7 @@ class TQStringList; class AdaSupportPart : public KDevLanguageSupport { - Q_OBJECT + TQ_OBJECT public: AdaSupportPart (TQObject *parent, const char *name, const TQStringList &); diff --git a/languages/ada/addclassdlg.ui b/languages/ada/addclassdlg.ui index 046b06ab..94006be8 100644 --- a/languages/ada/addclassdlg.ui +++ b/languages/ada/addclassdlg.ui @@ -420,9 +420,9 @@ <tabstop>PushButton2</tabstop> <tabstop>PushButton3</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>Public_toggled( bool )</slot> -</Q_SLOTS> +</slots> <includes> <include location="global" impldecl="in implementation">keditlistbox.h</include> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/languages/ada/configproblemreporter.ui b/languages/ada/configproblemreporter.ui index f2e03383..32a9b13d 100644 --- a/languages/ada/configproblemreporter.ui +++ b/languages/ada/configproblemreporter.ui @@ -78,12 +78,12 @@ <include location="global" impldecl="in implementation">kdialog.h</include> <include location="local" impldecl="in implementation">configproblemreporter.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>accept()</slot> <slot>bgParserCheckbox_toggled( bool b )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp index 12090860..66966f33 100644 --- a/languages/ada/problemreporter.cpp +++ b/languages/ada/problemreporter.cpp @@ -92,19 +92,19 @@ ProblemReporter::ProblemReporter( AdaSupportPart* part, TQWidget* parent, const m_timer = new TQTimer( this ); - connect( part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); - connect( part->partController(), TQT_SIGNAL(partAdded(KParts::Part*)), - this, TQT_SLOT(slotPartAdded(KParts::Part*)) ); - connect( part->partController(), TQT_SIGNAL(partRemoved(KParts::Part*)), - this, TQT_SLOT(slotPartRemoved(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(partAdded(KParts::Part*)), + this, TQ_SLOT(slotPartAdded(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(partRemoved(KParts::Part*)), + this, TQ_SLOT(slotPartRemoved(KParts::Part*)) ); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reparse()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(reparse()) ); - connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem*)) ); configure(); } @@ -134,7 +134,7 @@ void ProblemReporter::slotActivePartChanged( KParts::Part* part ) m_editor = dynamic_cast<KTextEditor::EditInterface*>( part ); if( m_editor ) - connect( m_document, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); + connect( m_document, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()) ); m_markIface = dynamic_cast<KTextEditor::MarkInterface*>( part ); @@ -255,8 +255,8 @@ void ProblemReporter::configWidget( KDialogBase* dlg ) kdDebug() << "ProblemReporter::configWidget()" << endl; TQVBox *vbox = dlg->addVBoxPage(i18n("Ada Parsing"), i18n("Ada Parsing"), BarIcon( "text-x-src", TDEIcon::SizeMedium )); ConfigureProblemReporter* w = new ConfigureProblemReporter( vbox ); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); - connect(dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(configure())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(configure())); } void ProblemReporter::slotPartAdded( KParts::Part* part ) diff --git a/languages/ada/problemreporter.h b/languages/ada/problemreporter.h index 3f23cbfd..4b497a1a 100644 --- a/languages/ada/problemreporter.h +++ b/languages/ada/problemreporter.h @@ -38,7 +38,7 @@ namespace KTextEditor{ } class ProblemReporter: public TQListView{ - Q_OBJECT + TQ_OBJECT public: ProblemReporter( AdaSupportPart* part, TQWidget* parent=0, const char* name=0 ); diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp index ca289234..25ef4197 100644 --- a/languages/bash/bashsupport_part.cpp +++ b/languages/bash/bashsupport_part.cpp @@ -43,19 +43,19 @@ BashSupportPart::BashSupportPart(TQObject *parent, const char *name, const TQStr setXMLFile("kdevbashsupport.rc"); TDEAction *action; - action = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); + action = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQ_SLOT(slotRun()),actionCollection(), "build_execute" ); action->setToolTip(i18n("Run")); action->setWhatsThis(i18n("<b>Run</b><p>Starts an application.")); kdDebug() << "Creating BashSupportPart" << endl; - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), this, TQT_SLOT(savedFile(const KURL&)) ); - connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part *))); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), this, TQ_SLOT(savedFile(const KURL&)) ); + connect(partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part *))); m_cc = new BashCodeCompletion(); } @@ -73,21 +73,21 @@ void BashSupportPart::projectConfigWidget(KDialogBase *dlg) Q_UNUSED( dlg ); // TQVBox *vbox = dlg->addVBoxPage(i18n("Bash")); // RubyConfigWidget *w = new RubyConfigWidget(*projectDom(), (TQWidget *)vbox, "Bash config widget"); -// connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); +// connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } void BashSupportPart::projectOpened() { kdDebug(9014) << "projectOpened()" << endl; - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), - this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), - this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQ_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQ_SLOT(removedFilesFromProject(const TQStringList &)) ); // We want to parse only after all components have been // properly initialized - TQTimer::singleShot(0, this, TQT_SLOT(parse())); + TQTimer::singleShot(0, this, TQ_SLOT(parse())); } @@ -332,11 +332,11 @@ void BashCodeCompletion::setActiveEditorPart(KParts::Part *part) } disconnect(part->widget(), 0, this, 0 ); // to make sure that it is't connected twice - connect(part->widget(), TQT_SIGNAL(cursorPositionChanged()), - this, TQT_SLOT(cursorPositionChanged())); - connect(part->widget(), TQT_SIGNAL(argHintHidden()), this, TQT_SLOT(argHintHidden())); - connect(part->widget(), TQT_SIGNAL(completionAborted()), this, TQT_SLOT(completionBoxAbort())); - connect(part->widget(), TQT_SIGNAL(completionDone()), this, TQT_SLOT(completionBoxHidden())); + connect(part->widget(), TQ_SIGNAL(cursorPositionChanged()), + this, TQ_SLOT(cursorPositionChanged())); + connect(part->widget(), TQ_SIGNAL(argHintHidden()), this, TQ_SLOT(argHintHidden())); + connect(part->widget(), TQ_SIGNAL(completionAborted()), this, TQ_SLOT(completionBoxAbort())); + connect(part->widget(), TQ_SIGNAL(completionDone()), this, TQ_SLOT(completionBoxHidden())); } diff --git a/languages/bash/bashsupport_part.h b/languages/bash/bashsupport_part.h index 284e4f4c..07b6104b 100644 --- a/languages/bash/bashsupport_part.h +++ b/languages/bash/bashsupport_part.h @@ -24,7 +24,7 @@ class BashCodeCompletion : TQObject { - Q_OBJECT + TQ_OBJECT public: BashCodeCompletion(); @@ -49,7 +49,7 @@ class BashCodeCompletion : TQObject class BashSupportPart : public KDevLanguageSupport { - Q_OBJECT + TQ_OBJECT public: BashSupportPart(TQObject *parent, const char *name, const TQStringList &); diff --git a/languages/cpp/KDevCppSupportIface.h b/languages/cpp/KDevCppSupportIface.h index 3d9363ba..614e1bd6 100644 --- a/languages/cpp/KDevCppSupportIface.h +++ b/languages/cpp/KDevCppSupportIface.h @@ -9,7 +9,7 @@ class CppSupportPart; class KDevCppSupportIface : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP public: diff --git a/languages/cpp/addattributedialog.cpp b/languages/cpp/addattributedialog.cpp index d6dd5290..0808d7af 100644 --- a/languages/cpp/addattributedialog.cpp +++ b/languages/cpp/addattributedialog.cpp @@ -100,7 +100,7 @@ void AddAttributeDialog::accept() int varEndLine, varEndColumn; ( *it ) ->getEndPosition( &varEndLine, &varEndColumn ); TQString access = accessID( *it ); - TQPair<int, int> varEndPoint = tqMakePair( varEndLine, varEndColumn ); + TQPair<int, int> varEndPoint = qMakePair( varEndLine, varEndColumn ); if ( !points.contains( access ) || points[ access ] < varEndPoint ) { @@ -139,7 +139,7 @@ void AddAttributeDialog::accept() else { str.prepend( access + ":\n" ); - points[ *it ] = tqMakePair( line - 1, 0 ); + points[ *it ] = qMakePair( line - 1, 0 ); pt = points[ *it ]; // end of class declaration } diff --git a/languages/cpp/addattributedialog.h b/languages/cpp/addattributedialog.h index da75c98c..1d1e61fd 100644 --- a/languages/cpp/addattributedialog.h +++ b/languages/cpp/addattributedialog.h @@ -28,7 +28,7 @@ class CppSupportPart; class AddAttributeDialog : public AddAttributeDialogBase { - Q_OBJECT + TQ_OBJECT public: AddAttributeDialog( CppSupportPart* cppSupport, ClassDom klass, diff --git a/languages/cpp/addattributedialogbase.ui b/languages/cpp/addattributedialogbase.ui index 18b98e9c..86ee3f25 100644 --- a/languages/cpp/addattributedialogbase.ui +++ b/languages/cpp/addattributedialogbase.ui @@ -258,9 +258,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -275,9 +272,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -359,14 +353,14 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot>addAttribute()</slot> <slot>deleteCurrentAttribute()</slot> <slot>currentChanged(TQListViewItem*)</slot> <slot>updateGUI()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp index e4b19c18..79ec1e65 100644 --- a/languages/cpp/addmethoddialog.cpp +++ b/languages/cpp/addmethoddialog.cpp @@ -166,7 +166,7 @@ void AddMethodDialog::accept() int funEndLine, funEndColumn; ( *it ) ->getEndPosition( &funEndLine, &funEndColumn ); TQString access = accessID( *it ); - TQPair<int, int> funEndPoint = tqMakePair( funEndLine, funEndColumn ); + TQPair<int, int> funEndPoint = qMakePair( funEndLine, funEndColumn ); if ( !points.contains( access ) || points[ access ] < funEndPoint ) { @@ -206,7 +206,7 @@ void AddMethodDialog::accept() else { str.prepend( access + ":\n" ); - points[ *it ] = tqMakePair( line - 1, 0 ); + points[ *it ] = qMakePair( line - 1, 0 ); pt = points[ *it ]; // end of class declaration } diff --git a/languages/cpp/addmethoddialog.h b/languages/cpp/addmethoddialog.h index f1cfaf28..0362eae1 100644 --- a/languages/cpp/addmethoddialog.h +++ b/languages/cpp/addmethoddialog.h @@ -28,7 +28,7 @@ class CppSupportPart; class AddMethodDialog : public AddMethodDialogBase { - Q_OBJECT + TQ_OBJECT public: AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass, diff --git a/languages/cpp/addmethoddialogbase.ui b/languages/cpp/addmethoddialogbase.ui index 3926f966..83af7489 100644 --- a/languages/cpp/addmethoddialogbase.ui +++ b/languages/cpp/addmethoddialogbase.ui @@ -314,9 +314,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -331,9 +328,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -442,7 +436,7 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot>addMethod()</slot> @@ -450,7 +444,7 @@ <slot>currentChanged(TQListViewItem*)</slot> <slot>updateGUI()</slot> <slot>browseImplementationFile()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/cpp/app_templates/CMakeLists.txt b/languages/cpp/app_templates/CMakeLists.txt index 14e63fa7..66656732 100644 --- a/languages/cpp/app_templates/CMakeLists.txt +++ b/languages/cpp/app_templates/CMakeLists.txt @@ -28,7 +28,6 @@ add_subdirectory( gtk2mmapp ) add_subdirectory( kapp ) add_subdirectory( kateplugin ) add_subdirectory( kateplugin2 ) -add_subdirectory( kde4app ) add_subdirectory( kdedcop ) add_subdirectory( kdevlang ) add_subdirectory( kdevpart ) @@ -58,9 +57,6 @@ add_subdirectory( opietoday ) add_subdirectory( qmakeapp ) add_subdirectory( qmakeempty ) add_subdirectory( qmakesimple ) -add_subdirectory( qt4hello ) -add_subdirectory( qt4makeapp ) -add_subdirectory( qtopia4app ) add_subdirectory( qtopiaapp ) add_subdirectory( tdecmodule ) add_subdirectory( tdeconfig35 ) diff --git a/languages/cpp/app_templates/Makefile.am b/languages/cpp/app_templates/Makefile.am index 8350118d..bbd1618a 100644 --- a/languages/cpp/app_templates/Makefile.am +++ b/languages/cpp/app_templates/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = kapp kpartapp kpartplugin tdecmodule kicker tdeioslave kdevpart kdevpart2 chello cpphello tdescreensaver kofficepart chello_gba dcopservice konqnavpanel qmakesimple qmakeapp qt4makeapp khello khello2 kateplugin kateplugin2 qtopiaapp kdedcop wxhello cppsdlhello tdeconfig35 kdevlang noatunvisual noatunui kmod tdefileplugin clanlib opieapp opieapplet opieinput opiemenu opienet opietoday kxt gtk2mmapp cppcurseshello win32hello win32gui cmakesimple cmakesimplec cmakelibcpp cmakelibc kscons_kxt kscons_tdemdi qt4hello qmakeempty automakeempty makefileempty qtopia4app kde4app +SUBDIRS = kapp kpartapp kpartplugin tdecmodule kicker tdeioslave kdevpart kdevpart2 chello cpphello tdescreensaver kofficepart chello_gba dcopservice konqnavpanel qmakesimple qmakeapp khello khello2 kateplugin kateplugin2 qtopiaapp kdedcop wxhello cppsdlhello tdeconfig35 kdevlang noatunvisual noatunui kmod tdefileplugin clanlib opieapp opieapplet opieinput opiemenu opienet opietoday kxt gtk2mmapp cppcurseshello win32hello win32gui cmakesimple cmakesimplec cmakelibcpp cmakelibc kscons_kxt kscons_tdemdi qmakeempty automakeempty makefileempty profilescdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CIDE profilesc_DATA = c.appwizard diff --git a/languages/cpp/app_templates/chello/chello.kdevtemplate b/languages/cpp/app_templates/chello/chello.kdevtemplate index b3848aa4..5d867549 100644 --- a/languages/cpp/app_templates/chello/chello.kdevtemplate +++ b/languages/cpp/app_templates/chello/chello.kdevtemplate @@ -13,21 +13,21 @@ Archive=chello.tar.gz [LIBS] Type = value -ValueType=QString +ValueType=TQString Value= OPT_LIBS Comment= Optional libraries to link to. Default= -lm [INCLUDES] Type = value -ValueType=QString +ValueType=TQString Value= OPT_INCS Comment= Optional include path. Default= -I/usr/include [CFLAGS] Type = value -ValueType=QString +ValueType=TQString Value= CFLAGS Comment= Optional CFLAGS to define in the makefile. Default= diff --git a/languages/cpp/app_templates/cmakelibc/CMakeLists.txt.src b/languages/cpp/app_templates/cmakelibc/CMakeLists.txt.src index d2fabc7a..9e3b5385 100644 --- a/languages/cpp/app_templates/cmakelibc/CMakeLists.txt.src +++ b/languages/cpp/app_templates/cmakelibc/CMakeLists.txt.src @@ -1,16 +1,16 @@ #this is just a basic CMakeLists.txt, for more information see the cmake manpage #add definitions, compiler switches, etc. -ADD_DEFINITIONS(-Wall -O2) +add_definitions(-Wall -O2) #build a shared library -ADD_LIBRARY(%{APPNAMELC} SHARED %{APPNAMELC}.c) +add_library(%{APPNAMELC} SHARED %{APPNAMELC}.c) #for testing the shared library you probably need some test app too -ADD_EXECUTABLE(%{APPNAMELC}test %{APPNAMELC}test.c) +add_executable(%{APPNAMELC}test %{APPNAMELC}test.c) #need to link to some other libraries ? just add them here -TARGET_LINK_LIBRARIES(%{APPNAMELC}test %{APPNAMELC}) +target_link_libraries(%{APPNAMELC}test %{APPNAMELC}) #add an install target here #INSTALL_FILES(...) diff --git a/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt.src b/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt.src index ee2bb832..6450c4b9 100644 --- a/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt.src +++ b/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt.src @@ -1,16 +1,16 @@ #this is just a basic CMakeLists.txt, for more information see the cmake manpage #add definitions, compiler switches, etc. -ADD_DEFINITIONS(-Wall -O2) +add_definitions(-Wall -O2) #build a shared library -ADD_LIBRARY(%{APPNAMELC} SHARED %{APPNAMELC}.cpp) +add_library(%{APPNAMELC} SHARED %{APPNAMELC}.cpp) #for testing the shared library you probably need some test app too -ADD_EXECUTABLE(%{APPNAMELC}test %{APPNAMELC}test.cpp) +add_executable(%{APPNAMELC}test %{APPNAMELC}test.cpp) #need to link to some other libraries ? just add them here -TARGET_LINK_LIBRARIES(%{APPNAMELC}test %{APPNAMELC}) +target_link_libraries(%{APPNAMELC}test %{APPNAMELC}) #add an install target here #INSTALL_FILES(...) diff --git a/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt.src b/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt.src index 6122c34f..f78028c9 100644 --- a/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt.src +++ b/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt.src @@ -2,26 +2,26 @@ # for more information see the cmake man page # add definitions, compiler switches, etc. -ADD_DEFINITIONS(${QT_DEFINITIONS} -Wall -O2 -g) +add_definitions(${QT_DEFINITIONS} -Wall -O2 -g) # add the Qt include dir to the include path -INCLUDE_DIRECTORIES(${TQT_INCLUDE_DIR}) +include_directories(${TQT_INCLUDE_DIR}) # list all source files in a variable -SET(%{APPNAMELC}_SRCS main.cpp %{APPNAMELC}.cpp) +set(%{APPNAMELC}_SRCS main.cpp %{APPNAMELC}.cpp) # specify the headers which have to be processed by moc # and collect the results in the variable given above -QT_WRAP_CPP (%{APPNAMELC} %{APPNAMELC}_SRCS %{APPNAMELC}.h) +qt_wrap_cpp (%{APPNAMELC} %{APPNAMELC}_SRCS %{APPNAMELC}.h) # create tan executable from the list of source files -ADD_EXECUTABLE(%{APPNAMELC} ${%{APPNAMELC}_SRCS}) +add_executable(%{APPNAMELC} ${%{APPNAMELC}_SRCS}) # link the application to the Qt libs -TARGET_LINK_LIBRARIES(%{APPNAMELC} ${TQT_LIBRARIES} ) +target_link_libraries(%{APPNAMELC} ${TQT_LIBRARIES} ) # create an install rule for the executable -INSTALL(TARGETS %{APPNAMELC} DESTINATION bin ) +install(TARGETS %{APPNAMELC} DESTINATION bin ) # if you need to install more things, take a look at the install() command # in the cmake man page diff --git a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp index 39b6e5af..8ce81310 100644 --- a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp +++ b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp @@ -37,17 +37,17 @@ openIcon = TQPixmap( fileopen ); TQToolButton * fileOpen = new TQToolButton( openIcon, tr("Open File"), TQString(), - this, TQT_SLOT(choose()), fileTools, "open file" ); + this, TQ_SLOT(choose()), fileTools, "open file" ); saveIcon = TQPixmap( filesave ); TQToolButton * fileSave = new TQToolButton( saveIcon, tr("Save File"), TQString(), - this, TQT_SLOT(save()), fileTools, "save file" ); + this, TQ_SLOT(save()), fileTools, "save file" ); printIcon = TQPixmap( fileprint ); TQToolButton * filePrint = new TQToolButton( printIcon, tr("Print File"), TQString(), - this, TQT_SLOT(print()), fileTools, "print file" ); + this, TQ_SLOT(print()), fileTools, "print file" ); (void)TQWhatsThis::whatsThisButton( fileTools ); @@ -79,41 +79,41 @@ menuBar()->insertItem( tr("&File"), file ); - file->insertItem( tr("&New"), this, TQT_SLOT(newDoc()), CTRL+Key_N ); + file->insertItem( tr("&New"), this, TQ_SLOT(newDoc()), CTRL+Key_N ); int id; id = file->insertItem( openIcon, tr("&Open..."), - this, TQT_SLOT(choose()), CTRL+Key_O ); + this, TQ_SLOT(choose()), CTRL+Key_O ); file->setWhatsThis( id, fileOpenText ); id = file->insertItem( saveIcon, tr("&Save"), - this, TQT_SLOT(save()), CTRL+Key_S ); + this, TQ_SLOT(save()), CTRL+Key_S ); file->setWhatsThis( id, fileSaveText ); - id = file->insertItem( tr("Save &As..."), this, TQT_SLOT(saveAs()) ); + id = file->insertItem( tr("Save &As..."), this, TQ_SLOT(saveAs()) ); file->setWhatsThis( id, fileSaveText ); file->insertSeparator(); id = file->insertItem( printIcon, tr("&Print..."), - this, TQT_SLOT(print()), CTRL+Key_P ); + this, TQ_SLOT(print()), CTRL+Key_P ); file->setWhatsThis( id, filePrintText ); file->insertSeparator(); - file->insertItem( tr("&Close"), this, TQT_SLOT(close()), CTRL+Key_W ); + file->insertItem( tr("&Close"), this, TQ_SLOT(close()), CTRL+Key_W ); - file->insertItem( tr("&Quit"), tqApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q ); + file->insertItem( tr("&Quit"), tqApp, TQ_SLOT( closeAllWindows() ), CTRL+Key_Q ); menuBar()->insertSeparator(); TQPopupMenu * help = new TQPopupMenu( this ); menuBar()->insertItem( tr("&Help"), help ); - help->insertItem( tr("&About"), this, TQT_SLOT(about()), Key_F1 ); - help->insertItem( tr("About &TQt"), this, TQT_SLOT(aboutTQt()) ); + help->insertItem( tr("&About"), this, TQ_SLOT(about()), Key_F1 ); + help->insertItem( tr("About &TQt"), this, TQ_SLOT(aboutTQt()) ); help->insertSeparator(); - help->insertItem( tr("What's &This"), this, TQT_SLOT(whatsThis()), SHIFT+Key_F1 ); + help->insertItem( tr("What's &This"), this, TQ_SLOT(whatsThis()), SHIFT+Key_F1 ); e = new TQTextEdit( this, "editor" ); e->setFocus(); diff --git a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h index ef58ff46..ba2d50ed 100644 --- a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h +++ b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.h @@ -9,7 +9,7 @@ class TQTextEdit; class %{APPNAME}: public TQMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/cmakeqt3app/main.cpp b/languages/cpp/app_templates/cmakeqt3app/main.cpp index 8938adc5..ba45c728 100644 --- a/languages/cpp/app_templates/cmakeqt3app/main.cpp +++ b/languages/cpp/app_templates/cmakeqt3app/main.cpp @@ -8,6 +8,6 @@ int main( int argc, char ** argv ) { %{APPNAME} * mw = new %{APPNAME}(); mw->setCaption( "%{APPNAME}" ); mw->show(); - a.connect( &a, TQT_SIGNAL(lastWindowClosed()), &a, TQT_SLOT(quit()) ); + a.connect( &a, TQ_SIGNAL(lastWindowClosed()), &a, TQ_SLOT(quit()) ); return a.exec(); } diff --git a/languages/cpp/app_templates/cpp.appwizard b/languages/cpp/app_templates/cpp.appwizard index dc233269..cbb5a6af 100644 --- a/languages/cpp/app_templates/cpp.appwizard +++ b/languages/cpp/app_templates/cpp.appwizard @@ -1,2 +1,2 @@ [General] -List=opiemenu,win32hello,cppcurseshello,gtk2mmapp,opienet,wxhello,cpphello,opietoday,clanlib,cppsdlhello,qmakeapp,qt4hello,qt4makeapp,cmakelibcpp,opieapp,qmakesimple,cmakesimple,generichello,opieapplet,qtopiaapp,gnome2mmapp,opieinput,win32gui,cmakeqt3app,qmakeempty,automakeempty,makefileempty,qtopia4app +List=opiemenu,win32hello,cppcurseshello,gtk2mmapp,opienet,wxhello,cpphello,opietoday,clanlib,cppsdlhello,qmakeapp,cmakelibcpp,opieapp,qmakesimple,cmakesimple,generichello,opieapplet,qtopiaapp,gnome2mmapp,opieinput,win32gui,cmakeqt3app,qmakeempty,automakeempty,makefileempty diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp index 774efe8e..d801904f 100644 --- a/languages/cpp/app_templates/kapp/app.cpp +++ b/languages/cpp/app_templates/kapp/app.cpp @@ -49,10 +49,10 @@ setupGUI(); // allow the view to change the statusbar and caption - connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); - connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), - this, TQT_SLOT(changeCaption(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); } @@ -88,19 +88,19 @@ void %{APPNAME}::load(const KURL& url) void %{APPNAME}::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection()); - KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - KStdAction::print(this, TQT_SLOT(filePrint()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + KStdAction::print(this, TQ_SLOT(filePrint()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); // this doesn't do anything useful. it's just here to illustrate // how to insert a custom menu and menu item TDEAction *custom = new TDEAction(i18n("Cus&tom Menuitem"), 0, - this, TQT_SLOT(optionsPreferences()), + this, TQ_SLOT(optionsPreferences()), actionCollection(), "custom_action"); } diff --git a/languages/cpp/app_templates/kapp/app.h b/languages/cpp/app_templates/kapp/app.h index 5f39dd11..fe2a96d3 100644 --- a/languages/cpp/app_templates/kapp/app.h +++ b/languages/cpp/app_templates/kapp/app.h @@ -25,7 +25,7 @@ class KURL; */ class %{APPNAME} : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/kapp/appview.cpp b/languages/cpp/app_templates/kapp/appview.cpp index 16c05a3f..244f4a75 100644 --- a/languages/cpp/app_templates/kapp/appview.cpp +++ b/languages/cpp/app_templates/kapp/appview.cpp @@ -63,10 +63,10 @@ return; } - connect(m_html, TQT_SIGNAL(setWindowCaption(const TQString&)), - this, TQT_SLOT(slotSetTitle(const TQString&))); - connect(m_html, TQT_SIGNAL(setStatusBarText(const TQString&)), - this, TQT_SLOT(slotOnURL(const TQString&))); + connect(m_html, TQ_SIGNAL(setWindowCaption(const TQString&)), + this, TQ_SLOT(slotSetTitle(const TQString&))); + connect(m_html, TQ_SIGNAL(setStatusBarText(const TQString&)), + this, TQ_SLOT(slotOnURL(const TQString&))); } diff --git a/languages/cpp/app_templates/kapp/appview.h b/languages/cpp/app_templates/kapp/appview.h index 79513a9d..f79e7322 100644 --- a/languages/cpp/app_templates/kapp/appview.h +++ b/languages/cpp/app_templates/kapp/appview.h @@ -23,7 +23,7 @@ class KURL; */ class %{APPNAME}View : public TQWidget, public %{APPNAME}Iface { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/kapp/pref.h b/languages/cpp/app_templates/kapp/pref.h index b2aae436..ec7116fd 100644 --- a/languages/cpp/app_templates/kapp/pref.h +++ b/languages/cpp/app_templates/kapp/pref.h @@ -11,7 +11,7 @@ class %{APPNAME}PrefPageTwo; class %{APPNAME}Preferences : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}Preferences(); @@ -23,7 +23,7 @@ private: class %{APPNAME}PrefPageOne : public TQFrame { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}PrefPageOne(TQWidget *parent = 0); @@ -31,7 +31,7 @@ public: class %{APPNAME}PrefPageTwo : public TQFrame { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}PrefPageTwo(TQWidget *parent = 0); diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.cpp b/languages/cpp/app_templates/kateplugin/plugin_app.cpp index 4d80a74c..351fca4e 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp @@ -55,7 +55,7 @@ void KatePlugin%{APPNAME}::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new TDEAction ( i18n("Insert Hello World"), 0, this, - TQT_SLOT( slotInsertHello() ), view->actionCollection(), + TQ_SLOT( slotInsertHello() ), view->actionCollection(), "edit_insert_%{APPNAMELC}" ); view->setInstance (new TDEInstance("kate")); diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.h b/languages/cpp/app_templates/kateplugin/plugin_app.h index 847e6175..fba66bcc 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.h +++ b/languages/cpp/app_templates/kateplugin/plugin_app.h @@ -16,14 +16,14 @@ class KatePluginFactory : public KLibFactory { - Q_OBJECT + TQ_OBJECT public: KatePluginFactory(); virtual ~KatePluginFactory(); - virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() ); private: static TDEInstance* s_instance; @@ -31,7 +31,7 @@ class KatePluginFactory : public KLibFactory class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp index 8845fae3..19b31c71 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp @@ -59,7 +59,7 @@ void KatePlugin%{APPNAME}::addView(Kate::MainWindow *win) PluginView *view = new PluginView (); (void) new TDEAction ( i18n("Insert Hello World"), 0, this, - TQT_SLOT( slotInsertHello() ), view->actionCollection(), + TQ_SLOT( slotInsertHello() ), view->actionCollection(), "edit_insert_%{APPNAMELC}" ); view->setInstance (new TDEInstance("kate")); @@ -94,7 +94,7 @@ Kate::PluginConfigPage* KatePlugin%{APPNAME}::configPage (uint, TQWidget *w, con { %{APPNAME}ConfigPage* p = new %{APPNAME}ConfigPage(this, w); initConfigPage( p ); - connect( p, TQT_SIGNAL(configPageApplyRequest(%{APPNAME}ConfigPage*)), this, TQT_SLOT(slotApplyConfig(%{APPNAME}ConfigPage*)) ); + connect( p, TQ_SIGNAL(configPageApplyRequest(%{APPNAME}ConfigPage*)), this, TQ_SLOT(slotApplyConfig(%{APPNAME}ConfigPage*)) ); return (Kate::PluginConfigPage*)p; } @@ -124,7 +124,7 @@ void KatePlugin%{APPNAME}::slotApplyConfig( %{APPNAME}ConfigPage* p ) lo->addWidget(lab); - // TODO: add connection to emit TQT_SLOT( changed() ) + // TODO: add connection to emit TQ_SLOT( changed() ) } %{APPNAME}ConfigPage::~%{APPNAME}ConfigPage() diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.h b/languages/cpp/app_templates/kateplugin2/plugin_app.h index 80fb0103..4096a9de 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.h +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.h @@ -20,14 +20,14 @@ class %{APPNAME}ConfigPage; class KatePluginFactory : public KLibFactory { - Q_OBJECT + TQ_OBJECT public: KatePluginFactory(); virtual ~KatePluginFactory(); - virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() ); private: static TDEInstance* s_instance; @@ -35,7 +35,7 @@ private: class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface, Kate::PluginConfigInterfaceExtension { - Q_OBJECT + TQ_OBJECT public: @@ -66,7 +66,7 @@ private: class %{APPNAME}ConfigPage : public Kate::PluginConfigPage { - Q_OBJECT + TQ_OBJECT friend class KatePlugin%{APPNAME}; diff --git a/languages/cpp/app_templates/kde4app/CMakeLists.txt b/languages/cpp/app_templates/kde4app/CMakeLists.txt deleted file mode 100644 index 215f653d..00000000 --- a/languages/cpp/app_templates/kde4app/CMakeLists.txt +++ /dev/null @@ -1,51 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -set( _tarball_desktops kapp4.desktop ) -set( _tarball_files - kapp4.cpp kapp4.h prefs_base.ui kapp4view.cpp - kapp4view.h kapp4view_base.ui main.cpp kde4appui.rc - kde4app-CMakeLists.txt kapp4.kcfg - settings.kcfgc kde4app.png README kde4app.kdevelop - kde4app.kdevelop.filelist -) -set( _tarball_content ${_tarball_desktops} ${_tarball_files} ) -list( SORT _tarball_content ) - -tde_create_translated_desktop( - SOURCE ${_tarball_desktops} - DESTINATION - - PO_DIR tdevelop-desktops -) - -file( - COPY ${_tarball_files} - DESTINATION ${CMAKE_CURRENT_BINARY_DIR} -) - -tde_create_tarball( - TARGET kde4app.tar.gz - SOURCEDIR ${CMAKE_CURRENT_BINARY_DIR} - FILES ${_tarball_content} -) - - -install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/kde4app.tar.gz kde4app.png - DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) - - -tde_create_translated_desktop( - SOURCE kde4app.kdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates - KEYWORDS Category - PO_DIR tdevelop-desktops -) diff --git a/languages/cpp/app_templates/kde4app/Makefile.am b/languages/cpp/app_templates/kde4app/Makefile.am deleted file mode 100644 index 2b39fcb4..00000000 --- a/languages/cpp/app_templates/kde4app/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -dataFiles = kapp4.cpp kapp4.h prefs_base.ui kapp4view.cpp kapp4view.h kapp4view_base.ui \ - main.cpp kde4appui.rc CMakeLists.txt kapp4.desktop kapp4.kcfg settings.kcfgc \ - kde4app.png README kde4app.kdevelop kde4app.kdevelop.filelist - -templateName = kde4app - -### no need to change below: -template_DATA = $(templateName).kdevtemplate -templatedir = ${appwizarddatadir}/templates - -appwizarddatadir = ${kde_datadir}/kdevappwizard -$(templateName).tar.gz: ${dataFiles} - $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} - $(GZIP_COMMAND) -f9 $(templateName).tar - -archivedir = ${appwizarddatadir} -archive_DATA = $(templateName).tar.gz ${templateName}.png - -CLEANFILES = *.tar.gz diff --git a/languages/cpp/app_templates/kde4app/README b/languages/cpp/app_templates/kde4app/README deleted file mode 100644 index 8180d28c..00000000 --- a/languages/cpp/app_templates/kde4app/README +++ /dev/null @@ -1,15 +0,0 @@ -!!!!!ATTENTION!!!!! - -Before starting the build you may need to setup the KDE4 environment variables. -To do this open Project->Project Options and then look at the "Run" and the "Make" -pages. Each of these two has an environment variables widget in which you have -to fill in the right values for the variables already listed. - -After setting up the variables you'll also need to run cmake inside the build -directory. This can not be done by tdevelop as a KDE4 environment is needed -when running cmake to find KDE4. Open the integrated konsole and change to the build -subdirectory. Then setup a KDE4 environment and run "cmake ../". - -More information how to setup a KDE4 development environment can be found on -http://techbase.kde.org/Getting_Started/Increased_Productivity_in_KDE4_with_Scripts - diff --git a/languages/cpp/app_templates/kde4app/kapp4.cpp b/languages/cpp/app_templates/kde4app/kapp4.cpp deleted file mode 100644 index d224123c..00000000 --- a/languages/cpp/app_templates/kde4app/kapp4.cpp +++ /dev/null @@ -1,90 +0,0 @@ -%{CPP_TEMPLATE} - -#include "%{APPNAMELC}.h" -#include "%{APPNAMELC}view.h" -#include "settings.h" - -#include <TQtGui/TQDropEvent> -#include <TQtGui/TQPainter> - -#include <tdeconfigdialog.h> -#include <kstatusbar.h> - -#include <tdeaction.h> -#include <tdeactioncollection.h> -#include <kstandardaction.h> - -#include <KDE/TDELocale> - -%{APPNAME}::%{APPNAME}() - : KXmlGuiWindow(), - m_view(new %{APPNAME}View(this)), - m_printer(0) -{ - // accept dnd - setAcceptDrops(true); - - // tell the KXmlGuiWindow that this is indeed the main widget - setCentralWidget(m_view); - - // then, setup our actions - setupActions(); - - // add a status bar - statusBar()->show(); - - // a call to KXmlGuiWindow::setupGUI() populates the GUI - // with actions, using KXMLGUI. - // It also applies the saved mainwindow settings, if any, and ask the - // mainwindow to automatically save settings if changed: window size, - // toolbar position, icon size, etc. - setupGUI(); -} - -%{APPNAME}::~%{APPNAME}() -{ -} - -void %{APPNAME}::setupActions() -{ - TDEStandardAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - TDEStandardAction::quit(tqApp, TQT_SLOT(quit()), actionCollection()); - - TDEStandardAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); - - // custom menu and menu item - the slot is in the class %{APPNAME}View - TDEAction *custom = new TDEAction(TDEIcon("colorize"), i18n("Swi&tch Colors"), this); - actionCollection()->addAction( TQLatin1String("switch_action"), custom ); - connect(custom, TQT_SIGNAL(triggered(bool)), m_view, TQT_SLOT(switchColors())); -} - -void %{APPNAME}::fileNew() -{ - // this slot is called whenever the File->New menu is selected, - // the New shortcut is pressed (usually CTRL+N) or the New toolbar - // button is clicked - - // create a new window - (new %{APPNAME})->show(); -} - -void %{APPNAME}::optionsPreferences() -{ - // The preference dialog is derived from prefs_base.ui - // - // compare the names of the widgets in the .ui file - // to the names of the variables in the .kcfg file - //avoid to have 2 dialogs shown - if ( TDEConfigDialog::showDialog( "settings" ) ) { - return; - } - TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self()); - TQWidget *generalSettingsDlg = new TQWidget; - ui_prefs_base.setupUi(generalSettingsDlg); - dialog->addPage(generalSettingsDlg, i18n("General"), "package_setting"); - connect(dialog, TQT_SIGNAL(settingsChanged(TQString)), m_view, TQT_SLOT(settingsChanged())); - dialog->setAttribute( TQt::WA_DeleteOnClose ); - dialog->show(); -} - -#include "%{APPNAMELC}.moc" diff --git a/languages/cpp/app_templates/kde4app/kapp4.desktop b/languages/cpp/app_templates/kde4app/kapp4.desktop deleted file mode 100644 index 37d66d29..00000000 --- a/languages/cpp/app_templates/kde4app/kapp4.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=KApp4 - -GenericName=A KDE4 Application - -Exec=kapp4 %i -caption "%c" -Icon=kapp4 -Type=Application -Terminal=false -X-DocPath=kapp4/kapp4.html diff --git a/languages/cpp/app_templates/kde4app/kapp4.h b/languages/cpp/app_templates/kde4app/kapp4.h deleted file mode 100644 index 3c209de2..00000000 --- a/languages/cpp/app_templates/kde4app/kapp4.h +++ /dev/null @@ -1,54 +0,0 @@ -%{H_TEMPLATE} -#ifndef %{APPNAMEUC}_H -#define %{APPNAMEUC}_H - - -#include <kxmlguiwindow.h> - -#include "ui_prefs_base.h" - -class %{APPNAME}View; -class KPrinter; -class TDEToggleAction; -class KUrl; - -/** - * This class serves as the main window for %{APPNAME}. It handles the - * menus, toolbars, and status bars. - * - * @short Main window class - * @author Andreas Pakulat <apaku@gmx.de> - * @version 0.1 - */ -class %{APPNAME} : public KXmlGuiWindow -{ - Q_OBJECT - -public: - /** - * Default Constructor - */ - %{APPNAME}(); - - /** - * Default Destructor - */ - virtual ~%{APPNAME}(); - -private slots: - void fileNew(); - void optionsPreferences(); - -private: - void setupActions(); - -private: - Ui::prefs_base ui_prefs_base ; - %{APPNAME}View *m_view; - - KPrinter *m_printer; - TDEToggleAction *m_toolbarAction; - TDEToggleAction *m_statusbarAction; -}; - -#endif // _%{APPNAMELC}_H_ diff --git a/languages/cpp/app_templates/kde4app/kapp4.kcfg b/languages/cpp/app_templates/kde4app/kapp4.kcfg deleted file mode 100644 index 6040f769..00000000 --- a/languages/cpp/app_templates/kde4app/kapp4.kcfg +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 - http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <kcfgfile name="%{APPNAMELC}rc"/> - <group name="Preferences"> - <entry name="col_background" type="Color"> - <label>color of the background</label> - <default>black</default> - </entry> - <entry name="col_foreground" type="Color"> - <label>color of the foreground</label> - <default>yellow</default> - </entry> - <entry name="val_time" type="Int"> - <label>size of a ball</label> - <default>2</default> - </entry> - </group> -</kcfg> diff --git a/languages/cpp/app_templates/kde4app/kapp4view.cpp b/languages/cpp/app_templates/kde4app/kapp4view.cpp deleted file mode 100644 index af95aa15..00000000 --- a/languages/cpp/app_templates/kde4app/kapp4view.cpp +++ /dev/null @@ -1,42 +0,0 @@ -%{CPP_TEMPLATE} -#include "%{APPNAMELC}view.h" -#include "settings.h" - -#include <tdelocale.h> -#include <TQtGui/TQLabel> - -%{APPNAME}View::%{APPNAME}View(TQWidget *) -{ - ui_%{APPNAMELC}view_base.setupUi(this); - settingsChanged(); - setAutoFillBackground(true); -} - -%{APPNAME}View::~%{APPNAME}View() -{ - -} - -void %{APPNAME}View::switchColors() -{ - // switch the foreground/background colors of the label - TQColor color = Settings::col_background(); - Settings::setCol_background( Settings::col_foreground() ); - Settings::setCol_foreground( color ); - - settingsChanged(); -} - -void %{APPNAME}View::settingsChanged() -{ - TQPalette pal; - pal.setColor( TQPalette::Window, Settings::col_background()); - pal.setColor( TQPalette::WindowText, Settings::col_foreground()); - ui_%{APPNAMELC}view_base.kcfg_sillyLabel->setPalette( pal ); - - // i18n : internationalization - ui_%{APPNAMELC}view_base.kcfg_sillyLabel->setText( i18n("This project is %1 days old",Settings::val_time()) ); - emit signalChangeStatusbar( i18n("Settings changed") ); -} - -#include "%{APPNAMELC}view.moc" diff --git a/languages/cpp/app_templates/kde4app/kapp4view.h b/languages/cpp/app_templates/kde4app/kapp4view.h deleted file mode 100644 index 855a2144..00000000 --- a/languages/cpp/app_templates/kde4app/kapp4view.h +++ /dev/null @@ -1,56 +0,0 @@ -%{H_TEMPLATE} -#ifndef %{APPNAMELC}VIEW_H -#define %{APPNAMELC}VIEW_H - -#include <TQtGui/TQWidget> - -#include "ui_%{APPNAMELC}view_base.h" - -class TQPainter; -class KUrl; - -/** - * This is the main view class for %{APPNAME}. Most of the non-menu, - * non-toolbar, and non-statusbar (e.g., non frame) GUI code should go - * here. - * - * @short Main view - * @author %{AUTHOR} <%{EMAIL}> - * @version %{VERSION} - */ - -class %{APPNAME}View : public TQWidget, public Ui::%{APPNAMELC}view_base -{ - Q_OBJECT - -public: - /** - * Default constructor - */ - %{APPNAME}View(TQWidget *parent); - - /** - * Destructor - */ - virtual ~%{APPNAME}View(); - -private: - Ui::%{APPNAMELC}view_base ui_%{APPNAMELC}view_base; - -signals: - /** - * Use this signal to change the content of the statusbar - */ - void signalChangeStatusbar(const TQString& text); - - /** - * Use this signal to change the content of the caption - */ - void signalChangeCaption(const TQString& text); - -private slots: - void switchColors(); - void settingsChanged(); -}; - -#endif // %{APPNAME}VIEW_H diff --git a/languages/cpp/app_templates/kde4app/kapp4view_base.ui b/languages/cpp/app_templates/kde4app/kapp4view_base.ui deleted file mode 100644 index 6738a789..00000000 --- a/languages/cpp/app_templates/kde4app/kapp4view_base.ui +++ /dev/null @@ -1,213 +0,0 @@ -<ui version="4.0" > -<class>%{APPNAMELC}view_base</class> -<widget class="TQWidget" name="%{APPNAMELC}view_base" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>315</width> - <height>233</height> - </rect> - </property> - <property name="windowTitle" > - <string>%{APPNAMELC}_base</string> - </property> - <property name="autoFillBackground" > - <bool>true</bool> - </property> - <layout class="TQGridLayout" > - <property name="leftMargin" > - <number>11</number> - </property> - <property name="topMargin" > - <number>11</number> - </property> - <property name="rightMargin" > - <number>11</number> - </property> - <property name="bottomMargin" > - <number>11</number> - </property> - <property name="horizontalSpacing" > - <number>6</number> - </property> - <property name="verticalSpacing" > - <number>6</number> - </property> - <item row="0" column="0" > - <widget class="TQLabel" name="kcfg_sillyLabel" > - <property name="palette" > - <palette> - <active> - <colorrole role="WindowText" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>255</red> - <green>255</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - <colorrole role="Button" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>0</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - <colorrole role="Base" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>0</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - <colorrole role="Window" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>0</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - <colorrole role="AlternateBase" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>0</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - </active> - <inactive> - <colorrole role="WindowText" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>255</red> - <green>255</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - <colorrole role="Button" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>0</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - <colorrole role="Base" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>0</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - <colorrole role="Window" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>0</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - <colorrole role="AlternateBase" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>0</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - </inactive> - <disabled> - <colorrole role="WindowText" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>119</red> - <green>119</green> - <blue>119</blue> - </color> - </brush> - </colorrole> - <colorrole role="Button" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>0</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - <colorrole role="Base" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>0</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - <colorrole role="Window" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>0</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - <colorrole role="AlternateBase" > - <brush brushstyle="SolidPattern" > - <color alpha="255" > - <red>0</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - </disabled> - </palette> - </property> - <property name="font" > - <font> - <family>Sans Serif</family> - <pointsize>12</pointsize> - </font> - </property> - <property name="autoFillBackground" > - <bool>true</bool> - </property> - <property name="text" > - <string>hello, world</string> - </property> - <property name="scaledContents" > - <bool>true</bool> - </property> - <property name="alignment" > - <set>Qt::AlignCenter</set> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> - </item> - </layout> - </widget> - <layoutdefault spacing="6" margin="11" /> - <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> - <resources/> - <connections/> -</ui> diff --git a/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt b/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt deleted file mode 100644 index ef8ff86a..00000000 --- a/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ -project(%{APPNAME}) -find_package(KDE4 REQUIRED) -include (KDE4Defaults) -include_directories( ${KDE4_INCLUDES} ${TQT_INCLUDES} ) - -set(%{APPNAMELC}_SRCS - %{APPNAMELC}.cpp - main.cpp - %{APPNAMELC}view.cpp - ) - -#kde4_automoc(${%{APPNAMELC}_SRCS}) - -kde4_add_ui_files(%{APPNAMELC}_SRCS %{APPNAMELC}view_base.ui prefs_base.ui) - -kde4_add_kcfg_files(%{APPNAMELC}_SRCS settings.kcfgc ) - -kde4_add_executable(%{APPNAMELC} ${%{APPNAMELC}_SRCS}) - -target_link_libraries(%{APPNAMELC} ${KDE4_TDEUI_LIBS} ) - -install(TARGETS %{APPNAMELC} DESTINATION ${BIN_INSTALL_DIR} ) - - -########### install files ############### - -install( FILES %{APPNAMELC}.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -install( FILES %{APPNAMELC}.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) -install( FILES %{APPNAMELC}ui.rc DESTINATION ${DATA_INSTALL_DIR}/%{APPNAMELC} ) - - diff --git a/languages/cpp/app_templates/kde4app/kde4app.kdevelop b/languages/cpp/app_templates/kde4app/kde4app.kdevelop deleted file mode 100644 index 5168efbe..00000000 --- a/languages/cpp/app_templates/kde4app/kde4app.kdevelop +++ /dev/null @@ -1,205 +0,0 @@ -<?xml version = '1.0'?> -<kdevelop> - <general> - <author>%{AUTHOR}</author> - <email>%{EMAIL}</email> - <version>%{VERSION}</version> - <projectmanagement>KDevCustomProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>C++</keyword> - <keyword>Code</keyword> - <keyword>Qt</keyword> - <keyword>KDE</keyword> - </keywords> - <projectname>%{APPNAMELC}</projectname> - <projectdirectory>.</projectdirectory> - <absoluteprojectpath>false</absoluteprojectpath> - <description/> - <ignoreparts/> - </general> - <kdevfileview> - <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*.po;*.ts" name="Translations" /> - <group pattern="*" name="Others" /> - </groups> - <tree> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidepatterns>*.o,*.lo,CVS</hidepatterns> - </tree> - </kdevfileview> - <kdevdoctreeview> - <ignoretocs> - <toc>ada</toc> - <toc>ada_bugs_gcc</toc> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>w3c-dom-level2-html</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>w3c-svg</toc> - <toc>sw</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - </ignoretocs> - <ignoreqt_xml> - <toc>qmake User Guide</toc> - </ignoreqt_xml> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell>libtool</dbgshell> - <programargs/> - <gdbpath/> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - <runappinappdirectory>true</runappinappdirectory> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - </display> - </kdevdebugger> - <kdevfilecreate> - <filetypes/> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - </useglobaltypes> - </kdevfilecreate> - <kdevcvs> - <cvsoptions>-f</cvsoptions> - <commitoptions/> - <updateoptions>-dP</updateoptions> - <addoptions/> - <removeoptions>-f</removeoptions> - <diffoptions>-u3 -p</diffoptions> - <logoptions/> - <rshoptions/> - </kdevcvs> - <cppsupportpart> - <codecompletion/> - <filetemplates> - <choosefiles>false</choosefiles> - <interfaceURL/> - <implementationURL/> - <interfacesuffix>.h</interfacesuffix> - <implementationsuffix>.cpp</implementationsuffix> - <lowercasefilenames>true</lowercasefilenames> - </filetemplates> - </cppsupportpart> - <kdevcustomproject> - <run> - <mainprogram>%{dest}/build/%{APPNAMELC}</mainprogram> - <programargs/> - <terminal>false</terminal> - <autocompile>false</autocompile> - <envvars> - <envvar value="" name="TDEDIRS" /> - <envvar value="" name="TDEHOME" /> - <envvar value="" name="LD_LIBRARY_PATH" /> - <envvar value="" name="PATH" /> - <envvar value="" name="PKG_CONFIG_PATH" /> - <envvar value="" name="QT_PLUGIN_PATH" /> - </envvars> - <autoinstall>false</autoinstall> - <autotdesu>false</autotdesu> - <globaldebugarguments/> - <useglobalprogram>true</useglobalprogram> - <globalcwd>%{dest}</globalcwd> - <directoryradio>executable</directoryradio> - </run> - <build> - <buildtool>make</buildtool> - <builddir>%{dest}/build</builddir> - </build> - <make> - <abortonerror>false</abortonerror> - <numberofjobs>1</numberofjobs> - <prio>0</prio> - <dontact>false</dontact> - <makebin>make</makebin> - <defaulttarget/> - <makeoptions/> - <selectedenvironment>default</selectedenvironment> - <environments> - <default> - <envvar value="" name="TDEDIRS" /> - <envvar value="" name="TDEHOME" /> - <envvar value="" name="LD_LIBRARY_PATH" /> - <envvar value="" name="PATH" /> - <envvar value="" name="PKG_CONFIG_PATH" /> - <envvar value="" name="QT_PLUGIN_PATH" /> - </default> - </environments> - </make> - <filetypes> - <filetype>*.h</filetype> - <filetype>*.cpp</filetype> - <filetype>CMakeLists.txt</filetype> - <filetype>*.desktop</filetype> - <filetype>*.kcfg*</filetype> - <filetype>*.ui</filetype> - <filetype>Doxyfile</filetype> - <filetype>*.dox</filetype> - <filetype>*.rc</filetype> - <filetype>*.cmake</filetype> - </filetypes> - <other> - <prio>0</prio> - <otherbin/> - <defaulttarget/> - <otheroptions/> - <selectedenvironment>default</selectedenvironment> - <environments> - <default/> - </environments> - </other> - <blacklist> - <path>build</path> - </blacklist> - </kdevcustomproject> - <kdevcppsupport> - <qt> - <used>true</used> - <version>4</version> - <includestyle>4</includestyle> - <designerintegration>ExternalDesigner</designerintegration> - <designer>/usr/bin/designer-qt4</designer> - <root>/usr/lib/qt4</root> - </qt> - </kdevcppsupport> - <kdevclassview> - <folderhierarchy>true</folderhierarchy> - <depthoffolders>2</depthoffolders> - </kdevclassview> - <kdevdocumentation> - <projectdoc> - <docsystem>Doxygen Documentation Collection</docsystem> - <docurl>%{APPNAMELC}.tag</docurl> - </projectdoc> - </kdevdocumentation> -</kdevelop> diff --git a/languages/cpp/app_templates/kde4app/kde4app.kdevelop.filelist b/languages/cpp/app_templates/kde4app/kde4app.kdevelop.filelist deleted file mode 100644 index 5235563f..00000000 --- a/languages/cpp/app_templates/kde4app/kde4app.kdevelop.filelist +++ /dev/null @@ -1,13 +0,0 @@ -# KDevelop Custom Project File List -CMakeLists.txt -main.cpp -prefs_base.ui -settings.kcfgc -%{APPNAMELC}.cpp -%{APPNAMELC}.desktop -%{APPNAMELC}.h -%{APPNAMELC}.kcfg -%{APPNAMELC}ui.rc -%{APPNAMELC}view.cpp -%{APPNAMELC}view.h -%{APPNAMELC}view_base.ui diff --git a/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate b/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate deleted file mode 100644 index e61148ed..00000000 --- a/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate +++ /dev/null @@ -1,95 +0,0 @@ -# TDE Config File -[General] -Name=KDE4 Application framework - -Comment=Generates a simple KDE4 application with one toplevel window, menus and toolbars. - -Category=C++/KDE4 - -Icon=kde4app.png -FileTemplates=h,CStyle,cpp,CStyle -ShowFilesAfterGeneration=%{dest}/README -Archive=kde4app.tar.gz - -[FILE1] -Type=install -Source=%{src}/CMakeLists.txt -Dest=%{dest}/CMakeLists.txt - -[FILE2] -Type=install -Source=%{src}/main.cpp -Dest=%{dest}/main.cpp - -[FILE3] -Type=install -Source=%{src}/kapp4.cpp -Dest=%{dest}/%{APPNAMELC}.cpp - -[FILE4] -Type=install -Source=%{src}/kapp4.h -Dest=%{dest}/%{APPNAMELC}.h - -[FILE5] -Type=install -Source=%{src}/kapp4view.cpp -Dest=%{dest}/%{APPNAMELC}view.cpp - -[FILE6] -Type=install -Source=%{src}/kapp4view.h -Dest=%{dest}/%{APPNAMELC}view.h - -[FILE7] -Type=install -Source=%{src}/kde4appui.rc -Dest=%{dest}/%{APPNAMELC}ui.rc - -[FILE8] -Type=install -Source=%{src}/kapp4view_base.ui -Dest=%{dest}/%{APPNAMELC}view_base.ui - -[FILE9] -Type=install -Source=%{src}/kapp4.desktop -Dest=%{dest}/%{APPNAMELC}.desktop - -[FILE10] -Type=install -Source=%{src}/kapp4.kcfg -Dest=%{dest}/%{APPNAMELC}.kcfg - -[FILE11] -Type=install -Source=%{src}/prefs_base.ui -Dest=%{dest}/prefs_base.ui - -[FILE12] -Type=install -Source=%{src}/settings.kcfgc -Dest=%{dest}/settings.kcfgc - -[FILE13] -Type=install -Source=%{src}/README -Dest=%{dest}/README - -[FILE14] -Type=install -Source=%{src}/kde4app.kdevelop -Dest=%{dest}/%{APPNAMELC}.kdevelop - -[FILE15] -Type=install -Source=%{src}/kde4app.kdevelop.filelist -Dest=%{dest}/%{APPNAMELC}.kdevelop.filelist - -[MKDIR1] -Type=mkdir -Dir=%{dest}/build - -[MSG] -Type=message -Comment=A KDE4 Application was created at %{dest} diff --git a/languages/cpp/app_templates/kde4app/kde4app.png b/languages/cpp/app_templates/kde4app/kde4app.png Binary files differdeleted file mode 100644 index 42dfe38d..00000000 --- a/languages/cpp/app_templates/kde4app/kde4app.png +++ /dev/null diff --git a/languages/cpp/app_templates/kde4app/kde4appui.rc b/languages/cpp/app_templates/kde4app/kde4appui.rc deleted file mode 100644 index 406bccc6..00000000 --- a/languages/cpp/app_templates/kde4app/kde4appui.rc +++ /dev/null @@ -1,8 +0,0 @@ -<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="KApp4" version="1"> -<MenuBar> - <Menu name="move"><text>&Move</text> - <Action name="switch_action" /> - </Menu> -</MenuBar> -</kpartgui> diff --git a/languages/cpp/app_templates/kde4app/main.cpp b/languages/cpp/app_templates/kde4app/main.cpp deleted file mode 100644 index 5c83921b..00000000 --- a/languages/cpp/app_templates/kde4app/main.cpp +++ /dev/null @@ -1,55 +0,0 @@ -%{CPP_TEMPLATE} - -#include "%{APPNAMELC}.h" -#include <tdeapplication.h> -#include <tdeaboutdata.h> -#include <tdecmdlineargs.h> -#include <KDE/TDELocale> - -static const char description[] = - I18N_NOOP("A KDE 4 Application"); - -static const char version[] = "%{VERSION}"; - -int main(int argc, char **argv) -{ - TDEAboutData about("%{APPNAMELC}", 0, ki18n("%{APPNAME}"), version, ki18n(description), - TDEAboutData::License_%{LICENSE}, ki18n("(C) %{YEAR} %{AUTHOR}"), KLocalizedString(), 0, "%{EMAIL}"); - about.addAuthor( ki18n("%{AUTHOR}"), KLocalizedString(), "%{EMAIL}" ); - TDECmdLineArgs::init(argc, argv, &about); - - TDECmdLineOptions options; - options.add("+[URL]", ki18n( "Document to open" )); - TDECmdLineArgs::addCmdLineOptions(options); - TDEApplication app; - - %{APPNAME} *widget = new %{APPNAME}; - - // see if we are starting with session management - if (app.isSessionRestored()) - { - RESTORE(%{APPNAME}); - } - else - { - // no session.. just start up normally - TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); - if (args->count() == 0) - { - //%{APPNAMELC} *widget = new %{APPNAMELC}; - widget->show(); - } - else - { - int i = 0; - for (; i < args->count(); i++) - { - //%{APPNAMELC} *widget = new %{APPNAMELC}; - widget->show(); - } - } - args->clear(); - } - - return app.exec(); -} diff --git a/languages/cpp/app_templates/kde4app/prefs_base.ui b/languages/cpp/app_templates/kde4app/prefs_base.ui deleted file mode 100644 index 87a191f1..00000000 --- a/languages/cpp/app_templates/kde4app/prefs_base.ui +++ /dev/null @@ -1,155 +0,0 @@ -<ui version="4.0" > - <class>prefs_base</class> - <widget class="TQWidget" name="prefs_base" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>282</width> - <height>156</height> - </rect> - </property> - <layout class="TQGridLayout" > - <item row="0" column="0" > - <widget class="TQLabel" name="textLabel2_2" > - <property name="text" > - <string>Background color:</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> - </item> - <item row="0" column="1" > - <widget class="KColorButton" name="kcfg_col_background" > - <property name="toolTip" > - <string>Choose a new background color</string> - </property> - <property name="whatsThis" > - <string><html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Change the <span style=" font-weight:600;">background</span> color by clicking here and choose the new <span style=" color:#ff0000;">color</span> in the <span style=" font-style:italic;">color dialog</span>.</p></body></html></string> - </property> - <property name="text" > - <string/> - </property> - </widget> - </item> - <item row="2" column="0" > - <widget class="TQLabel" name="textLabel1" > - <property name="text" > - <string>Project age:</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> - </item> - <item row="1" column="0" > - <widget class="TQLabel" name="textLabel2" > - <property name="text" > - <string>Foreground color:</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> - </item> - <item row="1" column="1" > - <widget class="KColorButton" name="kcfg_col_foreground" > - <property name="toolTip" > - <string>Choose a new foreground color</string> - </property> - <property name="whatsThis" > - <string><html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Change the <span style=" font-weight:600;">foreground</span> color by clicking here and choose the new <span style=" color:#ff0000;">color</span> in the <span style=" font-style:italic;">color dialog</span>.</p></body></html></string> - </property> - <property name="text" > - <string/> - </property> - </widget> - </item> - <item row="0" column="2" > - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType" > - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" > - <size> - <width>41</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="2" > - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType" > - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" > - <size> - <width>41</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="2" column="1" > - <widget class="TQSpinBox" name="kcfg_val_time" > - <property name="toolTip" > - <string>Set the project age (in days)</string> - </property> - <property name="whatsThis" > - <string>Change the project age (in days) by choosing a new number of days.</string> - </property> - <property name="minimum" > - <number>1</number> - </property> - <property name="value" > - <number>2</number> - </property> - </widget> - </item> - <item row="2" column="2" > - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType" > - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" > - <size> - <width>41</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <layoutdefault spacing="6" margin="11" /> - <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> - <customwidgets> - <customwidget> - <class>KColorButton</class> - <extends>QPushButton</extends> - <header>kcolorbutton.h</header> - </customwidget> - </customwidgets> - <includes> - <include location="local" >kcolorbutton.h</include> - </includes> - <resources/> - <connections/> -</ui> diff --git a/languages/cpp/app_templates/kde4app/settings.kcfgc b/languages/cpp/app_templates/kde4app/settings.kcfgc deleted file mode 100644 index 402fad09..00000000 --- a/languages/cpp/app_templates/kde4app/settings.kcfgc +++ /dev/null @@ -1,6 +0,0 @@ -# Code generation options for tdeconfig_compiler -File=%{APPNAMELC}.kcfg -ClassName=Settings -Singleton=true -Mutators=col_background,col_foreground -# will create the necessary code for setting those variables diff --git a/languages/cpp/app_templates/kdedcop/app.h b/languages/cpp/app_templates/kdedcop/app.h index 814fccad..ecb916d6 100644 --- a/languages/cpp/app_templates/kdedcop/app.h +++ b/languages/cpp/app_templates/kdedcop/app.h @@ -18,7 +18,7 @@ */ class %{APPNAME} : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp index 69dcd7d8..c96ffbf1 100644 --- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp @@ -28,17 +28,17 @@ static const KDevPluginInfo data("kdev%{APPNAMELC}"); setXMLFile("kdevlang_%{APPNAMELC}.rc"); - m_build = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); + m_build = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQ_SLOT(slotRun()),actionCollection(), "build_execute" ); kdDebug() << "Creating %{APPNAMELC} Part" << endl; - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), this, TQT_SLOT(savedFile(const KURL&)) ); - connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part *))); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), this, TQ_SLOT(savedFile(const KURL&)) ); + connect(partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part *))); } @@ -74,14 +74,14 @@ void %{APPNAME}Part::projectOpened() { kdDebug(9014) << "projectOpened()" << endl; - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), - this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), - this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQ_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQ_SLOT(removedFilesFromProject(const TQStringList &)) ); // We want to parse only after all components have been // properly initialized - TQTimer::singleShot(0, this, TQT_SLOT(parse())); + TQTimer::singleShot(0, this, TQ_SLOT(parse())); } void %{APPNAME}Part::projectClosed() { diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.h b/languages/cpp/app_templates/kdevlang/kdevlang_part.h index 1cce0fa6..80a5354d 100644 --- a/languages/cpp/app_templates/kdevlang/kdevlang_part.h +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.h @@ -17,7 +17,7 @@ class TDEAction; */ class %{APPNAME}Part : public KDevLanguageSupport { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &); diff --git a/languages/cpp/app_templates/kdevpart/globalconfig.h b/languages/cpp/app_templates/kdevpart/globalconfig.h index 723dbae2..c5625705 100644 --- a/languages/cpp/app_templates/kdevpart/globalconfig.h +++ b/languages/cpp/app_templates/kdevpart/globalconfig.h @@ -8,7 +8,7 @@ class %{APPNAME}Part; class %{APPNAME}GlobalConfig: public %{APPNAME}GlobalConfigBase { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); diff --git a/languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate b/languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate index a7d04396..7bb82bf9 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate +++ b/languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate @@ -12,14 +12,14 @@ Archive=kdevpart.tar.gz [SCOPE] Type = value -ValueType=QString +ValueType=TQString Value= SCOPE Comment= The scope of a plugin (Global, Project, Core) Default= Global [PROPS] Type = value -ValueType=QString +ValueType=TQString Value= PROPS Comment= The list of supported TDevelop properties Default= diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp index 6a2559ba..4c940738 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp @@ -60,16 +60,16 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( pluginData ) m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createGlobalConfigPage(i18n("%{APPNAME}"), GLOBALDOC_OPTIONS, info()->icon()); m_configProxy->createProjectConfigPage(i18n("%{APPNAME}"), PROJECTDOC_OPTIONS, info()->icon()); - connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); + connect(m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); - connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); - connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); - connect(core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed())); + connect(core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened())); + connect(core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed())); - TQTimer::singleShot(0, this, TQT_SLOT(init())); + TQTimer::singleShot(0, this, TQ_SLOT(init())); } %{APPNAME}Part::~%{APPNAME}Part() @@ -92,7 +92,7 @@ void %{APPNAME}Part::setupActions() { // create XMLGUI actions here action = new TDEAction(i18n("&Do Something..."), 0, - this, TQT_SLOT(doSomething()), actionCollection(), "plugin_action" ); + this, TQ_SLOT(doSomething()), actionCollection(), "plugin_action" ); action->setToolTip(i18n("Do something")); action->setWhatsThis(i18n("<b>Do something</b><p>Describe here what does this action do.")); } @@ -105,13 +105,13 @@ void %{APPNAME}Part::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, case GLOBALDOC_OPTIONS: { %{APPNAME}GlobalConfig *w = new %{APPNAME}GlobalConfig(this, page, "global config"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } case PROJECTDOC_OPTIONS: { %{APPNAME}ProjectConfig *w = new %{APPNAME}ProjectConfig(this, page, "project config"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } } @@ -131,7 +131,7 @@ void %{APPNAME}Part::contextMenu(TQPopupMenu *popup, const Context *context) // or create menu items on the fly // int id = -1; // id = popup->insertItem(i18n("Do Something Here"), - // this, TQT_SLOT(doSomething()) ); + // this, TQ_SLOT(doSomething()) ); // popup->setWhatsThis(id, i18n("<b>Do something here</b><p>Describe here what does this action do." } else if (context->hasType(Context::FileContext)) diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.h b/languages/cpp/app_templates/kdevpart/kdevpart_part.h index 9414d448..cae84cf2 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_part.h +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.h @@ -18,7 +18,7 @@ Please read the README.dox file for more info about this part */ class %{APPNAME}Part: public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &args); diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_widget.h b/languages/cpp/app_templates/kdevpart/kdevpart_widget.h index e54abd4d..53b86bc9 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_widget.h +++ b/languages/cpp/app_templates/kdevpart/kdevpart_widget.h @@ -10,7 +10,7 @@ class %{APPNAME}Part; class %{APPNAME}Widget: public TQWidget { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}Widget(%{APPNAME}Part *part); diff --git a/languages/cpp/app_templates/kdevpart/projectconfig.h b/languages/cpp/app_templates/kdevpart/projectconfig.h index 49d4f089..54ffcccf 100644 --- a/languages/cpp/app_templates/kdevpart/projectconfig.h +++ b/languages/cpp/app_templates/kdevpart/projectconfig.h @@ -8,7 +8,7 @@ class %{APPNAME}Part; class %{APPNAME}ProjectConfig: public %{APPNAME}ProjectConfigBase { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); diff --git a/languages/cpp/app_templates/kdevpart2/globalconfig.h b/languages/cpp/app_templates/kdevpart2/globalconfig.h index 723dbae2..c5625705 100644 --- a/languages/cpp/app_templates/kdevpart2/globalconfig.h +++ b/languages/cpp/app_templates/kdevpart2/globalconfig.h @@ -8,7 +8,7 @@ class %{APPNAME}Part; class %{APPNAME}GlobalConfig: public %{APPNAME}GlobalConfigBase { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate b/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate index 3eebf31a..d2b2e39f 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate +++ b/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate @@ -12,14 +12,14 @@ Archive=kdevpart2.tar.gz [SCOPE] Type = value -ValueType=QString +ValueType=TQString Value= SCOPE Comment= The scope of a plugin (Global, Project, Core) Default= Global [PROPS] Type = value -ValueType=QString +ValueType=TQString Value= PROPS Comment= The list of supported TDevelop properties Default= diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp index 6a2559ba..4c940738 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp @@ -60,16 +60,16 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( pluginData ) m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createGlobalConfigPage(i18n("%{APPNAME}"), GLOBALDOC_OPTIONS, info()->icon()); m_configProxy->createProjectConfigPage(i18n("%{APPNAME}"), PROJECTDOC_OPTIONS, info()->icon()); - connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); + connect(m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); - connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); - connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); - connect(core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed())); + connect(core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened())); + connect(core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed())); - TQTimer::singleShot(0, this, TQT_SLOT(init())); + TQTimer::singleShot(0, this, TQ_SLOT(init())); } %{APPNAME}Part::~%{APPNAME}Part() @@ -92,7 +92,7 @@ void %{APPNAME}Part::setupActions() { // create XMLGUI actions here action = new TDEAction(i18n("&Do Something..."), 0, - this, TQT_SLOT(doSomething()), actionCollection(), "plugin_action" ); + this, TQ_SLOT(doSomething()), actionCollection(), "plugin_action" ); action->setToolTip(i18n("Do something")); action->setWhatsThis(i18n("<b>Do something</b><p>Describe here what does this action do.")); } @@ -105,13 +105,13 @@ void %{APPNAME}Part::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, case GLOBALDOC_OPTIONS: { %{APPNAME}GlobalConfig *w = new %{APPNAME}GlobalConfig(this, page, "global config"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } case PROJECTDOC_OPTIONS: { %{APPNAME}ProjectConfig *w = new %{APPNAME}ProjectConfig(this, page, "project config"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } } @@ -131,7 +131,7 @@ void %{APPNAME}Part::contextMenu(TQPopupMenu *popup, const Context *context) // or create menu items on the fly // int id = -1; // id = popup->insertItem(i18n("Do Something Here"), - // this, TQT_SLOT(doSomething()) ); + // this, TQ_SLOT(doSomething()) ); // popup->setWhatsThis(id, i18n("<b>Do something here</b><p>Describe here what does this action do." } else if (context->hasType(Context::FileContext)) diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h index 9414d448..cae84cf2 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h @@ -18,7 +18,7 @@ Please read the README.dox file for more info about this part */ class %{APPNAME}Part: public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &args); diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h index e54abd4d..53b86bc9 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h @@ -10,7 +10,7 @@ class %{APPNAME}Part; class %{APPNAME}Widget: public TQWidget { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}Widget(%{APPNAME}Part *part); diff --git a/languages/cpp/app_templates/kdevpart2/projectconfig.h b/languages/cpp/app_templates/kdevpart2/projectconfig.h index 49d4f089..54ffcccf 100644 --- a/languages/cpp/app_templates/kdevpart2/projectconfig.h +++ b/languages/cpp/app_templates/kdevpart2/projectconfig.h @@ -8,7 +8,7 @@ class %{APPNAME}Part; class %{APPNAME}ProjectConfig: public %{APPNAME}ProjectConfigBase { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); diff --git a/languages/cpp/app_templates/khello/app.h b/languages/cpp/app_templates/khello/app.h index 11a9241f..bc0b1520 100644 --- a/languages/cpp/app_templates/khello/app.h +++ b/languages/cpp/app_templates/khello/app.h @@ -16,7 +16,7 @@ */ class %{APPNAME} : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/khello2/app.h b/languages/cpp/app_templates/khello2/app.h index 11a9241f..bc0b1520 100644 --- a/languages/cpp/app_templates/khello2/app.h +++ b/languages/cpp/app_templates/khello2/app.h @@ -16,7 +16,7 @@ */ class %{APPNAME} : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/khello2/widget.h b/languages/cpp/app_templates/khello2/widget.h index 127019ee..aac7c40d 100644 --- a/languages/cpp/app_templates/khello2/widget.h +++ b/languages/cpp/app_templates/khello2/widget.h @@ -7,7 +7,7 @@ class %{APPNAME}Widget : public %{APPNAME}WidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/khello2/widgetbase.ui b/languages/cpp/app_templates/khello2/widgetbase.ui index 365f4cf2..90cac0c6 100644 --- a/languages/cpp/app_templates/khello2/widgetbase.ui +++ b/languages/cpp/app_templates/khello2/widgetbase.ui @@ -45,8 +45,8 @@ <slot>button_clicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>button_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kicker/applet.h b/languages/cpp/app_templates/kicker/applet.h index 7d272743..e078b568 100644 --- a/languages/cpp/app_templates/kicker/applet.h +++ b/languages/cpp/app_templates/kicker/applet.h @@ -14,7 +14,7 @@ class %{APPNAME} : public KPanelApplet { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/kmake/mainview.ui b/languages/cpp/app_templates/kmake/mainview.ui index 194d8ffe..a5481dd2 100644 --- a/languages/cpp/app_templates/kmake/mainview.ui +++ b/languages/cpp/app_templates/kmake/mainview.ui @@ -69,8 +69,8 @@ <slot>slotHelloButtonClicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotHelloButtonClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kmake/mainviewimp.h b/languages/cpp/app_templates/kmake/mainviewimp.h index a5ca62df..3e1a7287 100644 --- a/languages/cpp/app_templates/kmake/mainviewimp.h +++ b/languages/cpp/app_templates/kmake/mainviewimp.h @@ -5,7 +5,7 @@ class MainViewImp : public MainView { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.h b/languages/cpp/app_templates/kofficepart/kopart_factory.h index 2d5a56e2..7957037a 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_factory.h +++ b/languages/cpp/app_templates/kofficepart/kopart_factory.h @@ -13,7 +13,7 @@ class TDEAboutData; class %{APPNAME}Factory : public KoFactory { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}Factory( TQObject* parent = 0, const char* name = 0 ); diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.h b/languages/cpp/app_templates/kofficepart/kopart_part.h index 9dced411..57b57cb6 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_part.h +++ b/languages/cpp/app_templates/kofficepart/kopart_part.h @@ -10,7 +10,7 @@ class %{APPNAME}Part : public KoDocument { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}Part( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false ); diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.cpp b/languages/cpp/app_templates/kofficepart/kopart_view.cpp index 601413ef..2cf5ff06 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_view.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_view.cpp @@ -18,9 +18,9 @@ { setInstance( %{APPNAME}Factory::global() ); setXMLFile( "%{APPNAMELC}.rc" ); - KStdAction::cut(this, TQT_SLOT( cut() ), actionCollection(), "cut" ); + KStdAction::cut(this, TQ_SLOT( cut() ), actionCollection(), "cut" ); // Note: Prefer KStdAction::* to any custom action if possible. - //m_cut = new TDEAction( i18n("&Cut"), "edit-cut", 0, this, TQT_SLOT( cut() ), + //m_cut = new TDEAction( i18n("&Cut"), "edit-cut", 0, this, TQ_SLOT( cut() ), // actionCollection(), "cut"); } diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.h b/languages/cpp/app_templates/kofficepart/kopart_view.h index a7e0fd50..6233ff6d 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_view.h +++ b/languages/cpp/app_templates/kofficepart/kopart_view.h @@ -15,7 +15,7 @@ class %{APPNAME}Part; class %{APPNAME}View : public KoView { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}View( %{APPNAME}Part* part, TQWidget* parent = 0, const char* name = 0 ); diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h index 527be77e..aedddf27 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h @@ -13,7 +13,7 @@ class %{APPNAME} : public KonqSidebarPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp index 759cbf5a..f963714e 100644 --- a/languages/cpp/app_templates/kpartapp/app.cpp +++ b/languages/cpp/app_templates/kpartapp/app.cpp @@ -76,16 +76,16 @@ void %{APPNAME}::load(const KURL& url) void %{APPNAME}::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); } void %{APPNAME}::saveProperties(TDEConfig* /*config*/) @@ -159,8 +159,8 @@ void %{APPNAME}::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } diff --git a/languages/cpp/app_templates/kpartapp/app.h b/languages/cpp/app_templates/kpartapp/app.h index b9101033..480680b7 100644 --- a/languages/cpp/app_templates/kpartapp/app.h +++ b/languages/cpp/app_templates/kpartapp/app.h @@ -21,7 +21,7 @@ class TDEToggleAction; */ class %{APPNAME} : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp index adf210b3..f4f866b1 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.cpp +++ b/languages/cpp/app_templates/kpartapp/app_part.cpp @@ -26,9 +26,9 @@ setWidget(m_widget); // create our actions - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - KStdAction::save(this, TQT_SLOT(save()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + KStdAction::save(this, TQ_SLOT(save()), actionCollection()); // set our XML-UI resource file setXMLFile("%{APPNAMELC}_part.rc"); @@ -49,12 +49,12 @@ void %{APPNAME}Part::setReadWrite(bool rw) // notify your internal widget of the read-write state m_widget->setReadOnly(!rw); if (rw) - connect(m_widget, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); + connect(m_widget, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(setModified())); else { - disconnect(m_widget, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); + disconnect(m_widget, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(setModified())); } ReadWritePart::setReadWrite(rw); diff --git a/languages/cpp/app_templates/kpartapp/app_part.h b/languages/cpp/app_templates/kpartapp/app_part.h index 6ea44663..39e3827b 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.h +++ b/languages/cpp/app_templates/kpartapp/app_part.h @@ -20,7 +20,7 @@ class TQMultiLineEdit; */ class %{APPNAME}Part : public KParts::ReadWritePart { - Q_OBJECT + TQ_OBJECT public: /** @@ -70,7 +70,7 @@ class TDEAboutData; class %{APPNAME}PartFactory : public KParts::Factory { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}PartFactory(); diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp index c395d983..ecda7fb0 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp @@ -14,7 +14,7 @@ Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* parent, const char* name ) // Instantiate all of your actions here. These will appear in // Konqueror's menu and toolbars. (void) new TDEAction( i18n("&Plugin Action"), "%{APPNAMELC}", 0, - this, TQT_SLOT(slotAction()), + this, TQ_SLOT(slotAction()), actionCollection(), "plugin_action" ); } diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.h b/languages/cpp/app_templates/kpartplugin/plugin_app.h index 16142b33..30352231 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.h +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.h @@ -7,7 +7,7 @@ class Plugin%{APPNAME} : public KParts::Plugin { - Q_OBJECT + TQ_OBJECT public: Plugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 ); @@ -19,13 +19,13 @@ public slots: class %{APPNAME}Factory : public KLibFactory { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}Factory(); virtual ~%{APPNAME}Factory(); - virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() ); static TDEInstance* instance(); diff --git a/languages/cpp/app_templates/kscons_kxt/QUICKSTART b/languages/cpp/app_templates/kscons_kxt/QUICKSTART index 0028fa2c..7036e4cb 100644 --- a/languages/cpp/app_templates/kscons_kxt/QUICKSTART +++ b/languages/cpp/app_templates/kscons_kxt/QUICKSTART @@ -64,7 +64,7 @@ To make scons run (much) faster, consult ./addons/README in bksys MOC PROCESSING In qt programs, when a header 'foo.h' contains a class that has -Q_SIGNALS and Q_SLOTS, then 'foo.h' must contain the macro Q_OBJECT +signals and slots, then 'foo.h' must contain the macro TQ_OBJECT in order to compile. foo_moc.cpp is usually generated, and is used to produce foo_moc.o which is linked with the program or the library. @@ -129,7 +129,7 @@ among others), so when you can work without libtool ** moc processing ** As stated above, you should always add #include "foo.moc" -for your qt classes (Q_OBJECT) to save precious compilation time. +for your qt classes (TQ_OBJECT) to save precious compilation time. ** using a cache ** It is a good idea to enable the cache feature in SConstruct, diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp index 00e1adea..44a90d53 100644 --- a/languages/cpp/app_templates/kscons_kxt/app.cpp +++ b/languages/cpp/app_templates/kscons_kxt/app.cpp @@ -48,10 +48,10 @@ setAutoSaveSettings(); // allow the view to change the statusbar and caption - connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); - connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), - this, TQT_SLOT(changeCaption(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); showTipOnStart(); } @@ -62,22 +62,22 @@ void %{APPNAME}::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::tipOfDay( this, TQT_SLOT( showTip() ), actionCollection() + KStdAction::tipOfDay( this, TQ_SLOT( showTip() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application.")); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item - the slot is in the class %{APPNAME}View TDEAction *custom = new TDEAction(i18n("Swi&tch Colors"), 0, - m_view, TQT_SLOT(switchColors()), + m_view, TQ_SLOT(switchColors()), actionCollection(), "switch_action"); createGUI(); @@ -140,7 +140,7 @@ void %{APPNAME}::optionsPreferences() // to the names of the variables in the .kcfg file TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow); dialog->addPage(new Prefs(), i18n("General"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged())); + connect(dialog, TQ_SIGNAL(settingsChanged()), m_view, TQ_SLOT(settingsChanged())); dialog->show(); } diff --git a/languages/cpp/app_templates/kscons_kxt/app.h b/languages/cpp/app_templates/kscons_kxt/app.h index 8fb9d688..9493eb35 100644 --- a/languages/cpp/app_templates/kscons_kxt/app.h +++ b/languages/cpp/app_templates/kscons_kxt/app.h @@ -28,7 +28,7 @@ class KURL; class %{APPNAME} : public TDEMainWindow, public DCOPObject { K_DCOP - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/kscons_kxt/appview.h b/languages/cpp/app_templates/kscons_kxt/appview.h index 38f0e58a..7b115860 100644 --- a/languages/cpp/app_templates/kscons_kxt/appview.h +++ b/languages/cpp/app_templates/kscons_kxt/appview.h @@ -21,7 +21,7 @@ class KURL; */ class %{APPNAME}View : public %{APPNAME}view_base { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART b/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART index 0028fa2c..7036e4cb 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART +++ b/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART @@ -64,7 +64,7 @@ To make scons run (much) faster, consult ./addons/README in bksys MOC PROCESSING In qt programs, when a header 'foo.h' contains a class that has -Q_SIGNALS and Q_SLOTS, then 'foo.h' must contain the macro Q_OBJECT +signals and slots, then 'foo.h' must contain the macro TQ_OBJECT in order to compile. foo_moc.cpp is usually generated, and is used to produce foo_moc.o which is linked with the program or the library. @@ -129,7 +129,7 @@ among others), so when you can work without libtool ** moc processing ** As stated above, you should always add #include "foo.moc" -for your qt classes (Q_OBJECT) to save precious compilation time. +for your qt classes (TQ_OBJECT) to save precious compilation time. ** using a cache ** It is a good idea to enable the cache feature in SConstruct, diff --git a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp index cde31592..daa8b078 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp +++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp @@ -31,9 +31,9 @@ K_EXPORT_COMPONENT_FACTORY( lib%{APPNAMELC}part, %{APPNAMELC}PartFactory ); setWidget(m_widget); // create our actions - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - KStdAction::save(this, TQT_SLOT(save()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + KStdAction::save(this, TQ_SLOT(save()), actionCollection()); // set our XML-UI resource file setXMLFile("%{APPNAMELC}_part.rc"); @@ -63,12 +63,12 @@ void %{APPNAMELC}Part::setReadWrite(bool rw) // notify your internal widget of the read-write state m_widget->setReadOnly(!rw); if (rw) - connect(m_widget, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); + connect(m_widget, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(setModified())); else { - disconnect(m_widget, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); + disconnect(m_widget, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(setModified())); } ReadWritePart::setReadWrite(rw); diff --git a/languages/cpp/app_templates/kscons_tdemdi/app_part.h b/languages/cpp/app_templates/kscons_tdemdi/app_part.h index 13f773a1..e23f8cbf 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/app_part.h +++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.h @@ -22,7 +22,7 @@ class TDEAboutData; */ class %{APPNAMELC}Part : public KParts::ReadWritePart { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp index c63cb223..51639f36 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp +++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp @@ -53,8 +53,8 @@ setStandardMDIMenuEnabled(false); m_manager = new KParts::PartManager(this); - connect(m_manager, TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(createGUI(KParts::Part*)) ); + connect(m_manager, TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(createGUI(KParts::Part*)) ); #if KDE_IS_VERSION(3, 3, 0) setToolviewStyle( KMdi::TextAndIcon ); @@ -77,7 +77,7 @@ // and a status bar statusBar()->show(); - connect( this, TQT_SIGNAL( viewActivated( KMdiChildView * ) ), this, TQT_SLOT( currentChanged( KMdiChildView * ) ) ); + connect( this, TQ_SIGNAL( viewActivated( KMdiChildView * ) ), this, TQ_SLOT( currentChanged( KMdiChildView * ) ) ); m_console = new tdemdikonsole(this, "konsole"); m_console->setIcon( SmallIcon("konsole") ); @@ -92,7 +92,7 @@ but->setIconSet(SmallIcon("tab_remove")); but->adjustSize(); but->hide(); - connect(but, TQT_SIGNAL(clicked()), actionCollection()->action( "file_close" ), TQT_SIGNAL(activated())); + connect(but, TQ_SIGNAL(clicked()), actionCollection()->action( "file_close" ), TQ_SIGNAL(activated())); tabWidget()->setCornerWidget(but, TopRight); } #endif @@ -124,22 +124,22 @@ void %{APPNAMELC}tdemdi::setupActions() { setXMLFile("%{APPNAMELC}_shell.rc"); - KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(slotFileNew()), actionCollection()); - KStdAction::tipOfDay( this, TQT_SLOT( showTip() ), actionCollection() + KStdAction::tipOfDay( this, TQ_SLOT( showTip() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application.")); - KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection()); - KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); + KStdAction::close(this, TQ_SLOT(slotFileClose()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); TDEAction* action = KStdAction::configureToolbars(this, - TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + TQ_SLOT(optionsConfigureToolbars()), actionCollection()); createGUI( NULL ); } @@ -320,7 +320,7 @@ void %{APPNAMELC}tdemdi::optionsPreferences() TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow); dialog->addPage(new prefs(), i18n("General"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChanged())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(settingsChanged())); dialog->show(); } diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h index 288395db..a2af9030 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h +++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h @@ -27,7 +27,7 @@ class MiscProperties; */ class %{APPNAMELC}tdemdi : public KMdiMainFrm { - Q_OBJECT + TQ_OBJECT public: %{APPNAMELC}tdemdi( KMdi::MdiMode mode ); diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp index 1feb1b8b..24b1a974 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp +++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp @@ -39,7 +39,7 @@ part()->widget()->reparent( this, TQPoint(0, 0) ); layout->addWidget( part()->widget() ); - // connect( m_part, TQT_SIGNAL(stateChanged()), this, TQT_SLOT(updateCaption()) ); + // connect( m_part, TQ_SIGNAL(stateChanged()), this, TQ_SLOT(updateCaption()) ); } else { diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.h b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.h index 00109fdb..1f40ea9a 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.h +++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.h @@ -14,7 +14,7 @@ */ class %{APPNAMELC}tdemdiView : public KMdiChildView { - Q_OBJECT + TQ_OBJECT public: %{APPNAMELC}tdemdiView( TQWidget *parentWidget=0L, const char *name=0L ); diff --git a/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp index 229c28a8..22c399ef 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp +++ b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp @@ -31,11 +31,11 @@ void tdemdikonsole::respawn() if (!m_part) return; - if (m_part->widget()->inherits(TQFRAME_OBJECT_NAME_STRING)) + if (m_part->widget()->inherits("TQFrame")) ((TQFrame*)m_part->widget())->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); m_haskonsole=true; - connect( m_part, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) ); + connect( m_part, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) ); m_part->widget()->show(); show(); diff --git a/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.h b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.h index d84cd961..0aded5c1 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.h +++ b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.h @@ -7,7 +7,7 @@ class tdemdikonsole : public TQVBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/kxt/app.cpp b/languages/cpp/app_templates/kxt/app.cpp index ecdd5127..e9edb6d5 100644 --- a/languages/cpp/app_templates/kxt/app.cpp +++ b/languages/cpp/app_templates/kxt/app.cpp @@ -47,10 +47,10 @@ setAutoSaveSettings(); // allow the view to change the statusbar and caption - connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); - connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), - this, TQT_SLOT(changeCaption(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); } @@ -60,19 +60,19 @@ void %{APPNAMELC}::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item - the slot is in the class %{APPNAMELC}View TDEAction *custom = new TDEAction(i18n("Swi&tch Colors"), 0, - m_view, TQT_SLOT(switchColors()), + m_view, TQ_SLOT(switchColors()), actionCollection(), "switch_action"); createGUI(); @@ -135,7 +135,7 @@ void %{APPNAMELC}::optionsPreferences() // to the names of the variables in the .kcfg file TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow); dialog->addPage(new Prefs(), i18n("General"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged())); + connect(dialog, TQ_SIGNAL(settingsChanged()), m_view, TQ_SLOT(settingsChanged())); dialog->show(); } diff --git a/languages/cpp/app_templates/kxt/app.h b/languages/cpp/app_templates/kxt/app.h index 7b6305ea..83bcca7d 100644 --- a/languages/cpp/app_templates/kxt/app.h +++ b/languages/cpp/app_templates/kxt/app.h @@ -26,7 +26,7 @@ class KURL; */ class %{APPNAMELC} : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/kxt/appview.h b/languages/cpp/app_templates/kxt/appview.h index a486ec43..20e010d0 100644 --- a/languages/cpp/app_templates/kxt/appview.h +++ b/languages/cpp/app_templates/kxt/appview.h @@ -21,7 +21,7 @@ class KURL; */ class %{APPNAMELC}View : public %{APPNAMELC}view_base { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.cpp b/languages/cpp/app_templates/noatunui/plugin_impl.cpp index 150e829d..a0c0d0ee 100644 --- a/languages/cpp/app_templates/noatunui/plugin_impl.cpp +++ b/languages/cpp/app_templates/noatunui/plugin_impl.cpp @@ -33,50 +33,50 @@ mBack=new TQPushButton(this); mBack->setFixedSize(buttonSize,buttonSize); mBack->setPixmap(BarIcon("noatunback")); - connect(mBack, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back())); + connect(mBack, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(back())); TQToolTip::add(mBack,i18n("Back")); mStop=new TQPushButton(this); mStop->setFixedSize(buttonSize,buttonSize); mStop->setPixmap(BarIcon("noatunstop")); - connect(mStop, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop())); + connect(mStop, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(stop())); TQToolTip::add(mStop, i18n("Stop")); mPlay=new TQPushButton(this); mPlay->setToggleButton(true); mPlay->setFixedSize(buttonSize,buttonSize); mPlay->setPixmap(BarIcon("noatunplay")); - connect(mPlay, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause())); + connect(mPlay, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(playpause())); TQToolTip::add(mPlay, i18n("Play")); mForward=new TQPushButton(this); mForward->setFixedSize(buttonSize,buttonSize); mForward->setPixmap(BarIcon("noatunforward")); - connect(mForward, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward())); + connect(mForward, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(forward())); TQToolTip::add(mForward, i18n("Forward")); mPlaylist=new TQPushButton(this); mPlaylist->setToggleButton(true); mPlaylist->setFixedSize(buttonSize,buttonSize); mPlaylist->setPixmap(BarIcon("noatunplaylist")); - connect(mPlaylist, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(toggleListView())); + connect(mPlaylist, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(toggleListView())); TQToolTip::add(mPlaylist, i18n("Playlist")); mLoop=new TQPushButton(this); mLoop->setFixedSize(buttonSize,buttonSize); mLoop->setPixmap(BarIcon("noatunloopnone")); - connect(mLoop, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(loop())); + connect(mLoop, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(loop())); TQToolTip::add(mLoop, i18n("Change loop style")); mPopup=new TQPushButton(this); mPopup->setFixedSize(buttonSize,buttonSize); mPopup->setPixmap(BarIcon("noatun")); - connect(mPopup, TQT_SIGNAL(clicked()), TQT_SLOT(popup())); + connect(mPopup, TQ_SIGNAL(clicked()), TQ_SLOT(popup())); - mVolume=new L33tSlider(0,100,10,0,Qt::Horizontal, this); + mVolume=new L33tSlider(0,100,10,0,TQt::Horizontal, this); mVolume->setValue(napp->player()->volume()); - mSeeker=new L33tSlider(0,1000,10,0,Qt::Horizontal, this); + mSeeker=new L33tSlider(0,1000,10,0,TQt::Horizontal, this); mStatusBar=new KStatusBar(this); @@ -98,30 +98,30 @@ statusBar()->message(i18n("No File Loaded")); statusBar()->insertItem("--:--/--:--", 1, 0, true); - connect(napp, TQT_SIGNAL(hideYourself()), this, TQT_SLOT(hide()) ); - connect(napp, TQT_SIGNAL(showYourself()), this, TQT_SLOT(show()) ); + connect(napp, TQ_SIGNAL(hideYourself()), this, TQ_SLOT(hide()) ); + connect(napp, TQ_SIGNAL(showYourself()), this, TQ_SLOT(show()) ); - connect(napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(slotPlaying())); - connect(napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(slotStopped())); - connect(napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(slotPaused())); + connect(napp->player(), TQ_SIGNAL(playing()), this, TQ_SLOT(slotPlaying())); + connect(napp->player(), TQ_SIGNAL(stopped()), this, TQ_SLOT(slotStopped())); + connect(napp->player(), TQ_SIGNAL(paused()), this, TQ_SLOT(slotPaused())); napp->player()->handleButtons(); - connect(napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); - connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(changeLoopType(int))); + connect(napp->player(), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); + connect(napp->player(), TQ_SIGNAL(loopTypeChange(int)), this, TQ_SLOT(changeLoopType(int))); /* This skipToWrapper is needed to pass milliseconds to Player() as everybody * below the GUI is based on milliseconds instead of some unprecise thingy * like seconds or mille */ - connect(seeker(), TQT_SIGNAL(userChanged(int)), this, TQT_SLOT(skipToWrapper(int))); - connect(this, TQT_SIGNAL(skipTo(int)), napp->player(), TQT_SLOT(skipTo(int))); - connect(seeker(), TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(sliderMoved(int))); + connect(seeker(), TQ_SIGNAL(userChanged(int)), this, TQ_SLOT(skipToWrapper(int))); + connect(this, TQ_SIGNAL(skipTo(int)), napp->player(), TQ_SLOT(skipTo(int))); + connect(seeker(), TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(sliderMoved(int))); - connect(mVolume, TQT_SIGNAL(sliderMoved(int)), napp->player(), TQT_SLOT(setVolume(int))); - connect(mVolume, TQT_SIGNAL(userChanged(int)), napp->player(), TQT_SLOT(setVolume(int))); + connect(mVolume, TQ_SIGNAL(sliderMoved(int)), napp->player(), TQ_SLOT(setVolume(int))); + connect(mVolume, TQ_SIGNAL(userChanged(int)), napp->player(), TQ_SLOT(setVolume(int))); - connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(playlistShown())); - connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(playlistHidden())); + connect(napp->player(), TQ_SIGNAL(playlistShown()), TQ_SLOT(playlistShown())); + connect(napp->player(), TQ_SIGNAL(playlistHidden()), TQ_SLOT(playlistHidden())); // Event Filter for the RMB for (TQPtrListIterator<TQObject> i(*children()); i.current(); ++i) diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.h b/languages/cpp/app_templates/noatunui/plugin_impl.h index 44f77f75..253c94dc 100644 --- a/languages/cpp/app_templates/noatunui/plugin_impl.h +++ b/languages/cpp/app_templates/noatunui/plugin_impl.h @@ -25,7 +25,7 @@ class KStatusBar; */ class %{APPNAME}UI : public TQWidget, public UserInterface { -Q_OBJECT +TQ_OBJECT public: %{APPNAME}UI(); diff --git a/languages/cpp/app_templates/opieapp/example.cpp b/languages/cpp/app_templates/opieapp/example.cpp index 6a0d616e..f0be7179 100644 --- a/languages/cpp/app_templates/opieapp/example.cpp +++ b/languages/cpp/app_templates/opieapp/example.cpp @@ -12,7 +12,7 @@ OPIE_EXPORT_APP( %{APPNAME}Factory ) %{APPNAME}::%{APPNAME}( TQWidget* parent, const char* name, WFlags fl ) : %{APPNAME}Base( parent, name, fl ) { - connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); + connect(quit, TQ_SIGNAL(clicked()), this, TQ_SLOT(goodBye())); } /* diff --git a/languages/cpp/app_templates/opieapp/example.h b/languages/cpp/app_templates/opieapp/example.h index 0dabb6c9..9f2cd967 100644 --- a/languages/cpp/app_templates/opieapp/example.h +++ b/languages/cpp/app_templates/opieapp/example.h @@ -4,7 +4,7 @@ class %{APPNAME} : public %{APPNAME}Base { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/opieapp/examplebase.ui b/languages/cpp/app_templates/opieapp/examplebase.ui index b6b81b11..e6f7eba6 100644 --- a/languages/cpp/app_templates/opieapp/examplebase.ui +++ b/languages/cpp/app_templates/opieapp/examplebase.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI> <class>%{APPNAME}Base</class> <widget> - <class>QWidget</class> + <class>TQWidget</class> <property stdset="1"> <name>name</name> <cstring>%{APPNAME}Base</cstring> diff --git a/languages/cpp/app_templates/opieapplet/simpleimpl.cpp b/languages/cpp/app_templates/opieapplet/simpleimpl.cpp index fbb29ae2..db3e71c4 100644 --- a/languages/cpp/app_templates/opieapplet/simpleimpl.cpp +++ b/languages/cpp/app_templates/opieapplet/simpleimpl.cpp @@ -128,7 +128,7 @@ TQRESULT %{APPNAME}Impl::queryInterface( const TQUuid& uuid, TQUnknownInterface* * Now the caller knows that the Interface Pointer * is valid and the interface supported */ - if ( uuid == IID_TQUnknown ) + if ( uuid == IID_QUnknown ) *iface = this; else if ( uuid == IID_TaskbarApplet ) *iface = this; diff --git a/languages/cpp/app_templates/opieapplet/simpleimpl.h b/languages/cpp/app_templates/opieapplet/simpleimpl.h index dc227bb1..a1e8400f 100644 --- a/languages/cpp/app_templates/opieapplet/simpleimpl.h +++ b/languages/cpp/app_templates/opieapplet/simpleimpl.h @@ -39,7 +39,7 @@ * You might also want to reimplement mouse*Event to use some simple actions */ class %{APPNAME} : public TQWidget { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}(TQWidget *parent); diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.cpp b/languages/cpp/app_templates/opieinput/simpleimpl.cpp index a4c2e177..dd3475e1 100644 --- a/languages/cpp/app_templates/opieinput/simpleimpl.cpp +++ b/languages/cpp/app_templates/opieinput/simpleimpl.cpp @@ -11,33 +11,33 @@ : TQHBox(par, "name", fl ) { TQCheckBox *box1 = new TQCheckBox(tr("Alt"),this); - connect(box1,TQT_SIGNAL(toggled(bool)), - this,TQT_SLOT(slotAlt(bool))); + connect(box1,TQ_SIGNAL(toggled(bool)), + this,TQ_SLOT(slotAlt(bool))); m_alt = box1; box1 = new TQCheckBox(tr("Shift"),this ); - connect(box1,TQT_SIGNAL(toggled(bool)), - this,TQT_SLOT(slotShift(bool))); + connect(box1,TQ_SIGNAL(toggled(bool)), + this,TQ_SLOT(slotShift(bool))); m_shi = box1; box1 = new TQCheckBox(tr("Ctrl","Control Shortcut on keyboard"),this ); - connect(box1,TQT_SIGNAL(toggled(bool)), - this,TQT_SLOT(slotCtrl(bool))); + connect(box1,TQ_SIGNAL(toggled(bool)), + this,TQ_SLOT(slotCtrl(bool))); m_ctrl = box1; TQSignalMapper *map = new TQSignalMapper(this); TQPushButton *btn = new TQPushButton("a",this); map->setMapping(btn,0); - connect(btn,TQT_SIGNAL(clicked()),map,TQT_SLOT(map())); + connect(btn,TQ_SIGNAL(clicked()),map,TQ_SLOT(map())); btn = new TQPushButton("b",this); map->setMapping(btn,1); - connect(btn,TQT_SIGNAL(clicked()),map,TQT_SLOT(map())); + connect(btn,TQ_SIGNAL(clicked()),map,TQ_SLOT(map())); btn = new TQPushButton("c",this); map->setMapping(btn,2); - connect(btn,TQT_SIGNAL(clicked()),map,TQT_SLOT(map())); + connect(btn,TQ_SIGNAL(clicked()),map,TQ_SLOT(map())); - connect(map,TQT_SIGNAL(mapped(int)), - this,TQT_SLOT(slotKey(int))); + connect(map,TQ_SIGNAL(mapped(int)), + this,TQ_SLOT(slotKey(int))); resetState(); } @@ -130,14 +130,14 @@ TQString %{APPNAME}Impl::name() void %{APPNAME}Impl::onKeyPress( TQObject *receiver, const char *slot ) { if ( m_pickboard ) - TQObject::connect( m_pickboard, TQT_SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); + TQObject::connect( m_pickboard, TQ_SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); } #ifndef TQT_NO_COMPONENT TQRESULT %{APPNAME}Impl::queryInterface( const TQUuid &uuid, TQUnknownInterface **iface ) { *iface = 0; - if ( uuid == IID_TQUnknown ) + if ( uuid == IID_QUnknown ) *iface = this; else if ( uuid == IID_InputMethod ) *iface = this; diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.h b/languages/cpp/app_templates/opieinput/simpleimpl.h index 6466810d..8ac6ce99 100644 --- a/languages/cpp/app_templates/opieinput/simpleimpl.h +++ b/languages/cpp/app_templates/opieinput/simpleimpl.h @@ -8,7 +8,7 @@ class TQPixmap; class TQCheckBox; class %{APPNAME} : public TQHBox { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}( TQWidget *par, WFlags f ); diff --git a/languages/cpp/app_templates/opiemenu/simpleimpl.cpp b/languages/cpp/app_templates/opiemenu/simpleimpl.cpp index 9d953663..7b32c534 100644 --- a/languages/cpp/app_templates/opiemenu/simpleimpl.cpp +++ b/languages/cpp/app_templates/opiemenu/simpleimpl.cpp @@ -60,7 +60,7 @@ void %{APPNAME}::activated() TQRESULT %{APPNAME}::queryInterface( const TQUuid &uuid, TQUnknownInterface **iface ) { *iface = 0; - if ( uuid == IID_TQUnknown ) + if ( uuid == IID_QUnknown ) *iface = this; else if ( uuid == IID_MenuApplet ) *iface = this; diff --git a/languages/cpp/app_templates/opiemenu/simpleimpl.h b/languages/cpp/app_templates/opiemenu/simpleimpl.h index bf111a5a..688cf0b8 100644 --- a/languages/cpp/app_templates/opiemenu/simpleimpl.h +++ b/languages/cpp/app_templates/opiemenu/simpleimpl.h @@ -8,7 +8,7 @@ class %{APPNAME} : public TQObject, public MenuAppletInterface { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/opienet/simpleiface.h b/languages/cpp/app_templates/opienet/simpleiface.h index 4ad088f8..8dac2450 100644 --- a/languages/cpp/app_templates/opienet/simpleiface.h +++ b/languages/cpp/app_templates/opienet/simpleiface.h @@ -4,7 +4,7 @@ #include <interfaces/interface.h> class %{APPNAME}Interface : public Interface { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/opietoday/examplepluginimpl.cpp b/languages/cpp/app_templates/opietoday/examplepluginimpl.cpp index a4896308..5b6367d2 100644 --- a/languages/cpp/app_templates/opietoday/examplepluginimpl.cpp +++ b/languages/cpp/app_templates/opietoday/examplepluginimpl.cpp @@ -16,7 +16,7 @@ TodayPluginObject* %{APPNAME}Impl::guiPart() { TQRESULT %{APPNAME}Impl::queryInterface( const TQUuid & uuid, TQUnknownInterface **iface ) { *iface = 0; - if ( ( uuid == IID_TQUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { + if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { *iface = this, (*iface)->addRef(); }else return TQS_FALSE; diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp index 2f491481..fdbbf4dd 100644 --- a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp +++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp @@ -17,7 +17,7 @@ // that should be triggered when clicked are defined in slotClicked() // of course also normal widgets can be used. m_exampleLabel = new OClickableLabel( this ); - connect( m_exampleLabel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClicked() ) ); + connect( m_exampleLabel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClicked() ) ); if ( m_layout ) { delete m_layout; diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.h b/languages/cpp/app_templates/opietoday/examplepluginwidget.h index 252efc85..a802f2ba 100644 --- a/languages/cpp/app_templates/opietoday/examplepluginwidget.h +++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.h @@ -7,7 +7,7 @@ class %{APPNAME}Widget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/qmakeapp/main.cpp b/languages/cpp/app_templates/qmakeapp/main.cpp index 8938adc5..ba45c728 100644 --- a/languages/cpp/app_templates/qmakeapp/main.cpp +++ b/languages/cpp/app_templates/qmakeapp/main.cpp @@ -8,6 +8,6 @@ int main( int argc, char ** argv ) { %{APPNAME} * mw = new %{APPNAME}(); mw->setCaption( "%{APPNAME}" ); mw->show(); - a.connect( &a, TQT_SIGNAL(lastWindowClosed()), &a, TQT_SLOT(quit()) ); + a.connect( &a, TQ_SIGNAL(lastWindowClosed()), &a, TQ_SLOT(quit()) ); return a.exec(); } diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp index 39b6e5af..8ce81310 100644 --- a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp +++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp @@ -37,17 +37,17 @@ openIcon = TQPixmap( fileopen ); TQToolButton * fileOpen = new TQToolButton( openIcon, tr("Open File"), TQString(), - this, TQT_SLOT(choose()), fileTools, "open file" ); + this, TQ_SLOT(choose()), fileTools, "open file" ); saveIcon = TQPixmap( filesave ); TQToolButton * fileSave = new TQToolButton( saveIcon, tr("Save File"), TQString(), - this, TQT_SLOT(save()), fileTools, "save file" ); + this, TQ_SLOT(save()), fileTools, "save file" ); printIcon = TQPixmap( fileprint ); TQToolButton * filePrint = new TQToolButton( printIcon, tr("Print File"), TQString(), - this, TQT_SLOT(print()), fileTools, "print file" ); + this, TQ_SLOT(print()), fileTools, "print file" ); (void)TQWhatsThis::whatsThisButton( fileTools ); @@ -79,41 +79,41 @@ menuBar()->insertItem( tr("&File"), file ); - file->insertItem( tr("&New"), this, TQT_SLOT(newDoc()), CTRL+Key_N ); + file->insertItem( tr("&New"), this, TQ_SLOT(newDoc()), CTRL+Key_N ); int id; id = file->insertItem( openIcon, tr("&Open..."), - this, TQT_SLOT(choose()), CTRL+Key_O ); + this, TQ_SLOT(choose()), CTRL+Key_O ); file->setWhatsThis( id, fileOpenText ); id = file->insertItem( saveIcon, tr("&Save"), - this, TQT_SLOT(save()), CTRL+Key_S ); + this, TQ_SLOT(save()), CTRL+Key_S ); file->setWhatsThis( id, fileSaveText ); - id = file->insertItem( tr("Save &As..."), this, TQT_SLOT(saveAs()) ); + id = file->insertItem( tr("Save &As..."), this, TQ_SLOT(saveAs()) ); file->setWhatsThis( id, fileSaveText ); file->insertSeparator(); id = file->insertItem( printIcon, tr("&Print..."), - this, TQT_SLOT(print()), CTRL+Key_P ); + this, TQ_SLOT(print()), CTRL+Key_P ); file->setWhatsThis( id, filePrintText ); file->insertSeparator(); - file->insertItem( tr("&Close"), this, TQT_SLOT(close()), CTRL+Key_W ); + file->insertItem( tr("&Close"), this, TQ_SLOT(close()), CTRL+Key_W ); - file->insertItem( tr("&Quit"), tqApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q ); + file->insertItem( tr("&Quit"), tqApp, TQ_SLOT( closeAllWindows() ), CTRL+Key_Q ); menuBar()->insertSeparator(); TQPopupMenu * help = new TQPopupMenu( this ); menuBar()->insertItem( tr("&Help"), help ); - help->insertItem( tr("&About"), this, TQT_SLOT(about()), Key_F1 ); - help->insertItem( tr("About &TQt"), this, TQT_SLOT(aboutTQt()) ); + help->insertItem( tr("&About"), this, TQ_SLOT(about()), Key_F1 ); + help->insertItem( tr("About &TQt"), this, TQ_SLOT(aboutTQt()) ); help->insertSeparator(); - help->insertItem( tr("What's &This"), this, TQT_SLOT(whatsThis()), SHIFT+Key_F1 ); + help->insertItem( tr("What's &This"), this, TQ_SLOT(whatsThis()), SHIFT+Key_F1 ); e = new TQTextEdit( this, "editor" ); e->setFocus(); diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.h b/languages/cpp/app_templates/qmakeapp/qmakeapp.h index ef58ff46..ba2d50ed 100644 --- a/languages/cpp/app_templates/qmakeapp/qmakeapp.h +++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.h @@ -9,7 +9,7 @@ class TQTextEdit; class %{APPNAME}: public TQMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate b/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate index 9572fea6..091cc093 100644 --- a/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate +++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate @@ -66,14 +66,14 @@ Comment=A Qt3/Qmake based application was created in %{dest} [TQTDIR] Type=value -ValueType=QString +ValueType=TQString Value=TQTDIR Comment=Directory where Qt3 is installed. Default= [QMAKE] Type=value -ValueType=QString +ValueType=TQString Value=QMAKE Comment=Absolute Path for QMake (Qt3). Default= diff --git a/languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate b/languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate index 2ff310ba..69339244 100644 --- a/languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate +++ b/languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate @@ -26,14 +26,14 @@ Comment=A Qmake based application was created in %{dest} [QMAKE] Type=value -ValueType=QString +ValueType=TQString Value=QMAKE Comment=Absolute Path for QMake. Default= [DESIGNER] Type=value -ValueType=QString +ValueType=TQString Value=DESIGNER Comment=Absolute Path for Designer. Default= diff --git a/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate b/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate index 4d9b41b1..c8718e94 100644 --- a/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate +++ b/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate @@ -42,14 +42,14 @@ Comment=A Qmake/Qt3 based hello world program was created in %{dest} [TQTDIR] Type=value -ValueType=QString +ValueType=TQString Value=TQTDIR Comment=Directory where Qt3 is installed. Default= [QMAKE] Type=value -ValueType=QString +ValueType=TQString Value=QMAKE Comment=Absolute Path for QMake (Qt3). Default= diff --git a/languages/cpp/app_templates/qt4hello/CMakeLists.txt b/languages/cpp/app_templates/qt4hello/CMakeLists.txt deleted file mode 100644 index 47a77b8b..00000000 --- a/languages/cpp/app_templates/qt4hello/CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -set( _tarball_content - main.cpp qt4hello.png qt4hello.kdevelop qt4hello.pro - src.pro ReadMe -) -list( SORT _tarball_content ) - -tde_create_tarball( - TARGET qt4hello.tar.gz - FILES ${_tarball_content} -) - - -install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/qt4hello.tar.gz qt4hello.png - DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) - - -tde_create_translated_desktop( - SOURCE qt4hello.kdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates - KEYWORDS Category - PO_DIR tdevelop-desktops -) diff --git a/languages/cpp/app_templates/qt4hello/Makefile.am b/languages/cpp/app_templates/qt4hello/Makefile.am deleted file mode 100644 index b285f781..00000000 --- a/languages/cpp/app_templates/qt4hello/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -dataFiles = main.cpp qt4hello.png qt4hello.kdevelop \ - qt4hello.pro src.pro ReadMe - -templateName = qt4hello - -### no need to change below: -template_DATA = $(templateName).kdevtemplate -templatedir = ${appwizarddatadir}/templates - -appwizarddatadir = ${kde_datadir}/kdevappwizard -$(templateName).tar.gz: ${dataFiles} - $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} - $(GZIP_COMMAND) -f9 $(templateName).tar - -archivedir = ${appwizarddatadir} -archive_DATA = $(templateName).tar.gz ${templateName}.png - -CLEANFILES = *.tar.gz diff --git a/languages/cpp/app_templates/qt4hello/ReadMe b/languages/cpp/app_templates/qt4hello/ReadMe deleted file mode 100644 index 87d23f71..00000000 --- a/languages/cpp/app_templates/qt4hello/ReadMe +++ /dev/null @@ -1,11 +0,0 @@ -READ THIS IN ORDER TO COMPILE THE Qt4 TEMPLATE ----------------------------------------------- - -Before compiling, check the Qt Options, go to -Project->Project Options->C++ Support and open the Qt Options tab. - -Check that the Qt installation directory is correct for the Qt version you've chosen. - ------------------- -Andreas Pakulat -July 2006 diff --git a/languages/cpp/app_templates/qt4hello/main.cpp b/languages/cpp/app_templates/qt4hello/main.cpp deleted file mode 100644 index 905f35fb..00000000 --- a/languages/cpp/app_templates/qt4hello/main.cpp +++ /dev/null @@ -1,11 +0,0 @@ -%{CPP_TEMPLATE} - -#include <TQCoreApplication> - -int main(int argc, char *argv[]) -{ - TQCoreApplication app(argc, argv); - tqDebug("Hello from TQt 4!"); - return 0; -} - diff --git a/languages/cpp/app_templates/qt4hello/qt4hello.kdevelop b/languages/cpp/app_templates/qt4hello/qt4hello.kdevelop deleted file mode 100644 index 74dee1ae..00000000 --- a/languages/cpp/app_templates/qt4hello/qt4hello.kdevelop +++ /dev/null @@ -1,113 +0,0 @@ -<?xml version="1.0"?> -<kdevelop> - <general> - <author>%{AUTHOR}</author> - <email>%{EMAIL}</email> - <version>%{VERSION}</version> - <projectmanagement>KDevTrollProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>Qt</keyword> - </keywords> - </general> - <kdevfileview> - <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*" name="Others" /> - </groups> - <tree> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidepatterns>*.o,*.lo,CVS</hidepatterns> - </tree> - </kdevfileview> - <kdevcppsupport> - <qt> - <used>true</used> - <version>4</version> - <includestyle>4</includestyle> - <designerintegration>ExternalDesigner</designerintegration> - <qmake>%{QMAKE}</qmake> - <designer>%{DESIGNER}</designer> - </qt> - </kdevcppsupport> - <kdevdoctreeview> - <ignoretocs> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>kde2book</toc> - <toc>opengl</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>qt-kdev3</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>stl</toc> - <toc>sw</toc> - <toc>w3c-dom-level2-html</toc> - <toc>w3c-svg</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - </ignoretocs> - <ignoredoxygen> - <toc>TDE Libraries (Doxygen)</toc> - </ignoredoxygen> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell/> - <breakpoints/> - <programargs></programargs> - <gdbpath>/usr/bin/gdb</gdbpath> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - </display> - <breakpoints/> - </kdevdebugger> - <kdevtrollproject> - <run> - <mainprogram>./bin/%{APPNAMELC}</mainprogram> - <programargs/> - </run> - </kdevtrollproject> - <workspace> - <openfiles/> - </workspace> - <kdevfilecreate> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - <type ext="ts" /> - <type ext="qrc" /> - </useglobaltypes> - </kdevfilecreate> - <kdevdocumentation> - <projectdoc> - <docsystem>Doxygen Documentation Collection</docsystem> - <docurl>%{APPNAMELC}.tag</docurl> - </projectdoc> - </kdevdocumentation> -</kdevelop> diff --git a/languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate b/languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate deleted file mode 100644 index eb76b3fd..00000000 --- a/languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate +++ /dev/null @@ -1,59 +0,0 @@ -# TDE Config File -[General] -Name=Basic Qt4 Application - -Comment=Generate a very simple QMake/Qt4 based application (crossplatform compatible) - Needs Qt4 - -Category=C++/QMake project - -Icon=qt4hello.png -FileTemplates=h,CStyle,cpp,CStyle -ShowFilesAfterGeneration=%{dest}/src/main.cpp,%{dest}/src/ReadMe -Archive=qt4hello.tar.gz - -[FILE1] -Type=install -Source=%{src}/qt4hello.kdevelop -Dest=%{dest}/%{APPNAMELC}.kdevelop - -[FILE2] -Type=install -Source=%{src}/qt4hello.pro -Dest=%{dest}/%{APPNAMELC}.pro - -[MkDir1] -Type=mkdir -Dir=%{dest}/src - -[FILE3] -Type=install -Source=%{src}/src.pro -Dest=%{dest}/src/src.pro - -[FILE4] -Type=install -Source=%{src}/main.cpp -Dest=%{dest}/src/main.cpp - -[FILE5] -Type=install -Source=%{src}/ReadMe -Dest=%{dest}/src/ReadMe - -[MSG] -Type=message -Comment=A Qt4/Qmake based application was created in %{dest} - -[QMAKE] -Type=value -ValueType=QString -Value=QMAKE -Comment=Absolute Path for QMake (Qt4). -Default= - -[DESIGNER] -Type=value -ValueType=QString -Value=DESIGNER -Comment=Absolute Path for Designer (Qt4). -Default= diff --git a/languages/cpp/app_templates/qt4hello/qt4hello.png b/languages/cpp/app_templates/qt4hello/qt4hello.png Binary files differdeleted file mode 100644 index b7c952b4..00000000 --- a/languages/cpp/app_templates/qt4hello/qt4hello.png +++ /dev/null diff --git a/languages/cpp/app_templates/qt4hello/qt4hello.pro b/languages/cpp/app_templates/qt4hello/qt4hello.pro deleted file mode 100644 index 7177d225..00000000 --- a/languages/cpp/app_templates/qt4hello/qt4hello.pro +++ /dev/null @@ -1,5 +0,0 @@ -SUBDIRS += src -TEMPLATE = subdirs -CONFIG += warn_on \ - qt \ - thread
\ No newline at end of file diff --git a/languages/cpp/app_templates/qt4hello/src.pro b/languages/cpp/app_templates/qt4hello/src.pro deleted file mode 100644 index ae5bac37..00000000 --- a/languages/cpp/app_templates/qt4hello/src.pro +++ /dev/null @@ -1,8 +0,0 @@ -SOURCES += main.cpp -TEMPLATE = app -CONFIG += warn_on \ - thread \ - qt -TARGET = %{APPNAMELC} -DESTDIR = ../bin -QT -= gui diff --git a/languages/cpp/app_templates/qt4makeapp/CMakeLists.txt b/languages/cpp/app_templates/qt4makeapp/CMakeLists.txt deleted file mode 100644 index ac7a350d..00000000 --- a/languages/cpp/app_templates/qt4makeapp/CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -set( _tarball_content - main.cpp qt4makeapp.cpp qt4makeapp.h qt4makeapp.png - qt4makeapp.kdevelop qt4makeapp.pro src.pro application.qrc - ReadMe filesave.xpm fileopen.xpm filenew.xpm editcopy.xpm - editpaste.xpm editcut.xpm -) -list( SORT _tarball_content ) - -tde_create_tarball( - TARGET qt4makeapp.tar.gz - FILES ${_tarball_content} -) - - -install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/qt4makeapp.tar.gz qt4makeapp.png - DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) - - -tde_create_translated_desktop( - SOURCE qt4makeapp.kdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates - KEYWORDS Category - PO_DIR tdevelop-desktops -) diff --git a/languages/cpp/app_templates/qt4makeapp/Makefile.am b/languages/cpp/app_templates/qt4makeapp/Makefile.am deleted file mode 100644 index 62c4c120..00000000 --- a/languages/cpp/app_templates/qt4makeapp/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -dataFiles = main.cpp qt4makeapp.cpp qt4makeapp.h qt4makeapp.png qt4makeapp.kdevelop \ - qt4makeapp.pro src.pro application.qrc ReadMe filesave.xpm fileopen.xpm filenew.xpm \ - editcopy.xpm editpaste.xpm editcut.xpm - -templateName = qt4makeapp - -### no need to change below: -template_DATA = $(templateName).kdevtemplate -templatedir = ${appwizarddatadir}/templates - -appwizarddatadir = ${kde_datadir}/kdevappwizard -$(templateName).tar.gz: ${dataFiles} - $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} - $(GZIP_COMMAND) -f9 $(templateName).tar - -archivedir = ${appwizarddatadir} -archive_DATA = $(templateName).tar.gz ${templateName}.png - -CLEANFILES = *.tar.gz
\ No newline at end of file diff --git a/languages/cpp/app_templates/qt4makeapp/ReadMe b/languages/cpp/app_templates/qt4makeapp/ReadMe deleted file mode 100644 index 87d23f71..00000000 --- a/languages/cpp/app_templates/qt4makeapp/ReadMe +++ /dev/null @@ -1,11 +0,0 @@ -READ THIS IN ORDER TO COMPILE THE Qt4 TEMPLATE ----------------------------------------------- - -Before compiling, check the Qt Options, go to -Project->Project Options->C++ Support and open the Qt Options tab. - -Check that the Qt installation directory is correct for the Qt version you've chosen. - ------------------- -Andreas Pakulat -July 2006 diff --git a/languages/cpp/app_templates/qt4makeapp/application.qrc b/languages/cpp/app_templates/qt4makeapp/application.qrc deleted file mode 100644 index c35b0695..00000000 --- a/languages/cpp/app_templates/qt4makeapp/application.qrc +++ /dev/null @@ -1,10 +0,0 @@ -<!DOCTYPE RCC><RCC version="1.0"> -<qresource> - <file>editcopy.xpm</file> - <file>editcut.xpm</file> - <file>filenew.xpm</file> - <file>fileopen.xpm</file> - <file>editpaste.xpm</file> - <file>filesave.xpm</file> -</qresource> -</RCC>
\ No newline at end of file diff --git a/languages/cpp/app_templates/qt4makeapp/editcopy.xpm b/languages/cpp/app_templates/qt4makeapp/editcopy.xpm deleted file mode 100644 index 8350ed0e..00000000 --- a/languages/cpp/app_templates/qt4makeapp/editcopy.xpm +++ /dev/null @@ -1,193 +0,0 @@ -/* XPM */ -static char *editcopy[] = { -/* columns rows colors chars-per-pixel */ -"32 32 155 2", -" c black", -". c #191000", -"X c #221700", -"o c #2E2300", -"O c #452E00", -"+ c #433200", -"@ c #493000", -"# c #553800", -"$ c #5D4600", -"% c #6B5000", -"& c #724B00", -"* c #7D5E00", -"= c #6E694F", -"- c #7E795F", -"; c #865900", -": c #8A5C00", -"> c #8B6800", -", c #936200", -"< c #926D00", -"1 c #926B1A", -"2 c #967000", -"3 c #9B721D", -"4 c #9B7625", -"5 c #9E792A", -"6 c #A47C00", -"7 c #AA7D00", -"8 c #A1761A", -"9 c #A57816", -"0 c #A4791D", -"q c #AD8200", -"w c #B28500", -"e c #AE8530", -"r c #B99626", -"t c #97906D", -"y c #B18D48", -"u c #B49049", -"i c #B89542", -"p c #BA9C4D", -"a c #BD9E52", -"s c #BFA053", -"d c #B8AE78", -"f c #BEB47E", -"g c #C49300", -"h c #C89600", -"j c #C19D2C", -"k c #C1A43F", -"l c #C09E4E", -"z c #CFB457", -"x c #C9B159", -"c c #CAB573", -"v c #D4BF7C", -"b c #FFDF62", -"n c #FFE064", -"m c #FFE16D", -"M c #FFE372", -"N c #FFE479", -"B c #A19D8E", -"V c #ABA89A", -"C c #BEB580", -"Z c #BDB488", -"A c #B8B496", -"S c #AEADAA", -"D c #B3AFA1", -"F c #BCBBB6", -"G c #BFBFB9", -"H c #C0B680", -"J c #C4BA85", -"K c #C6BD8B", -"L c #CBB589", -"P c #C8BE88", -"I c #C3BC90", -"U c #CBC18C", -"Y c #CCC493", -"T c #D7CB8C", -"R c #DAC786", -"E c #D8C789", -"W c #DAC98B", -"Q c #D0C690", -"! c #D4CA94", -"~ c #D4CC9B", -"^ c #D8CE98", -"/ c #DCD29C", -"( c #C6C3B7", -") c #C8C6BE", -"_ c #D5C5A5", -"` c #DBC8A1", -"' c #DBD4A2", -"] c #DED9AE", -"[ c #D9D5B1", -"{ c #E0CC82", -"} c #E8D98B", -"| c #E8D991", -" . c #E1D7A1", -".. c #E5DBA5", -"X. c #E4DCAB", -"o. c #E8DDAA", -"O. c #E1DCB2", -"+. c #E1DCB8", -"@. c #FFE683", -"#. c #FFE78A", -"$. c #FFE885", -"%. c #FFE88D", -"&. c #FFE992", -"*. c #FFEC9D", -"=. c #FFF09F", -"-. c #ECE2AC", -";. c #E5E0B6", -":. c #E5E1B8", -">. c #EBE4B6", -",. c #EAE5BC", -"<. c #F0E5A8", -"1. c #FFEDA3", -"2. c #FFEDA9", -"3. c #F1E8B8", -"4. c #FFEFB1", -"5. c #FFF1A5", -"6. c #FFF2AD", -"7. c #FFF2B4", -"8. c #FFF2BC", -"9. c #CAC8C2", -"0. c #D6D4CB", -"q. c #DFDAC5", -"w. c #D4D2D0", -"e. c #E0D7C5", -"r. c #E4DAC3", -"t. c #E8DEC7", -"y. c #E0DFD3", -"u. c #E6E2C2", -"i. c #E8E1C5", -"p. c #EBE3CB", -"a. c #EEE9C2", -"s. c #E8E6DC", -"d. c #F3EDC3", -"f. c #F2EDCB", -"g. c #F7F2CD", -"h. c #FFF3C3", -"j. c #FFF4CA", -"k. c #FFF8C5", -"l. c #FFF8CD", -"z. c #FDF5D2", -"x. c #FFF7D8", -"c. c #FFF9D4", -"v. c #FFF9DC", -"b. c #E9E8E7", -"n. c #F3EFE3", -"m. c #F2F0E3", -"M. c #F4F2EA", -"N. c #FBF7E6", -"B. c #FEF9E3", -"V. c #FFFBEC", -"C. c #F4F4F3", -"Z. c #F8F7F6", -"A. c #FEFCF4", -"S. c #FEFEFC", -"D. c None", -/* pixels */ -"D.D.D.D.D.D.D.D.D.D.D.D.h g g g g g g g g g g w * D.D.D.D.D.", -"D.D.D.D.D.D.D.D.D.D.D.D.g z.z.g.g.g.g.g.g.z.g.R 2 D.D.D.D.D.", -"D.D.D.D.D.D.D.D.D.D.D.D.g z.d.3.3.3.3.3.3.>.f.g.z < D.D.D.D.", -"D.D.D.D.D., : ; , : : : 7 a i a R -.-.-.-.' m.u.g.j > D.D.D.", -"D.D.D.D., u y y L L L L ` t.t.e.e v -.-.-.Y b.S.+.d.q D.D.D.", -"D.D.D.D., S.S.S.S.S.S.S.S.Z.b.S.e.i W o.o.K w.S.A.u.q D.D.D.", -"D.D.D.D., S.S.S.A.S.S.S.S.M.w.S.S._ a E ..K 0.S.S.q.7 D.D.D.", -"D.D.D.D., S.A.V.A.A.A.V.A.n.9.S.S.C._ a ..Y t = - A 6 D.D.D.", -"D.D.D.D., A.A.V.A.V.V.V.A.n.9.S.S.S.Z.3 ' ' K Z A ] 7 D.D.D.", -"D.D.D.D., A.V.B.V.V.B.V.V.n.( F S S G 5 ' | / / X.f.q D.D.D.", -"D.D.D.D., A.V.x.B.x.V.B.N.B.e.D B V ) 3 / / ^ ^ ' a.q D.D.D.", -"D.D.D.D., V.N.N.B.B.B.v.v.N.z.p.i.p.n.8 ^ / ! Q ' a.q D.D.D.", -"D.D.D.D., B.B.x.v.x.z.j.j.x.z.z.c.B.B.0 ! ! ! ^ ' ,.q D.D.D.", -"D.D.D.D., B.h.h.z.z.x.x.z.z.z.h.j.x.v.0 ! Q Y ! ~ ,.q D.D.D.", -"D.D.D.D., v.c.k.x.h.j.j.j.z.8.h.k.j.v.0 U T U U ~ ,.q D.D.D.", -"D.D.D.D., v.k.z.h.h.h.j.8.j.h.h.j.k.v.0 U U U U Y ;.q D.D.D.", -"D.D.D.D., x.h.8.8.h.j.8.8.4.h.4.8.h.x.8 P H P P ~ ;.q D.D.D.", -"D.D.D.D., v.h.4.4.8.8.4.1.z.h.8.4.h.c.8 H J H J Y ;.q D.D.D.", -"D.D.D.D., c.2.z.j.4.*.1.1.8.2.2.*.2.l.8 J J H J U ] q D.D.D.", -"D.D.D.D., l.h.2.4.4.1.%.1.&.2.4.8.7.k.8 f d f H U ] q D.D.D.", -"D.D.D.D., z.8.#.1.4.1.*.1.1.1.*.N 4.l.8 f f C K ~ :.q D.D.D.", -"D.D.D.D., 8.&.4.#.%.4.&.@.#.%.%.&.2.l.8 K K Y ~ ] ,.6 D.D.D.", -"D.D.D.D., h.&.#.*.1.1.%.N N #.&.*.1.l.0 ' ] T x r 6 % D.D.D.", -"D.D.D.D., 4.4.%.*.#.b &.N M b M 2.1.k.9 k 7 > $ o D.D.D.", -"D.D.D.D., 7.&.N 5.&.N @.*.b N M N =.k., + D.D.D.", -"D.D.D.D., 6.N N M M &.#.N 2.$.%.8.6.<.& D.D.D.D.D.", -"D.D.D.D., 5.&.7.n $.m M 1.7.7.o.c 5 & @ D.D.D.D.D.D.D.D.D.", -"D.D.D.D., 7.*.m %.=.&.7.} p 1 % # X D.D.D.D.D.D.D.D.D.D.", -"D.D.D.D., 6.5.5.5.| a 1 & + . D.D.D.D.D.D.D.D.D.D.", -"D.D.D.D., 6.-.a 1 & O . D.D.D.D.D.D.D.D.D.D.D.D.", -"D.D.D.D.; : % O . D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.", -"D.D.D.D. D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D." -}; diff --git a/languages/cpp/app_templates/qt4makeapp/editcut.xpm b/languages/cpp/app_templates/qt4makeapp/editcut.xpm deleted file mode 100644 index 9a118931..00000000 --- a/languages/cpp/app_templates/qt4makeapp/editcut.xpm +++ /dev/null @@ -1,252 +0,0 @@ -/* XPM */ -static char *editcut[] = { -/* columns rows colors chars-per-pixel */ -"32 32 214 2", -" c #000000", -". c #0B0B0B", -"X c #181300", -"o c #1D190B", -"O c #131313", -"+ c #1B1B1B", -"@ c #211E11", -"# c #26231A", -"$ c #2A2513", -"% c #2E2912", -"& c #2E2A19", -"* c #372E0B", -"= c #302A12", -"- c #312C1B", -"; c #3A320F", -": c #3C3415", -"> c #3C351B", -", c #232323", -"< c #2B2922", -"1 c #2C2C2C", -"2 c #302E26", -"3 c #353120", -"4 c #3F3B2D", -"5 c #313131", -"6 c #3A3A3A", -"7 c #423814", -"8 c #493E17", -"9 c #413D2F", -"0 c #423F32", -"q c #4F4319", -"w c #5C4A00", -"e c #5F4F0D", -"r c #514410", -"t c #554813", -"y c #4E472C", -"u c #444136", -"i c #4A483F", -"p c #534B2B", -"a c #504B37", -"s c #514C3A", -"d c #654F04", -"f c #604F0B", -"g c #665200", -"h c #675509", -"j c #6B5405", -"k c #6C5807", -"l c #6C590B", -"z c #745B04", -"x c #715D0A", -"c c #7B5B02", -"v c #625B3B", -"b c #7E6815", -"n c #6C643E", -"m c #4D4B42", -"M c #494949", -"N c #504D43", -"B c #54534C", -"V c #515151", -"C c #5D5B54", -"Z c #656048", -"A c #736A44", -"S c #726C54", -"D c #77725B", -"F c #696968", -"G c gray50", -"H c #826203", -"J c #806609", -"K c #836907", -"L c #8D6A03", -"P c #9A6F00", -"I c #9B7005", -"U c #9E730E", -"Y c #9C7511", -"T c #85732C", -"R c #88783B", -"E c #AE7C00", -"W c #A87B13", -"Q c #847B53", -"! c #827D64", -"~ c #9C862E", -"^ c #A98A1F", -"/ c #B28D0A", -"( c #B88D00", -") c #B2821A", -"_ c #B18E1B", -"` c #B3941C", -"' c #A88E2C", -"] c #A28C36", -"[ c #AE9224", -"{ c #89815E", -"} c #87826D", -"| c #858174", -" . c #888370", -".. c #8E8A7D", -"X. c #928C71", -"o. c #A28E44", -"O. c #AA9F74", -"+. c #B9A456", -"@. c #BDA85B", -"#. c #B2A068", -"$. c #C28700", -"%. c #CC8E00", -"&. c #C29A00", -"*. c #C4962F", -"=. c #CCA100", -"-. c #D6A800", -";. c #D1AC1B", -":. c #DDB31A", -">. c #D2A922", -",. c #D4AE2B", -"<. c #DBA12E", -"1. c #DBA433", -"2. c #DDB428", -"3. c #D2B23B", -"4. c #E6A200", -"5. c #E8A509", -"6. c #EAAF00", -"7. c #EFAC1E", -"8. c #F5A100", -"9. c #FFAD02", -"0. c #FCAF0D", -"q. c #FCB005", -"w. c #FFB60C", -"e. c #FFBD00", -"r. c #FFBD16", -"t. c #E3B432", -"y. c #E8BF3C", -"u. c #F6BE2F", -"i. c #C6A949", -"p. c #D9A948", -"a. c #D8AB52", -"s. c #DBBA45", -"d. c #C5B162", -"f. c #ECB74D", -"g. c #EFB841", -"h. c #EFBE4A", -"j. c #EABA55", -"k. c #FDC006", -"l. c #FFC10B", -"z. c #FFC800", -"x. c #FFC90D", -"c. c #FAC113", -"v. c #FBC11C", -"b. c #FDC910", -"n. c #EDC233", -"m. c #F5C32D", -"M. c #FFC728", -"N. c #F4C537", -"B. c #F6C63A", -"V. c #F5CB36", -"C. c #FFD73D", -"Z. c #E9C659", -"A. c #EAC85A", -"S. c #FFDA4B", -"D. c #FFDD5D", -"F. c #E9CD6B", -"G. c #FFD560", -"H. c #FFE06C", -"J. c gray56", -"K. c #959595", -"L. c gray62", -"P. c #A6A18A", -"I. c #A8A69E", -"U. c #AEA895", -"Y. c #B3AC8F", -"T. c #B8AF8B", -"R. c #B4AD96", -"E. c #B8B199", -"W. c #A4A4A4", -"Q. c #AAAAAA", -"!. c #B0ADA3", -"~. c #BBB6A3", -"^. c #B1B1B1", -"/. c #B9B9B6", -"(. c #BBBBBA", -"). c #C5BC9D", -"_. c #C2BCA2", -"`. c #C1BEB5", -"'. c #D2C38E", -"]. c #DCC78C", -"[. c #C7C0A7", -"{. c #C7C2AE", -"}. c #C7C3B2", -"|. c #C5C2B8", -" X c #CAC6B6", -".X c #CBC9BE", -"XX c #D9D3BB", -"oX c #E6D08A", -"OX c #E7DEBD", -"+X c #ECDEB3", -"@X c #FFF0B9", -"#X c #C5C5C5", -"$X c #CECCC7", -"%X c #D0CEC5", -"&X c #D0CFC8", -"*X c #D2D1CB", -"=X c #DBD6C5", -"-X c #DBD7C9", -";X c #D3D3D1", -":X c #DBDBDB", -">X c #E5E1D6", -",X c #E5E3DA", -"<X c #E8E5D9", -"1X c #EDEADC", -"2X c #FEF6DE", -"3X c #E6E6E6", -"4X c #E9E7E2", -"5X c #E9E8E4", -"6X c #EDECEA", -"7X c #F2F1EB", -"8X c #F1F1F1", -"9X c #F8F7F4", -"0X c #F9F8F8", -"qX c None", -/* pixels */ -"qXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqXqXqX5 5 5 1 , qXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqXqX5 V /.&XQ.F 1 , qXqXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqXqX5 _.D.S.H.@X&X6 . qXqXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqXqX5 S.=.w g &.C...+ qXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqXqX5 -.' + o t z.d., qXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqX5 C V.@.+ 3 :.3., qXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqX5 '.b.F.6 , 1 s.,., qXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqX1 b ( n.OXE.E.F.^ + qXqXqXqXqXqXqXqX5 5 1 , ", -"qXqXqXqXqXqXqX l x K A.oXoXZ.i., qXqXqXqXqXqX5 V &X0X6X, ", -"qXqXqXqXqXqXqX 8 ( c.v.k.N.1 qXqXqXqX5 V $X0X0X9XXX, ", -"qXqXqXqXqXqXqXqX O t 6.e.e.k.S O 5 5 V $X8X8X8X1XD : O ", -"qXqXqXqXqXqXqXqXqXqX 3 J e.G.7X#.+ . 5 C |.3X3X5X4X_.4 % ", -"qXqXqXqXqXqXqXqXqXqX q ].0X0X+X, B }.:X:X:X:X=XS & o ", -"qXqXqXqXqXqXqXqXqXqXqX + M 8X8X7XU.Q.#X*X*X*XR.< % qX", -"qXqXqXqXqXqXqXqXqXqXqXqX, 1 X6XW.G Q.L.^.{.Z @ . qXqX", -"qXqXqXqXqXqXqXqXqXqX5 5 m P.W.:X6 . 3X/.X., @ qXqXqXqX", -"qXqXqXqXqXqXqX5 5 5 n +.R.W.J.K.W.^.:X:X1Xm + qXqXqXqXqX", -"qXqXqXqXqX5 5 i o.y.v.q./ P.I.} | R.&X*X;X8X ., qXqXqXqXqXqX", -"qXqX5 5 5 R 3.M.5.E L 7.4._ 0 + O + i ).#X#X5X~., O qXqXqXqX", -"qX5 u ] m.r.%.H r : , t.0.P 7 $ , { `.(.;X-X, + qXqXqX", -"5 u 2.w.$.k t o , ~ h.P l , u T.^.#X<XN , qXqX", -"5 >.9.U r . . , T B.*.x qX + , Q !.Q.<XC , qX", -"p q.1.> . + 1 [ m.p.k . qXqXqXqX , u O.W.;X! + ", -"4 8.j.` p 5 y ;.u.a.d % qXqXqXqXqXqX O , A P._., ", -"1 x <.f.m.x.b.y.a.g ; qXqXqXqXqXqXqXqX + 0 v O ", -" - h c W W W W z : qXqXqXqXqXqXqXqXqXqX . . ", -" * e l l f X qXqXqXqXqXqXqXqXqXqXqXqXqX ", -"qX qXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqX qX", -"qXqXqX qXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqX" -}; diff --git a/languages/cpp/app_templates/qt4makeapp/editpaste.xpm b/languages/cpp/app_templates/qt4makeapp/editpaste.xpm deleted file mode 100644 index c29ad36b..00000000 --- a/languages/cpp/app_templates/qt4makeapp/editpaste.xpm +++ /dev/null @@ -1,295 +0,0 @@ -/* XPM */ -static char *editpaste[] = { -/* columns rows colors chars-per-pixel */ -"32 32 257 2", -" c black", -". c #0D0900", -"X c #191000", -"o c #221700", -"O c #2A1B00", -"+ c #332200", -"@ c #3E2900", -"# c #3A2804", -"$ c #4D3300", -"% c #4B3E15", -"& c #44391B", -"* c #543800", -"= c #5A3B00", -"- c #4D4015", -"; c #524E25", -": c #5A4F2C", -"> c #524E3D", -", c #58562F", -"< c #53503E", -"1 c #5E623B", -"2 c #634100", -"3 c #684500", -"4 c #6E4900", -"5 c #614F11", -"6 c #685416", -"7 c #734C00", -"8 c #784F00", -"9 c #755B00", -"0 c #7C5200", -"q c #7C5A00", -"w c #7B570F", -"e c #69562F", -"r c #786600", -"t c #7F6A00", -"y c #766300", -"u c #60613F", -"i c #7C6422", -"p c #545143", -"a c #54524B", -"s c gray32", -"d c #5D5D57", -"f c #616641", -"g c #67695D", -"h c #6B734D", -"j c #6C7553", -"k c #616261", -"l c #686A64", -"z c #6B7162", -"x c #727272", -"c c #003DFF", -"v c #0043FF", -"b c #004BFF", -"n c #0053FF", -"m c #015AFF", -"M c #0063FF", -"N c #046DFF", -"B c #0865FF", -"V c #0378FF", -"C c #1663FF", -"Z c #1576FF", -"A c #2678FF", -"S c #6F7B84", -"D c #77856D", -"F c #7B8B75", -"G c #0083FF", -"H c #0197FF", -"J c #0B92FF", -"K c #1385FF", -"L c #01A5FF", -"P c #0DB5FF", -"I c #3096FF", -"U c #2DADFF", -"Y c #2FBCFF", -"T c #22C6FF", -"R c #2AC5FF", -"E c #30D0FF", -"W c #38D5FF", -"Q c #4493F1", -"! c #5F83FF", -"~ c #5F8AFF", -"^ c #5290E4", -"/ c #5F92FF", -"( c #4CAAFE", -") c #40B8FF", -"_ c #779DCB", -"` c #6693E2", -"' c #6290FF", -"] c #649DFF", -"[ c #71A6E5", -"{ c #79A4FF", -"} c #7FB3FF", -"| c #68B8F3", -" . c #42DCFF", -".. c #47E0FF", -"X. c #58E9FF", -"o. c #64C0EB", -"O. c #6ADFEF", -"+. c #825600", -"@. c #845A00", -"#. c #8B5C00", -"$. c #905F00", -"%. c #8C6103", -"&. c #876807", -"*. c #8A6111", -"=. c #886E1B", -"-. c #887600", -";. c #8C7A00", -":. c #936200", -">. c #986800", -",. c #926C22", -"<. c #987A3F", -"1. c #A07200", -"2. c #A27511", -"3. c #A97D15", -"4. c #A77B14", -"5. c #998712", -"6. c #A68000", -"7. c #A78F00", -"8. c #AD8016", -"9. c #AC9600", -"0. c #BB8F00", -"q. c #A99B2A", -"w. c #B9A000", -"e. c #B3A63C", -"r. c #958D43", -"t. c #988F44", -"y. c #9A9346", -"u. c #9F9948", -"i. c #8B897C", -"p. c #958F6F", -"a. c #98937B", -"s. c #A68443", -"d. c #B08C41", -"f. c #AF9462", -"g. c #B39864", -"h. c #B2A850", -"j. c #BDB355", -"k. c #C3972F", -"l. c #C5A400", -"z. c #CCAC00", -"x. c #D7BB00", -"c. c #CCA030", -"v. c #CBB43E", -"b. c #E4AD0C", -"n. c #ECB600", -"m. c #EDB900", -"M. c #F2BB00", -"N. c #C1B84C", -"B. c #C1B757", -"V. c #C5BB58", -"C. c #C9BE5A", -"Z. c #C2A978", -"A. c #DFC000", -"S. c #FDCB00", -"D. c #F6C300", -"F. c #FFD100", -"G. c #FEDB00", -"H. c #FFDF0E", -"J. c #F5D500", -"K. c #FBCD39", -"L. c #FFE832", -"P. c #FFE432", -"I. c #CEC25C", -"U. c #D7C648", -"Y. c #DDC74B", -"T. c #D0C55E", -"R. c #D3C85F", -"E. c #D5C960", -"W. c #DDD264", -"Q. c #E0CA4C", -"!. c #E7D14E", -"~. c #EFDA51", -"^. c #F4D050", -"/. c #F9D452", -"(. c #FEDD53", -"). c #E2D765", -"_. c #E9DD69", -"`. c #E6DD68", -"'. c #FDDB6E", -"]. c #FFEE4F", -"[. c #FEE354", -"{. c #FEEA55", -"}. c #F7E153", -"|. c #FFF056", -" X c #ECE16A", -".X c #F1E56D", -"XX c #F7EA6F", -"oX c #F7EB70", -"OX c #F9EC70", -"+X c #FEF372", -"@X c #979486", -"#X c gray60", -"$X c #969596", -"%X c #8AA193", -"&X c #82A89B", -"*X c #8CAEA3", -"=X c #86A7A9", -"-X c #8BA2B1", -";X c #ACA580", -":X c #A5A291", -">X c #B3AF98", -",X c #B8B7AF", -"<X c #B3B2AB", -"1X c #B1B1B1", -"2X c #A6B8FF", -"3X c #88DEE0", -"4X c #8BF0FE", -"5X c #A4CFC6", -"6X c #BFD5FF", -"7X c #BFDCFF", -"8X c #C2AD82", -"9X c #CBB489", -"0X c #D2BF9B", -"qX c #D1C19F", -"wX c #C8C4AA", -"eX c #CFCBB7", -"rX c #D8C7A6", -"tX c #D2C2A3", -"yX c #D5CCB3", -"uX c #DAD1A1", -"iX c #DDD5BB", -"pX c #D7D1B3", -"aX c #ECE5BB", -"sX c #F5EBB5", -"dX c #F5ECBC", -"fX c #F8EEB8", -"gX c #FCF2BC", -"hX c #CBCBCB", -"jX c #D8D6C7", -"kX c #DDDDDD", -"lX c #E4DAC2", -"zX c #ECE6C7", -"xX c #EBE6D9", -"cX c #E9E3D0", -"vX c #F5EDC4", -"bX c #F6EFC9", -"nX c #F0EBD5", -"mX c #F3EFDB", -"MX c #FCF3C5", -"NX c #FCF4CA", -"BX c #F7F0CA", -"VX c #F6F0D2", -"CX c #F9F3D3", -"ZX c #F9F4DC", -"AX c #FFF8D4", -"SX c #FFF9DB", -"DX c #E7E7E4", -"FX c #EBEBE9", -"GX c #F1EDE1", -"HX c #F9F6E5", -"JX c #FDF9E4", -"KX c #FEFBEB", -"LX c #F6F2E6", -"PX c #FEFCF3", -"IX c #FEFDFD", -"UX c #F4F4F3", -"YX c None", -/* pixels */ -"YXYXYXYXYXYX YXYXYXYXYXYXYXYXYXYXYXYXYX", -"YXYXYXYX:.:.+ IXIXIXIXIXIXIXIXFX# +.7 YXYXYXYXYXYXYXYXYXYXYX", -"YXYXYX>.k.c.6 FXkXkXkXDXkXkXkXx i b.>.+ YXYXYXYXYXYXYXYXYXYX", -"YXYXYX:.'.K.=.hX1X1X1X1X1X1X1Xd &.0.%.* 7 #.#.:.$.#.2 YXYXYX", -"YXYXYX:./.M.%.$Xk k d s s s e w >.2.d.s.Z.9XrXlXxX0X7 YXYXYX", -"YXYXYX:.^.M.1.: % % - % 5 6 &.GXIXIXPXPXPXPXPXLXIXIXg.3 YXYX", -"YXYX#X:.^.m.v.y.r.r.r.r.h.h.2.IXPXPXKXKXPXKXHXxXUXIXIXf.4 YX", -"YXYX#X:.^.m.Y.I.B.j.j.j.V.I.4.PXKXJXKXJXKXKXmXjXFXIXIXUX+. YX", -"YXYX#X:.^.m.Y.E.I.j.j.j.I.R.8.PXKXSXJXJXJXSXnXeXDXIXIXUX<. YX", -"YXYXYX:./.M.!.W.R.I.T.R.E.W.8.UXJXJXSXSXSXSXnXeX:X@Xi.<X7 ", -"YXYXYX:./.D.~._.`.W.W.W.W. X8.PXJXSXAXSXSXSXVXjX>X@X@X,X4 ", -"YXYXYX:.(.S.}..X X X X X X X8.PXSXAXAXAXAXAXNXzXpXwXwXjX7 ", -"YXYXYX:.(.S.[.OXOXOXoXoXt.; O s a p p p p a.AXMXvXaXzXGX+. ", -"YXYXYX:.(.S.[.+X+X+XOX+X; 7X2X] / / ~ ! 2Xp MXNXNXNXSXKX+. YX", -"YXYXYX:.(.F.|.+X+X+X+X+Xy., _ A m b v c ! p MXMXgXMXAXKX+. YX", -"YXYXYX:.(.F.|.+X+X+X+X+X+Xj.& ^ B n b v ' < gXMXgXgXNXKX+. YX", -"YXYXYX:.(.F.U.W.+X+X+X+X).y.g Q N m n b ~ < gXgXgXgXAXJXq YX", -"YXYXYX:.[.l.j j y.I.j.r.1 =X( K N M m b ~ < gXgXgXgXNXKX+. YX", -"YXYXYX:.[.t 5X4X&XD F =X| U J G V Z A C / < fXgXgXgXMXHX+. YX", -"YXYXYX:.[.l.h 3XX...W T P L H K I [ S ` { < fXfXfXfXMXKX+. YX", -"YXYXYX:.[.G.e.1 *XO...E R Y Y | -Xd Z.k 6X> fXfXfXfXBXJX+. YX", -"YXYXYX:.[.G.{.`.u.1 F &X*X%Xz l a.uXfXp.> p.sXsXsXfXBXJX+. YX", -"YXYXYX:.{.G.|.+X+X XN.q.5.7.q cXvXsXsXsXsXsXsXsXsXsXBXKX+. YX", -"YXYXYX:.|.G.].|.L.H.G.G.G.A.1.JXvXsXsXsXsXsXsXsXfXdXCXPX+. YX", -"YXYXYX:.{.G.G.G.G.G.x.w.;.t :.HXdXsXsXsXsXsXdXvXBXZXLXtX= YX", -"YXYXYX:.{.G.J.x.9.;.r 9 q 0 #.KXvXsXaXsXvXBXCXHXiXg.*.= O YX", -"YXYXYX:.L.9.-.y 9 q 0 = + #.HXbXdXbXVXZXcX8X,.3 $ . YX", -"YXYXYX%.z.9 q 7 * o $.PXZXmXmX0Xs.0 $ X YX", -"YXYXYX8 0 = o :.IXpXg.*.= O YXYXYXYX", -"YXYXYX YXYX@.#.2 @ . YXYXYXYXYXYX", -"YXYXYX YXYXYXYXYX YXYXYXYXYXYXYXYXYX", -"YXYXYXYXYXYXYXYXYXYXYXYXYXYX YXYXYXYXYXYXYXYXYXYXYXYX" -}; diff --git a/languages/cpp/app_templates/qt4makeapp/filenew.xpm b/languages/cpp/app_templates/qt4makeapp/filenew.xpm deleted file mode 100644 index 85efceb2..00000000 --- a/languages/cpp/app_templates/qt4makeapp/filenew.xpm +++ /dev/null @@ -1,216 +0,0 @@ -/* XPM */ -static char *filenew[] = { -/* columns rows colors chars-per-pixel */ -"32 32 178 2", -" c black", -". c #191000", -"X c #221700", -"o c #452E00", -"O c #4A3100", -"+ c #4E3400", -"@ c #553800", -"# c #604000", -"$ c #6A4600", -"% c #6D4800", -"& c #704A00", -"* c #724C00", -"= c #744C00", -"- c #764E00", -"; c #785000", -": c #805500", -"> c #815500", -", c #835700", -"< c #865900", -"1 c #875A00", -"2 c #8A5B00", -"3 c #8A5C00", -"4 c #8B5C00", -"5 c #8C5D00", -"6 c #8D5D00", -"7 c #8F5E00", -"8 c #805911", -"9 c #905F00", -"0 c #906000", -"q c #926000", -"w c #946200", -"e c #956300", -"r c #966400", -"t c #976400", -"y c #956913", -"u c #926C22", -"i c #9B7732", -"p c #B18D48", -"a c #B28E49", -"s c #B4904A", -"d c #BAA373", -"f c #A1A195", -"g c #ABAB9F", -"h c #ADADAB", -"j c #AFAFAB", -"k c #B3B3A6", -"l c #BCBCB8", -"z c #BFBFBC", -"x c #CBB489", -"c c #CBB58A", -"v c #CDB78B", -"b c #CAB891", -"n c #C9BB9E", -"m c #CEBEA2", -"M c #C6C6BC", -"N c #D9C8A8", -"B c #E8E1BA", -"V c #E8E1BB", -"C c #FEFFA1", -"Z c #FFFFA0", -"A c #FEFFA3", -"S c #FEFFA4", -"D c #FEFFA6", -"F c #FEFFA8", -"G c #FEFFA9", -"H c #FFFFA8", -"J c #FEFFAA", -"K c #FEFFAB", -"L c #FFFFAB", -"P c #FEFFAC", -"I c #FFFFAC", -"U c #FEFFAE", -"Y c #FEFFAF", -"T c #FEFFB0", -"R c #FEFFB1", -"E c #FFFFB0", -"W c #FEFFB4", -"Q c #FEFFB5", -"! c #FFFFB4", -"~ c #FEFFB8", -"^ c #FEFFB9", -"/ c #FFFFB8", -"( c #FFFFB9", -") c #FEFFBB", -"_ c #FFFFBA", -"` c #FEFFBD", -"' c #FFFFBD", -"] c #FEFFBE", -"[ c #FFFFBE", -"{ c #C8C8C1", -"} c #CACAC4", -"| c #CBCBC6", -" . c #DBD2C1", -".. c #DEDFCF", -"X. c #D4D4D1", -"o. c #E1D5C1", -"O. c #E3D9C3", -"+. c #E5DCCC", -"@. c #E8E8D3", -"#. c #ECECD7", -"$. c #F0EBDA", -"%. c #FEFFC2", -"&. c #FEFFC3", -"*. c #FFFFC2", -"=. c #FEFFC7", -"-. c #FFFFC7", -";. c #FEFFCB", -":. c #FEFFCC", -">. c #FFFFCC", -",. c #FEFFCE", -"<. c #FEFFD0", -"1. c #FEFFD1", -"2. c #FFFFD0", -"3. c #FFFFD1", -"4. c #FFFFD3", -"5. c #FEFFD5", -"6. c #FFFFD5", -"7. c #FEFFD6", -"8. c #FEFFD7", -"9. c #FFFFD6", -"0. c #FFFFD8", -"q. c #FEFFDA", -"w. c #FFFFDA", -"e. c #FFFFDB", -"r. c #FFFFDC", -"t. c #FEFFDE", -"y. c #FEFFDF", -"u. c #FFFFDE", -"i. c #FFFFDF", -"p. c #E9E9E7", -"a. c #F3F3E9", -"s. c #F3F3EB", -"d. c #F5F5E8", -"f. c #F8F8E3", -"g. c #FEFFE0", -"h. c LightYellow", -"j. c #FFFFE1", -"k. c #FEFFE3", -"l. c #FFFFE3", -"z. c #FDFEE7", -"x. c #FEFFE4", -"c. c #FEFFE5", -"v. c #FFFFE4", -"b. c #FBFBE9", -"n. c #FEFFE8", -"m. c #FFFFE8", -"M. c #FFFFE9", -"N. c #FFFFEA", -"B. c #FEFFEC", -"V. c #FEFFED", -"C. c #FFFFEC", -"Z. c #FFFFED", -"A. c #FEFFEF", -"S. c #F4F4F0", -"D. c #F4F4F3", -"F. c #F5F5F4", -"G. c #F8F8F6", -"H. c ivory", -"J. c #FFFFF1", -"K. c #FEFFF3", -"L. c #FFFFF3", -"P. c #FEFFF4", -"I. c #FFFFF4", -"U. c #FEFFF7", -"Y. c #FFFFF6", -"T. c #FFFFF7", -"R. c #FBFBFB", -"E. c #FFFFF8", -"W. c #FFFFF9", -"Q. c #FFFFFA", -"!. c #FFFFFB", -"~. c gray99", -"^. c #FEFFFD", -"/. c #FFFFFC", -"(. c #FFFFFD", -"). c #FFFFFE", -"_. c gray100", -"`. c None", -/* pixels */ -"`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.`.w 2 1 w 4 4 4 6 w 9 6 - `.`.`.`.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.r s p p c c c c N O.+.o.y # `.`.`.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.r ).).).).).).).).F.p.). .& o `.`.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w ).E.).E.).E.E.E.S.X.).R.n $ + `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w E.Y.Y.E.Y.E.E.E.a.| ).).D.m % `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w E.Y.Y.J.Y.J.Y.Y.a.| ).).).D.> `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w Y.J.J.J.J.J.J.J.a.M l h h { ; `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w Y.B.B.B.N.N.B.B.b...k f h } ; `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w J.N.N.N.N.N.N.N.l.f.#.@.#.a.> `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w J.l.l.l.l.l.l.l.l.l.l.l.l.J.> `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w J.r.l.l.r.l.r.l.r.l.r.l.r.J.1 `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w B.r.r.q.q.q.q.q.q.r.q.q.r.B.> `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w N.5.5.5.5.q.5.5.5.5.5.5.5.B., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w N.<.<.<.<.<.<.<.5.<.<.<.<.N., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w l.,.;.;.;.,.;.,.;.,.;.;.;.l., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w l.-.-.-.-.-.-.;.-.-.-.-.;.l.> `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w l.-.%.%.%.%.%.%.%.%.%.%.%.l., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w r.' ' ' ' ' ) ' ' ' ' ' ' r., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w r.) ) W ) ) ) ) ) ) W ) ) q., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w q.W W W W W W W W W W W W q., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w 5.Y Y W Y Y Y Y Y Y Y Y Y 5., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w 5.J J J Y J Y Y J Y J J Y q., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w 5.J J D J J D J D J W ) ,.$.- `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w <.Z D D Z D J Y ' ,.B b i - O `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w <.Z Z Z Y ) <.B d u & @ X `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w ,.J ) ,.B d y & o . `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w Y.V d u & o . `.`.`.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.1 4 & o . `.`.`.`.`.`.`.`.`.`.`.", -"`.`.`.`.`.`.`.`. `.`.`.`.`.`.`.`.`.`.`.`.`.`.", -"`.`.`.`.`.`.`.`. `.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`." -}; diff --git a/languages/cpp/app_templates/qt4makeapp/fileopen.xpm b/languages/cpp/app_templates/qt4makeapp/fileopen.xpm deleted file mode 100644 index a6c33b62..00000000 --- a/languages/cpp/app_templates/qt4makeapp/fileopen.xpm +++ /dev/null @@ -1,295 +0,0 @@ -/* XPM */ -static char *fileopen[] = { -/* columns rows colors chars-per-pixel */ -"32 32 257 2", -" c black", -". c #0B0900", -"X c #130E00", -"o c #161100", -"O c #231A00", -"+ c #352600", -"@ c #3B311C", -"# c #433100", -"$ c #4F3B00", -"% c #4A3E16", -"& c #4A3D22", -"* c #4D421A", -"= c #54420D", -"- c #4E4529", -"; c #484338", -": c #484233", -"> c #5B4B24", -", c #624500", -"< c #674D00", -"1 c #6D4D00", -"2 c #6E4F17", -"3 c #6D5200", -"4 c #775500", -"5 c #745B0F", -"6 c #795200", -"7 c #7A5A00", -"8 c #715C18", -"9 c #764B0A", -"0 c #6C5423", -"q c #6D592E", -"w c #785E27", -"e c #735626", -"r c #665736", -"t c #7A631D", -"y c #7A672E", -"u c #776535", -"i c #5C5956", -"p c #78704F", -"a c #75726E", -"s c #8D4F00", -"d c #815700", -"f c #835A00", -"g c #8A5C00", -"h c #866400", -"j c #966100", -"k c #956F00", -"l c #9C6100", -"z c #9D7500", -"x c #856B2A", -"c c #8C752A", -"v c #8C723B", -"b c #977939", -"n c #A45D00", -"m c #A26100", -"M c #AA680D", -"N c #AB6700", -"B c #A07700", -"V c #A57B00", -"C c #AB7A00", -"Z c #AA7300", -"A c #AF721A", -"S c #B87E00", -"D c #B57B00", -"F c #B0731A", -"G c #B47C26", -"H c #B77E28", -"J c #897F59", -"K c #977C40", -"L c #927F58", -"P c #807A6C", -"I c #9C821D", -"U c #9F8A35", -"Y c #AC8000", -"T c #B28500", -"R c #B68800", -"E c #BB8B00", -"W c #A78337", -"Q c #A28B31", -"! c #AF9535", -"~ c #B58E3A", -"^ c #B88633", -"/ c #B49936", -"( c #BCA039", -") c #998445", -"_ c #978657", -"` c #8B8264", -"' c #8E8572", -"] c #978864", -"[ c #978C75", -"{ c #9F9072", -"} c #A38845", -"| c #A48952", -" . c #AA965C", -".. c #A89156", -"X. c #B5934D", -"o. c #B39D45", -"O. c #B49755", -"+. c #AB984A", -"@. c #AD9A65", -"#. c #A79778", -"$. c #A59874", -"%. c #A29B7A", -"&. c #A79775", -"*. c #BDA959", -"=. c #B3A46C", -"-. c #B1A07F", -";. c #B5A97A", -":. c #BEB37B", -">. c #C49200", -",. c #C89500", -"<. c #CC9800", -"1. c #C69812", -"2. c #D2A31C", -"3. c #C2A63E", -"4. c #D7AE37", -"5. c #C29840", -"6. c #C29B4E", -"7. c #C2A641", -"8. c #C6AA43", -"9. c #C8AC45", -"0. c #CBAF49", -"q. c #CAA746", -"w. c #C4A158", -"e. c #CAA65D", -"r. c #CEA857", -"t. c #CFA95A", -"y. c #C5AC50", -"u. c #CDB14B", -"i. c #CBB358", -"p. c #CAB152", -"a. c #D2AB59", -"s. c #D1B54D", -"d. c #D4B951", -"f. c #D6BC5B", -"g. c #DDB45E", -"h. c #D9BD56", -"j. c #D2B753", -"k. c #DAAB48", -"l. c #CEAE69", -"z. c #CCAD67", -"x. c #CCB662", -"c. c #CAB26B", -"v. c #C8B66B", -"b. c #CEB775", -"n. c #CEBE7F", -"m. c #D3AD66", -"M. c #D5BE64", -"N. c #D4BF6D", -"B. c #E4B34B", -"V. c #E0B75F", -"C. c #E1B85F", -"Z. c #E4BA61", -"A. c #E9BE63", -"S. c #DDC159", -"D. c #DAC269", -"F. c #D4C176", -"G. c #D8C67F", -"H. c #E1C55D", -"J. c #EFC05D", -"K. c #F1C15E", -"L. c #E0C264", -"P. c #E5C961", -"I. c #EDC164", -"U. c #E9CD65", -"Y. c #EFD36B", -"T. c #F2C564", -"R. c #F6C868", -"E. c #F8C760", -"W. c #FBCC6A", -"Q. c #FDCB63", -"!. c #F1D56D", -"~. c #FFD06C", -"^. c #F5D972", -"/. c #FED175", -"(. c #FADE77", -"). c #E4C87A", -"_. c #FEE27C", -"`. c #8F9192", -"'. c #9A9A96", -"]. c #A79F83", -"[. c #ADA583", -"{. c #A7A399", -"}. c #BBAC86", -"|. c #BDB088", -" X c #BBB298", -".X c #A7A8A6", -"XX c #ADAEB0", -"oX c #B5B6B4", -"OX c #BABCBC", -"+X c #C6B38E", -"@X c #D3BE80", -"#X c #D0BC95", -"$X c #C6BFA6", -"%X c #C5C29D", -"&X c #D2C283", -"*X c #DAC789", -"=X c #DBCA8B", -"-X c #D5C489", -";X c #DBCD94", -":X c #D6C699", -">X c #CFC8B1", -",X c #C8C6B7", -"<X c #D1C9A6", -"1X c #DBD3BA", -"2X c #E1C981", -"3X c #E0CD91", -"4X c #ECD686", -"5X c #EBD69E", -"6X c #FED682", -"7X c #FED88B", -"8X c #FEDC95", -"9X c #E3CEA3", -"0X c #EED9A9", -"qX c #E7DCB9", -"wX c #F4DDAF", -"eX c #FFE68A", -"rX c #FFE893", -"tX c #FFEA9F", -"yX c #FFE2A5", -"uX c #FFE3AC", -"iX c #FFECA7", -"pX c #FFEDAE", -"aX c #F1E0B6", -"sX c #FDE5B4", -"dX c #FFEEB4", -"fX c #F8E5BB", -"gX c #FFF0BC", -"hX c #C5C7C8", -"jX c #C7C8CA", -"kX c #CCCECF", -"lX c #CCCAC0", -"zX c #CDCED0", -"xX c #D1D1CF", -"cX c #D1D3D4", -"vX c #D6D8DA", -"bX c #DADCDE", -"nX c #DCDEE0", -"mX c #DEE0E2", -"MX c #E7DEC2", -"NX c #EBE1C5", -"BX c #F4E9C3", -"VX c #F7EACE", -"CX c #FEEAC3", -"ZX c #FAEBCA", -"AX c #FFF1C1", -"SX c #FFF3CC", -"DX c #FFF6DA", -"FX c #E1E3E5", -"GX c #E4E6E8", -"HX c #E7E9EA", -"JX c #E8E6E0", -"KX c #E9EAEC", -"LX c #ECEEF0", -"PX c #EEF0F2", -"IX c #F8F4E8", -"UX c #F1F3F5", -"YX c None", -/* pixels */ -"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX V E <.,.T YXYXYXYXYXYX", -"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX< E 2.aXCXVXE 3 E <.E YXYX", -"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX R ,.5XCX8XQ.wX<.1.$.OX<. YXYX", -"YXYXYXYXYXYXYXYXYXYXYXYXYXYX R >.L.ZXyXT.K.E.wX ..XKXKXR YXYX", -"YXYXYXYXYXYXYXYXYXYXYXYX V E 4.ZXsXW.K.I.Z.O.{.KXUXUXMXk YXYX", -"YXYXYXYXYXYX R E 7 YX< E 2.aXsX6XC.T.Z.w.[ xXUXUXUXUX2X3 YXYX", -"YXYXYXYX R >.).5X,.T ,.5XCX8XK.T.A.a.] OXUXUXUXUXUXUX2.O YXYX", -"YXYX Y E Z.ZXsX7XsX0XCXyXR.K.I.V._ .XUXUXUXUXUXLXKXJXV D N S 7 ", -" z E 4.fXsX/.K.~./.6X~.I.I.C...'.KXUXPXPXPXLXKXGXbXl.N m.SXm.D ", -" E 0XgX7XE.W.W.~.~.R.I.Z.w.' bXUXUXUXPXPXLXmXbX$X) ~ aXSXpXBXn ", -" <.CXT.Q.~.W.W.R.I.A.t._ hXUXUXUXUXPXLXGXnX,X .t XAXSXeX4Xl.Z ", -" <.sXB.W.W.W.T.A.g._ oXUXUXUXUXUXLXLXmXcX=.5 $.BXgXeX!.D.3Xm + ", -" <.sXB.R.R.A.V.| {.KXUXUXUXUXLXKXGXvX|.c u qXdXgX^.U.f.3XH f ", -" <.sXB.T.Z.m.[ nXUXUXUXUXPXKXHXbX,X) e <XdXiX_.S.u.P.F.t.h ", -" <.sXk.Z.r.K jXUXUXUXPXLXKXmXcX@.5 %.DXiX_.Y.S.d.h.D.*Xl X ", -" <.wXq.r.X.r UXUXPXPXKXmXvX|.y _ NXdXrX!.S.d.h.d.f.=XF 4 YX", -" ,.0X5.X.) a PXPXKXGXnX>X) y >XAXAX_.S.h.h.u.s.d.F.6.g YX", -" >.9X~ } u '.LXKXmXxX .5 [.IXAX_.!.S.h.h.d.8.s.D.n.j YXYX", -" >.:XW v & kXmXvX;.t ] BXAXrX!.U.u.S.9.u.3.7.i.;XM 1 YXYXYX", -" E #Xb u : nXcX_ u 1XSXgX^.U.H.S.d.8.s.d.u.b.-XG g YXYXYXYX", -" R +Xc r a zX[.= -XdX_.U.d.P.h.d.u.3.8.N.=Xw.l 1 YXYXYXYX", -" T }.x > `.oX> %.*.S.S.h.S.7.d.h.0.p.n.c.M d . YXYXYXYXYX", -" C ].w @ XXu p *.( h.S.s.u.u.u.p.N.*X^ g + YXYXYXYXYXYX", -" Z &.e ; ` * :.o.S.S.S.u.( 9.x.&XX.j , YXYXYXYXYXYX", -" B { 0 i % [.o.u.S.d.h.9.M.&Xz.M 6 YXYXYXYXYXYXYXYX", -" z { 0 - J *./ S.9.d.i.G.&XF g O YXYXYXYXYXYXYXYXYXYX", -" z $.2 w =.! s.d.p.N.;X^ l , YXYXYXYXYXYXYXYXYXYXYX", -" B &.9 ;.Q / j.x.@Xl.m 6 YXYXYXYXYXYXYXYXYXYXYXYXYX", -" h W @.+.I y.&Xb.F 7 O YXYXYXYXYXYXYXYXYXYXYXYXYXYXYX", -" $ s %XU F.=X^ j # YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX", -" g O.<Xe.l 1 YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX", -" o f n d . YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX" -}; diff --git a/languages/cpp/app_templates/qt4makeapp/filesave.xpm b/languages/cpp/app_templates/qt4makeapp/filesave.xpm deleted file mode 100644 index 86ea7d63..00000000 --- a/languages/cpp/app_templates/qt4makeapp/filesave.xpm +++ /dev/null @@ -1,295 +0,0 @@ -/* XPM */ -static char *filesave[] = { -/* columns rows colors chars-per-pixel */ -"32 32 257 2", -" c #000000", -". c #06060A", -"X c #09090D", -"o c #0B0B16", -"O c #101022", -"+ c #1E1E28", -"@ c #181829", -"# c #151F3A", -"$ c #1A263F", -"% c #1D2A3F", -"& c #272730", -"* c #2E2E3F", -"= c #212140", -"- c #212E41", -"; c #2F2F41", -": c #292A4A", -"> c #23224B", -", c #262353", -"< c #292655", -"1 c #2B2C54", -"2 c #2C2C5B", -"3 c #293746", -"4 c #2D304F", -"5 c #243243", -"6 c #2E315D", -"7 c #363647", -"8 c #303E4A", -"9 c #30325E", -"0 c #3C3C53", -"q c #2E2E60", -"w c #2F3160", -"e c #302E63", -"r c #313164", -"t c #363861", -"y c #353868", -"u c #384650", -"i c #284F6B", -"p c #2D547B", -"a c #3B486A", -"s c #36597D", -"d c #3D5D7C", -"f c #4C4C4C", -"g c #40405A", -"h c #414E56", -"j c #4B585E", -"k c #49545E", -"l c #555555", -"z c #4D4D6B", -"x c #434675", -"c c #4B5660", -"v c #4F5962", -"b c #41517E", -"n c #4B507D", -"m c #515C67", -"M c #505D6E", -"N c #5C5D7D", -"B c #546066", -"V c #54626D", -"C c #5B646D", -"Z c #55677A", -"A c #556B78", -"S c #5D6772", -"D c #6B6B6B", -"F c #646464", -"G c #616C73", -"H c #63707D", -"J c #6B7679", -"K c gray45", -"L c #00418E", -"P c #004494", -"I c #004894", -"U c #044F98", -"Y c #03509B", -"T c #0A5198", -"R c #13579C", -"E c #185DA1", -"W c #285888", -"Q c #2B6094", -"! c #396D9A", -"~ c #336A96", -"^ c #3D719B", -"/ c #226EB8", -"( c #326EA8", -") c #326BA3", -"_ c #3673AE", -"` c #3A76B4", -"' c #0B6FD1", -"] c #0F75D8", -"[ c #1479DA", -"{ c #1B7CDC", -"} c #466481", -"| c #42749C", -" . c #4A799E", -".. c #506A84", -"X. c #5F678D", -"o. c #576391", -"O. c #5A6592", -"+. c #5F6893", -"@. c #5B738B", -"#. c #507DA1", -"$. c #626283", -"%. c #636A94", -"&. c #656F98", -"*. c #657A8F", -"=. c #6B7299", -"-. c #717191", -";. c #797998", -":. c #687BA6", -">. c #2281DC", -",. c #3F81C0", -"<. c #3988D7", -"1. c #2785E1", -"2. c #2E8AE3", -"3. c #368FE5", -"4. c #3690E6", -"5. c #3D93E7", -"6. c #3D94E9", -"7. c #57839E", -"8. c #4787BC", -"9. c #5480A1", -"0. c #5B84A3", -"q. c #6E8496", -"w. c #6E8B9A", -"e. c #7D848E", -"r. c #728597", -"t. c #738598", -"y. c #768899", -"u. c #7B8B9B", -"i. c #6489A5", -"p. c #698EA7", -"a. c #6D8FA9", -"s. c #6E81AB", -"d. c #7683A6", -"f. c #768CB7", -"g. c #7395AD", -"h. c #7C96B0", -"j. c #4086CA", -"k. c #4986C3", -"l. c #4284C3", -"z. c #498ED2", -"x. c #4D95DB", -"c. c #548DC5", -"v. c #5D92C8", -"b. c #5593C9", -"n. c #5097DE", -"m. c #5198DE", -"M. c #4296E7", -"N. c #4895E2", -"B. c #4B99E5", -"V. c #4A9CEB", -"C. c #4599EB", -"Z. c #529DE6", -"A. c #589EE2", -"S. c #54A1EB", -"D. c #5AA1E6", -"F. c #5AA5EB", -"G. c #5EA8EF", -"H. c #53A3F1", -"J. c #5EAAF2", -"K. c #6699CB", -"L. c #799BC8", -"P. c #7EA6C9", -"I. c #60A2E5", -"U. c #65A7E8", -"Y. c #6BABE9", -"T. c #68ADF2", -"R. c #67B0F5", -"E. c #6DB3F6", -"W. c #70ADEA", -"Q. c #75B0E9", -"!. c #7CB5EB", -"~. c #73B9F8", -"^. c #7BBDFB", -"/. c #7CBAF6", -"(. c gray55", -"). c #828899", -"_. c #84949E", -"`. c #918E8A", -"'. c #949494", -"]. c #8F8FA9", -"[. c #8997A5", -"{. c #8A9AA9", -"}. c #9A9BAF", -"|. c #9399A9", -" X c #9FAAB5", -".X c #A29E9B", -"XX c #A7A7A7", -"oX c #ABABAB", -"OX c #A3A3B4", -"+X c #A8A8B7", -"@X c #A3ABB3", -"#X c #B4B5B5", -"$X c #B0B0BC", -"%X c #B7B9BC", -"&X c #BBB7B3", -"*X c #BBBBBB", -"=X c #82B1DB", -"-X c #81B7EC", -";X c #88BBED", -":X c #86BAED", -">X c #AEBBC8", -",X c #A6BDCD", -"<X c #BBBCC3", -"1X c #81C1F6", -"2X c #83C2FA", -"3X c #89C4FA", -"4X c #8CC8FC", -"5X c #95C2EF", -"6X c #93CBFD", -"7X c #9BCFFF", -"8X c #97D0FC", -"9X c #9CD3FE", -"0X c #BEC0C1", -"qX c #A3C7E7", -"wX c #A2CAF1", -"eX c #A1D4FF", -"rX c #A3D8FF", -"tX c #AADBFF", -"yX c #B0D1F2", -"uX c #BDD9F4", -"iX c #AAE0FF", -"pX c #B3E1FF", -"aX c #B9E6FF", -"sX c #BEE9FF", -"dX c #C4C4C4", -"fX c #C6C5CD", -"gX c #C6C8CB", -"hX c #CAC7C4", -"jX c #CAC8C6", -"kX c #CBCCCB", -"lX c #D1D0CE", -"zX c #D3D3D3", -"xX c #D4D7D9", -"cX c #D8D8D7", -"vX c #DBDBDB", -"bX c #C4ECFF", -"nX c #C9E0F6", -"mX c #C4F5FF", -"MX c #CCF2FF", -"NX c #D5E6F7", -"BX c #DDEBF9", -"VX c #DCFDFF", -"CX c #D3F1F5", -"ZX c #E1E0DE", -"AX c #E4E3E3", -"SX c #E4E7EA", -"DX c #E7E8E9", -"FX c #E8E6E4", -"GX c #EDE9E5", -"HX c #EBEBEB", -"JX c #E7EEF5", -"KX c #EAF2FA", -"LX c #F1EEEA", -"PX c #F3F3F3", -"IX c #F4F8FC", -"UX c #FDFDFC", -"YX c None", -/* pixels */ -"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXy y e 6 6 2 < < , , 1 YXYX", -"YXYXYX2 < , , q w 2 e r r r w e w r e 2 6 1 6 s :.f.L.y YXYX", -"YXYXYXx d.s.:.a # $ $ % - 5 3 8 u h k B S J ).,XF.b.7.r YXYX", -"YXYXYX&.mX~.8.V #X#X%XdXfXzXxXvXZXZXDXFXFXDXLXDX>.U i 9 YXYX", -"YXYXYXo.2X] L C UXDXcXzXkXkXkXjXjXdXdX%X%X&X%X*XN.' ~ 6 YXYX", -"YXYXYXo.1X] P k hXoXXXXXoXoX#X#X*X%X&X%X%XdXkXxXx.[ ~ 6 YXYX", -"YXYXYXO.3X[ I m FXkXjXjXkXkXkXkXkXkXzXzXzXcXZXSXx.{ ! 6 YXYX", -"YXYXYXo.3X{ I S UXvXxXzXkXkXkXkXkXjXdX*X%X#X&X%XZ.1.^ 9 YXYX", -"YXYXYXO.4X>.U j jX#X#X#X%XdXdXkXzXkXzXzXcXvXDXJXA.1.| 6 YXYX", -"YXYXYXO.6X>.T V PXZXZXZXAXSXDXDXFXHXDXHXHXHXHXSXI.2.| 9 YXYX", -"YXYXYXO.6X2.T G UXLXDXDXAXZXZXAXZXvXcXzXkXkXkXgXY.3. .6 YXYX", -"YXYXYXO.9X4.R m zXdXdXkXzXvXAXDXHXLXPXPXIXUXUXUXQ.6. .9 YXYX", -"YXYXYXO.9X5.R H UXIXUXUXUXUXUXUXUXUXUXUXIXKXJXBX-XC.#.9 YXYX", -"YXYXYXO.eXM./ h.UXUXIXKXBXNXnXuXyXwX5X:X!.Y.Y.Y.D.H.9.6 YXYX", -"YXYXYX+.rXB.<.x.Q.;X-XQ.Y.U.U.D.Z.Z.B.B.C.V.V.B.B.T.0.9 YXYX", -"YXYXYX+.tXB.N.B.B.B.B.C.V.V.H.H.H.D.N.z.8._ ( <.D.R.0.9 YXYX", -"YXYXYX+.tXS.Z.F.D.m.z.l.` ) Q W p s } @.r.[. X>XG.E.0.9 YXYX", -"YXYXYX+.pXU.m.) p d ..*.u.|.+X<XzXZXGXLXGXZXzXjX/.~.p.r YXYX", -"YXYXYX%.aXT.k.*.GXlX&X.X`..XhXlXzXvXvXvXvXxXkXgX2X^.a.w YXYX", -"YXYXYX%.aXE.k.r.LXoXl f l F *XlXzXvXvXvXvXcXzXgX4X:Xa.w YXYX", -"YXYXYX%.bX~.c.y.LX'.f D K D 0XkXzXvXvXvXvXvXzXfX6X4Xg.9 YXYX", -"YXYXYX%.bX^.c.y.LX'.l D K D 0XlXzXcXvXvXvXxXkXkX9X6Xw.r YXYX", -"YXYXYX%.bX2Xv.u.LX'.l K K K 0XlXzXcXvXvXvXvXkXfX9XP.M = YXYX", -"YXYXYX%.bX2XK.u.LX'.l K K D 0XlXxXcXvXZXvXxXzXkXqXZ : . YXYX", -"YXYXYX%.MX6XK.u.LX'.f F D D 0XkXzXcXvXvXvXvXcXkX_.: o YXYX", -"YXYXYX%.MX6XK.u.LXXX(.XX&XdXkXzXvXZXDXAXzX<X+X}.N O YXYX", -"YXYXYX%.VXiX=X{.FXzXkXkXjXdX<X$XOX].;.$.z 0 7 & X YXYXYX", -"YXYXYX=.CXq.A ).fX+X|.).-.N z 0 * + o YXYXYXYX", -"YXYXYXn $.t 6 , 4 0 * + . YXYXYXYXYXYX", -"YXYXYX> @ o YXYXYXYXYXYXYXYXYXYXYXYX", -"YXYXYX YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX", -"YXYXYX YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX" -}; diff --git a/languages/cpp/app_templates/qt4makeapp/main.cpp b/languages/cpp/app_templates/qt4makeapp/main.cpp deleted file mode 100644 index 55f24795..00000000 --- a/languages/cpp/app_templates/qt4makeapp/main.cpp +++ /dev/null @@ -1,14 +0,0 @@ -%{CPP_TEMPLATE} - -#include <TQApplication> -#include "%{APPNAMELC}.h" - -int main(int argc, char *argv[]) -{ - TQ_INIT_RESOURCE(application); - TQApplication app(argc, argv); - %{APPNAME} * mw = new %{APPNAME}(); - mw->show(); - return app.exec(); -} - diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp b/languages/cpp/app_templates/qt4makeapp/qt4makeapp deleted file mode 100644 index 2d69a161..00000000 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp +++ /dev/null @@ -1,11 +0,0 @@ -# QMake application -[General] -Name=Qt4/QMake Application - -Comment=Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4 - -Category=C++/QMake project - -Icon=qt4makeapp.png -FileTemplates=h,CStyle,cpp,CStyle -ShowFilesAfterGeneration=src/APPNAMELC.cpp diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp deleted file mode 100644 index c3a8964f..00000000 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp +++ /dev/null @@ -1,285 +0,0 @@ -%{CPP_TEMPLATE} - -#include <TQtGui> -#include "%{APPNAMELC}.h" - -#include <TQTextEdit> -#include <TQTextStream> -#include <TQCloseEvent> -#include <TQFileDialog> - -%{APPNAME}::%{APPNAME}() -{ - textEdit = new TQTextEdit; - setCentralWidget(textEdit); - - createActions(); - createMenus(); - createToolBars(); - createStatusBar(); - - readSettings(); - - connect(textEdit->document(), TQT_SIGNAL(contentsChanged()), - this, TQT_SLOT(documentWasModified())); - - setCurrentFile(""); -} - -void %{APPNAME}::closeEvent(TQCloseEvent *event) -{ - if (maybeSave()) { - writeSettings(); - event->accept(); - } else { - event->ignore(); - } -} - -void %{APPNAME}::newFile() -{ - if (maybeSave()) { - textEdit->clear(); - setCurrentFile(""); - } -} - -void %{APPNAME}::open() -{ - if (maybeSave()) { - TQString fileName = TQFileDialog::getOpenFileName(this); - if (!fileName.isEmpty()) - loadFile(fileName); - } -} - -bool %{APPNAME}::save() -{ - if (curFile.isEmpty()) { - return saveAs(); - } else { - return saveFile(curFile); - } -} - -bool %{APPNAME}::saveAs() -{ - TQString fileName = TQFileDialog::getSaveFileName(this); - if (fileName.isEmpty()) - return false; - - return saveFile(fileName); -} - -void %{APPNAME}::about() -{ - TQMessageBox::about(this, tr("About Application"), - tr("The <b>Application</b> example demonstrates how to " - "write modern GUI applications using TQt, with a menu bar, " - "toolbars, and a status bar.")); -} - -void %{APPNAME}::documentWasModified() -{ - setWindowModified(true); -} - -void %{APPNAME}::createActions() -{ - newAct = new TQAction(TQIcon(":/filenew.xpm"), tr("&New"), this); - newAct->setShortcut(tr("Ctrl+N")); - newAct->setStatusTip(tr("Create a new file")); - connect(newAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(newFile())); - - openAct = new TQAction(TQIcon(":/fileopen.xpm"), tr("&Open..."), this); - openAct->setShortcut(tr("Ctrl+O")); - openAct->setStatusTip(tr("Open an existing file")); - connect(openAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(open())); - - saveAct = new TQAction(TQIcon(":/filesave.xpm"), tr("&Save"), this); - saveAct->setShortcut(tr("Ctrl+S")); - saveAct->setStatusTip(tr("Save the document to disk")); - connect(saveAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(save())); - - saveAsAct = new TQAction(tr("Save &As..."), this); - saveAsAct->setStatusTip(tr("Save the document under a new name")); - connect(saveAsAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(saveAs())); - - exitAct = new TQAction(tr("E&xit"), this); - exitAct->setShortcut(tr("Ctrl+Q")); - exitAct->setStatusTip(tr("Exit the application")); - connect(exitAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(close())); - - cutAct = new TQAction(TQIcon(":/editcut.xpm"), tr("Cu&t"), this); - cutAct->setShortcut(tr("Ctrl+X")); - cutAct->setStatusTip(tr("Cut the current selection's contents to the " - "clipboard")); - connect(cutAct, TQT_SIGNAL(triggered()), textEdit, TQT_SLOT(cut())); - - copyAct = new TQAction(TQIcon(":/editcopy.xpm"), tr("&Copy"), this); - copyAct->setShortcut(tr("Ctrl+C")); - copyAct->setStatusTip(tr("Copy the current selection's contents to the " - "clipboard")); - connect(copyAct, TQT_SIGNAL(triggered()), textEdit, TQT_SLOT(copy())); - - pasteAct = new TQAction(TQIcon(":/editpaste.xpm"), tr("&Paste"), this); - pasteAct->setShortcut(tr("Ctrl+V")); - pasteAct->setStatusTip(tr("Paste the clipboard's contents into the current " - "selection")); - connect(pasteAct, TQT_SIGNAL(triggered()), textEdit, TQT_SLOT(paste())); - - aboutAct = new TQAction(tr("&About"), this); - aboutAct->setStatusTip(tr("Show the application's About box")); - connect(aboutAct, TQT_SIGNAL(triggered()), this, TQT_SLOT(about())); - - aboutTQtAct = new TQAction(tr("About &TQt"), this); - aboutTQtAct->setStatusTip(tr("Show the TQt library's About box")); - connect(aboutTQtAct, TQT_SIGNAL(triggered()), tqApp, TQT_SLOT(aboutTQt())); - - cutAct->setEnabled(false); - copyAct->setEnabled(false); - connect(textEdit, TQT_SIGNAL(copyAvailable(bool)), - cutAct, TQT_SLOT(setEnabled(bool))); - connect(textEdit, TQT_SIGNAL(copyAvailable(bool)), - copyAct, TQT_SLOT(setEnabled(bool))); -} - -void %{APPNAME}::createMenus() -{ - fileMenu = menuBar()->addMenu(tr("&File")); - fileMenu->addAction(newAct); - fileMenu->addAction(openAct); - fileMenu->addAction(saveAct); - fileMenu->addAction(saveAsAct); - fileMenu->addSeparator(); - fileMenu->addAction(exitAct); - - editMenu = menuBar()->addMenu(tr("&Edit")); - editMenu->addAction(cutAct); - editMenu->addAction(copyAct); - editMenu->addAction(pasteAct); - - menuBar()->addSeparator(); - - helpMenu = menuBar()->addMenu(tr("&Help")); - helpMenu->addAction(aboutAct); - helpMenu->addAction(aboutTQtAct); -} - -void %{APPNAME}::createToolBars() -{ - fileToolBar = addToolBar(tr("File")); - fileToolBar->addAction(newAct); - fileToolBar->addAction(openAct); - fileToolBar->addAction(saveAct); - - editToolBar = addToolBar(tr("Edit")); - editToolBar->addAction(cutAct); - editToolBar->addAction(copyAct); - editToolBar->addAction(pasteAct); -} - -void %{APPNAME}::createStatusBar() -{ - statusBar()->showMessage(tr("Ready")); -} - -void %{APPNAME}::readSettings() -{ - TQSettings settings("Trolltech", "Application Example"); - TQPoint pos = settings.value("pos", TQPoint(200, 200)).toPoint(); - TQSize size = settings.value("size", TQSize(400, 400)).toSize(); - resize(size); - move(pos); -} - -void %{APPNAME}::writeSettings() -{ - TQSettings settings("Trolltech", "Application Example"); - settings.setValue("pos", pos()); - settings.setValue("size", size()); -} - -bool %{APPNAME}::maybeSave() -{ - if (textEdit->document()->isModified()) { - int ret = TQMessageBox::warning(this, tr("Application"), - tr("The document has been modified.\n" - "Do you want to save your changes?"), - TQMessageBox::Yes | TQMessageBox::Default, - TQMessageBox::No, - TQMessageBox::Cancel | TQMessageBox::Escape); - if (ret == TQMessageBox::Yes) - return save(); - else if (ret == TQMessageBox::Cancel) - return false; - } - return true; -} - -void %{APPNAME}::loadFile(const TQString &fileName) -{ - TQFile file(fileName); - if (!file.open(TQFile::ReadOnly | TQFile::Text)) { - TQMessageBox::warning(this, tr("Application"), - tr("Cannot read file %1:\n%2.") - .arg(fileName) - .arg(file.errorString())); - return; - } - - TQTextStream in(&file); - TQApplication::setOverrideCursor(TQt::WaitCursor); - textEdit->setPlainText(in.readAll()); - TQApplication::restoreOverrideCursor(); - - setCurrentFile(fileName); - statusBar()->showMessage(tr("File loaded"), 2000); -} - -bool %{APPNAME}::saveFile(const TQString &fileName) -{ - TQFile file(fileName); - if (!file.open(TQFile::WriteOnly | TQFile::Text)) { - TQMessageBox::warning(this, tr("Application"), - tr("Cannot write file %1:\n%2.") - .arg(fileName) - .arg(file.errorString())); - return false; - } - - TQTextStream out(&file); - TQApplication::setOverrideCursor(TQt::WaitCursor); - out << textEdit->toPlainText(); - TQApplication::restoreOverrideCursor(); - - setCurrentFile(fileName); - statusBar()->showMessage(tr("File saved"), 2000); - return true; -} - -void %{APPNAME}::setCurrentFile(const TQString &fileName) -{ - curFile = fileName; - textEdit->document()->setModified(false); - setWindowModified(false); - - TQString shownName; - if (curFile.isEmpty()) - shownName = "untitled.txt"; - else - shownName = strippedName(curFile); - - setWindowTitle(tr("%1[*] - %2").arg(shownName).arg(tr("Application"))); -} - -TQString %{APPNAME}::strippedName(const TQString &fullFileName) -{ - return TQFileInfo(fullFileName).fileName(); -} - -%{APPNAME}::~%{APPNAME}() -{ - -} - diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h deleted file mode 100644 index 99a979cf..00000000 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.h +++ /dev/null @@ -1,66 +0,0 @@ -%{H_TEMPLATE} - -#ifndef %{APPNAMEUC}_H -#define %{APPNAMEUC}_H - -#include <TQMainWindow> -#include <TQCloseEvent> - -class TQAction; -class TQMenu; -class TQTextEdit; - -class %{APPNAME}:public TQMainWindow -{ - Q_OBJECT - - -public: - %{APPNAME}(); - ~%{APPNAME}(); - -protected: - void closeEvent(TQCloseEvent *event); - -private slots: - void newFile(); - void open(); - bool save(); - bool saveAs(); - void about(); - void documentWasModified(); - -private: - void createActions(); - void createMenus(); - void createToolBars(); - void createStatusBar(); - void readSettings(); - void writeSettings(); - bool maybeSave(); - void loadFile(const TQString &fileName); - bool saveFile(const TQString &fileName); - void setCurrentFile(const TQString &fileName); - TQString strippedName(const TQString &fullFileName); - - TQTextEdit *textEdit; - TQString curFile; - - TQMenu *fileMenu; - TQMenu *editMenu; - TQMenu *helpMenu; - TQToolBar *fileToolBar; - TQToolBar *editToolBar; - TQAction *newAct; - TQAction *openAct; - TQAction *saveAct; - TQAction *saveAsAct; - TQAction *exitAct; - TQAction *cutAct; - TQAction *copyAct; - TQAction *pasteAct; - TQAction *aboutAct; - TQAction *aboutTQtAct; -}; - -#endif diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevelop b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevelop deleted file mode 100644 index 74dee1ae..00000000 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevelop +++ /dev/null @@ -1,113 +0,0 @@ -<?xml version="1.0"?> -<kdevelop> - <general> - <author>%{AUTHOR}</author> - <email>%{EMAIL}</email> - <version>%{VERSION}</version> - <projectmanagement>KDevTrollProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>Qt</keyword> - </keywords> - </general> - <kdevfileview> - <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*" name="Others" /> - </groups> - <tree> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidepatterns>*.o,*.lo,CVS</hidepatterns> - </tree> - </kdevfileview> - <kdevcppsupport> - <qt> - <used>true</used> - <version>4</version> - <includestyle>4</includestyle> - <designerintegration>ExternalDesigner</designerintegration> - <qmake>%{QMAKE}</qmake> - <designer>%{DESIGNER}</designer> - </qt> - </kdevcppsupport> - <kdevdoctreeview> - <ignoretocs> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>kde2book</toc> - <toc>opengl</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>qt-kdev3</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>stl</toc> - <toc>sw</toc> - <toc>w3c-dom-level2-html</toc> - <toc>w3c-svg</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - </ignoretocs> - <ignoredoxygen> - <toc>TDE Libraries (Doxygen)</toc> - </ignoredoxygen> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell/> - <breakpoints/> - <programargs></programargs> - <gdbpath>/usr/bin/gdb</gdbpath> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - </display> - <breakpoints/> - </kdevdebugger> - <kdevtrollproject> - <run> - <mainprogram>./bin/%{APPNAMELC}</mainprogram> - <programargs/> - </run> - </kdevtrollproject> - <workspace> - <openfiles/> - </workspace> - <kdevfilecreate> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - <type ext="ts" /> - <type ext="qrc" /> - </useglobaltypes> - </kdevfilecreate> - <kdevdocumentation> - <projectdoc> - <docsystem>Doxygen Documentation Collection</docsystem> - <docurl>%{APPNAMELC}.tag</docurl> - </projectdoc> - </kdevdocumentation> -</kdevelop> diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate deleted file mode 100644 index c1c0fb90..00000000 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate +++ /dev/null @@ -1,104 +0,0 @@ -# TDE Config File -[General] -Name=Qt4 Application - -Comment=Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4 - -Category=C++/QMake project - -Icon=qt4makeapp.png -FileTemplates=h,CStyle,cpp,CStyle -ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}.cpp,%{dest}/src/ReadMe -Archive=qt4makeapp.tar.gz - -[FILE1] -Type=install -Source=%{src}/qt4makeapp.kdevelop -Dest=%{dest}/%{APPNAMELC}.kdevelop - -[FILE2] -Type=install -Source=%{src}/qt4makeapp.pro -Dest=%{dest}/%{APPNAMELC}.pro - -[MkDir1] -Type=mkdir -Dir=%{dest}/src - -[FILE3] -Type=install -Source=%{src}/src.pro -Dest=%{dest}/src/src.pro - -[FILE4] -Type=install -Source=%{src}/main.cpp -Dest=%{dest}/src/main.cpp - -[FILE5] -Type=install -Source=%{src}/qt4makeapp.cpp -Dest=%{dest}/src/%{APPNAMELC}.cpp - -[FILE6] -Type=install -Source=%{src}/qt4makeapp.h -Dest=%{dest}/src/%{APPNAMELC}.h - -[FILE7] -Type=install -Source=%{src}/fileopen.xpm -Dest=%{dest}/src/fileopen.xpm - -[FILE8] -Type=install -Source=%{src}/filesave.xpm -Dest=%{dest}/src/filesave.xpm - -[FILE9] -Type=install -Source=%{src}/filenew.xpm -Dest=%{dest}/src/filenew.xpm - -[FILE10] -Type=install -Source=%{src}/editcopy.xpm -Dest=%{dest}/src/editcopy.xpm - -[FILE11] -Type=install -Source=%{src}/editpaste.xpm -Dest=%{dest}/src/editpaste.xpm - -[FILE12] -Type=install -Source=%{src}/editcut.xpm -Dest=%{dest}/src/editcut.xpm - -[FILE13] -Type=install -Source=%{src}/application.qrc -Dest=%{dest}/src/application.qrc - -[FILE14] -Type=install -Source=%{src}/ReadMe -Dest=%{dest}/src/ReadMe - -[MSG] -Type=message -Comment=A Qt4/Qmake based application was created in %{dest} - -[QMAKE] -Type=value -ValueType=QString -Value=QMAKE -Comment=Absolute Path for QMake (Qt4). -Default= - -[DESIGNER] -Type=value -ValueType=QString -Value=DESIGNER -Comment=Absolute Path for Designer (Qt4). -Default= diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.png b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.png Binary files differdeleted file mode 100644 index d874d54e..00000000 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.png +++ /dev/null diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.pro b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.pro deleted file mode 100644 index 7177d225..00000000 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.pro +++ /dev/null @@ -1,5 +0,0 @@ -SUBDIRS += src -TEMPLATE = subdirs -CONFIG += warn_on \ - qt \ - thread
\ No newline at end of file diff --git a/languages/cpp/app_templates/qt4makeapp/src.pro b/languages/cpp/app_templates/qt4makeapp/src.pro deleted file mode 100644 index fa8baae6..00000000 --- a/languages/cpp/app_templates/qt4makeapp/src.pro +++ /dev/null @@ -1,10 +0,0 @@ -SOURCES += %{APPNAMELC}.cpp \ - main.cpp -HEADERS += %{APPNAMELC}.h -TEMPLATE = app -CONFIG += warn_on \ - thread \ - qt -TARGET = %{APPNAMELC} -DESTDIR = ../bin -RESOURCES = application.qrc diff --git a/languages/cpp/app_templates/qtopia4app/CMakeLists.txt b/languages/cpp/app_templates/qtopia4app/CMakeLists.txt deleted file mode 100644 index 2d708608..00000000 --- a/languages/cpp/app_templates/qtopia4app/CMakeLists.txt +++ /dev/null @@ -1,49 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -set( _tarball_desktops example.desktop ) -set( _tarball_files - Example.png app.kdevelop example.html - main.cpp Makefile.am app.pro example.cpp example.h - examplebase.ui -) -set( _tarball_content ${_tarball_desktops} ${_tarball_files} ) -list( SORT _tarball_content ) - -tde_create_translated_desktop( - SOURCE ${_tarball_desktops} - DESTINATION - - PO_DIR tdevelop-desktops -) - -file( - COPY ${_tarball_files} - DESTINATION ${CMAKE_CURRENT_BINARY_DIR} -) - -tde_create_tarball( - TARGET qtopia4app.tar.gz - SOURCEDIR ${CMAKE_CURRENT_BINARY_DIR} - FILES ${_tarball_content} -) - - -install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/qtopia4app.tar.gz qtopia4app.png - DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) - - -tde_create_translated_desktop( - SOURCE qtopia4app.kdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates - KEYWORDS Category - PO_DIR tdevelop-desktops -) diff --git a/languages/cpp/app_templates/qtopia4app/Example.png b/languages/cpp/app_templates/qtopia4app/Example.png Binary files differdeleted file mode 100644 index 9d1a807d..00000000 --- a/languages/cpp/app_templates/qtopia4app/Example.png +++ /dev/null diff --git a/languages/cpp/app_templates/qtopia4app/Makefile.am b/languages/cpp/app_templates/qtopia4app/Makefile.am deleted file mode 100644 index 57785690..00000000 --- a/languages/cpp/app_templates/qtopia4app/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -dataFiles = Example.png app.kdevelop example.desktop \ - example.html main.cpp Makefile.am app.pro example.cpp \ - example.h examplebase.ui - -templateName = qtopia4app - -### no need to change below: -template_DATA = $(templateName).kdevtemplate -templatedir = ${appwizarddatadir}/templates - -appwizarddatadir = ${kde_datadir}/kdevappwizard -$(templateName).tar.gz: ${dataFiles} - $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} - gzip -f9 $(templateName).tar - -archivedir = ${appwizarddatadir} -archive_DATA = $(templateName).tar.gz ${templateName}.png - -CLEANFILES = *.tar.gz diff --git a/languages/cpp/app_templates/qtopia4app/app.kdevelop b/languages/cpp/app_templates/qtopia4app/app.kdevelop deleted file mode 100644 index f7e4a952..00000000 --- a/languages/cpp/app_templates/qtopia4app/app.kdevelop +++ /dev/null @@ -1,163 +0,0 @@ -<?xml version="1.0"?> -<kdevelop> - <general> - <author>%{AUTHOR}</author> - <email>%{EMAIL}</email> - <version>%{VERSION}</version> - <projectmanagement>KDevTrollProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>Qt</keyword> - </keywords> - <ignoreparts/> - </general> - <kdevfileview> - <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*" name="Others" /> - </groups> - <tree> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidepatterns>*.o,*.lo,CVS</hidepatterns> - </tree> - </kdevfileview> - <kdevdoctreeview> - <ignoretocs> - <toc>ada</toc> - <toc>ada_bugs_gcc</toc> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>w3c-dom-level2-html</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>kde2book</toc> - <toc>opengl</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>stl</toc> - <toc>w3c-svg</toc> - <toc>sw</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - </ignoretocs> - <ignoredoxygen> - <toc>TDE Libraries (Doxygen)</toc> - </ignoredoxygen> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell>libtool</dbgshell> - <programargs></programargs> - <gdbpath></gdbpath> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - </display> - </kdevdebugger> - <kdevtrollproject> - <general> - <activedir></activedir> - </general> - <run> - <mainprogram>./%{APPNAMELC}</mainprogram> - <programargs>-qws</programargs> - <envvars> - <envvar value="/opt/Qtopia/SDK/4.2.4/x86" name="QPEDIR" /> - <envvar value="$QPEDIR/qtopiacore/target" name="TQTDIR" /> - <envvar value="/opt/Qtopia/SDK/4.2.4/x86/lib:/opt/Qtopia/SDK/4.2.4/x86/qtopiacore/target/lib:$LD_LIBRARY_PATH" name="LD_LIBRARY_PATH" /> - <envvar value="$PATH:/opt/Qtopia/SDK/scripts:/opt/Qtopia/SDK/4.2.4/x86/bin:/opt/Qtopia/SDK/4.2.4/x86/scripts" name="PATH" /> - - </envvars> - </run> - <envvars/> - <make> - <abortonerror>true</abortonerror> - <runmultiplejobs>false</runmultiplejobs> - <numberofjobs>1</numberofjobs> - <dontact>false</dontact> - <makebin></makebin> - <prio>0</prio> - <envvars> - <envvar value="/opt/Qtopia/SDK/4.2.4/x86" name="QPEDIR" /> - <envvar value="/opt/Qtopia/SDK/4.2.4/x86/qtopiacore/target" name="TQTDIR" /> - <envvar value="$PATH:/opt/Qtopia/SDK/scripts:/opt/Qtopia/SDK/4.2.4/x86/bin:/opt/Qtopia/SDK/4.2.4/x86/scripts" name="PATH" /> - </envvars> - </make> - </kdevtrollproject> - <kdevfilecreate> - <filetypes/> - <useglobaltypes/> - </kdevfilecreate> - <cppsupportpart> - <codecompletion> - <codehinting outputview="1" enablech="0" selectview="0" /> - </codecompletion> - <classstore> - <enablepcs>false</enablepcs> - <enablepp>false</enablepp> - <preparsing/> - </classstore> - <filetemplates> - <choosefiles>false</choosefiles> - <interfaceURL></interfaceURL> - <implementationURL></implementationURL> - <interfacesuffix>.h</interfacesuffix> - <implementationsuffix>.cpp</implementationsuffix> - <lowercasefilenames>true</lowercasefilenames> - </filetemplates> - </cppsupportpart> - <kdevclassview> - <folderhierarchy>true</folderhierarchy> - <depthoffolders>2</depthoffolders> - </kdevclassview> - <kdevcvs> - <cvsoptions>-f</cvsoptions> - <commitoptions></commitoptions> - <updateoptions>-dP</updateoptions> - <addoptions></addoptions> - <removeoptions>-f</removeoptions> - <diffoptions>-u3 -p</diffoptions> - <logoptions></logoptions> - <rshoptions></rshoptions> - </kdevcvs> - <kdevdocumentation> - <projectdoc> - <docsystem>Doxygen Documentation Collection</docsystem> - <docurl>%{APPNAMELC}.tag</docurl> - </projectdoc> - </kdevdocumentation> - <kdevcppsupport> - <qt> - <used>true</used> - <version>4</version> - <includestyle>4</includestyle> - <root>/usr/lib/qt3</root> - <designerintegration>ExternalDesigner</designerintegration> - <qmake>/opt/Qtopia/SDK/4.2.4/x86/bin/qtopiamake</qmake> - <designer>/opt/Qtopia/SDK/4.2.4/x86/bin/designer</designer> - <designerpluginpaths/> - </qt> - </kdevcppsupport> -</kdevelop> diff --git a/languages/cpp/app_templates/qtopia4app/app.pro b/languages/cpp/app_templates/qtopia4app/app.pro deleted file mode 100644 index 05a0bb9c..00000000 --- a/languages/cpp/app_templates/qtopia4app/app.pro +++ /dev/null @@ -1,31 +0,0 @@ -qtopia_project(qtopia app) # see buildsystem.html for more project keywords -TARGET=%{APPNAMELC} -CONFIG+=qtopia_main -CONFIG+=no_singleexec -CONFIG+=no_quicklaunch -CONFIG+=no_tr - -FORMS=%{APPNAMELC}base.ui -HEADERS=%{APPNAMELC}.h -SOURCES=main.cpp %{APPNAMELC}.cpp - -desktop.files=%{APPNAMELC}.desktop -desktop.path=/apps/Applications -desktop.hint=desktop - -pics.files=pics/* -pics.path=/pics/%{APPNAMELC} -pics.hint=pics - -help.source=help -help.files=%{APPNAME}.html -help.hint=help - -INSTALLS+=desktop pics help - -pkg.name=%{APPNAME} -pkg.desc=%{APPNAME} Application -pkg.version=1.0.0-1 -pkg.maintainer=%{AUTHOR} %{EMAIL} -pkg.license=GPL -pkg.domain=window diff --git a/languages/cpp/app_templates/qtopia4app/example.cpp b/languages/cpp/app_templates/qtopia4app/example.cpp deleted file mode 100644 index 735f7e03..00000000 --- a/languages/cpp/app_templates/qtopia4app/example.cpp +++ /dev/null @@ -1,40 +0,0 @@ - -#include "%{APPNAMELC}.h" -#include <tqpushbutton.h> - -%{APPNAME}Base::%{APPNAME}Base( TQWidget *parent, TQt::WFlags f ) - : TQWidget( parent, f ) -{ - setupUi( this ); -} - -%{APPNAME}Base::~%{APPNAME}Base() -{ -} - -/* - * Constructs a %{APPNAME} which is a child of 'parent', with the - * name 'name' and widget flags set to 'f' - */ -%{APPNAME}::%{APPNAME}( TQWidget *parent, TQt::WFlags f ) - : %{APPNAME}Base( parent, f ) -{ - connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); -} - -/* - * Destroys the object and frees any allocated resources - */ -%{APPNAME}::~%{APPNAME}() -{ - // no need to delete child widgets, TQt does it all for us -} - -/* - * A simple slot... not very interesting. - */ -void %{APPNAME}::goodBye() -{ - close(); -} - diff --git a/languages/cpp/app_templates/qtopia4app/example.desktop b/languages/cpp/app_templates/qtopia4app/example.desktop deleted file mode 100644 index 813ef2ec..00000000 --- a/languages/cpp/app_templates/qtopia4app/example.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=%{APPNAME} - -Comment=An %{APPNAME} Program - -Exec=%{APPNAMELC} -Icon=%{APPNAME} -Type=Application diff --git a/languages/cpp/app_templates/qtopia4app/example.h b/languages/cpp/app_templates/qtopia4app/example.h deleted file mode 100644 index f6e3c548..00000000 --- a/languages/cpp/app_templates/qtopia4app/example.h +++ /dev/null @@ -1,25 +0,0 @@ - -#ifndef %{APPNAMEUC}_H -#define %{APPNAMEUC}_H -#include "ui_%{APPNAMELC}base.h" - -class %{APPNAME}Base : public TQWidget, public Ui_%{APPNAME}Base -{ -public: - %{APPNAME}Base( TQWidget *parent = 0, TQt::WFlags f = 0 ); - virtual ~%{APPNAME}Base(); -}; - -class %{APPNAME} : public %{APPNAME}Base -{ - Q_OBJECT - -public: - %{APPNAME}( TQWidget *parent = 0, TQt::WFlags f = 0 ); - virtual ~%{APPNAME}(); - -private slots: - void goodBye(); -}; - -#endif // %{APPNAMEUC}_H diff --git a/languages/cpp/app_templates/qtopia4app/example.html b/languages/cpp/app_templates/qtopia4app/example.html deleted file mode 100644 index 9bcae99d..00000000 --- a/languages/cpp/app_templates/qtopia4app/example.html +++ /dev/null @@ -1,15 +0,0 @@ -<html> -<h1>%{APPNAME}</h1> - -<p>This is the help for the %{APPNAME} program. - -<p>To user this application: - -<ol> - <li>Press the <img width=12 height=12 src=%{APPNAME}.png> icon in the TQtopia launcher. - <li>Read the label. - <li>Press the button. - <li>Read the source code provided. -</ol> - -Now you know how to make a TQtopia application! diff --git a/languages/cpp/app_templates/qtopia4app/examplebase.ui b/languages/cpp/app_templates/qtopia4app/examplebase.ui deleted file mode 100644 index 107d4e96..00000000 --- a/languages/cpp/app_templates/qtopia4app/examplebase.ui +++ /dev/null @@ -1,44 +0,0 @@ -<ui version="4.0" stdsetdef="1" > - <author></author> - <comment></comment> - <exportmacro></exportmacro> - <class>%{APPNAME}Base</class> - <widget class="TQWidget" name="%{APPNAME}Base" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>196</width> - <height>245</height> - </rect> - </property> - <property name="windowTitle" > - <string>%{APPNAME}</string> - </property> - <layout class="TQVBoxLayout" > - <property name="margin" > - <number>11</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item> - <widget class="TQLabel" name="TextLabel1" > - <property name="text" > - <string>This is just an %{APPNAME}. It doesn't do anything interesting at all.</string> - </property> - <property name="wordWrap" > - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="TQPushButton" name="quit" > - <property name="text" > - <string>Quit</string> - </property> - </widget> - </item> - </layout> - </widget> -</ui> diff --git a/languages/cpp/app_templates/qtopia4app/main.cpp b/languages/cpp/app_templates/qtopia4app/main.cpp deleted file mode 100644 index b4ccc5ca..00000000 --- a/languages/cpp/app_templates/qtopia4app/main.cpp +++ /dev/null @@ -1,7 +0,0 @@ - -#include "%{APPNAMELC}.h" -#include <tqtopia/tqtopiaapplication.h> - -TQTOPIA_ADD_APPLICATION("%{APPNAMELC}", %{APPNAME}) -TQTOPIA_MAIN - diff --git a/languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate b/languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate deleted file mode 100644 index 6f4fbf08..00000000 --- a/languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate +++ /dev/null @@ -1,87 +0,0 @@ -# TDE Config File -[General] -Name=Qtopia 4 Application - -Comment=Generate a Qmake/Qt based application for Qtopia 4.x - -Category=C++/Embedded - -Icon=qmakeapp4.png -FileTemplates=h,CStyle,cpp,CStyle -ShowFilesAfterGeneration=%{dest}/%{APPNAMELC}.cpp -Archive=qtopia4app.tar.gz - -[MkDir0] -Type=mkdir -Dir=%{dest}/help - -[MkDir1] -Type=mkdir -Dir=%{dest}/help/html - -[FILE1] -Type=install -EscapeXML=true -Source=%{src}/app.kdevelop -Dest=%{dest}/%{APPNAMELC}.kdevelop - -[FILE2] -Type=install -Source=%{src}/Example.png -Dest=%{dest}/%{APPNAME}.png -Process=false - -[FILE3] -Type=install -Source=%{src}/app.pro -Dest=%{dest}/%{APPNAMELC}.pro - -[FILE4] -Type=install -Source=%{src}/example.cpp -Dest=%{dest}/%{APPNAMELC}.cpp - -[FILE5] -Type=install -Source=%{src}/example.h -Dest=%{dest}/%{APPNAMELC}.h - -[FILE6] -Type=install -EscapeXML=true -Source=%{src}/examplebase.ui -Dest=%{dest}/%{APPNAMELC}base.ui - -[FILE7] -Type=install -Source=%{src}/example.desktop -Dest=%{dest}/%{APPNAMELC}.desktop - -[FILE8] -Type=install -EscapeXML=true -Source=%{src}/example.html -Dest=%{dest}/%{APPNAMELC}.html - -[FILE9] -Type=install -Source=%{src}/main.cpp -Dest=%{dest}/main.cpp - -[MSG] -Type=message -Comment=A Qtopia application was created in %{dest} - -[QMAKE] -Type=value -ValueType=QString -Value=QMAKE -Comment=Absolute Path for QMake (Qt4). -Default=/opt/Qtopia/SDK/4.2.4/x86/bin/qtopiamake - -[DESIGNER] -Type=value -ValueType=QString -Value=DESIGNER -Comment=Absolute Path for Designer (Qt4). -Default=/opt/Qtopia/SDK/4.2.4/x86/bin/designer diff --git a/languages/cpp/app_templates/qtopia4app/qtopia4app.png b/languages/cpp/app_templates/qtopia4app/qtopia4app.png Binary files differdeleted file mode 100644 index 1107719a..00000000 --- a/languages/cpp/app_templates/qtopia4app/qtopia4app.png +++ /dev/null diff --git a/languages/cpp/app_templates/qtopiaapp/example.cpp b/languages/cpp/app_templates/qtopiaapp/example.cpp index d68f6c6d..f03ea5c3 100644 --- a/languages/cpp/app_templates/qtopiaapp/example.cpp +++ b/languages/cpp/app_templates/qtopiaapp/example.cpp @@ -9,7 +9,7 @@ %{APPNAME}::%{APPNAME}( TQWidget* parent, const char* name, WFlags fl ) : %{APPNAME}Base( parent, name, fl ) { - connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); + connect(quit, TQ_SIGNAL(clicked()), this, TQ_SLOT(goodBye())); } /* diff --git a/languages/cpp/app_templates/qtopiaapp/example.h b/languages/cpp/app_templates/qtopiaapp/example.h index eca9c039..af32c7e7 100644 --- a/languages/cpp/app_templates/qtopiaapp/example.h +++ b/languages/cpp/app_templates/qtopiaapp/example.h @@ -5,7 +5,7 @@ class %{APPNAME} : public %{APPNAME}Base { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/tdecmodule/module.h b/languages/cpp/app_templates/tdecmodule/module.h index 44ed3540..58622984 100644 --- a/languages/cpp/app_templates/tdecmodule/module.h +++ b/languages/cpp/app_templates/tdecmodule/module.h @@ -8,7 +8,7 @@ class %{APPNAME}: public TDECModule { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/tdeconfig35/app.cpp b/languages/cpp/app_templates/tdeconfig35/app.cpp index 1aab14b5..ce638d20 100644 --- a/languages/cpp/app_templates/tdeconfig35/app.cpp +++ b/languages/cpp/app_templates/tdeconfig35/app.cpp @@ -34,10 +34,10 @@ setAutoSaveSettings(); // allow the view to change the statusbar and caption - connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); - connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), - this, TQT_SLOT(changeCaption(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); } @@ -47,14 +47,14 @@ void %{APPNAMELC}::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item TDEAction *custom = new TDEAction(i18n("Swi&tch Colors"), 0, - m_view, TQT_SLOT(switchColors()), + m_view, TQ_SLOT(switchColors()), actionCollection(), "switch_action"); setupGUI(); @@ -75,7 +75,7 @@ void %{APPNAMELC}::optionsPreferences() // to the names of the variables in the .kcfg file TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow); dialog->addPage(new Prefs(), i18n("General"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged())); + connect(dialog, TQ_SIGNAL(settingsChanged()), m_view, TQ_SLOT(settingsChanged())); dialog->show(); } diff --git a/languages/cpp/app_templates/tdeconfig35/app.h b/languages/cpp/app_templates/tdeconfig35/app.h index b090428f..7e9825ab 100644 --- a/languages/cpp/app_templates/tdeconfig35/app.h +++ b/languages/cpp/app_templates/tdeconfig35/app.h @@ -25,7 +25,7 @@ class KURL; */ class %{APPNAMELC} : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/tdeconfig35/appview.h b/languages/cpp/app_templates/tdeconfig35/appview.h index a486ec43..20e010d0 100644 --- a/languages/cpp/app_templates/tdeconfig35/appview.h +++ b/languages/cpp/app_templates/tdeconfig35/appview.h @@ -21,7 +21,7 @@ class KURL; */ class %{APPNAMELC}View : public %{APPNAMELC}view_base { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.h b/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.h index 7397dafc..bdc6b945 100644 --- a/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.h +++ b/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.h @@ -12,7 +12,7 @@ class TQStringList; class %{APPNAME}Plugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp index 0d2bf1ff..168cd8c4 100644 --- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp +++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp @@ -38,10 +38,10 @@ extern "C" { /// @todo //Connect your signals and slots here to configure the screen saver. - connect( OkayPushButton, TQT_SIGNAL( released() ), - TQT_SLOT( slotOkPressed() ) ); - connect( CancelPushButton, TQT_SIGNAL( released() ), - TQT_SLOT( slotCancelPressed() ) ); + connect( OkayPushButton, TQ_SIGNAL( released() ), + TQ_SLOT( slotOkPressed() ) ); + connect( CancelPushButton, TQ_SIGNAL( released() ), + TQ_SLOT( slotCancelPressed() ) ); } diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.h b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.h index e066852a..9557e4c1 100644 --- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.h +++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.h @@ -8,7 +8,7 @@ class %{APPNAME} : public KScreenSaver { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}( WId drawable ); @@ -20,7 +20,7 @@ private: class %{APPNAME}Setup : public %{APPNAME}UI { - Q_OBJECT + TQ_OBJECT public: %{APPNAME}Setup( TQWidget *parent = NULL, const char *name = NULL ); diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp index a4ad9fed..a111acde 100644 --- a/languages/cpp/backgroundparser.cpp +++ b/languages/cpp/backgroundparser.cpp @@ -182,14 +182,14 @@ public: { SafeString s( fileName.ascii() ); TQMutexLocker locker( &m_mutex ); - m_fileList.push_front( tqMakePair( s, readFromDisk ) ); + m_fileList.push_front( qMakePair( s, readFromDisk ) ); } void push_back( const TQString& fileName, bool readFromDisk = false ) { SafeString s( fileName.ascii() ); TQMutexLocker locker( &m_mutex ); - m_fileList.push_back( tqMakePair( s, readFromDisk ) ); + m_fileList.push_back( qMakePair( s, readFromDisk ) ); } void pop_front() diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp index 569db783..abd282f4 100644 --- a/languages/cpp/ccconfigwidget.cpp +++ b/languages/cpp/ccconfigwidget.cpp @@ -64,15 +64,15 @@ CCConfigWidget::CCConfigWidget( CppSupportPart* part, TQWidget* parent, const ch : CCConfigWidgetBase( parent, name ) { m_pPart = part; - connect( m_pPart->codeRepository(), TQT_SIGNAL( catalogRegistered( Catalog* ) ), - this, TQT_SLOT( catalogRegistered( Catalog* ) ) ); - connect( m_pPart->codeRepository(), TQT_SIGNAL( catalogUnregistered( Catalog* ) ), - this, TQT_SLOT( catalogUnregistered( Catalog* ) ) ); + connect( m_pPart->codeRepository(), TQ_SIGNAL( catalogRegistered( Catalog* ) ), + this, TQ_SLOT( catalogRegistered( Catalog* ) ) ); + connect( m_pPart->codeRepository(), TQ_SIGNAL( catalogUnregistered( Catalog* ) ), + this, TQ_SLOT( catalogUnregistered( Catalog* ) ) ); - connect( m_qtDir, TQT_SIGNAL(urlSelected(const TQString &)), - this, TQT_SLOT(isValidTQtDir(const TQString &))); - connect( m_qtDir, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(isValidTQtDir(const TQString &))); + connect( m_qtDir, TQ_SIGNAL(urlSelected(const TQString &)), + this, TQ_SLOT(isValidTQtDir(const TQString &))); + connect( m_qtDir, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(isValidTQtDir(const TQString &))); initGeneralTab( ); initTQtTab(); @@ -401,39 +401,15 @@ void CCConfigWidget::initTQtTab() c->init(); m_qtUsed->setChecked( c->isUsed() ); - if( c->version() == 4 ) - { - m_versionQt4->setChecked( true ); - m_kdevembedded->setEnabled( false ); - m_kdevexternal->setEnabled( false ); - m_qtStyleVersion4->setEnabled( true ); - m_designerPath->setEnabled( true ); - m_qmakePath->setEnabled( true ); - m_qtDir->setEnabled( false ); - m_txtQtDir->setEnabled( false ); - m_txtDesigner->setEnabled( true ); - pluginPaths->setEnabled( true ); - } - else - { - m_versionQt3->setChecked( true ); - m_kdevembedded->setEnabled( true ); - m_kdevexternal->setEnabled( true ); - m_qtStyleVersion4->setEnabled( false ); - m_designerPath->setEnabled( true ); - m_qmakePath->setEnabled( true ); - m_qtDir->setEnabled( true ); - m_txtQtDir->setEnabled( true ); - m_txtDesigner->setEnabled( true ); - pluginPaths->setEnabled( false ); - } - if( c->includeStyle() == 4 ) - { - m_qtStyleVersion4->setChecked( true ); - }else - { - m_qtStyleVersion3->setChecked( true ); - } + m_versionQt3->setChecked( true ); + m_kdevembedded->setEnabled( true ); + m_kdevexternal->setEnabled( true ); + m_designerPath->setEnabled( true ); + m_qmakePath->setEnabled( true ); + m_qtDir->setEnabled( true ); + m_txtQtDir->setEnabled( true ); + m_txtDesigner->setEnabled( true ); + m_qtStyleVersion3->setChecked( true ); m_qtDir->setURL( c->root() ); isValidTQtDir(m_qtDir->url()); m_qmakePath->setURL( c->qmakePath() ); @@ -487,21 +463,8 @@ void CCConfigWidget::saveTQtTab() QtBuildConfig* c = m_pPart->qtBuildConfig(); c->setUsed( m_qtUsed->isChecked() ); - if( m_versionQt4->isChecked() ) - { - c->setVersion( 4 ); - } - else - { - c->setVersion( 3 ); - } - if( m_qtStyleVersion4->isChecked() ) - { - c->setIncludeStyle( 4 ); - }else - { - c->setIncludeStyle( 3 ); - } + c->setVersion( 3 ); + c->setIncludeStyle( 3 ); c->setRoot( m_qtDir->url() ); c->setTQMakePath( m_qmakePath->url() ); c->setDesignerPath( m_designerPath->url() ); @@ -524,32 +487,16 @@ void CCConfigWidget::isValidTQtDir( const TQString &dir ) TQFileInfo inc( dir + TQString( TQChar( TQDir::separator() ) )+ "include"+TQString( TQChar( TQDir::separator() ) )+ "tqt.h" ); - if ( !m_versionQt4->isChecked() && !inc.exists() ) - { - m_qtDir->lineEdit()->setPaletteForegroundColor(TQColor("#ff0000")); - }else - { - m_qtDir->lineEdit()->unsetPalette(); - } + m_qtDir->lineEdit()->unsetPalette(); } void CCConfigWidget::toggleTQtVersion( bool ) { if ( m_versionQt3->isChecked() ) { - m_qtStyleVersion4->setEnabled( false ); m_qtStyleVersion3->setChecked( true ); m_kdevembedded->setEnabled( true ); m_kdevexternal->setEnabled( true ); - pluginPaths->setEnabled( false ); - } - if ( m_versionQt4->isChecked() ) - { - m_qtStyleVersion4->setEnabled( true ); - m_tqtdesigner->setChecked( true ); - m_kdevembedded->setEnabled( false ); - m_kdevexternal->setEnabled( false ); - pluginPaths->setEnabled( true ); } isValidTQtDir( m_qtDir->url() ); isTQMakeExecutable( m_qmakePath->url() ); @@ -563,15 +510,15 @@ void CCConfigWidget::openPluginPaths() KDialog d( this ); TQVBoxLayout* mainlayout = new TQVBoxLayout( &d ); KPushButton* ok = new KPushButton( KStdGuiItem::ok(), &d ); - connect( ok, TQT_SIGNAL(clicked()), &d, TQT_SLOT(accept())); + connect( ok, TQ_SIGNAL(clicked()), &d, TQ_SLOT(accept())); KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), &d ); - connect( cancel, TQT_SIGNAL(clicked()), &d, TQT_SLOT(reject())); + connect( cancel, TQ_SIGNAL(clicked()), &d, TQ_SLOT(reject())); TQHBoxLayout* btns = new TQHBoxLayout( &d ); btns->addItem( new TQSpacerItem(10,10,TQSizePolicy::Expanding) ); btns->addWidget(ok); btns->addWidget(cancel); - d.setCaption( i18n( "Edit TQt4 Designer Plugin Paths" ) ); + d.setCaption( i18n( "Edit TQt Designer Plugin Paths" ) ); KURLRequester * req = new KURLRequester( &d ); req->setMode( KFile::Directory ); KEditListBox* p = new KEditListBox( i18n( "Plugin Paths" ), req->customEditor(), &d ); diff --git a/languages/cpp/ccconfigwidget.h b/languages/cpp/ccconfigwidget.h index 403ce550..962b45a4 100644 --- a/languages/cpp/ccconfigwidget.h +++ b/languages/cpp/ccconfigwidget.h @@ -22,7 +22,7 @@ class KEditListBox; class CCConfigWidget : public CCConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/ccconfigwidgetbase.ui b/languages/cpp/ccconfigwidgetbase.ui index e24ce54f..294deadc 100644 --- a/languages/cpp/ccconfigwidgetbase.ui +++ b/languages/cpp/ccconfigwidgetbase.ui @@ -289,9 +289,6 @@ completion-box.</string> <string>Show comment with argument hint</string> </property> - <property name="accel"> - <string></string> - </property> </widget> </vbox> </widget> @@ -640,7 +637,7 @@ navigate the header and vice versa</string> <bool>false</bool> </property> <property name="title"> - <string>Qt::Orientation</string> + <string>Orientation</string> </property> <property name="exclusive"> <bool>true</bool> @@ -928,20 +925,6 @@ This option only applies to QMake projects.</string> <string>Select this if your project is using Qt version 3.x.<br>When this is changed the project needs to be closed and re-opened.</string> </property> </widget> - <widget class="TQRadioButton"> - <property name="name"> - <cstring>m_versionQt4</cstring> - </property> - <property name="text"> - <string>Qt 4</string> - </property> - <property name="toolTip" stdset="0"> - <string>Use Qt version 4 (When this is changed the project needs to be closed and re-opened.)</string> - </property> - <property name="whatsThis" stdset="0"> - <string>Select this if your project is using Qt version 4.x.<br>When this is changed the project needs to be closed and re-opened.</string> - </property> - </widget> <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_5</cstring> @@ -988,7 +971,7 @@ This option only applies to QMake projects.</string> <string>Qt3 Directory:</string> </property> <property name="toolTip" stdset="0"> - <string>This setting is only needed for Qt3 programs, for Qt4 just make sure the QMake Binary is set properly</string> + <string>This setting is only needed for Qt3 programs</string> </property> </widget> <widget class="KURLRequester"> @@ -1059,9 +1042,6 @@ This option only applies to QMake projects.</string> <property name="text"> <string>Qt &3 style (#include <qwidget.h>)</string> </property> - <property name="accel"> - <string>Alt+3</string> - </property> <property name="checked"> <bool>true</bool> </property> @@ -1069,20 +1049,6 @@ This option only applies to QMake projects.</string> <string>Select this if your project is using include style as known from Qt version 3.x.</string> </property> </widget> - <widget class="TQRadioButton"> - <property name="name"> - <cstring>m_qtStyleVersion4</cstring> - </property> - <property name="text"> - <string>Qt &4 style (#include <QWidget>)</string> - </property> - <property name="accel"> - <string>Alt+4</string> - </property> - <property name="whatsThis" stdset="0"> - <string>Select this if your project is using include style as known from Qt version 4.x.</string> - </property> - </widget> </vbox> </widget> <widget class="TQButtonGroup"> @@ -1176,35 +1142,6 @@ This option only applies to QMake projects.</string> </widget> </hbox> </widget> - <widget class="TQLayoutWidget"> - <property name="name"> - <cstring>layout10</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="TQLabel"> - <property name="name"> - <cstring>textLabel1_4</cstring> - </property> - <property name="text"> - <string>Extra Plugin Paths for Qt4 Designer:</string> - </property> - <property name="buddy" stdset="0"> - <cstring>m_designerPrefix</cstring> - </property> - </widget> - <widget class="KPushButton"> - <property name="name"> - <cstring>pluginPaths</cstring> - </property> - <property name="text"> - <string>Change Plugin Paths</string> - </property> - </widget> - </hbox> - </widget> </vbox> </widget> <spacer> @@ -1625,12 +1562,6 @@ you right click on a variable in a header file.</string> <slot>toggleQtVersion(bool)</slot> </connection> <connection> - <sender>m_versionQt4</sender> - <signal>toggled(bool)</signal> - <receiver>CCConfigWidgetBase</receiver> - <slot>toggleQtVersion(bool)</slot> - </connection> - <connection> <sender>m_tqtdesigner</sender> <signal>toggled(bool)</signal> <receiver>m_txtDesigner</receiver> @@ -1667,18 +1598,6 @@ you right click on a variable in a header file.</string> <slot>setDisabled(bool)</slot> </connection> <connection> - <sender>m_versionQt4</sender> - <signal>toggled(bool)</signal> - <receiver>m_qtDir</receiver> - <slot>setDisabled(bool)</slot> - </connection> - <connection> - <sender>m_versionQt4</sender> - <signal>toggled(bool)</signal> - <receiver>m_txtQtDir</receiver> - <slot>setDisabled(bool)</slot> - </connection> - <connection> <sender>m_versionQt3</sender> <signal>toggled(bool)</signal> <receiver>m_txtQtDir</receiver> @@ -1726,24 +1645,6 @@ you right click on a variable in a header file.</string> <receiver>CCConfigWidgetBase</receiver> <slot>isDesignerExecutable(const TQString&)</slot> </connection> - <connection> - <sender>m_versionQt4</sender> - <signal>toggled(bool)</signal> - <receiver>textLabel1_4</receiver> - <slot>setEnabled(bool)</slot> - </connection> - <connection> - <sender>pluginPaths</sender> - <signal>clicked()</signal> - <receiver>CCConfigWidgetBase</receiver> - <slot>openPluginPaths()</slot> - </connection> - <connection> - <sender>m_versionQt4</sender> - <signal>toggled(bool)</signal> - <receiver>pluginPaths</receiver> - <slot>setEnabled(bool)</slot> - </connection> </connections> <tabstops> <tabstop>cpp_options</tabstop> @@ -1754,7 +1655,7 @@ you right click on a variable in a header file.</string> <tabstop>newPCSButton</tabstop> <tabstop>advancedOptions</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">implementationFile()</slot> <slot access="protected">interfaceFile()</slot> <slot access="protected">slotAddPPPath()</slot> @@ -1775,7 +1676,7 @@ you right click on a variable in a header file.</string> <slot>isQMakeExecutable(const TQString&)</slot> <slot>isValidQtDir(const TQString&)</slot> <slot>openPluginPaths()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/cpp/classgeneratorconfig.h b/languages/cpp/classgeneratorconfig.h index 9c9cf86f..c64ba257 100644 --- a/languages/cpp/classgeneratorconfig.h +++ b/languages/cpp/classgeneratorconfig.h @@ -16,7 +16,7 @@ class ClassGeneratorConfig : public ClassGeneratorConfigBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/classgeneratorconfigbase.ui b/languages/cpp/classgeneratorconfigbase.ui index a047fca3..a0c7f964 100644 --- a/languages/cpp/classgeneratorconfigbase.ui +++ b/languages/cpp/classgeneratorconfigbase.ui @@ -253,9 +253,9 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">templateTypeChanged(int type)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.h b/languages/cpp/compiler/gccoptions/gccoptionsplugin.h index 656bd289..561cf151 100644 --- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.h +++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.h @@ -26,7 +26,7 @@ class Warnings2Tab; class GccOptionsPlugin : public KDevCompilerOptions { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/configproblemreporter.ui b/languages/cpp/configproblemreporter.ui index d752d715..9085a377 100644 --- a/languages/cpp/configproblemreporter.ui +++ b/languages/cpp/configproblemreporter.ui @@ -176,14 +176,14 @@ If disabled, the parser will typically only run when the file is saved.</string> <variables> <variable>CppSupportPart* m_part;</variable> </variables> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>setPart( CppSupportPart * part )</slot> <slot>accept()</slot> <slot>bgParserCheckbox_toggled( bool b )</slot> <slot access="protected">setDelayLabel( int delay )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp index b032ac72..d09602c0 100644 --- a/languages/cpp/cppcodecompletion.cpp +++ b/languages/cpp/cppcodecompletion.cpp @@ -358,7 +358,7 @@ struct PopupFillerHelpStruct { memType = "enum"; TQString txt = i18n( "Jump to %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) ); - int id = parent->insertItem( txt, receiver, TQT_SLOT( popupAction( int ) ) ); + int id = parent->insertItem( txt, receiver, TQ_SLOT( popupAction( int ) ) ); receiver->m_popupActions.insert( id, d.decl ); } @@ -448,12 +448,12 @@ struct PopupFillerHelpStruct { } } - int id = parent->insertItem( txt1, receiver, TQT_SLOT( popupAction( int ) ) ); + int id = parent->insertItem( txt1, receiver, TQ_SLOT( popupAction( int ) ) ); if ( d.resolved() ) receiver->m_popupActions.insert( id, d.resolved() ->getDeclarationInfo() ); if ( !txt2.isEmpty() ) { - int id2 = parent->insertItem( txt2, receiver, TQT_SLOT( popupDefinitionAction( int ) ) ); + int id2 = parent->insertItem( txt2, receiver, TQ_SLOT( popupDefinitionAction( int ) ) ); if ( d.resolved() ) receiver->m_popupDefinitionActions.insert( id2, d.resolved() ->getDeclarationInfo() ); } @@ -538,7 +538,7 @@ struct PopupClassViewFillerHelpStruct { memType = "enum"; TQString txt = i18n( "Show %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) ); - int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); + int id = parent->insertItem( txt, receiver, TQ_SLOT( popupClassViewAction( int ) ) ); receiver->m_popupClassViewActions.insert( id, dom ); } @@ -597,7 +597,7 @@ struct PopupClassViewFillerHelpStruct { } } - int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); + int id = parent->insertItem( txt, receiver, TQ_SLOT( popupClassViewAction( int ) ) ); if ( dom ) receiver->m_popupClassViewActions.insert( id, dom ); @@ -645,7 +645,7 @@ class PopupFiller { //kdDebug( 9007 ) << "found include-file \"" << includeFile << "\"" << endl; } - int id = parent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).arg ( includeFile ).arg( decl.name ), struk.receiver, TQT_SLOT( popupAction( int ) ) ); + int id = parent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).arg ( includeFile ).arg( decl.name ), struk.receiver, TQ_SLOT( popupAction( int ) ) ); DeclarationInfo fakeDec; fakeDec.name = decl.name; fakeDec.file = includeFile; @@ -671,7 +671,7 @@ class PopupFiller { f.type = d.desc(); f.memberType = SimpleTypeImpl::MemberInfo::Variable; - /*int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) ); + /*int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQ_SLOT( popupAction( int ) ) ); m_popupActions.insert( id, type.sourceVariable );*/ struk.insertItem( parent, f, prefix ); @@ -683,7 +683,7 @@ class PopupFiller { parent->insertItem( i18n( "Comment on %1" ).arg( sourceVariable.name ), m ); TQStringList ls = prepareTextForMenu( sourceVariable.comment, 15, 100 ); for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { - m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); + m->insertItem( *it, 0, TQ_SLOT( popupClassViewAction( int ) ) ); } parent->insertSeparator(); } @@ -764,7 +764,7 @@ class PopupFiller { mo->insertItem( i18n( "Comment" ), m ); TQStringList ls = prepareTextForMenu( ( *it ).first.decl.comment, 15, 100 ); for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { - m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); + m->insertItem( *it, 0, TQ_SLOT( popupClassViewAction( int ) ) ); } } @@ -796,7 +796,7 @@ class PopupFiller { parent->insertItem( i18n( "Comment on %1" ).arg( cleanForMenu( d->name() ) ), m ); TQStringList ls = prepareTextForMenu( d->resolved() ->comment(), 15, 100 ); for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { - m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); + m->insertItem( *it, 0, TQ_SLOT( popupClassViewAction( int ) ) ); } } } @@ -856,14 +856,14 @@ struct CppCodeCompletionData { if ( recoveryPoints.count() == 0 ) return 0; - TQPair<int, int> pt = tqMakePair( line, column ); + TQPair<int, int> pt = qMakePair( line, column ); TQPtrListIterator<RecoveryPoint> it( recoveryPoints ); RecoveryPoint* recPt = 0; while ( it.current() ) { - TQPair<int, int> startPt = tqMakePair( it.current() ->startLine, it.current() ->startColumn ); - TQPair<int, int> endPt = tqMakePair( it.current() ->endLine, it.current() ->endColumn ); + TQPair<int, int> startPt = qMakePair( it.current() ->startLine, it.current() ->startColumn ); + TQPair<int, int> endPt = qMakePair( it.current() ->endLine, it.current() ->endColumn ); if ( pt < startPt ) { break; @@ -896,7 +896,7 @@ m_codeCompleteCh2Rx( "(->)|(\\:\\:)" ) { m_pSupport = part; - connect( m_pSupport->codeCompletionConfig(), TQT_SIGNAL( stored() ), this, TQT_SLOT( emptyCache() ) ); + connect( m_pSupport->codeCompletionConfig(), TQ_SIGNAL( stored() ), this, TQ_SLOT( emptyCache() ) ); m_activeCursor = 0; m_activeEditor = 0; @@ -908,17 +908,17 @@ m_codeCompleteCh2Rx( "(->)|(\\:\\:)" ) { m_ccLine = 0; m_ccColumn = 0; - connect( m_ccTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimeout() ) ); - connect( m_showStatusTextTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotStatusTextTimeout() ) ); + connect( m_ccTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTimeout() ) ); + connect( m_showStatusTextTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotStatusTextTimeout() ) ); computeFileEntryList(); CppSupportPart* cppSupport = m_pSupport; - connect( cppSupport->project(), TQT_SIGNAL( addedFilesToProject( const TQStringList& ) ), - this, TQT_SLOT( computeFileEntryList() ) ); - connect( cppSupport->project(), TQT_SIGNAL( removedFilesFromProject( const TQStringList& ) ), - this, TQT_SLOT( computeFileEntryList() ) ); - connect( cppSupport, TQT_SIGNAL( synchronousParseReady( const TQString&, ParsedFilePointer ) ), this, TQT_SLOT( synchronousParseReady( const TQString&, ParsedFilePointer ) ) ); + connect( cppSupport->project(), TQ_SIGNAL( addedFilesToProject( const TQStringList& ) ), + this, TQ_SLOT( computeFileEntryList() ) ); + connect( cppSupport->project(), TQ_SIGNAL( removedFilesFromProject( const TQStringList& ) ), + this, TQ_SLOT( computeFileEntryList() ) ); + connect( cppSupport, TQ_SIGNAL( synchronousParseReady( const TQString&, ParsedFilePointer ) ), this, TQ_SLOT( synchronousParseReady( const TQString&, ParsedFilePointer ) ) ); m_bArgHintShow = false; m_bCompletionBoxShow = false; @@ -928,9 +928,9 @@ m_codeCompleteCh2Rx( "(->)|(\\:\\:)" ) { m_repository = new CodeInformationRepository( cppSupport->codeRepository() ); - connect( cppSupport->codeRepository(), TQT_SIGNAL(catalogRegistered( Catalog* )), this, TQT_SLOT( emptyCache() ) ); - connect( cppSupport->codeRepository(), TQT_SIGNAL(catalogUnregistered( Catalog* )), this, TQT_SLOT( emptyCache() ) ); - connect( cppSupport->codeRepository(), TQT_SIGNAL(catalogChanged( Catalog* )), this, TQT_SLOT( emptyCache() ) ); + connect( cppSupport->codeRepository(), TQ_SIGNAL(catalogRegistered( Catalog* )), this, TQ_SLOT( emptyCache() ) ); + connect( cppSupport->codeRepository(), TQ_SIGNAL(catalogUnregistered( Catalog* )), this, TQ_SLOT( emptyCache() ) ); + connect( cppSupport->codeRepository(), TQ_SIGNAL(catalogChanged( Catalog* )), this, TQ_SLOT( emptyCache() ) ); setupCodeInformationRepository(); @@ -945,22 +945,22 @@ m_codeCompleteCh2Rx( "(->)|(\\:\\:)" ) { if ( part->partController() ->activePart() ) slotActivePartChanged( part->partController() ->activePart() ); - connect( part->partController( ), TQT_SIGNAL( partAdded( KParts::Part* ) ), - this, TQT_SLOT( slotPartAdded( KParts::Part* ) ) ); - connect( part->partController( ), TQT_SIGNAL( activePartChanged( KParts::Part* ) ), - this, TQT_SLOT( slotActivePartChanged( KParts::Part* ) ) ); + connect( part->partController( ), TQ_SIGNAL( partAdded( KParts::Part* ) ), + this, TQ_SLOT( slotPartAdded( KParts::Part* ) ) ); + connect( part->partController( ), TQ_SIGNAL( activePartChanged( KParts::Part* ) ), + this, TQ_SLOT( slotActivePartChanged( KParts::Part* ) ) ); - connect( part, TQT_SIGNAL( fileParsed( const TQString& ) ), - this, TQT_SLOT( slotFileParsed( const TQString& ) ) ); - connect( part, TQT_SIGNAL( codeModelUpdated( const TQString& ) ), - this, TQT_SLOT( slotCodeModelUpdated( const TQString& ) ) ); + connect( part, TQ_SIGNAL( fileParsed( const TQString& ) ), + this, TQ_SLOT( slotFileParsed( const TQString& ) ) ); + connect( part, TQ_SIGNAL( codeModelUpdated( const TQString& ) ), + this, TQ_SLOT( slotCodeModelUpdated( const TQString& ) ) ); TDEAction * action = new TDEAction( i18n("Jump to declaration under cursor"), 0, CTRL + Key_Comma, - this, TQT_SLOT(slotJumpToDeclCursorContext()), part->actionCollection(), "jump_to_declaration_cursor_context" ); + this, TQ_SLOT(slotJumpToDeclCursorContext()), part->actionCollection(), "jump_to_declaration_cursor_context" ); action->plug( &m_DummyActionWidget ); action = new TDEAction( i18n("Jump to definition under cursor"), 0, CTRL + Key_Period, - this, TQT_SLOT(slotJumpToDefCursorContext()), part->actionCollection(), "jump_to_defintion_cursor_context" ); + this, TQ_SLOT(slotJumpToDefCursorContext()), part->actionCollection(), "jump_to_defintion_cursor_context" ); action->plug( &m_DummyActionWidget ); } @@ -1028,13 +1028,13 @@ void CppCodeCompletion::integratePart( KParts::Part * part ) { if ( m_pSupport ) { //The slot should connected even when automatic completion is disabled, so it can be enabled any time kdDebug( 9007 ) << k_funcinfo << "enabling code completion" << endl; - connect( part, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( slotTextChanged() ) ); - connect( part->widget(), TQT_SIGNAL( completionDone() ), this, - TQT_SLOT( slotCompletionBoxHidden() ) ); - connect( part->widget(), TQT_SIGNAL( completionAborted() ), this, - TQT_SLOT( slotCompletionBoxHidden() ) ); - connect( part->widget(), TQT_SIGNAL( argHintHidden() ), this, - TQT_SLOT( slotArgHintHidden() ) ); + connect( part, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( slotTextChanged() ) ); + connect( part->widget(), TQ_SIGNAL( completionDone() ), this, + TQ_SLOT( slotCompletionBoxHidden() ) ); + connect( part->widget(), TQ_SIGNAL( completionAborted() ), this, + TQ_SLOT( slotCompletionBoxHidden() ) ); + connect( part->widget(), TQ_SIGNAL( argHintHidden() ), this, + TQ_SLOT( slotArgHintHidden() ) ); } } } @@ -1047,7 +1047,7 @@ void CppCodeCompletion::slotActivePartChanged( KParts::Part * part ) { emptyCache(); this->d->recoveryPoints.clear(); if ( m_activeHintInterface && m_activeView ) { - disconnect( m_activeView , TQT_SIGNAL( needTextHint( int, int, TQString & ) ), this, TQT_SLOT( slotTextHint( int, int, TQString& ) ) ); + disconnect( m_activeView , TQ_SIGNAL( needTextHint( int, int, TQString & ) ), this, TQ_SLOT( slotTextHint( int, int, TQString& ) ) ); m_activeHintInterface = 0; } @@ -1094,7 +1094,7 @@ void CppCodeCompletion::slotActivePartChanged( KParts::Part * part ) { if ( m_activeHintInterface ) { #ifndef DISABLETOOLTIPS m_activeHintInterface->enableTextHints( 500 ); - connect( m_activeView, TQT_SIGNAL( needTextHint( int, int, TQString & ) ), this, TQT_SLOT( slotTextHint( int, int, TQString& ) ) ); + connect( m_activeView, TQ_SIGNAL( needTextHint( int, int, TQString & ) ), this, TQ_SLOT( slotTextHint( int, int, TQString& ) ) ); #endif } else { @@ -1537,7 +1537,7 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte else gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).arg( cleanForMenu( type.macro.name() ) ), m ); - int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( type.macro.name() ) ), this, TQT_SLOT( popupAction( int ) ) ); + int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( type.macro.name() ) ), this, TQ_SLOT( popupAction( int ) ) ); TQPopupMenu * b = PopupTracker::createPopup( m ); m->insertItem( i18n( "Body" ), b ); @@ -1551,7 +1551,7 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte TQStringList ls = prepareTextForMenu( type.macro.body(), 20, 100 ); for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { - b->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); + b->insertItem( *it, 0, TQ_SLOT( popupClassViewAction( int ) ) ); } } @@ -1569,7 +1569,7 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte else gid = popup->insertItem( i18n( "Goto Include File: %1" ).arg( cleanForMenu( includeFileName ) ), m ); - int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( includeFilePath ) ), this, TQT_SLOT( popupAction( int ) ) ); + int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( includeFilePath ) ), this, TQ_SLOT( popupAction( int ) ) ); DeclarationInfo i; i.file = includeFilePath; @@ -1617,7 +1617,7 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte popup->setWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to navigate to positions of items that are involved in this expression" ) ); /*if( type.sourceVariable && type.sourceVariable.name != "this" ) { - int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) ); + int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQ_SLOT( popupAction( int ) ) ); m_popupActions.insert( id, type.sourceVariable ); }*/ @@ -2050,14 +2050,13 @@ void CppCodeCompletion::needRecoveryPoints() { if ( this->d->recoveryPoints.isEmpty() ) { kdDebug( 9007 ) << "missing recovery-points for file " << m_activeFileName << " they have to be computed now" << endl; - m_pSupport->backgroundParser() ->lock () - ; + m_pSupport->backgroundParser() ->lock(); std::vector<CppCodeCompletion> vec; - TranslationUnitAST * ast = *m_pSupport->backgroundParser() ->translationUnit( m_activeFileName ); + ParsedFilePointer pTransUnit = m_pSupport->backgroundParser() ->translationUnit( m_activeFileName ); m_pSupport->backgroundParser() ->unlock(); - if ( !ast ) { + if ( !pTransUnit ) { kdDebug( 9007 ) << "background-parser is missing the translation-unit. The file needs to be reparsed." << endl; m_pSupport->parseFileAndDependencies( m_activeFileName, true ); // m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Background-parser is missing the necessary translation-unit. It will be computed, but this completion will fail." ).arg( m_activeFileName ), 2000 ); @@ -2500,8 +2499,8 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { if ( start_expr != int( contents.length() ) ) expr = contents.mid( start_expr, contents.length() - start_expr ).stripWhiteSpace(); - if ( expr.startsWith( "SIGNAL" ) || expr.startsWith( "SLOT" ) ) { - m_completionMode = expr.startsWith( "SIGNAL" ) ? SignalCompletion : SlotCompletion; + if ( expr.startsWith( "TQ_SIGNAL" ) || expr.startsWith( "TQ_SLOT" ) ) { + m_completionMode = expr.startsWith( "TQ_SIGNAL" ) ? SignalCompletion : SlotCompletion; showArguments = false; int end_expr = start_expr - 1; @@ -2684,70 +2683,74 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { ///@todo is all this necessary? if ( !recoveredDecl.get() && !recoveredTypeSpec.get() ) { - TranslationUnitAST * ast = *m_pSupport->backgroundParser() ->translationUnit( m_activeFileName ); - if ( AST * node = findNodeAt( ast, line, column ) ) { - kdDebug( 9007 ) << "------------------- AST FOUND --------------------" << endl; - kdDebug( 9007 ) << "node-kind = " << nodeTypeToString( node->nodeType() ) << endl; + ParsedFilePointer pTransUnit = m_pSupport->backgroundParser() ->translationUnit(m_activeFileName); + if (pTransUnit) + { + TranslationUnitAST *ast = *pTransUnit; + if ( AST * node = findNodeAt( ast, line, column ) ) { + kdDebug( 9007 ) << "------------------- AST FOUND --------------------" << endl; + kdDebug( 9007 ) << "node-kind = " << nodeTypeToString( node->nodeType() ) << endl; - if ( FunctionDefinitionAST * def = functionDefinition( node ) ) { - kdDebug( 9007 ) << "------> found a function definition" << endl; + if ( FunctionDefinitionAST * def = functionDefinition( node ) ) { + kdDebug( 9007 ) << "------> found a function definition" << endl; - int startLine, startColumn; - def->getStartPosition( &startLine, &startColumn ); + int startLine, startColumn; + def->getStartPosition( &startLine, &startColumn ); - TQString contents = getText( startLine, startColumn, line, showArguments ? nCol : column ); + TQString contents = getText( startLine, startColumn, line, showArguments ? nCol : column ); - /// @todo remove code duplication - int start_expr = expressionAt( contents, contents.length() ); + /// @todo remove code duplication + int start_expr = expressionAt( contents, contents.length() ); - // kdDebug(9007) << "start_expr = " << start_expr << endl; - if ( start_expr != int( contents.length() ) ) - expr = contents.mid( start_expr, contents.length() - start_expr ).stripWhiteSpace(); + // kdDebug(9007) << "start_expr = " << start_expr << endl; + if ( start_expr != int( contents.length() ) ) + expr = contents.mid( start_expr, contents.length() - start_expr ).stripWhiteSpace(); - if ( expr.startsWith( "SIGNAL" ) || expr.startsWith( "SLOT" ) ) { - m_completionMode = expr.startsWith( "SIGNAL" ) ? SignalCompletion : SlotCompletion; + if ( expr.startsWith( "TQ_SIGNAL" ) || expr.startsWith( "TQ_SLOT" ) ) { + m_completionMode = expr.startsWith( "TQ_SIGNAL" ) ? SignalCompletion : SlotCompletion; - showArguments = false; - int end_expr = start_expr - 1; - while ( end_expr > 0 && contents[ end_expr ].isSpace() ) - --end_expr; + showArguments = false; + int end_expr = start_expr - 1; + while ( end_expr > 0 && contents[ end_expr ].isSpace() ) + --end_expr; - if ( contents[ end_expr ] != ',' ) { - expr = TQString(); + if ( contents[ end_expr ] != ',' ) { + expr = TQString(); + } else { + start_expr = expressionAt( contents, end_expr ); + expr = contents.mid( start_expr, end_expr - start_expr ).stripWhiteSpace(); + } } else { - start_expr = expressionAt( contents, end_expr ); - expr = contents.mid( start_expr, end_expr - start_expr ).stripWhiteSpace(); - } - } else { - int idx = expr.length() - 1; - while ( expr[ idx ].isLetterOrNumber() || expr[ idx ] == '_' ) - --idx; - - if ( idx != int( expr.length() ) - 1 ) { - ++idx; - word = expr.mid( idx ).stripWhiteSpace(); - expr = expr.left( idx ).stripWhiteSpace(); + int idx = expr.length() - 1; + while ( expr[ idx ].isLetterOrNumber() || expr[ idx ] == '_' ) + --idx; + + if ( idx != int( expr.length() ) - 1 ) { + ++idx; + word = expr.mid( idx ).stripWhiteSpace(); + expr = expr.left( idx ).stripWhiteSpace(); + } } - } - ctx = computeContext( def, line, column, startLine, startColumn ); + ctx = computeContext( def, line, column, startLine, startColumn ); - TQStringList scope; - scopeOfNode( def, scope ); - this_type = SimpleType( scope, getIncludeFiles() ); + TQStringList scope; + scopeOfNode( def, scope ); + this_type = SimpleType( scope, getIncludeFiles() ); - if ( scope.size() ) { /* - SimpleVariable var; - var.type = scope; - var.name = "this"; - ctx->add( var );*/ - //kdDebug(9007) << "add variable " << var.name << " with type " << var.type << endl; - } + if ( scope.size() ) { /* + SimpleVariable var; + var.type = scope; + var.name = "this"; + ctx->add( var );*/ + //kdDebug(9007) << "add variable " << var.name << " with type " << var.type << endl; + } - ExpressionInfo exp( expr ); - exp.t = ( ExpressionInfo::Type ) ( ExpressionInfo::NormalExpression | ExpressionInfo::TypeExpression ); - type = evaluateExpression( exp, ctx ); + ExpressionInfo exp( expr ); + exp.t = ( ExpressionInfo::Type ) ( ExpressionInfo::NormalExpression | ExpressionInfo::TypeExpression ); + type = evaluateExpression( exp, ctx ); + } } } } diff --git a/languages/cpp/cppcodecompletion.h b/languages/cpp/cppcodecompletion.h index dcdb9a79..1ebee6ba 100644 --- a/languages/cpp/cppcodecompletion.h +++ b/languages/cpp/cppcodecompletion.h @@ -45,7 +45,7 @@ ///A little debugging class #include <tqpopupmenu.h> class PopupTracker : public TQObject { - Q_OBJECT + TQ_OBJECT public: static PopupTracker* pt; @@ -56,7 +56,7 @@ public: if( !pt ) pt = new PopupTracker(); TQPopupMenu* m = new TQPopupMenu( parent ); ++pendingPopups; - connect( m, TQT_SIGNAL(destroyed()), pt, TQT_SLOT(destroyedPopup()) ); + connect( m, TQ_SIGNAL(destroyed()), pt, TQ_SLOT(destroyedPopup()) ); return m; } @@ -94,7 +94,7 @@ typedef TDESharedPtr<SimpleTypeImpl> TypePointer; class CppCodeCompletion : public TQObject { - Q_OBJECT + TQ_OBJECT public: friend class SimpleType; diff --git a/languages/cpp/cppcodecompletionconfig.h b/languages/cpp/cppcodecompletionconfig.h index f7c8c18c..994bfc55 100644 --- a/languages/cpp/cppcodecompletionconfig.h +++ b/languages/cpp/cppcodecompletionconfig.h @@ -24,7 +24,7 @@ class TQDomDocument; */ class CppCodeCompletionConfig : public TQObject { - Q_OBJECT + TQ_OBJECT public: CppCodeCompletionConfig( CppSupportPart* part, TQDomDocument* dom ); diff --git a/languages/cpp/cppimplementationwidget.cpp b/languages/cpp/cppimplementationwidget.cpp index 35069349..1307e3d8 100644 --- a/languages/cpp/cppimplementationwidget.cpp +++ b/languages/cpp/cppimplementationwidget.cpp @@ -43,7 +43,7 @@ CppImplementationWidget::CppImplementationWidget( KDevLanguageSupport *part, TQStringList CppImplementationWidget::createClassFiles() { - TQString template_h = "#ifndef $DEFTEXT$_H\n#define $DEFTEXT$_H\n\n#include \"$BASEINCLUDE$\"\n\nclass $CLASSNAME$: public $BASECLASSNAME$ {\nQ_OBJECT\n\npublic:\n $CLASSNAME$(TQWidget *parent = 0, const char *name = 0);\n};\n\n#endif\n"; + TQString template_h = "#ifndef $DEFTEXT$_H\n#define $DEFTEXT$_H\n\n#include \"$BASEINCLUDE$\"\n\nclass $CLASSNAME$: public $BASECLASSNAME$ {\nTQ_OBJECT\n\npublic:\n $CLASSNAME$(TQWidget *parent = 0, const char *name = 0);\n};\n\n#endif\n"; TQString template_cpp = "#include \"$CLASSINCLUDE$\"\n\n$CLASSNAME$::$CLASSNAME$(TQWidget *parent, const char *name)\n :$BASECLASSNAME$(parent, name)\n{\n}\n"; if ( m_part->project() ->options() == KDevProject::UsesAutotoolsBuildSystem ) template_cpp += "\n#include \"$MOCINCLUDE$\"\n"; diff --git a/languages/cpp/cppimplementationwidget.h b/languages/cpp/cppimplementationwidget.h index 040fc759..fd9bd319 100644 --- a/languages/cpp/cppimplementationwidget.h +++ b/languages/cpp/cppimplementationwidget.h @@ -29,7 +29,7 @@ class CppSupportPart; class CppImplementationWidget : public ImplementationWidget { - Q_OBJECT + TQ_OBJECT public: CppImplementationWidget( KDevLanguageSupport *part, TQWidget* parent = 0, const char* name = 0, bool modal = false ); diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp index dda53df7..514974fe 100644 --- a/languages/cpp/cppnewclassdlg.cpp +++ b/languages/cpp/cppnewclassdlg.cpp @@ -79,20 +79,20 @@ CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, TQWidget *parent, co accessMenu = new TQPopupMenu( this ); accessMenu->insertItem( i18n( "Use as Private" ), - this, TQT_SLOT( changeToPrivate() ), 0, 1 ); + this, TQ_SLOT( changeToPrivate() ), 0, 1 ); accessMenu->insertItem( i18n( "Use as Protected" ), - this, TQT_SLOT( changeToProtected() ), 0, 2 ); + this, TQ_SLOT( changeToProtected() ), 0, 2 ); accessMenu->insertItem( i18n( "Use as Public" ), - this, TQT_SLOT( changeToPublic() ), 0, 3 ); + this, TQ_SLOT( changeToPublic() ), 0, 3 ); accessMenu->insertSeparator(); accessMenu->insertItem( i18n( "Unset" ), - this, TQT_SLOT( changeToInherited() ), 0, 5 ); + this, TQ_SLOT( changeToInherited() ), 0, 5 ); overMenu = new TQPopupMenu( this ); overMenu->insertItem( i18n( "Extend Base Class Functionality" ), - this, TQT_SLOT( extendFunctionality() ), 0, 11 ); + this, TQ_SLOT( extendFunctionality() ), 0, 11 ); overMenu->insertItem( i18n( "Replace Base Class Method" ), - this, TQT_SLOT( replaceFunctionality() ), 0, 12 ); + this, TQ_SLOT( replaceFunctionality() ), 0, 12 ); compBasename = basename_edit->completionObject(); setCompletionBasename( m_part->codeModel() ); @@ -374,7 +374,7 @@ void CppNewClassDialog::checkTQWidgetInheritance( int val ) if ( baseclasses_view->childCount() == 0 ) { addBaseClass(); - basename_edit->setText( TQWIDGET_OBJECT_NAME_STRING ); + basename_edit->setText( "TQWidget" ); } /* constructors_cpp_edit->append(classname_edit->text() + "::" + classname_edit->text() + "(TQWidget *parent, const char *name):\n TQWidget(parent, name)\n{\n}\n"); @@ -396,7 +396,7 @@ void CppNewClassDialog::qobject_box_stateChanged( int val ) if ( baseclasses_view->childCount() == 0 ) { addBaseClass(); - basename_edit->setText( TQOBJECT_OBJECT_NAME_STRING ); + basename_edit->setText( "TQObject" ); } @@ -1171,7 +1171,7 @@ void CppNewClassDialog::setAccessForBase( TQString baseclass, TQString newAccess void CppNewClassDialog::access_view_mouseButtonPressed( int button, TQListViewItem * item, const TQPoint &p, int /*c*/ ) { - if ( item && ( ( button == Qt::LeftButton ) || ( button == Qt::RightButton ) ) && ( item->depth() > 1 ) ) + if ( item && ( ( button == TQt::LeftButton ) || ( button == TQt::RightButton ) ) && ( item->depth() > 1 ) ) { accessMenu->setItemEnabled( 1, true ); accessMenu->setItemEnabled( 2, true ); @@ -1196,7 +1196,7 @@ void CppNewClassDialog::access_view_mouseButtonPressed( int button, TQListViewIt void CppNewClassDialog::methods_view_mouseButtonPressed( int button , TQListViewItem * item, const TQPoint&p , int /*c*/ ) { - if ( item && ( button == Qt::RightButton ) && ( item->depth() > 1 ) && ( ! item->text( 1 ).isEmpty() ) ) + if ( item && ( button == TQt::RightButton ) && ( item->depth() > 1 ) && ( ! item->text( 1 ).isEmpty() ) ) { overMenu->exec( p ); } @@ -1437,7 +1437,7 @@ void CppNewClassDialog::ClassGenerator::common_text() headeronly = dlg.headeronly_box->isChecked(); if ( ( dlg.baseclasses_view->childCount() == 0 ) && childClass ) - new TQListViewItem( dlg.baseclasses_view, TQWIDGET_OBJECT_NAME_STRING, "public" ); + new TQListViewItem( dlg.baseclasses_view, "TQWidget", "public" ); if ( objc && ( dlg.baseclasses_view->childCount() == 0 ) ) new TQListViewItem( dlg.baseclasses_view, "NSObject", "public" ); @@ -1962,7 +1962,7 @@ void CppNewClassDialog::ClassGenerator::gen_interface() { if ( !it.current() ->text( 0 ).isEmpty() ) if ( !it.current() ->text( 3 ).isEmpty() ) - // if ((!childClass) || (it.current()->text(0) != TQWIDGET_OBJECT_NAME_STRING)) + // if ((!childClass) || (it.current()->text(0) != "TQWidget")) includeBaseHeader += ( includeBaseHeader.isEmpty() ? TQString( "" ) : TQString( "\n" ) ) + TQString::fromLatin1( "#include " ) + ( it.current() ->text( 2 ).toInt() == 0 ? TQString( "<" ) : TQString( "\"" ) ) + it.current() ->text( 3 ) @@ -2013,7 +2013,7 @@ void CppNewClassDialog::ClassGenerator::gen_interface() TQString qobjectStr; if ( childClass || qobject ) - qobjectStr = "Q_OBJECT\n"; + qobjectStr = "TQ_OBJECT\n"; TQString baseclass; diff --git a/languages/cpp/cppnewclassdlg.h b/languages/cpp/cppnewclassdlg.h index 37c52ea5..1b6c43ba 100644 --- a/languages/cpp/cppnewclassdlg.h +++ b/languages/cpp/cppnewclassdlg.h @@ -112,7 +112,7 @@ private: class CppNewClassDialog : public CppNewClassDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/cppnewclassdlgbase.ui b/languages/cpp/cppnewclassdlgbase.ui index 03cd0909..4f827821 100644 --- a/languages/cpp/cppnewclassdlgbase.ui +++ b/languages/cpp/cppnewclassdlgbase.ui @@ -413,7 +413,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <enum>StrongFocus</enum> </property> <property name="whatsThis" stdset="0"> - <string>Insert the base class which your new class will be derived from. If you have checked 'Generate QWidget child class' the new class will be derived from QWidget. If no base class is named, the new class will not have a parent class. You can also use template classes here (like BaseClass<int, int>)</string> + <string>Insert the base class which your new class will be derived from. If you have checked 'Generate TQWidget child class' the new class will be derived from TQWidget. If no base class is named, the new class will not have a parent class. You can also use template classes here (like BaseClass<int, int>)</string> </property> </widget> <widget class="KLineEdit" row="0" column="2"> @@ -1236,7 +1236,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <tabstop>gen_config</tabstop> <tabstop>constructors_cpp_edit</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">updateClassStore()</slot> <slot access="protected">access_view_mouseButtonPressed( int button, TQListViewItem * item, const TQPoint & p, int c )</slot> <slot access="protected">classNameChanged( const TQString & text )</slot> @@ -1278,7 +1278,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <slot access="protected">scopeboxActivated( int )</slot> <slot access="protected">classNamespaceChanged( const TQString & )</slot> <slot access="protected">headeronly_box_stateChanged(int val)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/cpp/cppsplitheadersourceconfig.h b/languages/cpp/cppsplitheadersourceconfig.h index c5a7eace..410f11c2 100644 --- a/languages/cpp/cppsplitheadersourceconfig.h +++ b/languages/cpp/cppsplitheadersourceconfig.h @@ -28,7 +28,7 @@ class TQDomDocument; class CppSplitHeaderSourceConfig : public TQObject { - Q_OBJECT + TQ_OBJECT public: CppSplitHeaderSourceConfig( CppSupportPart* part, TQDomDocument* dom ); diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp index e444bfea..c94539de 100644 --- a/languages/cpp/cppsupportpart.cpp +++ b/languages/cpp/cppsupportpart.cpp @@ -201,10 +201,10 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri m_pCompletionConfig = new CppCodeCompletionConfig( this, projectDom() ); m_pSplitHeaderSourceConfig = new CppSplitHeaderSourceConfig( this, projectDom() ); - m_pCreateGetterSetterConfiguration = new CreateGetterSetterConfiguration( this ); connect( m_pSplitHeaderSourceConfig, TQT_SIGNAL( stored() ), - this, TQT_SLOT( splitHeaderSourceConfigStored() ) ); - connect( m_pCompletionConfig, TQT_SIGNAL( stored() ), - this, TQT_SLOT( codeCompletionConfigStored() ) ); + m_pCreateGetterSetterConfiguration = new CreateGetterSetterConfiguration( this ); connect( m_pSplitHeaderSourceConfig, TQ_SIGNAL( stored() ), + this, TQ_SLOT( splitHeaderSourceConfigStored() ) ); + connect( m_pCompletionConfig, TQ_SIGNAL( stored() ), + this, TQ_SLOT( codeCompletionConfigStored() ) ); m_qtBuildConfig = new QtBuildConfig( this, projectDom() ); m_qtBuildConfig->store(); @@ -215,44 +215,44 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri m_problemReporter = 0; m_textChangedTimer = new TQTimer( this ); - connect( m_textChangedTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotParseCurrentFile()) ); + connect( m_textChangedTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotParseCurrentFile()) ); m_cursorMovedTimer = new TQTimer( this ); - connect( m_cursorMovedTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCursorPositionChanged()) ); + connect( m_cursorMovedTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCursorPositionChanged()) ); // m_deleteParserStoreTimer = new TQTimer( this ); m_saveMemoryTimer = new TQTimer( this ); m_buildSafeFileSetTimer = new TQTimer( this ); // m_functionHintTimer = new TQTimer( this ); - connect( m_buildSafeFileSetTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(buildSafeFileSet()) ); - connect( m_saveMemoryTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSaveMemory()) ); -// connect( m_deleteParserStoreTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDeleteParserStore()) ); + connect( m_buildSafeFileSetTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(buildSafeFileSet()) ); + connect( m_saveMemoryTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSaveMemory()) ); +// connect( m_deleteParserStoreTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDeleteParserStore()) ); resetParserStoreTimer(); m_saveMemoryTimer->start( 240000, false ); //Free some memory every 4 minutes - // connect( m_functionHintTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotFunctionHint()) ); + // connect( m_functionHintTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotFunctionHint()) ); setXMLFile( "kdevcppsupport.rc" ); m_catalogList.setAutoDelete( true ); - connect( core(), TQT_SIGNAL( projectOpened() ), this, TQT_SLOT( projectOpened() ) ); - connect( core(), TQT_SIGNAL( projectClosed() ), this, TQT_SLOT( projectClosed() ) ); - connect( core(), TQT_SIGNAL( languageChanged() ), this, TQT_SLOT( projectOpened() ) ); - connect( partController(), TQT_SIGNAL( savedFile( const KURL& ) ), - this, TQT_SLOT( savedFile( const KURL& ) ) ); - connect( core(), TQT_SIGNAL( contextMenu( TQPopupMenu *, const Context * ) ), - this, TQT_SLOT( contextMenu( TQPopupMenu *, const Context * ) ) ); - connect( partController(), TQT_SIGNAL( activePartChanged( KParts::Part* ) ), - this, TQT_SLOT( activePartChanged( KParts::Part* ) ) ); - connect( partController(), TQT_SIGNAL( partRemoved( KParts::Part* ) ), - this, TQT_SLOT( partRemoved( KParts::Part* ) ) ); - - connect( core(), TQT_SIGNAL( configWidget( KDialogBase* ) ), - this, TQT_SLOT( configWidget( KDialogBase* ) ) ); + connect( core(), TQ_SIGNAL( projectOpened() ), this, TQ_SLOT( projectOpened() ) ); + connect( core(), TQ_SIGNAL( projectClosed() ), this, TQ_SLOT( projectClosed() ) ); + connect( core(), TQ_SIGNAL( languageChanged() ), this, TQ_SLOT( projectOpened() ) ); + connect( partController(), TQ_SIGNAL( savedFile( const KURL& ) ), + this, TQ_SLOT( savedFile( const KURL& ) ) ); + connect( core(), TQ_SIGNAL( contextMenu( TQPopupMenu *, const Context * ) ), + this, TQ_SLOT( contextMenu( TQPopupMenu *, const Context * ) ) ); + connect( partController(), TQ_SIGNAL( activePartChanged( KParts::Part* ) ), + this, TQ_SLOT( activePartChanged( KParts::Part* ) ) ); + connect( partController(), TQ_SIGNAL( partRemoved( KParts::Part* ) ), + this, TQ_SLOT( partRemoved( KParts::Part* ) ) ); + + connect( core(), TQ_SIGNAL( configWidget( KDialogBase* ) ), + this, TQ_SLOT( configWidget( KDialogBase* ) ) ); m_switchHeaderSourceAction = new TDEAction( i18n( "Switch Header/Implementation" ), SHIFT + Key_F12, - this, TQT_SLOT( slotSwitchHeader() ), + this, TQ_SLOT( slotSwitchHeader() ), actionCollection(), "edit_switchheader" ); m_switchHeaderSourceAction->setToolTip( i18n( "Switch between header and implementation files" ) ); m_switchHeaderSourceAction->setWhatsThis( i18n( "<b>Switch Header/Implementation</b><p>" @@ -265,7 +265,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri TDEAction *action; action = new TDEAction( i18n( "Complete Text" ), CTRL + Key_Space, - this, TQT_SLOT( slotCompleteText() ), + this, TQ_SLOT( slotCompleteText() ), actionCollection(), "edit_complete_text" ); action->setToolTip( i18n( "Complete current expression" ) ); action->setWhatsThis( i18n( "<b>Complete Text</p><p>Completes current expression using " @@ -274,11 +274,11 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri action->setEnabled( false ); m_createGetterSetterAction = new TDEAction( i18n( "Create Accessor Methods" ), 0, - this, TQT_SLOT( slotCreateAccessMethods() ), actionCollection(), + this, TQ_SLOT( slotCreateAccessMethods() ), actionCollection(), "edit_create_getter_setter" ); action = new TDEAction( i18n( "Make Member" ), 0, Key_F2, - this, TQT_SLOT( slotMakeMember() ), + this, TQ_SLOT( slotMakeMember() ), actionCollection(), "edit_make_member" ); action->setToolTip( i18n( "Make member" ) ); action->setWhatsThis( i18n( "<b>Make member</b><p>Creates a class member function in implementation file " @@ -286,7 +286,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri action->plug( &m_DummyActionWidget ); action = new TDEAction( i18n( "Navigation Menu" ), 0, CTRL + ALT + Key_Space, - this, TQT_SLOT( slotNavigate() ), + this, TQ_SLOT( slotNavigate() ), actionCollection(), "edit_navigate" ); action->setToolTip( i18n( "Show the navigation-menu" ) ); action->setWhatsThis( i18n( "<b>Navigate</b><p>Shows a navigation-menu based on the type-evaluation of the item under the cursor." ) ); @@ -294,7 +294,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri action = new TDEAction( i18n( "New Class..." ), "classnew", 0, - this, TQT_SLOT( slotNewClass() ), + this, TQ_SLOT( slotNewClass() ), actionCollection(), "project_newclass" ); action->setToolTip( i18n( "Generate a new class" ) ); action->setWhatsThis( i18n( "<b>New Class</b><p>Calls the <b>New Class</b> wizard." ) ); @@ -306,8 +306,8 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri withcpp = true; // daniel - connect( core( ), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, - TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); + connect( core( ), TQ_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, + TQ_SLOT( projectConfigWidget( KDialogBase* ) ) ); new KDevCppSupportIface( this ); //(void) dcopClient(); @@ -438,7 +438,7 @@ void CppSupportPart::projectConfigWidget( KDialogBase* dlg ) vbox = dlg->addVBoxPage( i18n( "C++ Support" ), i18n( "C++ Support" ), BarIcon( info() ->icon(), TDEIcon::SizeMedium ) ); CCConfigWidget* w = new CCConfigWidget( this, vbox ); - connect( dlg, TQT_SIGNAL( okClicked( ) ), w, TQT_SLOT( accept( ) ) ); + connect( dlg, TQ_SIGNAL( okClicked( ) ), w, TQ_SLOT( accept( ) ) ); } void CppSupportPart::configWidget( KDialogBase *dlg ) @@ -446,13 +446,13 @@ void CppSupportPart::configWidget( KDialogBase *dlg ) TQVBox * vbox = dlg->addVBoxPage( i18n( "C++ Class Generator" ), i18n( "C++ Class Generator" ), BarIcon( info() ->icon(), TDEIcon::SizeMedium ) ); ClassGeneratorConfig *w = new ClassGeneratorConfig( vbox, "classgenerator config widget" ); - connect( dlg, TQT_SIGNAL( okClicked() ), w, TQT_SLOT( storeConfig() ) ); + connect( dlg, TQ_SIGNAL( okClicked() ), w, TQ_SLOT( storeConfig() ) ); vbox = dlg->addVBoxPage(i18n("C++ Parsing"), i18n("C++ Parsing"), BarIcon( "text-x-c++src", TDEIcon::SizeMedium) ); ConfigureProblemReporter* ww = new ConfigureProblemReporter( vbox ); ww->setPart( this ); - connect(dlg, TQT_SIGNAL(okClicked()), ww, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), ww, TQ_SLOT(accept())); } void CppSupportPart::activePartChanged( KParts::Part *part ) @@ -465,11 +465,11 @@ void CppSupportPart::activePartChanged( KParts::Part *part ) if ( m_activeView ) { - disconnect( m_activeView, TQT_SIGNAL( cursorPositionChanged() ), this, 0 ); + disconnect( m_activeView, TQ_SIGNAL( cursorPositionChanged() ), this, 0 ); } if ( m_activeDocument ) { - disconnect( m_activeDocument, TQT_SIGNAL(textChanged()), this, 0 ); + disconnect( m_activeDocument, TQ_SIGNAL(textChanged()), this, 0 ); } m_isTyping = false; @@ -500,14 +500,14 @@ void CppSupportPart::activePartChanged( KParts::Part *part ) if ( m_activeDocument ) { - connect( m_activeDocument, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); + connect( m_activeDocument, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()) ); m_textChangedTimer->start( 250, true ); // kick the parse timer, we might want to parse the current file } if ( m_activeViewCursor ) { - connect( m_activeView, TQT_SIGNAL( cursorPositionChanged() ), this, TQT_SLOT(slotCursorMoved()) ); -// this, TQT_SLOT( slotCursorPositionChanged() ) ); + connect( m_activeView, TQ_SIGNAL( cursorPositionChanged() ), this, TQ_SLOT(slotCursorMoved()) ); +// this, TQ_SLOT( slotCursorPositionChanged() ) ); } @@ -516,8 +516,8 @@ void CppSupportPart::activePartChanged( KParts::Part *part ) if ( !textHintIface ) return ; - connect( view, TQT_SIGNAL( needTextHint( int, int, TQString& ) ), - this, TQT_SLOT( slotNeedTextHint( int, int, TQString& ) ) ); + connect( view, TQ_SIGNAL( needTextHint( int, int, TQString& ) ), + this, TQ_SLOT( slotNeedTextHint( int, int, TQString& ) ) ); textHintIface->enableTextHints( 1000 ); #endif @@ -551,17 +551,17 @@ void CppSupportPart::projectOpened( ) embedProblemReporter(); - connect( core(), TQT_SIGNAL( configWidget( KDialogBase* ) ), - m_problemReporter, TQT_SLOT( configWidget( KDialogBase* ) ) ); + connect( core(), TQ_SIGNAL( configWidget( KDialogBase* ) ), + m_problemReporter, TQ_SLOT( configWidget( KDialogBase* ) ) ); - connect( project( ), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ), - this, TQT_SLOT( addedFilesToProject( const TQStringList & ) ) ); - connect( project( ), TQT_SIGNAL( removedFilesFromProject( const TQStringList & ) ), - this, TQT_SLOT( removedFilesFromProject( const TQStringList & ) ) ); - connect( project( ), TQT_SIGNAL( changedFilesInProject( const TQStringList & ) ), - this, TQT_SLOT( changedFilesInProject( const TQStringList & ) ) ); - connect( project(), TQT_SIGNAL( projectCompiled() ), - this, TQT_SLOT( slotProjectCompiled() ) ); + connect( project( ), TQ_SIGNAL( addedFilesToProject( const TQStringList & ) ), + this, TQ_SLOT( addedFilesToProject( const TQStringList & ) ) ); + connect( project( ), TQ_SIGNAL( removedFilesFromProject( const TQStringList & ) ), + this, TQ_SLOT( removedFilesFromProject( const TQStringList & ) ) ); + connect( project( ), TQ_SIGNAL( changedFilesInProject( const TQStringList & ) ), + this, TQ_SLOT( changedFilesInProject( const TQStringList & ) ) ); + connect( project(), TQ_SIGNAL( projectCompiled() ), + this, TQ_SLOT( slotProjectCompiled() ) ); m_timestamp.clear(); m_parseEmitWaiting.clear(); @@ -573,7 +573,7 @@ void CppSupportPart::projectOpened( ) m_buildSafeFileSetTimer->start( 500, true ); updateParserConfiguration(); //Necessary to respect custom include-paths and such - TQTimer::singleShot( 500, this, TQT_SLOT( initialParse( ) ) ); + TQTimer::singleShot( 500, this, TQ_SLOT( initialParse( ) ) ); } void CppSupportPart::embedProblemReporter( bool force ) @@ -687,7 +687,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) MakeMemberHelper( text, atline, atcol ); if ( !text.isEmpty() ) { - id = popup->insertItem( i18n( "Make Member" ), this, TQT_SLOT( slotMakeMember() ) ); + id = popup->insertItem( i18n( "Make Member" ), this, TQ_SLOT( slotMakeMember() ) ); popup->setWhatsThis( id, i18n( "<b>Make member</b><p>Creates a class member function in implementation file " "based on the member declaration at the current line." ) ); } @@ -754,7 +754,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) } text += formatModelItem( *it, true ); text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) ); - int id = m2->insertItem( text, this, TQT_SLOT( gotoDeclarationLine( int ) ) ); + int id = m2->insertItem( text, this, TQ_SLOT( gotoDeclarationLine( int ) ) ); int line, column; ( *it ) ->getStartPosition( &line, &column ); m2->setItemParameter( id, line ); @@ -795,7 +795,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) } text += formatModelItem( *it, true ); text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) ); - int id = m->insertItem( text, this, TQT_SLOT( gotoLine( int ) ) ); + int id = m->insertItem( text, this, TQ_SLOT( gotoLine( int ) ) ); int line, column; ( *it ) ->getStartPosition( &line, &column ); m->setItemParameter( id, line ); @@ -821,7 +821,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) if ( mcontext->item() ->isClass() ) { m_activeClass = ( ClassModel* ) mcontext->item(); - int id = popup->insertItem( i18n( "Extract Interface..." ), this, TQT_SLOT( slotExtractInterface() ) ); + int id = popup->insertItem( i18n( "Extract Interface..." ), this, TQ_SLOT( slotExtractInterface() ) ); popup->setWhatsThis( id, i18n( "<b>Extract interface</b><p>Extracts interface from the selected class and creates a new class with this interface. " "No implementation code is extracted and no implementation code is created." ) ); } @@ -839,7 +839,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) if ( url.fileName().endsWith( ".ui" ) ) { m_contextFileName = url.path(); - int id = popup->insertItem( i18n( "Create or Select Implementation..." ), this, TQT_SLOT( slotCreateSubclass() ) ); + int id = popup->insertItem( i18n( "Create or Select Implementation..." ), this, TQ_SLOT( slotCreateSubclass() ) ); popup->setWhatsThis( id, i18n( "<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner." ) ); } } @@ -1393,13 +1393,13 @@ bool CppSupportPart::shouldSplitDocument(const KURL &url) return false; } -Qt::Orientation CppSupportPart::splitOrientation() const +TQt::Orientation CppSupportPart::splitOrientation() const { TQString o = splitHeaderSourceConfig()->orientation(); if ( o == "Vertical" ) - return Qt::Vertical; + return TQt::Vertical; else - return Qt::Horizontal; + return TQt::Horizontal; } void CppSupportPart::slotNewClass() @@ -1506,7 +1506,7 @@ bool CppSupportPart::parseProject( bool force ) uint offset; _jd->stream >> fn >> ts >> offset; - _jd->pcs[ fn ] = tqMakePair( ts, offset ); + _jd->pcs[ fn ] = qMakePair( ts, offset ); } } } @@ -1526,7 +1526,7 @@ bool CppSupportPart::parseProject( bool force ) _jd->backgroundCount = 0; _jd->cycle = 0; - TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) ); m_saveMemoryTimer->stop(); //Do not regularly remove cached files that may still be needed while parsing(the cache anyway be full for the whole parsing-process) return true; @@ -1583,7 +1583,7 @@ void CppSupportPart::slotParseFiles() } ++( _jd->it ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) ); if( _jd->it == _jd->files.end()) { if( _jd->reparseList.isEmpty() ) { @@ -1639,11 +1639,11 @@ void CppSupportPart::slotParseFiles() _jd->progressBar->setTotalSteps( _jd->backgroundCount ); if( _jd->lastParse.msecsTo( TQTime::currentTime()) > 60000 && !m_backgroundParser->filesInQueue()) { _jd->backgroundCount = _jd->backgroundState; ///Stop waiting if there is no progress and no file in the background-parser - TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) ); } else { int timeStep = 0; if( alwaysParseInBackground ) { - TQTimer::singleShot( 10, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 10, this, TQ_SLOT( slotParseFiles() ) ); } else { if( _jd->it == _jd->reparseList.end() ) { /*_jd->it = _jd->files.end(); @@ -1659,7 +1659,7 @@ void CppSupportPart::slotParseFiles() timeStep = 1; }*/ } - TQTimer::singleShot( timeStep, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( timeStep, this, TQ_SLOT( slotParseFiles() ) ); } } } @@ -1699,25 +1699,29 @@ void CppSupportPart::slotNeedTextHint( int line, int column, TQString& textHint return ; m_backgroundParser->lock(); - TranslationUnitAST* ast = *m_backgroundParser->translationUnit( m_activeFileName ); - AST* node = 0; - if ( ast && ( node = findNodeAt( ast, line, column ) ) ) + ParsedFilePointer pTransUnit = m_backgroundParser->translationUnit(m_activeFileName); + if (pTransUnit) { + TranslationUnitAST* ast = *pTransUnit; + AST* node = 0; + if ( ast && ( node = findNodeAt( ast, line, column ) ) ) + { - while ( node && node->nodeType() != NodeType_FunctionDefinition ) - node = node->parent(); + while ( node && node->nodeType() != NodeType_FunctionDefinition ) + node = node->parent(); - if ( node ) - { - int startLine, startColumn; - int endLine, endColumn; - node->getStartPosition( &startLine, &startColumn ); - node->getEndPosition( &endLine, &endColumn ); + if ( node ) + { + int startLine, startColumn; + int endLine, endColumn; + node->getStartPosition( &startLine, &startColumn ); + node->getEndPosition( &endLine, &endColumn ); - if ( !node->text().isNull() ) - textHint = node->text(); - else - textHint = m_activeEditor->textLine( startLine ).simplifyWhiteSpace(); + if ( !node->text().isNull() ) + textHint = node->text(); + else + textHint = m_activeEditor->textLine( startLine ).simplifyWhiteSpace(); + } } } m_backgroundParser->unlock(); @@ -2082,9 +2086,9 @@ void CppSupportPart::splitHeaderSourceConfigStored( ) { TQString o = splitHeaderSourceConfig()->orientation(); if ( o == "Vertical" ) - emit splitOrientationChanged( Qt::Vertical ); + emit splitOrientationChanged( TQt::Vertical ); else if ( o == "Horizontal" ) - emit splitOrientationChanged( Qt::Horizontal ); + emit splitOrientationChanged( TQt::Horizontal ); } void CppSupportPart::removeWithReferences( const TQString & fileName ) @@ -3165,7 +3169,7 @@ void UIBlockTester::UIBlockTesterThread::stop() { UIBlockTester::UIBlockTester( uint milliseconds ) : m_thread( *this ), m_msecs( milliseconds ) { m_timer = new TQTimer( this ); m_timer->start( milliseconds/10 ); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timer()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timer()) ); timer(); m_thread.start(); } diff --git a/languages/cpp/cppsupportpart.h b/languages/cpp/cppsupportpart.h index 15a272fd..dc4d4451 100644 --- a/languages/cpp/cppsupportpart.h +++ b/languages/cpp/cppsupportpart.h @@ -38,7 +38,7 @@ ///A class that helps detecting what exactly makes the UI block. To use it, just place a breakpoint on UIBlockTester::lockup() and inspect the execution-position of the main thread class UIBlockTester : public TQObject { - Q_OBJECT + TQ_OBJECT class UIBlockTesterThread : public TQThread { public: @@ -155,7 +155,7 @@ private: class CppSupportPart : public KDevLanguageSupport { - Q_OBJECT + TQ_OBJECT public: @@ -289,7 +289,7 @@ protected: virtual TQString formatClassName( const TQString &name ); virtual TQString unformatClassName( const TQString &name ); virtual bool shouldSplitDocument( const KURL &url ); - virtual Qt::Orientation splitOrientation() const; + virtual TQt::Orientation splitOrientation() const; virtual void addMethod( ClassDom klass ); virtual void addAttribute( ClassDom klass ); diff --git a/languages/cpp/creategettersetter.ui b/languages/cpp/creategettersetter.ui index fcd6e684..1080ffc3 100644 --- a/languages/cpp/creategettersetter.ui +++ b/languages/cpp/creategettersetter.ui @@ -219,9 +219,9 @@ <tabstop>m_btnCancel</tabstop> <tabstop>m_btnOk</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">slotInlineChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/languages/cpp/creategettersetterconfiguration.h b/languages/cpp/creategettersetterconfiguration.h index e556e9dd..474c4af8 100644 --- a/languages/cpp/creategettersetterconfiguration.h +++ b/languages/cpp/creategettersetterconfiguration.h @@ -34,7 +34,7 @@ class TQDomDocument; * @author Jonas Jacobi <j.jacobi@gmx.de> */ class CreateGetterSetterConfiguration : public TQObject{ -Q_OBJECT +TQ_OBJECT public: CreateGetterSetterConfiguration(CppSupportPart* part); diff --git a/languages/cpp/creategettersetterdialog.h b/languages/cpp/creategettersetterdialog.h index f5075b95..95ea4dd4 100644 --- a/languages/cpp/creategettersetterdialog.h +++ b/languages/cpp/creategettersetterdialog.h @@ -23,7 +23,7 @@ class CppSupportPart; */ class CreateGetterSetterDialog: public CreateGetterSetterDialogBase { - Q_OBJECT + TQ_OBJECT public: CreateGetterSetterDialog(CppSupportPart* part, ClassDom aClass, VariableDom var, TQWidget *parent = 0, const char *name = 0); diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp index 893ac55b..a87ed5b6 100644 --- a/languages/cpp/createpcsdialog.cpp +++ b/languages/cpp/createpcsdialog.cpp @@ -212,7 +212,7 @@ CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, TQWidget* parent, const KService::Ptr ptr = *it; int error = 0; - KDevPCSImporter* importer = KParts::ComponentFactory::createInstanceFromService<KDevPCSImporter>( ptr, TQT_TQOBJECT(this), ptr->name().latin1(), TQStringList(), &error ); + KDevPCSImporter* importer = KParts::ComponentFactory::createInstanceFromService<KDevPCSImporter>( ptr, this, ptr->name().latin1(), TQStringList(), &error ); if ( importer ) { new PCSListViewItem( ptr, importer, importerListView ); @@ -276,7 +276,7 @@ void CreatePCSDialog::slotSelected( const TQString & ) m_settings = importer->createSettingsPage( settingsPage ); setNextEnabled( currentPage(), false ); setHelpEnabled( currentPage(), false ); - connect( m_settings, TQT_SIGNAL( enabled( int ) ), this, TQT_SLOT( setNextPageEnabled( int ) ) ); + connect( m_settings, TQ_SIGNAL( enabled( int ) ), this, TQ_SLOT( setNextPageEnabled( int ) ) ); if ( m_settings ) { @@ -307,7 +307,7 @@ void CreatePCSDialog::slotSelected( const TQString & ) m_part->removeCatalog( dbName ); m_jobData = new PCSJobData( dbName, fileList ); - TQTimer::singleShot( 0, this, TQT_SLOT(parseNext()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(parseNext()) ); } } @@ -340,7 +340,7 @@ void CreatePCSDialog::parseNext( ) ++(m_jobData->it); - TQTimer::singleShot( 0, this, TQT_SLOT(parseNext()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(parseNext()) ); } diff --git a/languages/cpp/createpcsdialog.h b/languages/cpp/createpcsdialog.h index 73b08620..9aab172b 100644 --- a/languages/cpp/createpcsdialog.h +++ b/languages/cpp/createpcsdialog.h @@ -20,7 +20,7 @@ class CppSupportPart; class CreatePCSDialog : public CreatePCSDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/createpcsdialogbase.ui b/languages/cpp/createpcsdialogbase.ui index a128e877..14e859b0 100644 --- a/languages/cpp/createpcsdialogbase.ui +++ b/languages/cpp/createpcsdialogbase.ui @@ -159,10 +159,10 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>slotSelected(const TQString&)</slot> <slot>slotSelectionChanged(TQListViewItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/languages/cpp/debugger/DESIGN.txt b/languages/cpp/debugger/DESIGN.txt index 627fd403..3f4b4786 100644 --- a/languages/cpp/debugger/DESIGN.txt +++ b/languages/cpp/debugger/DESIGN.txt @@ -30,7 +30,7 @@ necessary to clear already cached data for other threads. == Command execution == The controller has a queue of commands to send to gdb. A command typically -has a callback (pair of QObject* and a member pointer) to be called when +has a callback (pair of TQObject* and a member pointer) to be called when command is done. When the queue is non-empty, and debugger is not busy executing the previous diff --git a/languages/cpp/debugger/breakpoint.h b/languages/cpp/debugger/breakpoint.h index a313a814..28e7f1dd 100644 --- a/languages/cpp/debugger/breakpoint.h +++ b/languages/cpp/debugger/breakpoint.h @@ -46,7 +46,7 @@ enum BP_TYPES class Breakpoint : public TQObject { - Q_OBJECT + TQ_OBJECT public: Breakpoint(bool temporary=false, bool enabled=true); diff --git a/languages/cpp/debugger/dbgcontroller.h b/languages/cpp/debugger/dbgcontroller.h index 022a6fcf..8b55896b 100644 --- a/languages/cpp/debugger/dbgcontroller.h +++ b/languages/cpp/debugger/dbgcontroller.h @@ -67,7 +67,7 @@ enum DBGStateFlags /***************************************************************************/ class DbgController : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp index 718345a1..f6791209 100644 --- a/languages/cpp/debugger/dbgpsdlg.cpp +++ b/languages/cpp/debugger/dbgpsdlg.cpp @@ -73,21 +73,21 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) topLayout->addWidget(pids_); pids_->setFont(TDEGlobalSettings::fixedFont()); - KButtonBox *buttonbox = new KButtonBox(this, Qt::Horizontal); + KButtonBox *buttonbox = new KButtonBox(this, TQt::Horizontal); buttonbox->addStretch(); TQPushButton *ok = buttonbox->addButton(KStdGuiItem::ok()); TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); buttonbox->layout(); topLayout->addWidget(buttonbox); - connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); - connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept())); + connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); // Default display to 40 chars wide, default height is okay resize( ((TDEGlobalSettings::fixedFont()).pointSize())*40, height()); topLayout->activate(); - TQTimer::singleShot(0, this, TQT_SLOT(slotInit())); + TQTimer::singleShot(0, this, TQ_SLOT(slotInit())); } @@ -133,8 +133,8 @@ void Dbg_PS_Dialog::slotInit() } #endif - connect( psProc_, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(slotProcessExited()) ); - connect( psProc_, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(slotReceivedOutput(TDEProcess *, char *, int)) ); + connect( psProc_, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(slotProcessExited()) ); + connect( psProc_, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQ_SLOT(slotReceivedOutput(TDEProcess *, char *, int)) ); psProc_->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); } diff --git a/languages/cpp/debugger/dbgpsdlg.h b/languages/cpp/debugger/dbgpsdlg.h index fd42fa2b..dc92245d 100644 --- a/languages/cpp/debugger/dbgpsdlg.h +++ b/languages/cpp/debugger/dbgpsdlg.h @@ -30,7 +30,7 @@ namespace GDBDebugger class Dbg_PS_Dialog : public KDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp index 05b92d8a..f9143fc0 100644 --- a/languages/cpp/debugger/dbgtoolbar.cpp +++ b/languages/cpp/debugger/dbgtoolbar.cpp @@ -107,13 +107,13 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e) if (moving_) return; - if (e->button() == Qt::RightButton) { + if (e->button() == TQt::RightButton) { TDEPopupMenu *menu = new TDEPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); menu->insertItem(i18n("Dock to Panel"), - parent(), TQT_SLOT(slotDock())); + parent(), TQ_SLOT(slotDock())); menu->insertItem(i18n("Dock to Panel && Iconify TDevelop"), - parent(), TQT_SLOT(slotIconifyAndDock())); + parent(), TQ_SLOT(slotIconifyAndDock())); menu->popup(e->globalPos()); } else { moving_ = true; @@ -229,22 +229,22 @@ DbgDocker::DbgDocker(TQWidget* parent, DbgToolBar* toolBar, const TQPixmap& pixm void DbgDocker::mousePressEvent(TQMouseEvent *e) { - if (!TQT_TQRECT_OBJECT(rect()).contains( e->pos())) + if (!rect().contains( e->pos())) return; switch (e->button()) { - case Qt::LeftButton: + case TQt::LeftButton: { // Not really a click, but it'll hold for the time being !!! emit clicked(); break; } - case Qt::RightButton: + case TQt::RightButton: { TDEPopupMenu* menu = new TDEPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); - menu->insertItem(i18n("Activate"), toolBar_, TQT_SLOT(slotUndock())); - menu->insertItem(i18n("Activate (TDevelop gets focus)"), toolBar_, TQT_SLOT(slotActivateAndUndock())); + menu->insertItem(i18n("Activate"), toolBar_, TQ_SLOT(slotUndock())); + menu->insertItem(i18n("Activate (TDevelop gets focus)"), toolBar_, TQ_SLOT(slotActivateAndUndock())); menu->popup(e->globalPos()); break; } @@ -270,9 +270,9 @@ DbgToolBar::DbgToolBar(DebuggerPart* part, docker_(0), dockWindow_(new KSystemTray(parent)) { - winModule_ = new KWinModule(TQT_TQOBJECT(this)); + winModule_ = new KWinModule(this); docker_ = new DbgDocker(parent, this, BarIcon("dbgnext")); - connect(docker_, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver())); + connect(docker_, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepOver())); // Must have noFocus set so that we can see what window was active. // see slotDbgKdevFocus() for more comments @@ -285,7 +285,7 @@ DbgToolBar::DbgToolBar(DebuggerPart* part, // KWin::setType(winId(), NET::Override); // So it has no decoration KWin::setType(winId(), NET::Dock); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setFrameStyle( TQFrame::Box | TQFrame::Plain ); setLineWidth(4); setMidLineWidth(0); @@ -310,17 +310,17 @@ DbgToolBar::DbgToolBar(DebuggerPart* part, bKDevFocus_ = new DbgButton(BarIcon("tdevelop"), TQString(), this); bPrevFocus_ = new DbgButton(BarIcon("dbgmemview"), TQString(), this); - connect(bRun, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotRun())); - connect(bInterrupt, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotPause())); - connect(bNext, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver())); - connect(bNexti, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOverInstruction())); - connect(bStep, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepInto())); - connect(bStepi, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepIntoInstruction())); - connect(bFinish, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOut())); - connect(bRunTo, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotRunToCursor())); - connect(bView, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotMemoryView())); - connect(bKDevFocus_, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotKdevFocus())); - connect(bPrevFocus_, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrevFocus())); + connect(bRun, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotRun())); + connect(bInterrupt, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotPause())); + connect(bNext, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepOver())); + connect(bNexti, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepOverInstruction())); + connect(bStep, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepInto())); + connect(bStepi, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepIntoInstruction())); + connect(bFinish, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepOut())); + connect(bRunTo, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotRunToCursor())); + connect(bView, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotMemoryView())); + connect(bKDevFocus_, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotKdevFocus())); + connect(bPrevFocus_, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPrevFocus())); TQToolTip::add( bRun, i18n("Continue with application execution, may start the application") ); TQToolTip::add( bInterrupt, i18n("Interrupt the application execution") ); diff --git a/languages/cpp/debugger/dbgtoolbar.h b/languages/cpp/debugger/dbgtoolbar.h index 3616c831..717643b4 100644 --- a/languages/cpp/debugger/dbgtoolbar.h +++ b/languages/cpp/debugger/dbgtoolbar.h @@ -32,7 +32,7 @@ class DebuggerPart; class DbgDocker : public KSystemTray { - Q_OBJECT + TQ_OBJECT public: @@ -50,7 +50,7 @@ private: class DbgToolBar : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/debugger/debuggerconfigwidget.h b/languages/cpp/debugger/debuggerconfigwidget.h index 3a52da93..1fa060a8 100644 --- a/languages/cpp/debugger/debuggerconfigwidget.h +++ b/languages/cpp/debugger/debuggerconfigwidget.h @@ -25,7 +25,7 @@ class DebuggerPart; class DebuggerConfigWidget : public DebuggerConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/debugger/debuggerconfigwidgetbase.ui b/languages/cpp/debugger/debuggerconfigwidgetbase.ui index 9d6dcbf1..b3d0ae5e 100644 --- a/languages/cpp/debugger/debuggerconfigwidgetbase.ui +++ b/languages/cpp/debugger/debuggerconfigwidgetbase.ui @@ -156,9 +156,6 @@ If you are not "dlopen"ing libs then leave this unchecked.</string> <property name="text"> <string>Enable separate terminal for application &IO</string> </property> - <property name="accel"> - <string>Alt+I</string> - </property> <property name="whatsThis" stdset="0"> <string>This allows you to enter terminal input when your application contains terminal input code (e.g. cin, fgets, etc.). @@ -173,9 +170,6 @@ Otherwise leave it unchecked.</string> <property name="text"> <string>E&nable floating toolbar</string> </property> - <property name="accel"> - <string>Alt+N</string> - </property> <property name="whatsThis" stdset="0"> <string>Use the floating toolbar. This toolbar always stays on top of all windows so that if the app covers TDevelop @@ -192,9 +186,6 @@ This toolbar is in addition to the toolbar in TDevelop.</string> <property name="text"> <string>Display static &members</string> </property> - <property name="accel"> - <string>Alt+M</string> - </property> <property name="whatsThis" stdset="0"> <string>Displaying static members makes GDB slower in producing data within TDE and TQt. diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp index 6621cbf8..e2efd7b0 100644 --- a/languages/cpp/debugger/debuggerpart.cpp +++ b/languages/cpp/debugger/debuggerpart.cpp @@ -166,12 +166,12 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi mainWindow()->setViewAvailable(gdbOutputWidget, false); // gdbBreakpointWidget -> this - connect( gdbBreakpointWidget, TQT_SIGNAL(refreshBPState(const Breakpoint&)), - this, TQT_SLOT(slotRefreshBPState(const Breakpoint&))); - connect( gdbBreakpointWidget, TQT_SIGNAL(publishBPState(const Breakpoint&)), - this, TQT_SLOT(slotRefreshBPState(const Breakpoint&))); - connect( gdbBreakpointWidget, TQT_SIGNAL(gotoSourcePosition(const TQString&, int)), - this, TQT_SLOT(slotGotoSource(const TQString&, int)) ); + connect( gdbBreakpointWidget, TQ_SIGNAL(refreshBPState(const Breakpoint&)), + this, TQ_SLOT(slotRefreshBPState(const Breakpoint&))); + connect( gdbBreakpointWidget, TQ_SIGNAL(publishBPState(const Breakpoint&)), + this, TQ_SLOT(slotRefreshBPState(const Breakpoint&))); + connect( gdbBreakpointWidget, TQ_SIGNAL(gotoSourcePosition(const TQString&, int)), + this, TQ_SLOT(slotGotoSource(const TQString&, int)) ); viewerWidget = new ViewerWidget( controller, 0, "viewerWidget"); @@ -179,15 +179,15 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi i18n("Debug views"), i18n("Special debugger views")); mainWindow()->setViewAvailable(viewerWidget, false); - connect(viewerWidget, TQT_SIGNAL(setViewShown(bool)), - this, TQT_SLOT(slotShowView(bool))); + connect(viewerWidget, TQ_SIGNAL(setViewShown(bool)), + this, TQ_SLOT(slotShowView(bool))); // Now setup the actions TDEAction *action; // action = new TDEAction(i18n("&Start"), "1rightarrow", CTRL+SHIFT+Key_F9, action = new TDEAction(i18n("&Start"), "dbgrun", Key_F9, - this, TQT_SLOT(slotRun()), + this, TQ_SLOT(slotRun()), actionCollection(), "debug_run"); action->setToolTip( i18n("Start in debugger") ); action->setWhatsThis( i18n("<b>Start in debugger</b><p>" @@ -198,7 +198,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi "about variables, frame stack, and so on.") ); action = new TDEAction(i18n("&Restart"), "dbgrestart", 0, - this, TQT_SLOT(slotRestart()), + this, TQ_SLOT(slotRestart()), actionCollection(), "debug_restart"); action->setToolTip( i18n("Restart program") ); action->setWhatsThis( i18n("<b>Restarts application</b><p>" @@ -208,33 +208,33 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action = new TDEAction(i18n("Sto&p"), "process-stop", 0, - this, TQT_SLOT(slotStop()), + this, TQ_SLOT(slotStop()), actionCollection(), "debug_stop"); action->setToolTip( i18n("Stop debugger") ); action->setWhatsThis(i18n("<b>Stop debugger</b><p>Kills the executable and exits the debugger.")); action = new TDEAction(i18n("Interrupt"), "media-playback-pause", 0, - this, TQT_SLOT(slotPause()), + this, TQ_SLOT(slotPause()), actionCollection(), "debug_pause"); action->setToolTip( i18n("Interrupt application") ); action->setWhatsThis(i18n("<b>Interrupt application</b><p>Interrupts the debugged process or current GDB command.")); action = new TDEAction(i18n("Run to &Cursor"), "dbgrunto", 0, - this, TQT_SLOT(slotRunToCursor()), + this, TQ_SLOT(slotRunToCursor()), actionCollection(), "debug_runtocursor"); action->setToolTip( i18n("Run to cursor") ); action->setWhatsThis(i18n("<b>Run to cursor</b><p>Continues execution until the cursor position is reached.")); action = new TDEAction(i18n("Set E&xecution Position to Cursor"), "dbgjumpto", 0, - this, TQT_SLOT(slotJumpToCursor()), + this, TQ_SLOT(slotJumpToCursor()), actionCollection(), "debug_jumptocursor"); action->setToolTip( i18n("Jump to cursor") ); action->setWhatsThis(i18n("<b>Set Execution Position </b><p>Set the execution pointer to the current cursor position.")); action = new TDEAction(i18n("Step &Over"), "dbgnext", Key_F10, - this, TQT_SLOT(slotStepOver()), + this, TQ_SLOT(slotStepOver()), actionCollection(), "debug_stepover"); action->setToolTip( i18n("Step over the next line") ); action->setWhatsThis( i18n("<b>Step over</b><p>" @@ -245,14 +245,14 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action = new TDEAction(i18n("Step over Ins&truction"), "dbgnextinst", 0, - this, TQT_SLOT(slotStepOverInstruction()), + this, TQ_SLOT(slotStepOverInstruction()), actionCollection(), "debug_stepoverinst"); action->setToolTip( i18n("Step over instruction") ); action->setWhatsThis(i18n("<b>Step over instruction</b><p>Steps over the next assembly instruction.")); action = new TDEAction(i18n("Step &Into"), "dbgstep", Key_F11, - this, TQT_SLOT(slotStepInto()), + this, TQ_SLOT(slotStepInto()), actionCollection(), "debug_stepinto"); action->setToolTip( i18n("Step into the next statement") ); action->setWhatsThis( i18n("<b>Step into</b><p>" @@ -262,14 +262,14 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action = new TDEAction(i18n("Step into I&nstruction"), "dbgstepinst", 0, - this, TQT_SLOT(slotStepIntoInstruction()), + this, TQ_SLOT(slotStepIntoInstruction()), actionCollection(), "debug_stepintoinst"); action->setToolTip( i18n("Step into instruction") ); action->setWhatsThis(i18n("<b>Step into instruction</b><p>Steps into the next assembly instruction.")); action = new TDEAction(i18n("Step O&ut"), "dbgstepout", Key_F12, - this, TQT_SLOT(slotStepOut()), + this, TQ_SLOT(slotStepOut()), actionCollection(), "debug_stepout"); action->setToolTip( i18n("Steps out of the current function") ); action->setWhatsThis( i18n("<b>Step out</b><p>" @@ -281,7 +281,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action = new TDEAction(i18n("Viewers"), "dbgmemview", 0, - this, TQT_SLOT(slotMemoryView()), + this, TQ_SLOT(slotMemoryView()), actionCollection(), "debug_memview"); action->setToolTip( i18n("Debugger viewers") ); action->setWhatsThis(i18n("<b>Debugger viewers</b><p>Various information about application being executed. There are 4 views available:<br>" @@ -292,7 +292,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action = new TDEAction(i18n("Examine Core File..."), "application-x-core", 0, - this, TQT_SLOT(slotExamineCore()), + this, TQ_SLOT(slotExamineCore()), actionCollection(), "debug_core"); action->setToolTip( i18n("Examine core file") ); action->setWhatsThis( i18n("<b>Examine core file</b><p>" @@ -304,72 +304,72 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action = new TDEAction(i18n("Attach to Process"), "connect_creating", 0, - this, TQT_SLOT(slotAttachProcess()), + this, TQ_SLOT(slotAttachProcess()), actionCollection(), "debug_attach"); action->setToolTip( i18n("Attach to process") ); action->setWhatsThis(i18n("<b>Attach to process</b><p>Attaches the debugger to a running process.")); action = new TDEAction(i18n("Toggle Breakpoint"), 0, 0, - this, TQT_SLOT(toggleBreakpoint()), + this, TQ_SLOT(toggleBreakpoint()), actionCollection(), "debug_toggle_breakpoint"); action->setToolTip(i18n("Toggle breakpoint")); action->setWhatsThis(i18n("<b>Toggle breakpoint</b><p>Toggles the breakpoint at the current line in editor.")); - connect( mainWindow()->main()->guiFactory(), TQT_SIGNAL(clientAdded(KXMLGUIClient*)), - this, TQT_SLOT(guiClientAdded(KXMLGUIClient*)) ); + connect( mainWindow()->main()->guiFactory(), TQ_SIGNAL(clientAdded(KXMLGUIClient*)), + this, TQ_SLOT(guiClientAdded(KXMLGUIClient*)) ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( partController(), TQT_SIGNAL(loadedFile(const KURL &)), - gdbBreakpointWidget, TQT_SLOT(slotRefreshBP(const KURL &)) ); - connect( debugger(), TQT_SIGNAL(toggledBreakpoint(const TQString &, int)), - gdbBreakpointWidget, TQT_SLOT(slotToggleBreakpoint(const TQString &, int)) ); - connect( debugger(), TQT_SIGNAL(editedBreakpoint(const TQString &, int)), - gdbBreakpointWidget, TQT_SLOT(slotEditBreakpoint(const TQString &, int)) ); - connect( debugger(), TQT_SIGNAL(toggledBreakpointEnabled(const TQString &, int)), - gdbBreakpointWidget, TQT_SLOT(slotToggleBreakpointEnabled(const TQString &, int)) ); + connect( partController(), TQ_SIGNAL(loadedFile(const KURL &)), + gdbBreakpointWidget, TQ_SLOT(slotRefreshBP(const KURL &)) ); + connect( debugger(), TQ_SIGNAL(toggledBreakpoint(const TQString &, int)), + gdbBreakpointWidget, TQ_SLOT(slotToggleBreakpoint(const TQString &, int)) ); + connect( debugger(), TQ_SIGNAL(editedBreakpoint(const TQString &, int)), + gdbBreakpointWidget, TQ_SLOT(slotEditBreakpoint(const TQString &, int)) ); + connect( debugger(), TQ_SIGNAL(toggledBreakpointEnabled(const TQString &, int)), + gdbBreakpointWidget, TQ_SLOT(slotToggleBreakpointEnabled(const TQString &, int)) ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(slotStop(KDevPlugin*)) ); - connect( core(), TQT_SIGNAL(projectClosed()), - this, TQT_SLOT(projectClosed()) ); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(slotStop(KDevPlugin*)) ); + connect( core(), TQ_SIGNAL(projectClosed()), + this, TQ_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) ); procLineMaker = new ProcessLineMaker(); - connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)), - appFrontend(), TQT_SLOT(insertStdoutLine(const TQCString&)) ); - connect( procLineMaker, TQT_SIGNAL(receivedStderrLine(const TQCString&)), - appFrontend(), TQT_SLOT(insertStderrLine(const TQCString&)) ); + connect( procLineMaker, TQ_SIGNAL(receivedStdoutLine(const TQCString&)), + appFrontend(), TQ_SLOT(insertStdoutLine(const TQCString&)) ); + connect( procLineMaker, TQ_SIGNAL(receivedStderrLine(const TQCString&)), + appFrontend(), TQ_SLOT(insertStderrLine(const TQCString&)) ); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStdoutLine(const TQCString&)), - appFrontend(), TQT_SLOT(addPartialStdoutLine(const TQCString&))); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)), - appFrontend(), TQT_SLOT(addPartialStderrLine(const TQCString&))); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStdoutLine(const TQCString&)), + appFrontend(), TQ_SLOT(addPartialStdoutLine(const TQCString&))); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStderrLine(const TQCString&)), + appFrontend(), TQ_SLOT(addPartialStderrLine(const TQCString&))); // The output from tracepoints goes to "application" window, because // we don't have any better alternative, and using yet another window // is undesirable. Besides, this makes tracepoint look even more similar // to printf debugging. - connect( gdbBreakpointWidget, TQT_SIGNAL(tracingOutput(const char*)), - procLineMaker, TQT_SLOT(slotReceivedStdout(const char*))); + connect( gdbBreakpointWidget, TQ_SIGNAL(tracingOutput(const char*)), + procLineMaker, TQ_SLOT(slotReceivedStdout(const char*))); - connect(partController(), TQT_SIGNAL(savedFile(const KURL &)), - this, TQT_SLOT(slotFileSaved())); + connect(partController(), TQ_SIGNAL(savedFile(const KURL &)), + this, TQ_SLOT(slotFileSaved())); if (project()) - connect(project(), TQT_SIGNAL(projectCompiled()), - this, TQT_SLOT(slotProjectCompiled())); + connect(project(), TQ_SIGNAL(projectCompiled()), + this, TQ_SLOT(slotProjectCompiled())); setupController(); - TQTimer::singleShot(0, this, TQT_SLOT(setupDcop())); + TQTimer::singleShot(0, this, TQ_SLOT(setupDcop())); } void DebuggerPart::setupDcop() @@ -379,7 +379,7 @@ void DebuggerPart::setupDcop() if ((*it).find("drkonqi-") == 0) slotDCOPApplicationRegistered(*it); - connect(kapp->dcopClient(), TQT_SIGNAL(applicationRegistered(const TQCString&)), TQT_SLOT(slotDCOPApplicationRegistered(const TQCString&))); + connect(kapp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)), TQ_SLOT(slotDCOPApplicationRegistered(const TQCString&))); kapp->dcopClient()->setNotifications(true); } @@ -415,7 +415,7 @@ ASYNC DebuggerPart::slotDebugExternalProcess() if (attachProcess(pid) && m_drkonqi.isEmpty()) { m_drkonqi = kapp->dcopClient()->senderId(); - TQTimer::singleShot(15000, this, TQT_SLOT(slotCloseDrKonqi())); + TQTimer::singleShot(15000, this, TQ_SLOT(slotCloseDrKonqi())); mainWindow()->raiseView(framestackWidget); } @@ -497,7 +497,7 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) if (act) { int id = popup->insertItem( act->iconSet(), i18n("Run to &Cursor"), - this, TQT_SLOT(slotRunToCursor()), + this, TQ_SLOT(slotRunToCursor()), 0, -1, index); popup->setWhatsThis(id, act->whatsThis()); @@ -507,7 +507,7 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) if (econtext->url().isLocalFile()) { int id = popup->insertItem( i18n("Toggle Breakpoint"), - this, TQT_SLOT(toggleBreakpoint()), + this, TQ_SLOT(toggleBreakpoint()), 0, -1, index); index += running; popup->setWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line.")); @@ -516,12 +516,12 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) { TQString squeezed = KStringHandler::csqueeze(m_contextIdent, 30); int id = popup->insertItem( i18n("Evaluate: %1").arg(squeezed), - this, TQT_SLOT(contextEvaluate()), + this, TQ_SLOT(contextEvaluate()), 0, -1, index); index += running; popup->setWhatsThis(id, i18n("<b>Evaluate expression</b><p>Shows the value of the expression under the cursor.")); int id2 = popup->insertItem( i18n("Watch: %1").arg(squeezed), - this, TQT_SLOT(contextWatch()), + this, TQ_SLOT(contextWatch()), 0, -1, index); index += running; popup->setWhatsThis(id2, i18n("<b>Watch expression</b><p>Adds an expression under the cursor to the Variables/Watch list.")); @@ -562,8 +562,8 @@ void DebuggerPart::projectConfigWidget(KDialogBase *dlg) { TQVBox *vbox = dlg->addVBoxPage(i18n("Debugger"), i18n("Debugger"), BarIcon( info()->icon(), TDEIcon::SizeMedium) ); DebuggerConfigWidget *w = new DebuggerConfigWidget(this, vbox, "debugger config widget"); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); - connect( dlg, TQT_SIGNAL(finished()), controller, TQT_SLOT(configure()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(finished()), controller, TQ_SLOT(configure()) ); } @@ -572,57 +572,57 @@ void DebuggerPart::setupController() VariableTree *variableTree = variableWidget->varTree(); // variableTree -> gdbBreakpointWidget - connect( variableTree, TQT_SIGNAL(toggleWatchpoint(const TQString &)), - gdbBreakpointWidget, TQT_SLOT(slotToggleWatchpoint(const TQString &))); + connect( variableTree, TQ_SIGNAL(toggleWatchpoint(const TQString &)), + gdbBreakpointWidget, TQ_SLOT(slotToggleWatchpoint(const TQString &))); // gdbOutputWidget -> controller - connect( gdbOutputWidget, TQT_SIGNAL(userGDBCmd(const TQString &)), - controller, TQT_SLOT(slotUserGDBCmd(const TQString&))); - connect( gdbOutputWidget, TQT_SIGNAL(breakInto()), - controller, TQT_SLOT(slotBreakInto())); + connect( gdbOutputWidget, TQ_SIGNAL(userGDBCmd(const TQString &)), + controller, TQ_SLOT(slotUserGDBCmd(const TQString&))); + connect( gdbOutputWidget, TQ_SIGNAL(breakInto()), + controller, TQ_SLOT(slotBreakInto())); - connect( controller, TQT_SIGNAL(breakpointHit(int)), - gdbBreakpointWidget, TQT_SLOT(slotBreakpointHit(int))); + connect( controller, TQ_SIGNAL(breakpointHit(int)), + gdbBreakpointWidget, TQ_SLOT(slotBreakpointHit(int))); // controller -> disassembleWidget - connect( controller, TQT_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), - disassembleWidget, TQT_SLOT(slotShowStepInSource(const TQString&, int, const TQString&))); + connect( controller, TQ_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), + disassembleWidget, TQ_SLOT(slotShowStepInSource(const TQString&, int, const TQString&))); // controller -> this - connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), - this, TQT_SLOT(slotStatus(const TQString&, int))); - connect( controller, TQT_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), - this, TQT_SLOT(slotShowStep(const TQString&, int))); - connect( controller, TQT_SIGNAL(debuggerAbnormalExit()), - this, TQT_SLOT(slotDebuggerAbnormalExit())); + connect( controller, TQ_SIGNAL(dbgStatus(const TQString&, int)), + this, TQ_SLOT(slotStatus(const TQString&, int))); + connect( controller, TQ_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), + this, TQ_SLOT(slotShowStep(const TQString&, int))); + connect( controller, TQ_SIGNAL(debuggerAbnormalExit()), + this, TQ_SLOT(slotDebuggerAbnormalExit())); - connect(controller, TQT_SIGNAL(event(GDBController::event_t)), - this, TQT_SLOT(slotEvent(GDBController::event_t))); + connect(controller, TQ_SIGNAL(event(GDBController::event_t)), + this, TQ_SLOT(slotEvent(GDBController::event_t))); // controller -> procLineMaker - connect( controller, TQT_SIGNAL(ttyStdout(const char*)), - procLineMaker, TQT_SLOT(slotReceivedStdout(const char*))); - connect( controller, TQT_SIGNAL(ttyStderr(const char*)), - procLineMaker, TQT_SLOT(slotReceivedStderr(const char*))); + connect( controller, TQ_SIGNAL(ttyStdout(const char*)), + procLineMaker, TQ_SLOT(slotReceivedStdout(const char*))); + connect( controller, TQ_SIGNAL(ttyStderr(const char*)), + procLineMaker, TQ_SLOT(slotReceivedStderr(const char*))); // controller -> gdbOutputWidget - connect( controller, TQT_SIGNAL(gdbInternalCommandStdout(const char*)), - gdbOutputWidget, TQT_SLOT(slotInternalCommandStdout(const char*)) ); - connect( controller, TQT_SIGNAL(gdbUserCommandStdout(const char*)), - gdbOutputWidget, TQT_SLOT(slotUserCommandStdout(const char*)) ); + connect( controller, TQ_SIGNAL(gdbInternalCommandStdout(const char*)), + gdbOutputWidget, TQ_SLOT(slotInternalCommandStdout(const char*)) ); + connect( controller, TQ_SIGNAL(gdbUserCommandStdout(const char*)), + gdbOutputWidget, TQ_SLOT(slotUserCommandStdout(const char*)) ); - connect( controller, TQT_SIGNAL(gdbStderr(const char*)), - gdbOutputWidget, TQT_SLOT(slotReceivedStderr(const char*)) ); - connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), - gdbOutputWidget, TQT_SLOT(slotDbgStatus(const TQString&, int))); + connect( controller, TQ_SIGNAL(gdbStderr(const char*)), + gdbOutputWidget, TQ_SLOT(slotReceivedStderr(const char*)) ); + connect( controller, TQ_SIGNAL(dbgStatus(const TQString&, int)), + gdbOutputWidget, TQ_SLOT(slotDbgStatus(const TQString&, int))); // controller -> viewerWidget - connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), - viewerWidget, TQT_SLOT(slotDebuggerState(const TQString&, int))); + connect( controller, TQ_SIGNAL(dbgStatus(const TQString&, int)), + viewerWidget, TQ_SLOT(slotDebuggerState(const TQString&, int))); - connect(statusBarIndicator, TQT_SIGNAL(doubleClicked()), - controller, TQT_SLOT(explainDebuggerStatus())); + connect(statusBarIndicator, TQ_SIGNAL(doubleClicked()), + controller, TQ_SLOT(explainDebuggerStatus())); } @@ -857,18 +857,18 @@ void DebuggerPart::slotRun() if (rebuild) { - disconnect(TQT_SIGNAL(buildProject())); + disconnect(TQ_SIGNAL(buildProject())); // The KDevProject has no method to build the project, // so try connecting to a slot has is present to all // existing project managers. // Note: this assumes that 'slotBuild' will save // modified files. - if (connect(this, TQT_SIGNAL(buildProject()), - project(), TQT_SLOT(slotBuild()))) + if (connect(this, TQ_SIGNAL(buildProject()), + project(), TQ_SLOT(slotBuild()))) { - connect(project(), TQT_SIGNAL(projectCompiled()), - this, TQT_SLOT(slotRun_part2())); + connect(project(), TQ_SIGNAL(projectCompiled()), + this, TQ_SLOT(slotRun_part2())); emit buildProject(); rebuild = true; @@ -894,8 +894,8 @@ void DebuggerPart::slotRun_part2() { needRebuild_ = false; - disconnect(project(), TQT_SIGNAL(projectCompiled()), - this, TQT_SLOT(slotRun_part2())); + disconnect(project(), TQ_SIGNAL(projectCompiled()), + this, TQ_SLOT(slotRun_part2())); if (controller->stateIsOn( s_dbgNotStarted )) { diff --git a/languages/cpp/debugger/debuggerpart.h b/languages/cpp/debugger/debuggerpart.h index 50479249..04efcb9a 100644 --- a/languages/cpp/debugger/debuggerpart.h +++ b/languages/cpp/debugger/debuggerpart.h @@ -46,7 +46,7 @@ class ViewerWidget; class DebuggerPart : public KDevPlugin, virtual public DebuggerDCOPInterface { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/debugger/debuggertracingdialog.cpp b/languages/cpp/debugger/debuggertracingdialog.cpp index 90657b29..6d1122ee 100644 --- a/languages/cpp/debugger/debuggertracingdialog.cpp +++ b/languages/cpp/debugger/debuggertracingdialog.cpp @@ -19,11 +19,11 @@ namespace GDBDebugger { expressions->setButtons(KEditListBox::Add | KEditListBox::Remove); - connect(enable, TQT_SIGNAL(stateChanged(int)), - this, TQT_SLOT(enableOrDisable(int))); + connect(enable, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(enableOrDisable(int))); - connect(enableCustomFormat, TQT_SIGNAL(stateChanged(int)), - this, TQT_SLOT(enableOrDisableCustomFormat(int))); + connect(enableCustomFormat, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(enableOrDisableCustomFormat(int))); enable->setChecked(bp_->tracingEnabled()); expressions->setItems(bp_->tracedExpressions()); diff --git a/languages/cpp/debugger/debuggertracingdialog.h b/languages/cpp/debugger/debuggertracingdialog.h index d09a6a31..fa66c7f2 100644 --- a/languages/cpp/debugger/debuggertracingdialog.h +++ b/languages/cpp/debugger/debuggertracingdialog.h @@ -22,7 +22,7 @@ namespace GDBDebugger class DebuggerTracingDialog : public DebuggerTracingDialogBase { - Q_OBJECT + TQ_OBJECT public: DebuggerTracingDialog(Breakpoint* bp, diff --git a/languages/cpp/debugger/debuggertracingdialogbase.ui b/languages/cpp/debugger/debuggertracingdialogbase.ui index b6e01791..4f42b213 100644 --- a/languages/cpp/debugger/debuggertracingdialogbase.ui +++ b/languages/cpp/debugger/debuggertracingdialogbase.ui @@ -130,9 +130,9 @@ If custom format string is not enabled, names and values of all expressions will <slot>reject()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>enableOrDisable()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/languages/cpp/debugger/disassemblewidget.h b/languages/cpp/debugger/disassemblewidget.h index 54729aa4..5b085c0a 100644 --- a/languages/cpp/debugger/disassemblewidget.h +++ b/languages/cpp/debugger/disassemblewidget.h @@ -32,7 +32,7 @@ class GDBController; class DisassembleWidget : public TQTextEdit { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/debugger/framestackwidget.cpp b/languages/cpp/debugger/framestackwidget.cpp index 423fae89..e81bf590 100644 --- a/languages/cpp/debugger/framestackwidget.cpp +++ b/languages/cpp/debugger/framestackwidget.cpp @@ -57,11 +57,11 @@ FramestackWidget::FramestackWidget(GDBController* controller, // FIXME: maybe, all debugger components should derive from // a base class that does this connect. - connect(controller, TQT_SIGNAL(event(GDBController::event_t)), - this, TQT_SLOT(slotEvent(GDBController::event_t))); + connect(controller, TQ_SIGNAL(event(GDBController::event_t)), + this, TQ_SLOT(slotEvent(GDBController::event_t))); - connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); } diff --git a/languages/cpp/debugger/framestackwidget.h b/languages/cpp/debugger/framestackwidget.h index ca79c2f6..ed570245 100644 --- a/languages/cpp/debugger/framestackwidget.h +++ b/languages/cpp/debugger/framestackwidget.h @@ -90,7 +90,7 @@ private: */ class FramestackWidget : public TQListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp index 47904817..c8064711 100644 --- a/languages/cpp/debugger/gdbbreakpointwidget.cpp +++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp @@ -145,8 +145,8 @@ void BreakpointTableRow::appendEmptyRow() ComplexEditCell* act = new ComplexEditCell(table()); table()->setItem(row, Tracing, act); - TQObject::connect(act, TQT_SIGNAL(edit(TQTableItem*)), - table()->parent(), TQT_SLOT(editTracing(TQTableItem*))); + TQObject::connect(act, TQ_SIGNAL(edit(TQTableItem*)), + table()->parent(), TQ_SLOT(editTracing(TQTableItem*))); } /***************************************************************************/ @@ -251,39 +251,39 @@ controller_(controller) m_table->show(); - connect( newBreakpoint, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotAddBlankBreakpoint(int)) ); + connect( newBreakpoint, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotAddBlankBreakpoint(int)) ); - connect( m_table, TQT_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), - this, TQT_SLOT(slotContextMenuShow(int, int, const TQPoint & )) ); - connect( m_ctxMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotContextMenuSelect(int)) ); + connect( m_table, TQ_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), + this, TQ_SLOT(slotContextMenuShow(int, int, const TQPoint & )) ); + connect( m_ctxMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotContextMenuSelect(int)) ); - connect( m_table, TQT_SIGNAL(doubleClicked(int, int, int, const TQPoint &)), - this, TQT_SLOT(slotRowDoubleClicked(int, int, int, const TQPoint &))); + connect( m_table, TQ_SIGNAL(doubleClicked(int, int, int, const TQPoint &)), + this, TQ_SLOT(slotRowDoubleClicked(int, int, int, const TQPoint &))); - connect( m_table, TQT_SIGNAL(valueChanged(int, int)), - this, TQT_SLOT(slotNewValue(int, int))); + connect( m_table, TQ_SIGNAL(valueChanged(int, int)), + this, TQ_SLOT(slotNewValue(int, int))); - connect( m_table, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(slotEditBreakpoint())); -// connect( m_table, TQT_SIGNAL(f2Pressed()), -// this, TQT_SLOT(slotEditBreakpoint())); - connect( m_table, TQT_SIGNAL(deletePressed()), - this, TQT_SLOT(slotRemoveBreakpoint())); + connect( m_table, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(slotEditBreakpoint())); +// connect( m_table, TQ_SIGNAL(f2Pressed()), +// this, TQ_SLOT(slotEditBreakpoint())); + connect( m_table, TQ_SIGNAL(deletePressed()), + this, TQ_SLOT(slotRemoveBreakpoint())); // This slot doesn't exist anymore -// connect( m_table, TQT_SIGNAL(insertPressed()), -// this, TQT_SLOT(slotAddBlankBreakpoint())); +// connect( m_table, TQ_SIGNAL(insertPressed()), +// this, TQ_SLOT(slotAddBlankBreakpoint())); // FIXME: maybe, all debugger components should derive from // a base class that does this connect. - connect(controller, TQT_SIGNAL(event(GDBController::event_t)), - this, TQT_SLOT(slotEvent(GDBController::event_t))); + connect(controller, TQ_SIGNAL(event(GDBController::event_t)), + this, TQ_SLOT(slotEvent(GDBController::event_t))); connect(controller, - TQT_SIGNAL(watchpointHit(int, const TQString&, const TQString&)), + TQ_SIGNAL(watchpointHit(int, const TQString&, const TQString&)), this, - TQT_SLOT(slotWatchpointHit(int, const TQString&, const TQString&))); + TQ_SLOT(slotWatchpointHit(int, const TQString&, const TQString&))); } /***************************************************************************/ @@ -453,8 +453,8 @@ BreakpointTableRow* GDBBreakpointWidget::addBreakpoint(Breakpoint *bp) BreakpointTableRow* btr = new BreakpointTableRow( m_table, TQTableItem::WhenCurrent, bp ); - connect(bp, TQT_SIGNAL(modified(Breakpoint*)), - this, TQT_SLOT(slotBreakpointModified(Breakpoint*))); + connect(bp, TQ_SIGNAL(modified(Breakpoint*)), + this, TQ_SLOT(slotBreakpointModified(Breakpoint*))); sendToGdb(*bp); @@ -686,7 +686,7 @@ void GDBBreakpointWidget::slotRemoveAllBreakpoints() void GDBBreakpointWidget::slotRowDoubleClicked(int row, int col, int btn, const TQPoint &) { - if ( btn == Qt::LeftButton ) + if ( btn == TQt::LeftButton ) { // kdDebug(9012) << "in slotRowSelected row=" << row << endl; BreakpointTableRow* btr = (BreakpointTableRow *) m_table->item(row, Control); @@ -1238,7 +1238,7 @@ TQWidget* ComplexEditCell::createEditor() const // than 20. b->setFixedWidth( 20 ); - connect(b, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEdit())); + connect(b, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEdit())); return box; } diff --git a/languages/cpp/debugger/gdbbreakpointwidget.h b/languages/cpp/debugger/gdbbreakpointwidget.h index c121e38e..3e3ce94d 100644 --- a/languages/cpp/debugger/gdbbreakpointwidget.h +++ b/languages/cpp/debugger/gdbbreakpointwidget.h @@ -43,7 +43,7 @@ class GDBController; class GDBBreakpointWidget : public TQHBox { - Q_OBJECT + TQ_OBJECT public: @@ -138,7 +138,7 @@ class BreakpointTableRow; */ class ComplexEditCell : public TQObject, public TQTableItem { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/debugger/gdbcommand.h b/languages/cpp/debugger/gdbcommand.h index 7000235a..946bc3aa 100644 --- a/languages/cpp/debugger/gdbcommand.h +++ b/languages/cpp/debugger/gdbcommand.h @@ -91,8 +91,8 @@ public: private: TQString command_; - TQGuardedPtr<TQT_BASE_OBJECT_NAME> handler_this; - typedef void (TQT_BASE_OBJECT_NAME::* handler_t)(const GDBMI::ResultRecord&); + TQGuardedPtr<TQObject> handler_this; + typedef void (TQObject::* handler_t)(const GDBMI::ResultRecord&); handler_t handler_method; TQValueVector<TQString> lines; bool run; @@ -153,8 +153,8 @@ public: // GDBCommand overrides bool invokeHandler(const GDBMI::ResultRecord& r); private: - TQGuardedPtr<TQT_BASE_OBJECT_NAME> cli_handler_this; - typedef void (TQT_BASE_OBJECT_NAME::* cli_handler_t)(const TQValueVector<TQString>&); + TQGuardedPtr<TQObject> cli_handler_this; + typedef void (TQObject::* cli_handler_t)(const TQValueVector<TQString>&); cli_handler_t cli_handler_method; }; @@ -165,7 +165,7 @@ private: class SentinelCommand : public GDBCommand { public: - typedef void (TQT_BASE_OBJECT_NAME::*handler_method_t)(); + typedef void (TQObject::*handler_method_t)(); template<class Handler> SentinelCommand(Handler* handler_this, @@ -186,7 +186,7 @@ public: } private: - TQGuardedPtr<TQT_BASE_OBJECT_NAME> handler_this; + TQGuardedPtr<TQObject> handler_this; handler_method_t handler_method; }; @@ -207,7 +207,7 @@ private: class ExpressionValueCommand : public TQObject, public GDBCommand { public: - typedef void (TQT_BASE_OBJECT_NAME::*handler_method_t)(const TQString&); + typedef void (TQObject::*handler_method_t)(const TQString&); template<class Handler> ExpressionValueCommand( @@ -226,7 +226,7 @@ public: } private: - TQGuardedPtr<TQT_BASE_OBJECT_NAME> handler_this; + TQGuardedPtr<TQObject> handler_this; handler_method_t handler_method; }; diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp index bca8b98d..be796329 100644 --- a/languages/cpp/debugger/gdbcontroller.cpp +++ b/languages/cpp/debugger/gdbcontroller.cpp @@ -798,17 +798,17 @@ bool GDBController::start(const TQString& shell, const DomUtil::PairList& run_en dbgProcess_ = new TDEProcess; - connect( dbgProcess_, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotDbgStdout(TDEProcess *, char *, int)) ); + connect( dbgProcess_, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotDbgStdout(TDEProcess *, char *, int)) ); - connect( dbgProcess_, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(slotDbgStderr(TDEProcess *, char *, int)) ); + connect( dbgProcess_, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(slotDbgStderr(TDEProcess *, char *, int)) ); - connect( dbgProcess_, TQT_SIGNAL(wroteStdin(TDEProcess *)), - this, TQT_SLOT(slotDbgWroteStdin(TDEProcess *)) ); + connect( dbgProcess_, TQ_SIGNAL(wroteStdin(TDEProcess *)), + this, TQ_SLOT(slotDbgWroteStdin(TDEProcess *)) ); - connect( dbgProcess_, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotDbgProcessExited(TDEProcess*)) ); + connect( dbgProcess_, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotDbgProcessExited(TDEProcess*)) ); application_ = application; @@ -1101,8 +1101,8 @@ void GDBController::slotRun() tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *kapp->config() )); if (!config_dbgTerminal_) { - connect( tty_, TQT_SIGNAL(OutOutput(const char*)), TQT_SIGNAL(ttyStdout(const char*)) ); - connect( tty_, TQT_SIGNAL(ErrOutput(const char*)), TQT_SIGNAL(ttyStderr(const char*)) ); + connect( tty_, TQ_SIGNAL(OutOutput(const char*)), TQ_SIGNAL(ttyStdout(const char*)) ); + connect( tty_, TQ_SIGNAL(ErrOutput(const char*)), TQ_SIGNAL(ttyStderr(const char*)) ); } TQString tty(tty_->getSlave()); @@ -1459,9 +1459,9 @@ void GDBController::slotDbgStdout(TDEProcess *, char *buf, int buflen) FileSymbol file; file.contents = reply; - std::auto_ptr<GDBMI::Record> r(mi_parser_.parse(&file)); + std::unique_ptr<GDBMI::Record> r(mi_parser_.parse(&file)); - if (r.get() == 0) + if (!r) { // FIXME: Issue an error! kdDebug(9012) << "Invalid MI message: " << reply << "\n"; diff --git a/languages/cpp/debugger/gdbcontroller.h b/languages/cpp/debugger/gdbcontroller.h index cf5d2eb6..f0f6389b 100644 --- a/languages/cpp/debugger/gdbcontroller.h +++ b/languages/cpp/debugger/gdbcontroller.h @@ -51,7 +51,7 @@ class STTY; class GDBController : public DbgController { - Q_OBJECT + TQ_OBJECT public: @@ -330,7 +330,7 @@ private: // After highting current line we need to do something more, // like announcing write watchpoints, and so need to have // access to the stop packet. So store it here. - std::auto_ptr<GDBMI::ResultRecord> last_stop_result; + std::unique_ptr<GDBMI::ResultRecord> last_stop_result; // Gdb 6.4 (and 6.3) does not support "character" format with MI, // so the only way it can work is via the "print" command. As gdb diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp index deabf2c8..74ce3dc1 100644 --- a/languages/cpp/debugger/gdboutputwidget.cpp +++ b/languages/cpp/debugger/gdboutputwidget.cpp @@ -78,11 +78,11 @@ GDBOutputWidget::GDBOutputWidget( TQWidget *parent, const char *name) : slotDbgStatus( "", s_dbgNotStarted); - connect( m_userGDBCmdEditor, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotGDBCmd()) ); - connect( m_Interrupt, TQT_SIGNAL(clicked()), TQT_SIGNAL(breakInto())); + connect( m_userGDBCmdEditor, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotGDBCmd()) ); + connect( m_Interrupt, TQ_SIGNAL(clicked()), TQ_SIGNAL(breakInto())); - connect( &updateTimer_, TQT_SIGNAL(timeout()), - this, TQT_SLOT(flushPending())); + connect( &updateTimer_, TQ_SIGNAL(timeout()), + this, TQ_SLOT(flushPending())); } /***************************************************************************/ @@ -325,7 +325,7 @@ TQPopupMenu* OutputText::createPopupMenu(const TQPoint&) int id = popup->insertItem(i18n("Show Internal Commands"), this, - TQT_SLOT(toggleShowInternalCommands())); + TQ_SLOT(toggleShowInternalCommands())); popup->setItemChecked(id, parent_->showInternalCommands_); popup->setWhatsThis( @@ -338,7 +338,7 @@ TQPopupMenu* OutputText::createPopupMenu(const TQPoint&) popup->insertItem(i18n("Copy All"), this, - TQT_SLOT(copyAll())); + TQ_SLOT(copyAll())); return popup; diff --git a/languages/cpp/debugger/gdboutputwidget.h b/languages/cpp/debugger/gdboutputwidget.h index e7442b31..490ab93a 100644 --- a/languages/cpp/debugger/gdboutputwidget.h +++ b/languages/cpp/debugger/gdboutputwidget.h @@ -34,7 +34,7 @@ namespace GDBDebugger class GDBOutputWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -116,7 +116,7 @@ private: */ class OutputText : public TQTextEdit { - Q_OBJECT + TQ_OBJECT public: OutputText(GDBOutputWidget* parent) diff --git a/languages/cpp/debugger/gdbtable.h b/languages/cpp/debugger/gdbtable.h index 4b6cfece..9186622c 100644 --- a/languages/cpp/debugger/gdbtable.h +++ b/languages/cpp/debugger/gdbtable.h @@ -16,7 +16,7 @@ namespace GDBDebugger { class GDBTable : public TQTable { -Q_OBJECT +TQ_OBJECT public: GDBTable(TQWidget *parent = 0, const char *name = 0); diff --git a/languages/cpp/debugger/label_with_double_click.h b/languages/cpp/debugger/label_with_double_click.h index 409c80a3..8209f15a 100644 --- a/languages/cpp/debugger/label_with_double_click.h +++ b/languages/cpp/debugger/label_with_double_click.h @@ -6,7 +6,7 @@ class LabelWithDoubleClick : public TQLabel { - Q_OBJECT + TQ_OBJECT public: LabelWithDoubleClick(const TQString& s, TQWidget* parent); diff --git a/languages/cpp/debugger/memviewdlg.cpp b/languages/cpp/debugger/memviewdlg.cpp index 616b374f..86f7e61c 100644 --- a/languages/cpp/debugger/memviewdlg.cpp +++ b/languages/cpp/debugger/memviewdlg.cpp @@ -116,11 +116,11 @@ namespace GDBDebugger l->addSpacing(2); - connect(startAddressLineEdit, TQT_SIGNAL(returnPressed()), - okButton, TQT_SLOT(animateClick())); + connect(startAddressLineEdit, TQ_SIGNAL(returnPressed()), + okButton, TQ_SLOT(animateClick())); - connect(amountLineEdit, TQT_SIGNAL(returnPressed()), - okButton, TQT_SLOT(animateClick())); + connect(amountLineEdit, TQ_SIGNAL(returnPressed()), + okButton, TQ_SLOT(animateClick())); } }; @@ -162,8 +162,8 @@ namespace GDBDebugger { ok_ = true; - connect(real_widget, TQT_SIGNAL(bufferChanged(int, int)), - this, TQT_SLOT(memoryEdited(int, int))); + connect(real_widget, TQ_SIGNAL(bufferChanged(int, int)), + this, TQ_SLOT(memoryEdited(int, int))); khexedit2_real_widget = real_widget; @@ -197,22 +197,22 @@ namespace GDBDebugger rangeSelector_ = new MemoryRangeSelector(this); l->addWidget(rangeSelector_); - connect(rangeSelector_->okButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotChangeMemoryRange())); + connect(rangeSelector_->okButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotChangeMemoryRange())); - connect(rangeSelector_->cancelButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotHideRangeDialog())); + connect(rangeSelector_->cancelButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotHideRangeDialog())); connect(rangeSelector_->startAddressLineEdit, - TQT_SIGNAL(textChanged(const TQString&)), + TQ_SIGNAL(textChanged(const TQString&)), this, - TQT_SLOT(slotEnableOrDisable())); + TQ_SLOT(slotEnableOrDisable())); connect(rangeSelector_->amountLineEdit, - TQT_SIGNAL(textChanged(const TQString&)), + TQ_SIGNAL(textChanged(const TQString&)), this, - TQT_SLOT(slotEnableOrDisable())); + TQ_SLOT(slotEnableOrDisable())); l->addWidget(khexedit2_widget); @@ -436,11 +436,11 @@ namespace GDBDebugger toolBox_->setCurrentItem(widget); memoryViews_.push_back(widget); - connect(widget, TQT_SIGNAL(captionChanged(const TQString&)), - this, TQT_SLOT(slotChildCaptionChanged(const TQString&))); + connect(widget, TQ_SIGNAL(captionChanged(const TQString&)), + this, TQ_SLOT(slotChildCaptionChanged(const TQString&))); - connect(widget, TQT_SIGNAL(destroyed(TQObject*)), - this, TQT_SLOT(slotChildDestroyed(TQObject*))); + connect(widget, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(slotChildDestroyed(TQObject*))); } void ViewerWidget::slotDebuggerState(const TQString&, int state) @@ -466,7 +466,7 @@ namespace GDBDebugger TQValueVector<MemoryView*>::iterator i, e; for(i = memoryViews_.begin(), e = memoryViews_.end(); i != e; ++i) { - if (TQT_BASE_OBJECT(*i) == TQT_BASE_OBJECT(child)) + if (*i == child) { memoryViews_.erase(i); break; diff --git a/languages/cpp/debugger/memviewdlg.h b/languages/cpp/debugger/memviewdlg.h index b277a35b..37f0b0fc 100644 --- a/languages/cpp/debugger/memviewdlg.h +++ b/languages/cpp/debugger/memviewdlg.h @@ -33,7 +33,7 @@ namespace GDBDebugger class ViewerWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ViewerWidget(GDBController* controller, @@ -64,7 +64,7 @@ namespace GDBDebugger class MemoryView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: MemoryView(GDBController* controller, diff --git a/languages/cpp/debugger/mi/miparser.cpp b/languages/cpp/debugger/mi/miparser.cpp index e078c04c..e950f2f3 100644 --- a/languages/cpp/debugger/mi/miparser.cpp +++ b/languages/cpp/debugger/mi/miparser.cpp @@ -97,7 +97,7 @@ bool MIParser::parsePrompt(Record *&record) bool MIParser::parseStreamRecord(Record *&record) { - std::auto_ptr<StreamRecord> stream(new StreamRecord); + std::unique_ptr<StreamRecord> stream(new StreamRecord); switch (lex->lookAhead()) { case '~': @@ -128,7 +128,7 @@ bool MIParser::parseResultRecord(Record *&record) TQString reason = lex->currentTokenText(); lex->nextToken(); - std::auto_ptr<ResultRecord> res(new ResultRecord); + std::unique_ptr<ResultRecord> res(new ResultRecord); res->reason = reason; if (lex->lookAhead() != ',') { @@ -151,7 +151,7 @@ bool MIParser::parseResult(Result *&result) TQString variable = lex->currentTokenText(); lex->nextToken(); - std::auto_ptr<Result> res(new Result); + std::unique_ptr<Result> res(new Result); res->variable = variable; if (lex->lookAhead() != '=') @@ -207,7 +207,7 @@ bool MIParser::parseList(Value *&value) { ADVANCE('['); - std::auto_ptr<ListValue> lst(new ListValue); + std::unique_ptr<ListValue> lst(new ListValue); // Note: can't use parseCSV here because of nested // "is this Value or Result" guessing. Too lazy to factor @@ -248,7 +248,7 @@ bool MIParser::parseList(Value *&value) bool MIParser::parseCSV(TupleValue** value, char start, char end) { - std::auto_ptr<TupleValue> tuple(new TupleValue); + std::unique_ptr<TupleValue> tuple(new TupleValue); if (!parseCSV(*tuple, start, end)) return false; diff --git a/languages/cpp/debugger/stty.cpp b/languages/cpp/debugger/stty.cpp index 6960ad6d..9d95ad0d 100644 --- a/languages/cpp/debugger/stty.cpp +++ b/languages/cpp/debugger/stty.cpp @@ -132,7 +132,7 @@ STTY::STTY(bool ext, const TQString &termAppName) if (fout >= 0) { ttySlave = TQString(tty_slave); out = new TQSocketNotifier(fout, TQSocketNotifier::Read, this); - connect( out, TQT_SIGNAL(activated(int)), this, TQT_SLOT(OutReceived(int)) ); + connect( out, TQ_SIGNAL(activated(int)), this, TQ_SLOT(OutReceived(int)) ); } } } diff --git a/languages/cpp/debugger/stty.h b/languages/cpp/debugger/stty.h index 8c4cd2a4..818cd7fa 100644 --- a/languages/cpp/debugger/stty.h +++ b/languages/cpp/debugger/stty.h @@ -35,7 +35,7 @@ namespace GDBDebugger class STTY : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp index 5750d243..e46db5dc 100644 --- a/languages/cpp/debugger/variablewidget.cpp +++ b/languages/cpp/debugger/variablewidget.cpp @@ -104,14 +104,14 @@ VariableWidget::VariableWidget(GDBController* controller, topLayout->addItem(buttons); - connect( addButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddWatchVariable()) ); - connect( evalButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEvaluateExpression()) ); + connect( addButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddWatchVariable()) ); + connect( evalButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEvaluateExpression()) ); - connect( watchVarEditor_, TQT_SIGNAL(returnPressed()), - TQT_SLOT(slotEvaluateExpression()) ); + connect( watchVarEditor_, TQ_SIGNAL(returnPressed()), + TQ_SLOT(slotEvaluateExpression()) ); - connect(controller, TQT_SIGNAL(event(GDBController::event_t)), - varTree_, TQT_SLOT(slotEvent(GDBController::event_t))); + connect(controller, TQ_SIGNAL(event(GDBController::event_t)), + varTree_, TQ_SLOT(slotEvent(GDBController::event_t))); // Setup help items. @@ -223,10 +223,10 @@ VariableTree::VariableTree(VariableWidget *parent, addColumn(i18n("Value")); // setResizeMode(AllColumns); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*)) ); - connect( this, TQT_SIGNAL(itemRenamed( TQListViewItem*, int, const TQString&)), - this, TQT_SLOT(slotItemRenamed( TQListViewItem*, int, const TQString&))); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*)) ); + connect( this, TQ_SIGNAL(itemRenamed( TQListViewItem*, int, const TQString&)), + this, TQ_SLOT(slotItemRenamed( TQListViewItem*, int, const TQString&))); } // ************************************************************************** @@ -1085,9 +1085,9 @@ VarItem::VarItem(TrimmableItem *parent, baseClassMember_(false), alive_(true) { - connect(this, TQT_SIGNAL(varobjNameChange(const TQString&, const TQString&)), + connect(this, TQ_SIGNAL(varobjNameChange(const TQString&, const TQString&)), varTree(), - TQT_SLOT(slotVarobjNameChanged(const TQString&, const TQString&))); + TQ_SLOT(slotVarobjNameChanged(const TQString&, const TQString&))); // User might have entered format together with expression: like @@ -1130,9 +1130,9 @@ VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj, baseClassMember_(baseClassMember), alive_(true) { - connect(this, TQT_SIGNAL(varobjNameChange(const TQString&, const TQString&)), + connect(this, TQ_SIGNAL(varobjNameChange(const TQString&, const TQString&)), varTree(), - TQT_SLOT(slotVarobjNameChanged(const TQString&, const TQString&))); + TQ_SLOT(slotVarobjNameChanged(const TQString&, const TQString&))); expression_ = varobj["exp"].literal(); varobjName_ = varobj["name"].literal(); diff --git a/languages/cpp/debugger/variablewidget.h b/languages/cpp/debugger/variablewidget.h index bf1116d3..902faad9 100644 --- a/languages/cpp/debugger/variablewidget.h +++ b/languages/cpp/debugger/variablewidget.h @@ -51,7 +51,7 @@ enum DataType { typeUnknown, typeValue, typePointer, typeReference, class VariableWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -85,7 +85,7 @@ private: class VariableTree : public TDEListView, public TQToolTip { - Q_OBJECT + TQ_OBJECT public: VariableTree(VariableWidget *parent, @@ -227,7 +227,7 @@ protected: class VarItem : public TQObject, public TrimmableItem { - Q_OBJECT + TQ_OBJECT public: enum format_t { natural, hexadecimal, decimal, character, binary }; diff --git a/languages/cpp/doc/cppannotations.toc b/languages/cpp/doc/cppannotations.toc index 7631c681..15cb3367 100644 --- a/languages/cpp/doc/cppannotations.toc +++ b/languages/cpp/doc/cppannotations.toc @@ -433,7 +433,6 @@ <tocsect3 name="18.3.4: Pointing to a newly allocated object" url="cplusplus18.html#l324"/> <tocsect3 name="18.3.5: Operators and members" url="cplusplus18.html#l325"/> <tocsect3 name="18.3.6: Using `unique_ptr' objects for arrays" url="cplusplus18.html#l326"/> - <tocsect3 name="18.3.7: The legacy class 'auto_ptr' (deprecated)" url="cplusplus18.html#l327"/> </tocsect2> <tocsect2 name="18.4: The class 'shared_ptr'" url="cplusplus18.html#l328"> <tocsect3 name="18.4.1: Defining `shared_ptr' objects" url="cplusplus18.html#l329"/> diff --git a/languages/cpp/doc/qt-kdev3.toc b/languages/cpp/doc/qt-kdev3.toc index ff9826cd..4675d7c2 100644 --- a/languages/cpp/doc/qt-kdev3.toc +++ b/languages/cpp/doc/qt-kdev3.toc @@ -16,7 +16,7 @@ <tocsect2 name="Designing the program" url="#Designing_the_Program"/> <tocsect2 name="Adding widgets" url="#Adding_Widgets"/> <tocsect2 name="Getting spaced out" url="#Getting_Spaced_Out"/> - <tocsect2 name="Signals and Q_SLOTS" url="#Signals_and_Slots"/> + <tocsect2 name="Signals and slots" url="#Signals_and_Slots"/> <tocsect2 name="Generating the source" url="#Generating_the_Source"/> <tocsect2 name="Implementing the slot" url="#Implementing_the_Slot"/> </tocsect1> diff --git a/languages/cpp/pcsimporter/CMakeLists.txt b/languages/cpp/pcsimporter/CMakeLists.txt index 2f904a5d..f734da91 100644 --- a/languages/cpp/pcsimporter/CMakeLists.txt +++ b/languages/cpp/pcsimporter/CMakeLists.txt @@ -12,4 +12,3 @@ add_subdirectory( qtimporter ) add_subdirectory( tdelibsimporter ) add_subdirectory( customimporter ) -add_subdirectory( qt4importer ) diff --git a/languages/cpp/pcsimporter/Makefile.am b/languages/cpp/pcsimporter/Makefile.am index 31533b36..9a7e1bb4 100644 --- a/languages/cpp/pcsimporter/Makefile.am +++ b/languages/cpp/pcsimporter/Makefile.am @@ -1,3 +1,3 @@ INCLUDES = METASOURCES = AUTO -SUBDIRS = qtimporter tdelibsimporter customimporter qt4importer +SUBDIRS = qtimporter tdelibsimporter customimporter diff --git a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h index 884a033d..83bea8c2 100644 --- a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h +++ b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h @@ -18,7 +18,7 @@ class SettingsDialog; class KDevCustomImporter : public KDevPCSImporter { -Q_OBJECT +TQ_OBJECT public: KDevCustomImporter(TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp index cdaf65b9..f08703b0 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp @@ -45,10 +45,10 @@ SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) grid->addMultiCellWidget( elb, 3, 3, 0, grid->numCols() ); - // connect( dbName_edit, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( validate() ) ); - connect( elb->addButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( validate() ) ); - connect( elb->removeButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( validate() ) ); - connect( elb, TQT_SIGNAL( added( const TQString& ) ), this, TQT_SLOT( validateDirectory( const TQString& ) ) ); + // connect( dbName_edit, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( validate() ) ); + connect( elb->addButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( validate() ) ); + connect( elb->removeButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( validate() ) ); + connect( elb, TQ_SIGNAL( added( const TQString& ) ), this, TQ_SLOT( validateDirectory( const TQString& ) ) ); } SettingsDialog::~SettingsDialog() diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.h b/languages/cpp/pcsimporter/customimporter/settingsdialog.h index 2b8e7fbd..6c9aaf2c 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialog.h +++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.h @@ -18,7 +18,7 @@ class KEditListBox; class SettingsDialog : public SettingsDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui index 7fc72d0e..5d1ff666 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui @@ -55,9 +55,9 @@ </widget> </vbox> </widget> -<Q_SIGNALS> +<signals> <signal>enabled(int)</signal> -</Q_SIGNALS> +</signals> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt b/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt deleted file mode 100644 index 509a4f16..00000000 --- a/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/languages/lib/interfaces - ${CMAKE_SOURCE_DIR}/lib/interfaces - ${TDE_INCLUDE_DIR} - ${TQT_INCLUDE_DIRS} -) - -link_directories( - ${TQT_LIBRARY_DIRS} -) - - -##### other data ################################ - -tde_create_translated_desktop( - SOURCE kdevqt4importer.desktop - DESTINATION ${SERVICES_INSTALL_DIR} - PO_DIR tdevelop-desktops -) - - -##### libkdevqt4importer (module) ############### - -tde_add_kpart( libkdevqt4importer AUTOMOC - SOURCES - kdevqt4importer.cpp settingsdialogbase.ui - settingsdialog.cpp - LINK lang_interfaces-shared tdevelop-shared - DESTINATION ${PLUGIN_INSTALL_DIR} -) diff --git a/languages/cpp/pcsimporter/qt4importer/Makefile.am b/languages/cpp/pcsimporter/qt4importer/Makefile.am deleted file mode 100644 index 12f12104..00000000 --- a/languages/cpp/pcsimporter/qt4importer/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -INCLUDES = -I$(top_srcdir)/languages/lib/interfaces \ - -I$(top_srcdir)/lib/interfaces $(all_includes) -METASOURCES = AUTO -kde_module_LTLIBRARIES = libkdevqt4importer.la - -noinst_HEADERS = kdevqt4importer.h settingsdialog.h -libkdevqt4importer_la_SOURCES = kdevqt4importer.cpp settingsdialogbase.ui settingsdialog.cpp -kde_services_DATA = kdevqt4importer.desktop -libkdevqt4importer_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/languages/lib/interfaces/liblang_interfaces.la -libkdevqt4importer_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp deleted file mode 100644 index 0289c7a4..00000000 --- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp +++ /dev/null @@ -1,107 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2003 by Roberto Raggi * - * roberto@kdevelop.org * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#include "kdevqt4importer.h" -#include "kdevqt4importer.moc" -#include "settingsdialog.h" - -#include <kgenericfactory.h> -#include <tdetempfile.h> -#include <kprocess.h> -#include <kdebug.h> - -#include <tqtextstream.h> -#include <tqlabel.h> -#include <tqdir.h> - -K_EXPORT_COMPONENT_FACTORY( libkdevqt4importer, KGenericFactory<KDevQt4Importer>( "kdevqt4importer" ) ) - -KDevQt4Importer::KDevQt4Importer( TQObject * parent, const char * name, const TQStringList& ) - : KDevPCSImporter( parent, name ) -{ - m_qtfile = 0; -} - -KDevQt4Importer::~KDevQt4Importer() -{ - if (m_qtfile) - delete m_qtfile; - - m_qtfile = 0; -} - -TQStringList KDevQt4Importer::fileList() -{ - if( !m_settings ) - return TQStringList(); - - if (m_qtfile) - delete m_qtfile; - - KTempFile ifile; - TQTextStream &is = *ifile.textStream(); - - is << "#include <TQtCore/tqobjectdefs.h>\n" - << "#undef slots\n#undef signals\n#undef slots\n#undef signals" - << "#define slots slots\n" - << "#define signals signals\n" - << "#include <TQtCore/TQtCore>\n" - << "#include <TQtGui/TQtGui>\n" - << "#include <TQtNetwork/TQtNetwork>\n" - << "#include <TQtXml/TQtXml>\n" - << "#include <TQt3Support/TQt3Support>\n" - << "#include <TQtSql/TQtSql>\n" - << "#include <TQtTest/TQtTest>\n" - << "#include <TQtOpenGL/TQtOpenGL>\n"; - - - - TDEProcess proc; - proc << "cpp" << "-nostdinc" << "-xc++"; - - m_qtfile = new KTempFile(); - - // include paths - TQStringList paths = includePaths(); - for (TQStringList::Iterator it = paths.begin(); it != paths.end(); ++it) - proc << "-I" << *it; - - ifile.close(); - - TQString o; - o += "-o"; - o += m_qtfile->name(); - - proc << ifile.name() << o; - proc.start(TDEProcess::Block); - - return m_qtfile->name(); -} - -TQStringList KDevQt4Importer::includePaths() -{ - if( !m_settings || !m_qtfile) - return TQStringList(); - - TQStringList includePaths; - includePaths.push_back( m_settings->qtDir() ); - includePaths.push_back( m_settings->qtDir() + "/TQt" ); - - /// @todo add mkspec - return includePaths; -} - -TQWidget * KDevQt4Importer::createSettingsPage( TQWidget * parent, const char * name ) -{ - m_settings = new SettingsDialog( parent, name ); - return m_settings; -} - diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop deleted file mode 100644 index cd7697ee..00000000 --- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=KDevQt4Importer - -Comment=TDevelop Qt4 PCS Importer - -Type=Service -Icon=gear -X-TDE-ServiceTypes=TDevelop/PCSImporter -X-TDE-Library=libkdevqt4importer -X-TDevelop-PCSImporter= -X-TDevelop-Version=5 diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h deleted file mode 100644 index 3b9563f3..00000000 --- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h +++ /dev/null @@ -1,40 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2003 by Roberto Raggi * - * roberto@kdevelop.org * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#ifndef KDEVTQTIMPORTER_H -#define KDEVTQTIMPORTER_H - -#include <kdevpcsimporter.h> -#include <tqguardedptr.h> - -class SettingsDialog; -class KTempFile; - -class KDevQt4Importer : public KDevPCSImporter -{ - Q_OBJECT - -public: - KDevQt4Importer( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); - virtual ~KDevQt4Importer(); - - virtual TQString dbName() const { return TQString::fromLatin1("TQt4"); } - virtual TQStringList fileList(); - virtual TQStringList includePaths(); - - virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 ); - -private: - TQGuardedPtr<SettingsDialog> m_settings; - KTempFile *m_qtfile; -}; - -#endif diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp deleted file mode 100644 index 22c5b666..00000000 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp +++ /dev/null @@ -1,112 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2003 by Roberto Raggi * - * roberto@kdevelop.org * - * * - * Copyright (C) 2006 by Jens Dagerbo * - * jens.dagerbo@swipnet.se * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#include <tdelistbox.h> -#include <kcombobox.h> -#include <kurlrequester.h> -#include <kdebug.h> -#include <klineedit.h> -#include <tdemessagebox.h> -#include <tdelocale.h> - -#include <tqfile.h> -#include <tqdir.h> -#include <tqregexp.h> -#include <cstdlib> - -#include "settingsdialog.h" - -TQListBoxItem* TQListBox_selectedItem(TQListBox* cpTQListBox) -{ - if ( cpTQListBox->selectionMode() != TQListBox::Single ) - return 0; - if ( cpTQListBox->isSelected( cpTQListBox->currentItem() ) ) - return cpTQListBox->item(cpTQListBox->currentItem()); - return 0; -} - -SettingsDialog::SettingsDialog(TQWidget* parent, const char* name, WFlags fl) - : SettingsDialogBase(parent,name,fl) -{ - TQStringList qtdirs; - qtdirs.push_back( ::getenv("TQTDIR") + TQString("/include") ); - qtdirs.push_back( TQString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt/include" ); - qtdirs.push_back( TQString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt-main/include" ); - qtdirs.push_back( "/usr/qt/4/include" ); - - for( TQStringList::Iterator it=qtdirs.begin(); it!=qtdirs.end(); ++it ) - { - TQString qtdir = *it; - if( !qtdir.isEmpty() && isValidTQtDir(qtdir) ) - if (!qtListBox->findItem(qtdir, ExactMatch)) - qtListBox->insertItem( qtdir ); - } - - qtUrl->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); - - connect( addUrlButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addUrlButton_clicked()) ); -} - -SettingsDialog::~SettingsDialog() -{ -} - -void SettingsDialog::slotSelectionChanged(TQListBoxItem* item) -{ - if( !qtListBox->selectedItem() ) - { - emit enabled( false ); - return; - } - - - emit enabled( true ); -} - -bool SettingsDialog::isValidTQtDir( const TQString & path ) const -{ - return TQFile::exists( path + "/TQtCore/TQtCore" ); -} - -TQString SettingsDialog::qtDir( ) const -{ - return qtListBox->currentText(); -} - -TQString SettingsDialog::configuration( ) const -{ - return ""; -} - -void SettingsDialog::addUrlButton_clicked( ) -{ - kdDebug(9000) << k_funcinfo << endl; - - if ( isValidTQtDir( qtUrl->url() ) ) - { - qtListBox->insertItem( qtUrl->url() ); - if ( TQListBoxItem * item = qtListBox->findItem( qtUrl->url(), ExactMatch ) ) - { - qtListBox->setSelected( item, true ); - } - qtUrl->lineEdit()->clear(); - } - else - { - KMessageBox::error( this, i18n("This does not appear to be a valid TQt4 include directory.\nPlease select a different directory."), i18n("Invalid Directory") ); - } -} - - -#include "settingsdialog.moc" diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.h b/languages/cpp/pcsimporter/qt4importer/settingsdialog.h deleted file mode 100644 index 32065973..00000000 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.h +++ /dev/null @@ -1,47 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2003 by Roberto Raggi * - * roberto@kdevelop.org * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#ifndef SETTINGSDIALOG_H -#define SETTINGSDIALOG_H - -#include "settingsdialogbase.h" - -class SettingsDialog : public SettingsDialogBase -{ - Q_OBJECT - - -public: - SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); - ~SettingsDialog(); - /*$PUBLIC_FUNCTIONS$*/ - - bool isValidTQtDir( const TQString& path ) const; - - TQString qtDir() const; - TQString configuration() const; - -public slots: - /*$PUBLIC_SLOTS$*/ - virtual void slotSelectionChanged(TQListBoxItem*); - -protected: - /*$PROTECTED_FUNCTIONS$*/ - -protected slots: - /*$PROTECTED_SLOTS$*/ - void addUrlButton_clicked(); - -}; - -#endif - - diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui b/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui deleted file mode 100644 index b0a48d2a..00000000 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui +++ /dev/null @@ -1,80 +0,0 @@ -<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> -<class>SettingsDialogBase</class> -<widget class="TQWidget"> - <property name="name"> - <cstring>SettingsDialogBase</cstring> - </property> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>346</width> - <height>275</height> - </rect> - </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> - <property name="name"> - <cstring>textLabel1_2</cstring> - </property> - <property name="text"> - <string>Qt4 include directories: -Only the selected entry will be used</string> - </property> - </widget> - <widget class="TQPushButton" row="2" column="1"> - <property name="name"> - <cstring>addUrlButton</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>0</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>&Add</string> - </property> - </widget> - <widget class="KURLRequester" row="2" column="0"> - <property name="name"> - <cstring>qtUrl</cstring> - </property> - </widget> - <widget class="TDEListBox" row="1" column="0" rowspan="1" colspan="2"> - <property name="name"> - <cstring>qtListBox</cstring> - </property> - </widget> - </grid> -</widget> -<customwidgets> -</customwidgets> -<connections> - <connection> - <sender>qtListBox</sender> - <signal>selectionChanged(TQListBoxItem*)</signal> - <receiver>SettingsDialogBase</receiver> - <slot>slotSelectionChanged(TQListBoxItem*)</slot> - </connection> -</connections> -<forwards> - <forward>class TQListBoxItem;</forward> -</forwards> -<Q_SIGNALS> - <signal>enabled(int)</signal> -</Q_SIGNALS> -<Q_SLOTS> - <slot>slotSelectionChanged(TQListBoxItem*)</slot> -</Q_SLOTS> -<layoutdefaults spacing="6" margin="11"/> -<includes> - <include location="global" impldecl="in implementation">kurlrequester.h</include> - <include location="global" impldecl="in implementation">tdelistbox.h</include> -</includes> -</UI> diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h index bad9973e..23c511da 100644 --- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h +++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h @@ -19,7 +19,7 @@ class SettingsDialog; class KDevQtImporter : public KDevPCSImporter { - Q_OBJECT + TQ_OBJECT public: KDevQtImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp index 2993c789..b79e4b17 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp @@ -56,7 +56,7 @@ SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) qtUrl->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); - connect( addUrlButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addUrlButton_clicked()) ); + connect( addUrlButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addUrlButton_clicked()) ); } SettingsDialog::~SettingsDialog() diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.h b/languages/cpp/pcsimporter/qtimporter/settingsdialog.h index 32065973..796adf72 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.h +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.h @@ -16,7 +16,7 @@ class SettingsDialog : public SettingsDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui index efba8920..af41060e 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui @@ -125,12 +125,12 @@ Only the selected entry will be used</string> <forwards> <forward>class TQListBoxItem;</forward> </forwards> -<Q_SIGNALS> +<signals> <signal>enabled(int)</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>slotSelectionChanged(TQListBoxItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h index 14fb7cff..1e79cc12 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h +++ b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h @@ -19,7 +19,7 @@ class SettingsDialog; class KDevKDELibsImporter : public KDevPCSImporter { - Q_OBJECT + TQ_OBJECT public: KDevKDELibsImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp index 631d50d0..0c2ea291 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp @@ -53,7 +53,7 @@ SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) kdeUrl->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); - connect( addUrlButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addUrlButton_clicked()) ); + connect( addUrlButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addUrlButton_clicked()) ); } SettingsDialog::~SettingsDialog() diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.h b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.h index adcd182a..5893903d 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.h +++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.h @@ -16,7 +16,7 @@ class SettingsDialog : public SettingsDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui index 8ac0d2db..7253be6d 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui @@ -118,12 +118,12 @@ Only the selected entry will be used</string> <forwards> <forward>class TQListBoxItem;</forward> </forwards> -<Q_SIGNALS> +<signals> <signal>enabled(int)</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>slotSelectionChanged(TQListBoxItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kurlrequester.h</include> diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp index 49cb66f7..34a7fd9e 100644 --- a/languages/cpp/problemreporter.cpp +++ b/languages/cpp/problemreporter.cpp @@ -96,7 +96,7 @@ m_markIface( 0 ) "<tt>//FIXME fix this</tt>")); m_initCurrentTimer = new TQTimer( this ); - connect( m_initCurrentTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(initCurrentList()) ); + connect( m_initCurrentTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(initCurrentList()) ); m_gridLayout = new TQGridLayout(this,2,3); m_errorList = new TDEListView(this); @@ -145,16 +145,16 @@ m_markIface( 0 ) m_gridLayout->addWidget(m_filterLabel,0,1,TQt::AlignRight); m_gridLayout->addWidget(m_filterEdit,0,2,TQt::AlignLeft); - connect( m_filterEdit, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(slotFilter()) ); - connect( m_filterEdit, TQT_SIGNAL(textChanged( const TQString & )), - this, TQT_SLOT(slotFilter()) ); - connect( m_tabBar, TQT_SIGNAL(selected(int)), - this, TQT_SLOT(slotTabSelected(int)) ); - connect( part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); - connect( part->partController(), TQT_SIGNAL(partAdded(KParts::Part*)), - this, TQT_SLOT(slotPartAdded(KParts::Part*)) ); + connect( m_filterEdit, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(slotFilter()) ); + connect( m_filterEdit, TQ_SIGNAL(textChanged( const TQString & )), + this, TQ_SLOT(slotFilter()) ); + connect( m_tabBar, TQ_SIGNAL(selected(int)), + this, TQ_SLOT(slotTabSelected(int)) ); + connect( part->partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(partAdded(KParts::Part*)), + this, TQ_SLOT(slotPartAdded(KParts::Part*)) ); // any editors that were open when we loaded the project needs to have their markType07 icon set too.. TQPtrListIterator<KParts::Part> it( *m_cppSupport->partController()->parts() ); @@ -225,11 +225,11 @@ void ProblemReporter::InitListView(TDEListView* listview) listview->addColumn( i18n("Problem") ); listview->setAllColumnsShowFocus( TRUE ); - connect( listview, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem*)) ); + connect( listview, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem*)) ); - connect( listview, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem* )) ); + connect( listview, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem* )) ); } diff --git a/languages/cpp/problemreporter.h b/languages/cpp/problemreporter.h index 66bf9c62..01a14192 100644 --- a/languages/cpp/problemreporter.h +++ b/languages/cpp/problemreporter.h @@ -104,7 +104,7 @@ namespace KTextEditor class ProblemReporter: public TQWidget { - Q_OBJECT + TQ_OBJECT public: ProblemReporter( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0 ); diff --git a/languages/cpp/qtbuildconfig.h b/languages/cpp/qtbuildconfig.h index 6bbd71ef..e357a38f 100644 --- a/languages/cpp/qtbuildconfig.h +++ b/languages/cpp/qtbuildconfig.h @@ -31,7 +31,7 @@ class TQDomDocument; */ class QtBuildConfig : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/subclassing_template/CMakeLists.txt b/languages/cpp/subclassing_template/CMakeLists.txt index 3223a7d7..4da5b172 100644 --- a/languages/cpp/subclassing_template/CMakeLists.txt +++ b/languages/cpp/subclassing_template/CMakeLists.txt @@ -11,5 +11,4 @@ install( FILES subclass_template.h subclass_template.cpp - subclass_qt4_template.h subclass_qt4_template.cpp DESTINATION ${DATA_INSTALL_DIR}/kdevcppsupport/subclassing ) diff --git a/languages/cpp/subclassing_template/Makefile.am b/languages/cpp/subclassing_template/Makefile.am index 4e722ca0..6ce03476 100644 --- a/languages/cpp/subclassing_template/Makefile.am +++ b/languages/cpp/subclassing_template/Makefile.am @@ -1,5 +1,4 @@ cppsupportdatadir = ${kde_datadir}/kdevcppsupport subclassingdir = ${cppsupportdatadir}/subclassing -subclassing_DATA = subclass_template.h subclass_template.cpp \ - subclass_qt4_template.h subclass_qt4_template.cpp +subclassing_DATA = subclass_template.h subclass_template.cpp diff --git a/languages/cpp/subclassing_template/subclass_qt4_template.cpp b/languages/cpp/subclassing_template/subclass_qt4_template.cpp deleted file mode 100644 index 4531fa69..00000000 --- a/languages/cpp/subclassing_template/subclass_qt4_template.cpp +++ /dev/null @@ -1,16 +0,0 @@ - - -#include "$NEWFILENAMELC$.h" - -$NEWCLASS$::$NEWCLASS$(TQWidget* parent, TQt::WFlags fl) -: $TQTBASECLASS$( parent, fl ), Ui::$BASECLASS$() -{ - setupUi(this); -} - -$NEWCLASS$::~$NEWCLASS$() -{ -} - -/*$SPECIALIZATION$*/ - diff --git a/languages/cpp/subclassing_template/subclass_qt4_template.h b/languages/cpp/subclassing_template/subclass_qt4_template.h deleted file mode 100644 index 62751c32..00000000 --- a/languages/cpp/subclassing_template/subclass_qt4_template.h +++ /dev/null @@ -1,29 +0,0 @@ - -#ifndef $NEWFILENAMEUC$_H -#define $NEWFILENAMEUC$_H - -#include <$TQTBASECLASS$> -#include "ui_$BASEFILENAME$.h" - -class $NEWCLASS$ : public $TQTBASECLASS$, private Ui::$BASECLASS$ -{ - Q_OBJECT - - -public: - $NEWCLASS$(TQWidget* parent = 0, TQt::WFlags fl = 0 ); - ~$NEWCLASS$(); - /*$PUBLIC_FUNCTIONS$*/ - -public slots: - /*$PUBLIC_SLOTS$*/ - -protected: - /*$PROTECTED_FUNCTIONS$*/ - -protected slots: - /*$PROTECTED_SLOTS$*/ - -}; - -#endif diff --git a/languages/cpp/subclassing_template/subclass_template.h b/languages/cpp/subclassing_template/subclass_template.h index 25bcf98c..5b68d851 100644 --- a/languages/cpp/subclassing_template/subclass_template.h +++ b/languages/cpp/subclassing_template/subclass_template.h @@ -6,7 +6,7 @@ class $NEWCLASS$ : public $BASECLASS$ { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp index 48bc3f91..96ec6385 100644 --- a/languages/cpp/subclassingdlg.cpp +++ b/languages/cpp/subclassingdlg.cpp @@ -191,13 +191,13 @@ void SubclassingDlg::readUiFile() // Special widget specific slots SlotItem *newSlot; - m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class",TQDIALOG_OBJECT_NAME_STRING); + m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class","TQDialog"); - if ( (m_qtBaseClassName==TQMAINWINDOW_OBJECT_NAME_STRING) || (m_qtBaseClassName==TQWIDGET_OBJECT_NAME_STRING) ) + if ( (m_qtBaseClassName=="TQMainWindow") || (m_qtBaseClassName=="TQWidget") ) m_canBeModal = false; else m_canBeModal = true; - if (m_qtBaseClassName != TQWIDGET_OBJECT_NAME_STRING) + if (m_qtBaseClassName != "TQWidget") { newSlot = new SLOT_ACCEPT; newSlot->setOn(false); @@ -214,7 +214,7 @@ void SubclassingDlg::readUiFile() m_slots << newSlot; } - if (m_qtBaseClassName == TQWIZARD_OBJECT_NAME_STRING) + if (m_qtBaseClassName == "TQWizard") { newSlot = new SLOT_NEXT; m_slotView->insertItem(newSlot); @@ -369,10 +369,7 @@ void SubclassingDlg::accept() int qtVersion = DomUtil::readIntEntry( *m_cppSupport->project()->projectDom(), "/kdevcppsupport/qt/version", 3 ); if (m_creatingNewSubclass) { - if ( qtVersion == 3 ) - loadBuffer(buffer,::locate("data", "kdevcppsupport/subclassing/subclass_template.h")); - else - loadBuffer(buffer,::locate("data", "kdevcppsupport/subclassing/subclass_qt4_template.h")); + loadBuffer(buffer,::locate("data", "kdevcppsupport/subclassing/subclass_template.h")); buffer = FileTemplate::read(m_cppSupport, "h") + buffer; TQFileInfo fi(m_filename + ".h"); @@ -464,10 +461,7 @@ void SubclassingDlg::accept() if (m_creatingNewSubclass) { - if ( qtVersion == 3 ) - loadBuffer(buffer,::locate("data", "kdevcppsupport/subclassing/subclass_template.cpp")); - else - loadBuffer(buffer,::locate("data", "kdevcppsupport/subclassing/subclass_qt4_template.cpp")); + loadBuffer(buffer,::locate("data", "kdevcppsupport/subclassing/subclass_template.cpp")); buffer = FileTemplate::read(m_cppSupport, "cpp") + buffer; TQFileInfo fi(m_filename + ".cpp"); diff --git a/languages/cpp/subclassingdlgbase.ui b/languages/cpp/subclassingdlgbase.ui index 67dcd97f..1b41e69e 100644 --- a/languages/cpp/subclassingdlgbase.ui +++ b/languages/cpp/subclassingdlgbase.ui @@ -233,9 +233,9 @@ <slot>onChangedClassName()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>onChangedClassName()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/cpp/tqtdesignercppintegration.cpp b/languages/cpp/tqtdesignercppintegration.cpp index 6132f758..10472ad8 100644 --- a/languages/cpp/tqtdesignercppintegration.cpp +++ b/languages/cpp/tqtdesignercppintegration.cpp @@ -68,7 +68,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function int funEndLine, funEndColumn; ( *it ) ->getEndPosition( &funEndLine, &funEndColumn ); TQString access = accessID( *it ); - TQPair<int, int> funEndPoint = tqMakePair( funEndLine, funEndColumn ); + TQPair<int, int> funEndPoint = qMakePair( funEndLine, funEndColumn ); if ( !points.contains( access ) || points[ access ] < funEndPoint ) { @@ -98,7 +98,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function else { str.prepend( access + ":\n" ); - points[ access ] = tqMakePair( line - 1, 0 ); + points[ access ] = qMakePair( line - 1, 0 ); pt = points[ access ]; // end of class declaration } diff --git a/languages/cpp/tqtdesignercppintegration.h b/languages/cpp/tqtdesignercppintegration.h index ada0321a..be92a995 100644 --- a/languages/cpp/tqtdesignercppintegration.h +++ b/languages/cpp/tqtdesignercppintegration.h @@ -24,7 +24,7 @@ class QtDesignerCppIntegration : public QtDesignerIntegration { - Q_OBJECT + TQ_OBJECT public: QtDesignerCppIntegration( KDevLanguageSupport *part, ImplementationWidget *impl ); diff --git a/languages/csharp/csharpconfigwidget.h b/languages/csharp/csharpconfigwidget.h index d5a348c4..e0a0894e 100644 --- a/languages/csharp/csharpconfigwidget.h +++ b/languages/csharp/csharpconfigwidget.h @@ -18,7 +18,7 @@ class CSharpConfigWidget : public CSharpConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp index 8ecb44eb..a2684118 100644 --- a/languages/csharp/csharpsupportpart.cpp +++ b/languages/csharp/csharpsupportpart.cpp @@ -55,35 +55,35 @@ CSharpSupportPart::CSharpSupportPart(TQObject *parent, const char *name, const T setXMLFile("kdevcsharpsupport.rc"); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), - this, TQT_SLOT(savedFile(const KURL&)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), + this, TQ_SLOT(savedFile(const KURL&)) ); TDEAction *action; action = new TDEAction( i18n("Execute Main Program"), "application-x-executable", 0, - this, TQT_SLOT(slotExecute()), + this, TQ_SLOT(slotExecute()), actionCollection(), "build_exec" ); action->setToolTip( i18n("Runs the CSharp program") ); action = new TDEAction( i18n("Execute String..."), "application-x-executable", 0, - this, TQT_SLOT(slotExecuteString()), + this, TQ_SLOT(slotExecuteString()), actionCollection(), "build_execstring" ); action->setToolTip( i18n("Executes a string as CSharp code") ); action = new TDEAction( i18n("Start CSharp Interpreter"), "application-x-executable", 0, - this, TQT_SLOT(slotStartInterpreter()), + this, TQ_SLOT(slotStartInterpreter()), actionCollection(), "build_runinterpreter" ); action->setToolTip( i18n("Starts the CSharp interpreter without a program") ); action = new TDEAction( i18n("Find CSharp Function Documentation..."), 0, - this, TQT_SLOT(slotCSharpdocFunction()), + this, TQ_SLOT(slotCSharpdocFunction()), actionCollection(), "help_csharpdocfunction" ); action->setToolTip( i18n("Show the documentation page of a CSharp function") ); action = new TDEAction( i18n("Find CSharp FAQ Entry..."), 0, - this, TQT_SLOT(slotCSharpdocFAQ()), + this, TQ_SLOT(slotCSharpdocFAQ()), actionCollection(), "help_csharpdocfaq" ); action->setToolTip( i18n("Show the FAQ entry for a keyword") ); @@ -106,14 +106,14 @@ void CSharpSupportPart::projectOpened() { kdDebug(9007) << "projectOpened()" << endl; - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), - this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), - this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQ_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQ_SLOT(removedFilesFromProject(const TQStringList &)) ); // We want to parse only after all components have been // procsharpy initialized - TQTimer::singleShot(0, this, TQT_SLOT(initialParse())); + TQTimer::singleShot(0, this, TQ_SLOT(initialParse())); } diff --git a/languages/csharp/csharpsupportpart.h b/languages/csharp/csharpsupportpart.h index 18e5a663..1ecc6c36 100644 --- a/languages/csharp/csharpsupportpart.h +++ b/languages/csharp/csharpsupportpart.h @@ -18,7 +18,7 @@ class CSharpSupportPart : public KDevLanguageSupport { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/fortran/compiler/pgioptions/pgioptionsfactory.h b/languages/fortran/compiler/pgioptions/pgioptionsfactory.h index 09340c6c..435b8daa 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsfactory.h +++ b/languages/fortran/compiler/pgioptions/pgioptionsfactory.h @@ -17,7 +17,7 @@ class PgiOptionsFactory : public KLibFactory { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/fortran/compiler/pgioptions/pgioptionsplugin.h b/languages/fortran/compiler/pgioptions/pgioptionsplugin.h index d5d80892..5d0a2722 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsplugin.h +++ b/languages/fortran/compiler/pgioptions/pgioptionsplugin.h @@ -23,7 +23,7 @@ class HpfTab; class PgiOptionsPlugin : public KDevCompilerOptions { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp index 170ff230..c9e44ff4 100644 --- a/languages/fortran/fortransupportpart.cpp +++ b/languages/fortran/fortransupportpart.cpp @@ -55,17 +55,17 @@ FortranSupportPart::FortranSupportPart(TQObject *parent, const char *name, const setXMLFile("kdevfortransupport.rc"); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), - this, TQT_SLOT(savedFile(const KURL&)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), + this, TQ_SLOT(savedFile(const KURL&)) ); TDEAction *action; action = new TDEAction( i18n("&Ftnchek"), 0, - this, TQT_SLOT(slotFtnchek()), + this, TQ_SLOT(slotFtnchek()), actionCollection(), "project_ftnchek" ); action->setToolTip(i18n("Run ftnchek")); action->setWhatsThis(i18n("<b>Run ftnchek</b><p>Runs <b>ftnchek</b> to check fortran programs for semantic errors. Configure ftnchek options in project settings dialog, <b>Ftnchek</b> tab.")); @@ -159,7 +159,7 @@ void FortranSupportPart::projectConfigWidget(KDialogBase *dlg) { TQVBox *vbox = dlg->addVBoxPage(i18n("Ftnchek"), i18n("Ftnchek"), BarIcon("tdevelop", TDEIcon::SizeMedium)); FtnchekConfigWidget *w = new FtnchekConfigWidget(*projectDom(), vbox, "ftnchek config widget"); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } @@ -167,16 +167,16 @@ void FortranSupportPart::projectOpened() { kdDebug(9019) << "projectOpened()" << endl; - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), - this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), - this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQ_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQ_SLOT(removedFilesFromProject(const TQStringList &)) ); // We want to parse only after all components have been // properly initialized parser = new FixedFormParser(codeModel()); - TQTimer::singleShot(0, this, TQT_SLOT(initialParse())); + TQTimer::singleShot(0, this, TQ_SLOT(initialParse())); } diff --git a/languages/fortran/fortransupportpart.h b/languages/fortran/fortransupportpart.h index 7ed0f122..07d30021 100644 --- a/languages/fortran/fortransupportpart.h +++ b/languages/fortran/fortransupportpart.h @@ -22,7 +22,7 @@ class KDevMakeFrontend; class FortranSupportPart : public KDevLanguageSupport { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/fortran/ftnchekconfigwidget.h b/languages/fortran/ftnchekconfigwidget.h index 492dfa94..30568db2 100644 --- a/languages/fortran/ftnchekconfigwidget.h +++ b/languages/fortran/ftnchekconfigwidget.h @@ -19,7 +19,7 @@ class TQButtonGroup; class FtnchekConfigWidget : public FtnchekConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/java/KDevJavaSupportIface.h b/languages/java/KDevJavaSupportIface.h index d0c4d441..d9653bb8 100644 --- a/languages/java/KDevJavaSupportIface.h +++ b/languages/java/KDevJavaSupportIface.h @@ -9,7 +9,7 @@ class JavaSupportPart; class KDevJavaSupportIface : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP public: diff --git a/languages/java/app_templates/kappjava/app.java b/languages/java/app_templates/kappjava/app.java index 40bc6b93..50f3bff1 100644 --- a/languages/java/app_templates/kappjava/app.java +++ b/languages/java/app_templates/kappjava/app.java @@ -43,10 +43,10 @@ public class %{APPNAME} extends TDEMainWindow setupGUI(); // allow the view to change the statusbar and caption - connect(m_view, SIGNAL("signalChangeStatusbar(String)"), - this, SLOT("changeStatusbar(String)")); - connect(m_view, SIGNAL("signalChangeCaption(String)"), - this, SLOT("changeCaption(String)")); + connect(m_view, TQ_SIGNAL("signalChangeStatusbar(String)"), + this, TQ_SLOT("changeStatusbar(String)")); + connect(m_view, TQ_SIGNAL("signalChangeCaption(String)"), + this, TQ_SLOT("changeCaption(String)")); } @@ -77,19 +77,19 @@ public void load(KURL url) public void setupActions() { TDEApplication kapp = TDEApplication.kApplication(); - KStdAction.openNew(this, SLOT("fileNew()"), actionCollection()); - KStdAction.open(this, SLOT("fileOpen()"), actionCollection()); - KStdAction.save(this, SLOT("fileSave()"), actionCollection()); - KStdAction.saveAs(this, SLOT("fileSaveAs()"), actionCollection()); - KStdAction.print(this, SLOT("filePrint()"), actionCollection()); - KStdAction.quit(kapp, SLOT("quit()"), actionCollection()); + KStdAction.openNew(this, TQ_SLOT("fileNew()"), actionCollection()); + KStdAction.open(this, TQ_SLOT("fileOpen()"), actionCollection()); + KStdAction.save(this, TQ_SLOT("fileSave()"), actionCollection()); + KStdAction.saveAs(this, TQ_SLOT("fileSaveAs()"), actionCollection()); + KStdAction.print(this, TQ_SLOT("filePrint()"), actionCollection()); + KStdAction.quit(kapp, TQ_SLOT("quit()"), actionCollection()); - KStdAction.preferences(this, SLOT("optionsPreferences()"), actionCollection()); + KStdAction.preferences(this, TQ_SLOT("optionsPreferences()"), actionCollection()); // this doesn't do anything useful. it's just here to illustrate // how to insert a custom menu and menu item TDEAction custom = new TDEAction(tr("Cus&tom Menuitem"), new TDEShortcut(), - this, SLOT("optionsPreferences()"), + this, TQ_SLOT("optionsPreferences()"), actionCollection(), "custom_action"); } diff --git a/languages/java/app_templates/kappjava/app_client.java b/languages/java/app_templates/kappjava/app_client.java index 9648cfad..ab327d4c 100644 --- a/languages/java/app_templates/kappjava/app_client.java +++ b/languages/java/app_templates/kappjava/app_client.java @@ -19,10 +19,10 @@ int main(int argc, char **argv) QByteArray data; QDataStream ds(data, IO_WriteOnly); if (argc > 1) - ds << QString(argv[1]); + ds << TQString(argv[1]); else - ds << QString("http://www.kde.org"); - client->send("%{APPNAMELC}", "%{APPNAME}Iface", "openURL(QString)", data); + ds << TQString("http://www.kde.org"); + client->send("%{APPNAMELC}", "%{APPNAME}Iface", "openURL(TQString)", data); return app.exec(); } diff --git a/languages/java/app_templates/kappjava/appview.java b/languages/java/app_templates/kappjava/appview.java index 347ff58f..4a1e9f84 100644 --- a/languages/java/app_templates/kappjava/appview.java +++ b/languages/java/app_templates/kappjava/appview.java @@ -17,12 +17,12 @@ import org.kde.koala.*; * @author %{AUTHOR} <%{EMAIL}> * @version %{VERSION} */ -public class %{APPNAME}View extends QWidget +public class %{APPNAME}View extends TQWidget { QHBoxLayout top_layout; -public %{APPNAME}View(QWidget parent) +public %{APPNAME}View(TQWidget parent) { super(parent, null); // setup our layout manager to automatically add our widgets @@ -71,10 +71,10 @@ public %{APPNAME}View(QWidget parent) return; } - connect(m_html, SIGNAL("setWindowCaption(String)"), - this, SLOT("slotSetTitle(String)")); - connect(m_html, SIGNAL("setStatusBarText(String)"), - this, SLOT("slotOnURL(String)")); + connect(m_html, TQ_SIGNAL("setWindowCaption(String)"), + this, TQ_SLOT("slotSetTitle(String)")); + connect(m_html, TQ_SIGNAL("setStatusBarText(String)"), + this, TQ_SLOT("slotOnURL(String)")); } diff --git a/languages/java/app_templates/kappjava/pref.java b/languages/java/app_templates/kappjava/pref.java index a50fdb31..90e8e533 100644 --- a/languages/java/app_templates/kappjava/pref.java +++ b/languages/java/app_templates/kappjava/pref.java @@ -28,7 +28,7 @@ public %{APPNAME}Preferences() } public class %{APPNAME}PrefPageOne extends QFrame { -public %{APPNAME}PrefPageOne(QWidget parent) +public %{APPNAME}PrefPageOne(TQWidget parent) { super(parent); QHBoxLayout layout = new QHBoxLayout(this); @@ -39,7 +39,7 @@ public %{APPNAME}PrefPageOne(QWidget parent) } public class %{APPNAME}PrefPageTwo extends QFrame { -public %{APPNAME}PrefPageTwo(QWidget parent) +public %{APPNAME}PrefPageTwo(TQWidget parent) { super(parent); QHBoxLayout layout = new QHBoxLayout(this); diff --git a/languages/java/app_templates/superwaba/superwaba b/languages/java/app_templates/superwaba/superwaba index eddcce86..82fb4752 100644 --- a/languages/java/app_templates/superwaba/superwaba +++ b/languages/java/app_templates/superwaba/superwaba @@ -16,14 +16,14 @@ Type=value Value=JAVA Comment=Path to your java root Default=/usr/lib/java -ValueType=QString +ValueType=TQString [WABA] Type=value Value=WABA Comment=Path to your SuperWaba root Default=/usr/lib -ValueType=QString +ValueType=TQString [GNU] Type=install archive diff --git a/languages/java/app_templates/superwaba/superwaba.kdevtemplate b/languages/java/app_templates/superwaba/superwaba.kdevtemplate index a14c511a..3711dbc4 100644 --- a/languages/java/app_templates/superwaba/superwaba.kdevtemplate +++ b/languages/java/app_templates/superwaba/superwaba.kdevtemplate @@ -16,14 +16,14 @@ Type=value Value=JAVA Comment=Path to your java root Default=/usr/lib/java -ValueType=QString +ValueType=TQString [WABA] Type=value Value=WABA Comment=Path to your SuperWaba root Default=/usr/lib -ValueType=QString +ValueType=TQString [GNU] Type=install archive diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp index d6a034e4..7c63a63f 100644 --- a/languages/java/backgroundparser.cpp +++ b/languages/java/backgroundparser.cpp @@ -137,7 +137,7 @@ public: void push_back( const TQString& fileName, bool readFromDisk=false ) { TQMutexLocker locker( &m_mutex ); - m_fileList.append( tqMakePair(fileName, readFromDisk) ); /// \FIXME ROBE deepcopy?! + m_fileList.append( qMakePair(fileName, readFromDisk) ); /// \FIXME ROBE deepcopy?! } void pop_front() diff --git a/languages/java/configproblemreporter.ui b/languages/java/configproblemreporter.ui index 9bea48d7..c253e1d4 100644 --- a/languages/java/configproblemreporter.ui +++ b/languages/java/configproblemreporter.ui @@ -234,7 +234,7 @@ <tabstop>pushButton5</tabstop> <tabstop>pushButton6</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>accept()</slot> @@ -244,7 +244,7 @@ <slot>removeSpecialHeader()</slot> <slot>moveUpSpecialHeader()</slot> <slot>moveDownSpecialHeader()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/java/java.g b/languages/java/java.g index 4228a573..15ccf63d 100644 --- a/languages/java/java.g +++ b/languages/java/java.g @@ -157,18 +157,18 @@ private: public: void setDriver( Driver* d ) { m_driver = d; } - void setFileName( const QString& fileName ) { m_driver->currentFileName() = fileName; } + void setFileName( const TQString& fileName ) { m_driver->currentFileName() = fileName; } void reportError( const ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex ){ - m_driver->addProblem( m_driver->currentFileName(), Problem( QString::fromLocal8Bit(ex.getMessage().c_str()), ex.getLine(), ex.getColumn()) ); + m_driver->addProblem( m_driver->currentFileName(), Problem( TQString::fromLocal8Bit(ex.getMessage().c_str()), ex.getLine(), ex.getColumn()) ); } void reportError( const ANTLR_USE_NAMESPACE(std)string& errorMessage ){ - m_driver->addProblem( m_driver->currentFileName(), Problem( QString::fromLocal8Bit(errorMessage.c_str()), LT(1)->getLine(), LT(1)->getColumn()) ); + m_driver->addProblem( m_driver->currentFileName(), Problem( TQString::fromLocal8Bit(errorMessage.c_str()), LT(1)->getLine(), LT(1)->getColumn()) ); } void reportMessage( const ANTLR_USE_NAMESPACE(std)string& message ){ - m_driver->addProblem( m_driver->currentFileName(), Problem( QString::fromLocal8Bit(message.c_str()), LT(1)->getLine(), LT(1)->getColumn()) ); + m_driver->addProblem( m_driver->currentFileName(), Problem( TQString::fromLocal8Bit(message.c_str()), LT(1)->getLine(), LT(1)->getColumn()) ); } } @@ -1061,18 +1061,18 @@ private: public: void setDriver( Driver* d ) { m_driver = d; } - void setFileName( const QString& fileName ) { m_driver->currentFileName() = fileName; } + void setFileName( const TQString& fileName ) { m_driver->currentFileName() = fileName; } virtual void reportError( const ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex ){ - m_driver->addProblem( m_driver->currentFileName(), Problem( QString::fromLocal8Bit(ex.getMessage().c_str()), ex.getLine(), ex.getColumn()) ); + m_driver->addProblem( m_driver->currentFileName(), Problem( TQString::fromLocal8Bit(ex.getMessage().c_str()), ex.getLine(), ex.getColumn()) ); } virtual void reportError( const ANTLR_USE_NAMESPACE(std)string& errorMessage ){ - m_driver->addProblem( m_driver->currentFileName(), Problem( QString::fromLocal8Bit(errorMessage.c_str()), getLine(), getColumn()) ); + m_driver->addProblem( m_driver->currentFileName(), Problem( TQString::fromLocal8Bit(errorMessage.c_str()), getLine(), getColumn()) ); } virtual void reportWarning( const ANTLR_USE_NAMESPACE(std)string& warnMessage ){ - m_driver->addProblem( m_driver->currentFileName(), Problem( QString::fromLocal8Bit(warnMessage.c_str()), getLine(), getColumn()) ); + m_driver->addProblem( m_driver->currentFileName(), Problem( TQString::fromLocal8Bit(warnMessage.c_str()), getLine(), getColumn()) ); } } diff --git a/languages/java/java.store.g b/languages/java/java.store.g index cc545c64..bf996974 100644 --- a/languages/java/java.store.g +++ b/languages/java/java.store.g @@ -72,26 +72,26 @@ public: } } -compilationUnit { QString package; QString imp; QStringList imports; } +compilationUnit { TQString package; TQString imp; QStringList imports; } : { init(); } (package=packageDefinition)? (imp=importDefinition { imports << imp; } )* (typeDefinition)* ; -packageDefinition returns [ QString id ] +packageDefinition returns [ TQString id ] : #( PACKAGE_DEF id=identifier ) ; -importDefinition returns [ QString id ] +importDefinition returns [ TQString id ] : #( IMPORT id=identifierStar ) ; -typeDefinition { QStringList bases; QString className; ClassDom klass; QStringList m;} +typeDefinition { QStringList bases; TQString className; ClassDom klass; QStringList m;} : #(CLASS_DEF m=modifiers IDENT { klass = m_model->create<ClassModel>(); - QString name = QString::fromUtf8( #IDENT->getText().c_str(), #IDENT->getText().length() ); + TQString name = TQString::fromUtf8( #IDENT->getText().c_str(), #IDENT->getText().length() ); QStringList path = QStringList::split( ".", name ); className = path.back(); @@ -125,7 +125,7 @@ typeDefinition { QStringList bases; QString className; ClassDom klass; QStringLi | #(INTERFACE_DEF m=modifiers IDENT { klass = m_model->create<ClassModel>(); - QString name = QString::fromUtf8( #IDENT->getText().c_str(), #IDENT->getText().length() ); + TQString name = TQString::fromUtf8( #IDENT->getText().c_str(), #IDENT->getText().length() ); QStringList path = QStringList::split( ".", name ); className = path.back(); @@ -154,16 +154,16 @@ typeDefinition { QStringList bases; QString className; ClassDom klass; QStringLi ) ; -typeSpec returns [ QString tp ] +typeSpec returns [ TQString tp ] : #(TYPE tp=typeSpecArray) ; -typeSpecArray returns [ QString tp ] +typeSpecArray returns [ TQString tp ] : #( ARRAY_DECLARATOR tp=typeSpecArray ) { tp += "[]"; } | tp=type ; -type returns [ QString tp ] +type returns [ TQString tp ] : tp=identifier | b:builtInType { tp = #b->getText().c_str(); } ; @@ -199,11 +199,11 @@ modifier | "volatile" ; -extendsClause returns [ QStringList l ] { QString id; } +extendsClause returns [ QStringList l ] { TQString id; } : #(EXTENDS_CLAUSE (id=identifier { l << id; } )* ) ; -implementsClause returns [ QStringList l ] { QString id; } +implementsClause returns [ QStringList l ] { TQString id; } : #(IMPLEMENTS_CLAUSE (id=identifier { l << id; } )* ) ; @@ -256,7 +256,7 @@ ctorDef returns [ FunctionDom meth ] { methodDecl returns [ FunctionDom meth ] { QStringList m; - QString tp; + TQString tp; meth = m_model->create<FunctionModel>(); meth->setFileName( m_file->name() ); } @@ -274,7 +274,7 @@ methodDecl returns [ FunctionDom meth ] { methodDef returns [ FunctionDom meth ] { QStringList m; - QString tp; + TQString tp; meth = m_model->create<FunctionModel>(); meth->setFileName( m_file->name() ); } @@ -292,7 +292,7 @@ methodDef returns [ FunctionDom meth ] { variableDef returns [ VariableDom attr ] { QStringList m; - QString tp; + TQString tp; attr = m_model->create<VariableModel>(); attr->setFileName( m_file->name() ); } @@ -311,7 +311,7 @@ variableDef returns [ VariableDom attr ] { ; parameterDef returns [ ArgumentDom arg ] { - QString tp; + TQString tp; arg = m_model->create<ArgumentModel>(); } : #(PARAMETER_DEF modifiers tp=typeSpec IDENT ) @@ -360,21 +360,21 @@ throwsClause : #( "throws" (identifier)* ) ; -identifier returns [ QString id ] +identifier returns [ TQString id ] : IDENT { id = #IDENT->getText().c_str(); } | #( DOT id=identifier IDENT ) { - id += QString(".") + #IDENT->getText().c_str(); + id += TQString(".") + #IDENT->getText().c_str(); } ; -identifierStar returns [ QString id ] +identifierStar returns [ TQString id ] : IDENT { id = #IDENT->getText().c_str(); } - | #( DOT id=identifier (STAR { id += QString(".") + #STAR->getText().c_str(); } | - IDENT { id += QString(".") + #IDENT->getText().c_str(); }) ) + | #( DOT id=identifier (STAR { id += TQString(".") + #STAR->getText().c_str(); } | + IDENT { id += TQString(".") + #IDENT->getText().c_str(); }) ) ; slist diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp index 50571ba6..36f9dadc 100644 --- a/languages/java/javasupportpart.cpp +++ b/languages/java/javasupportpart.cpp @@ -135,37 +135,37 @@ JavaSupportPart::JavaSupportPart(TQObject *parent, const char *name, const TQStr m_backgroundParser = new BackgroundParser( this, &m_eventConsumed ); m_backgroundParser->start(); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), - this, TQT_SLOT(savedFile(const KURL&)) ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(activePartChanged(KParts::Part*))); - connect( partController(), TQT_SIGNAL(partRemoved(KParts::Part*)), - this, TQT_SLOT(partRemoved(KParts::Part*))); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), + this, TQ_SLOT(savedFile(const KURL&)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(activePartChanged(KParts::Part*))); + connect( partController(), TQ_SIGNAL(partRemoved(KParts::Part*)), + this, TQ_SLOT(partRemoved(KParts::Part*))); m_problemReporter = new ProblemReporter( this, 0, "problemReporterWidget" ); m_problemReporter->setIcon( SmallIcon("application-vnd.tde.info") ); mainWindow( )->embedOutputView( m_problemReporter, i18n("Problems"), i18n("Problem reporter")); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), - m_problemReporter, TQT_SLOT(configWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), - this, TQT_SLOT(configWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), + m_problemReporter, TQ_SLOT(configWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), + this, TQ_SLOT(configWidget(KDialogBase*)) ); TDEAction *action; action = new TDEAction(i18n("New Class..."), "classnew", 0, - this, TQT_SLOT(slotNewClass()), + this, TQ_SLOT(slotNewClass()), actionCollection(), "project_newclass"); action->setToolTip( i18n("Generate a new class") ); action->setWhatsThis( i18n("<b>New Class</b>Generates a new class.<p>") ); // daniel - connect( core( ), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, - TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); + connect( core( ), TQ_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, + TQ_SLOT( projectConfigWidget( KDialogBase* ) ) ); new KDevJavaSupportIface( this ); //(void) dcopClient(); @@ -288,8 +288,8 @@ void JavaSupportPart::activePartChanged(KParts::Part *part) if( !textHintIface ) return; - connect( view, TQT_SIGNAL(needTextHint(int,int,TQString&)), - this, TQT_SLOT(slotNeedTextHint(int,int,TQString&)) ); + connect( view, TQ_SIGNAL(needTextHint(int,int,TQString&)), + this, TQ_SLOT(slotNeedTextHint(int,int,TQString&)) ); textHintIface->enableTextHints( 1000 ); #endif @@ -302,20 +302,20 @@ void JavaSupportPart::projectOpened( ) m_projectDirectory = URLUtil::canonicalPath( project()->projectDirectory() ); - connect( project( ), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ), - this, TQT_SLOT( addedFilesToProject( const TQStringList & ) ) ); - connect( project( ), TQT_SIGNAL( removedFilesFromProject( const TQStringList &) ), - this, TQT_SLOT( removedFilesFromProject( const TQStringList & ) ) ); - connect( project( ), TQT_SIGNAL( changedFilesInProject( const TQStringList & ) ), - this, TQT_SLOT( changedFilesInProject( const TQStringList & ) ) ); - connect( project(), TQT_SIGNAL(projectCompiled()), - this, TQT_SLOT(slotProjectCompiled()) ); + connect( project( ), TQ_SIGNAL( addedFilesToProject( const TQStringList & ) ), + this, TQ_SLOT( addedFilesToProject( const TQStringList & ) ) ); + connect( project( ), TQ_SIGNAL( removedFilesFromProject( const TQStringList &) ), + this, TQ_SLOT( removedFilesFromProject( const TQStringList & ) ) ); + connect( project( ), TQ_SIGNAL( changedFilesInProject( const TQStringList & ) ), + this, TQ_SLOT( changedFilesInProject( const TQStringList & ) ) ); + connect( project(), TQ_SIGNAL(projectCompiled()), + this, TQ_SLOT(slotProjectCompiled()) ); m_timestamp.clear(); m_projectClosed = false; - TQTimer::singleShot( 500, this, TQT_SLOT( initialParse( ) ) ); + TQTimer::singleShot( 500, this, TQ_SLOT( initialParse( ) ) ); } @@ -531,7 +531,7 @@ JavaSupportPart::parseProject( ) uint offset; stream >> fn >> ts >> offset; - pcs[ fn ] = tqMakePair( ts, offset ); + pcs[ fn ] = qMakePair( ts, offset ); } } } diff --git a/languages/java/javasupportpart.h b/languages/java/javasupportpart.h index a69e3524..69495e65 100644 --- a/languages/java/javasupportpart.h +++ b/languages/java/javasupportpart.h @@ -48,7 +48,7 @@ namespace KTextEditor class JavaSupportPart : public KDevLanguageSupport { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp index e1fc4174..e5a158b6 100644 --- a/languages/java/problemreporter.cpp +++ b/languages/java/problemreporter.cpp @@ -97,17 +97,17 @@ ProblemReporter::ProblemReporter( JavaSupportPart* part, TQWidget* parent, const m_timer = new TQTimer( this ); - connect( part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); - connect( part->partController(), TQT_SIGNAL(partAdded(KParts::Part*)), - this, TQT_SLOT(slotPartAdded(KParts::Part*)) ); - connect( part->partController(), TQT_SIGNAL(partRemoved(KParts::Part*)), - this, TQT_SLOT(slotPartRemoved(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(partAdded(KParts::Part*)), + this, TQ_SLOT(slotPartAdded(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(partRemoved(KParts::Part*)), + this, TQ_SLOT(slotPartRemoved(KParts::Part*)) ); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reparse()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(reparse()) ); - connect( this, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem*)) ); configure(); } @@ -137,7 +137,7 @@ void ProblemReporter::slotActivePartChanged( KParts::Part* part ) if( !m_javaSupport->isValidSource(m_fileName) ) return; - connect( m_document, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); + connect( m_document, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()) ); m_markIface = dynamic_cast<KTextEditor::MarkInterface*>( part ); if( !m_javaSupport->backgroundParser() ) @@ -239,8 +239,8 @@ void ProblemReporter::configWidget( KDialogBase* dlg ) ConfigureProblemReporter* w = new ConfigureProblemReporter( vbox ); //FIXME adymo: unused functionality w->groupBox3->hide(); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); - connect(dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(configure())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(configure())); } void ProblemReporter::slotPartAdded( KParts::Part* part ) diff --git a/languages/java/problemreporter.h b/languages/java/problemreporter.h index a70d81c6..6147bf80 100644 --- a/languages/java/problemreporter.h +++ b/languages/java/problemreporter.h @@ -37,7 +37,7 @@ namespace KTextEditor{ } class ProblemReporter: public TDEListView{ - Q_OBJECT + TQ_OBJECT public: ProblemReporter( JavaSupportPart* part, TQWidget* parent=0, const char* name=0 ); diff --git a/languages/kjssupport/jscodecompletion.cpp b/languages/kjssupport/jscodecompletion.cpp index 436e0a95..ca7e7690 100644 --- a/languages/kjssupport/jscodecompletion.cpp +++ b/languages/kjssupport/jscodecompletion.cpp @@ -82,11 +82,11 @@ void JSCodeCompletion::setActiveEditorPart( KParts::Part * part ) } disconnect(part->widget(), 0, this, 0 ); // to make sure that it is't connected twice - connect(part->widget(), TQT_SIGNAL(cursorPositionChanged()), - this, TQT_SLOT(cursorPositionChanged())); - connect(part->widget(), TQT_SIGNAL(argHintHidden()), this, TQT_SLOT(argHintHidden())); - connect(part->widget(), TQT_SIGNAL(completionAborted()), this, TQT_SLOT(completionBoxAbort())); - connect(part->widget(), TQT_SIGNAL(completionDone()), this, TQT_SLOT(completionBoxHidden())); + connect(part->widget(), TQ_SIGNAL(cursorPositionChanged()), + this, TQ_SLOT(cursorPositionChanged())); + connect(part->widget(), TQ_SIGNAL(argHintHidden()), this, TQ_SLOT(argHintHidden())); + connect(part->widget(), TQ_SIGNAL(completionAborted()), this, TQ_SLOT(completionBoxAbort())); + connect(part->widget(), TQ_SIGNAL(completionDone()), this, TQ_SLOT(completionBoxHidden())); } TQValueList< KTextEditor::CompletionEntry > JSCodeCompletion::getVars( const TQString & startText ) diff --git a/languages/kjssupport/jscodecompletion.h b/languages/kjssupport/jscodecompletion.h index f1d18a70..3afb4846 100644 --- a/languages/kjssupport/jscodecompletion.h +++ b/languages/kjssupport/jscodecompletion.h @@ -28,7 +28,7 @@ The code completion engine for Javascript. */ class JSCodeCompletion : public TQObject { - Q_OBJECT + TQ_OBJECT public: JSCodeCompletion(TQObject *parent = 0, const char *name = 0); diff --git a/languages/kjssupport/kjsproblems.h b/languages/kjssupport/kjsproblems.h index ff1a0ce1..1f08f60e 100644 --- a/languages/kjssupport/kjsproblems.h +++ b/languages/kjssupport/kjsproblems.h @@ -27,7 +27,7 @@ class kjsSupportPart; */ class KJSProblems : public TDEListView { -Q_OBJECT +TQ_OBJECT public: diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp index 71c680b4..306fdb4a 100644 --- a/languages/kjssupport/kjssupport_part.cpp +++ b/languages/kjssupport/kjssupport_part.cpp @@ -69,20 +69,20 @@ kjsSupportPart::kjsSupportPart(TQObject *parent, const char *name, const TQStrin setXMLFile("kdevkjssupport.rc"); - m_build = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); + m_build = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQ_SLOT(slotRun()),actionCollection(), "build_execute" ); m_build->setStatusText( i18n("Test the active script.") ); kdDebug() << "Creating kjssupport Part" << endl; - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(savedFile(const TQString&)), this, TQT_SLOT(savedFile(const TQString&)) ); - connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part *))); - connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( partController(), TQ_SIGNAL(savedFile(const TQString&)), this, TQ_SLOT(savedFile(const TQString&)) ); + connect(partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part *))); + connect(core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); // Building kjs interpreter. @@ -140,14 +140,14 @@ void kjsSupportPart::projectOpened() { kdDebug(9014) << "projectOpened()" << endl; - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), - this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), - this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQ_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQ_SLOT(removedFilesFromProject(const TQStringList &)) ); // We want to parse only after all components have been // properly initialized - TQTimer::singleShot(0, this, TQT_SLOT(parse())); + TQTimer::singleShot(0, this, TQ_SLOT(parse())); } void kjsSupportPart::projectClosed() { @@ -427,7 +427,7 @@ void kjsSupportPart::contextMenu(TQPopupMenu * popupMenu, const Context *context m_selectedUI = fcontext->fileName(); if (m_selectedUI.right(3).lower() == ".ui") int id = popupMenu->insertItem(i18n("Implement Slots"), - this, TQT_SLOT(implementSlots())); + this, TQ_SLOT(implementSlots())); else m_selectedUI = TQString(); } diff --git a/languages/kjssupport/kjssupport_part.h b/languages/kjssupport/kjssupport_part.h index 4572b9a2..eebe081e 100644 --- a/languages/kjssupport/kjssupport_part.h +++ b/languages/kjssupport/kjssupport_part.h @@ -45,7 +45,7 @@ class typeProperty; class kjsSupportPart : public KDevLanguageSupport { - Q_OBJECT + TQ_OBJECT public: kjsSupportPart(TQObject *parent, const char *name, const TQStringList &); diff --git a/languages/kjssupport/subclassingdlg.cpp b/languages/kjssupport/subclassingdlg.cpp index 513e0180..34d1f682 100644 --- a/languages/kjssupport/subclassingdlg.cpp +++ b/languages/kjssupport/subclassingdlg.cpp @@ -188,13 +188,13 @@ void SubclassingDlg::readUiFile() // Special widget specific slots SlotItem *newSlot; - m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class",TQDIALOG_OBJECT_NAME_STRING); + m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class","TQDialog"); - if ( (m_qtBaseClassName==TQMAINWINDOW_OBJECT_NAME_STRING) || (m_qtBaseClassName==TQWIDGET_OBJECT_NAME_STRING) ) + if ( (m_qtBaseClassName=="TQMainWindow") || (m_qtBaseClassName=="TQWidget") ) m_canBeModal = false; else m_canBeModal = true; - if (m_qtBaseClassName != TQWIDGET_OBJECT_NAME_STRING) + if (m_qtBaseClassName != "TQWidget") { newSlot = new SLOT_ACCEPT; newSlot->setOn(false); @@ -211,7 +211,7 @@ void SubclassingDlg::readUiFile() m_slots << newSlot; } - if (m_qtBaseClassName == TQWIZARD_OBJECT_NAME_STRING) + if (m_qtBaseClassName == "TQWizard") { newSlot = new SLOT_NEXT; m_slotView->insertItem(newSlot); diff --git a/languages/kjssupport/subclassingdlgbase.ui b/languages/kjssupport/subclassingdlgbase.ui index 23ec7b34..250da264 100644 --- a/languages/kjssupport/subclassingdlgbase.ui +++ b/languages/kjssupport/subclassingdlgbase.ui @@ -245,9 +245,9 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot>onChangedClassName()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/lib/debugger/Mainpage.dox b/languages/lib/debugger/Mainpage.dox index 90c16a2a..c0e6b077 100644 --- a/languages/lib/debugger/Mainpage.dox +++ b/languages/lib/debugger/Mainpage.dox @@ -12,16 +12,16 @@ This library contains classes to implement debugger support for a programming la Each debugger support plugin must interact with an editor to set breakpoints, jump to execution points, etc. This kind of interaction is implemented in @ref Debugger class. Your debugger support plugin just need to create -an instance of @ref Debugger class and connect its Q_SIGNALS, for example: +an instance of @ref Debugger class and connect its signals, for example: @code m_debugger = new Debugger( partController() ); -connect( m_debugger, SIGNAL(toggledBreakpoint(const QString &, int)), - debuggerBreakpointWidget, SLOT(slotToggleBreakpoint(const QString &, int)) ); -connect( m_debugger, SIGNAL(editedBreakpoint(const QString &, int)), - debuggerBreakpointWidget, SLOT(slotEditBreakpoint(const QString &, int)) ); -connect( m_debugger, SIGNAL(toggledBreakpointEnabled(const QString &, int)), - debuggerBreakpointWidget, SLOT(slotToggleBreakpointEnabled(const QString &, int)) ); +connect( m_debugger, TQ_SIGNAL(toggledBreakpoint(const TQString &, int)), + debuggerBreakpointWidget, TQ_SLOT(slotToggleBreakpoint(const TQString &, int)) ); +connect( m_debugger, TQ_SIGNAL(editedBreakpoint(const TQString &, int)), + debuggerBreakpointWidget, TQ_SLOT(slotEditBreakpoint(const TQString &, int)) ); +connect( m_debugger, TQ_SIGNAL(toggledBreakpointEnabled(const TQString &, int)), + debuggerBreakpointWidget, TQ_SLOT(slotToggleBreakpointEnabled(const TQString &, int)) ); @endcode Then m_debugger instance can be used for example, to jump to the execution point: @code diff --git a/languages/lib/debugger/debugger.cpp b/languages/lib/debugger/debugger.cpp index bc8356b7..111ca93c 100644 --- a/languages/lib/debugger/debugger.cpp +++ b/languages/lib/debugger/debugger.cpp @@ -16,8 +16,8 @@ Debugger *Debugger::s_instance = 0; Debugger::Debugger(KDevPartController *partController) :m_partController(partController) { - connect( m_partController, TQT_SIGNAL(partAdded(KParts::Part*)), - this, TQT_SLOT(partAdded(KParts::Part*)) ); + connect( m_partController, TQ_SIGNAL(partAdded(KParts::Part*)), + this, TQ_SLOT(partAdded(KParts::Part*)) ); } @@ -46,7 +46,7 @@ void Debugger::setBreakpoint(const TQString &fileName, int lineNum, int id, bool // Temporarily disconnect so we don't get confused by receiving extra // marksChanged signals - disconnect( part, TQT_SIGNAL(marksChanged()), this, TQT_SLOT(marksChanged()) ); + disconnect( part, TQ_SIGNAL(marksChanged()), this, TQ_SLOT(marksChanged()) ); iface->removeMark( lineNum, Breakpoint | ActiveBreakpoint | ReachedBreakpoint | DisabledBreakpoint ); BPItem bpItem(fileName, lineNum); @@ -71,7 +71,7 @@ void Debugger::setBreakpoint(const TQString &fileName, int lineNum, int id, bool BPList.append(BPItem(fileName, lineNum)); } - connect( part, TQT_SIGNAL(marksChanged()), this, TQT_SLOT(marksChanged()) ); + connect( part, TQ_SIGNAL(marksChanged()), this, TQ_SLOT(marksChanged()) ); } @@ -203,7 +203,7 @@ void Debugger::partAdded( KParts::Part* part ) iface->setPixmap((MarkInterface::MarkTypes)ExecutionPoint, *executionPointPixmap()); iface->setMarksUserChangable( Bookmark | Breakpoint ); - connect( part, TQT_SIGNAL(marksChanged()), this, TQT_SLOT(marksChanged()) ); + connect( part, TQ_SIGNAL(marksChanged()), this, TQ_SLOT(marksChanged()) ); } #include "debugger.moc" diff --git a/languages/lib/debugger/debugger.h b/languages/lib/debugger/debugger.h index d4112490..ca689170 100644 --- a/languages/lib/debugger/debugger.h +++ b/languages/lib/debugger/debugger.h @@ -56,7 +56,7 @@ private: */ class Debugger : public KDevDebugger { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/lib/debugger/kdevdebugger.h b/languages/lib/debugger/kdevdebugger.h index 4cb7df3f..ba2dc352 100644 --- a/languages/lib/debugger/kdevdebugger.h +++ b/languages/lib/debugger/kdevdebugger.h @@ -33,7 +33,7 @@ */ class KDevDebugger : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/lib/designer_integration/implementationwidget.h b/languages/lib/designer_integration/implementationwidget.h index 3dd53763..381cb87f 100644 --- a/languages/lib/designer_integration/implementationwidget.h +++ b/languages/lib/designer_integration/implementationwidget.h @@ -39,7 +39,7 @@ Subclasses of this class should reimplement only pure virtual functions in the c */ class ImplementationWidget : public CreateImplemenationWidgetBase { -Q_OBJECT +TQ_OBJECT public: ImplementationWidget(KDevLanguageSupport *part, TQWidget* parent = 0, const char* name = 0, bool modal = false); diff --git a/languages/lib/designer_integration/implementationwidgetbase.ui b/languages/lib/designer_integration/implementationwidgetbase.ui index d2780bc1..45cebd8e 100644 --- a/languages/lib/designer_integration/implementationwidgetbase.ui +++ b/languages/lib/designer_integration/implementationwidgetbase.ui @@ -257,9 +257,9 @@ <tabstop>okButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">classNameChanged(const TQString &)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/languages/lib/designer_integration/tqtdesignerintegration.h b/languages/lib/designer_integration/tqtdesignerintegration.h index f76eecba..b5d7d64d 100644 --- a/languages/lib/designer_integration/tqtdesignerintegration.h +++ b/languages/lib/designer_integration/tqtdesignerintegration.h @@ -37,7 +37,7 @@ Subclasses of this class should reimplement only pure virtual functions in the c */ class QtDesignerIntegration : public KDevDesignerIntegration { -Q_OBJECT +TQ_OBJECT public: QtDesignerIntegration(KDevLanguageSupport *part, ImplementationWidget *impl, diff --git a/languages/lib/interfaces/kdevpcsimporter.h b/languages/lib/interfaces/kdevpcsimporter.h index 870865cb..b4abc647 100644 --- a/languages/lib/interfaces/kdevpcsimporter.h +++ b/languages/lib/interfaces/kdevpcsimporter.h @@ -34,7 +34,7 @@ is to provide file selection wizard. */ class KDevPCSImporter: public TQObject { - Q_OBJECT + TQ_OBJECT public: KDevPCSImporter( TQObject* parent=0, const char* name=0 ); diff --git a/languages/pascal/PascalStoreWalkerTokenTypes.h b/languages/pascal/PascalStoreWalkerTokenTypes.h index 4631429c..1911fc9c 100644 --- a/languages/pascal/PascalStoreWalkerTokenTypes.h +++ b/languages/pascal/PascalStoreWalkerTokenTypes.h @@ -183,7 +183,7 @@ struct CUSTOM_API PascalStoreWalkerTokenTypes { INHERITED = 172, NEW = 173, SELF = 174, - TQT_METHOD = 175, + METHOD = 175, ADDSUBOR = 176, ASSIGNEQUAL = 177, SIGN = 178, diff --git a/languages/pascal/PascalTokenTypes.h b/languages/pascal/PascalTokenTypes.h index 42e97d53..185197e4 100644 --- a/languages/pascal/PascalTokenTypes.h +++ b/languages/pascal/PascalTokenTypes.h @@ -186,7 +186,7 @@ struct CUSTOM_API PascalTokenTypes { INHERITED = 172, NEW = 173, SELF = 174, - TQT_METHOD = 175, + METHOD = 175, ADDSUBOR = 176, ASSIGNEQUAL = 177, SIGN = 178, diff --git a/languages/pascal/compiler/dccoptions/dccoptionsplugin.h b/languages/pascal/compiler/dccoptions/dccoptionsplugin.h index d8465520..7e9a9772 100644 --- a/languages/pascal/compiler/dccoptions/dccoptionsplugin.h +++ b/languages/pascal/compiler/dccoptions/dccoptionsplugin.h @@ -17,7 +17,7 @@ class DccOptionsPlugin : public KDevCompilerOptions { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/pascal/compiler/dccoptions/optiontabs.cpp b/languages/pascal/compiler/dccoptions/optiontabs.cpp index 306fe5a0..bc586c0c 100644 --- a/languages/pascal/compiler/dccoptions/optiontabs.cpp +++ b/languages/pascal/compiler/dccoptions/optiontabs.cpp @@ -357,8 +357,8 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) layout3->addWidget(release); layout3->addWidget(debug); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - connect(release, TQT_SIGNAL(clicked()), this, TQT_SLOT(setReleaseOptions())); - connect(debug, TQT_SIGNAL(clicked()), this, TQT_SLOT(setDebugOptions())); + connect(release, TQ_SIGNAL(clicked()), this, TQ_SLOT(setReleaseOptions())); + connect(debug, TQ_SIGNAL(clicked()), this, TQ_SLOT(setDebugOptions())); layout->addStretch(); } diff --git a/languages/pascal/compiler/dccoptions/optiontabs.h b/languages/pascal/compiler/dccoptions/optiontabs.h index 04351ea7..07977e42 100644 --- a/languages/pascal/compiler/dccoptions/optiontabs.h +++ b/languages/pascal/compiler/dccoptions/optiontabs.h @@ -92,7 +92,7 @@ private: class DebugOptimTab : public TQWidget { - Q_OBJECT + TQ_OBJECT public: DebugOptimTab( TQWidget *parent=0, const char *name=0 ); diff --git a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h index e30b33c0..8b876bf4 100644 --- a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h +++ b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h @@ -17,7 +17,7 @@ class FpcOptionsPlugin : public KDevCompilerOptions { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/pascal/compiler/fpcoptions/optiontabs.cpp b/languages/pascal/compiler/fpcoptions/optiontabs.cpp index 86c77cda..4f39337d 100644 --- a/languages/pascal/compiler/fpcoptions/optiontabs.cpp +++ b/languages/pascal/compiler/fpcoptions/optiontabs.cpp @@ -410,8 +410,8 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) TQPushButton *debug = new TQPushButton(i18n("Debug"), this); layout6->addWidget(release); layout6->addWidget(debug); - connect(release, TQT_SIGNAL(clicked()), this, TQT_SLOT(setReleaseOptions())); - connect(debug, TQT_SIGNAL(clicked()), this, TQT_SLOT(setDebugOptions())); + connect(release, TQ_SIGNAL(clicked()), this, TQ_SLOT(setReleaseOptions())); + connect(debug, TQ_SIGNAL(clicked()), this, TQ_SLOT(setDebugOptions())); layout->addStretch(); } diff --git a/languages/pascal/compiler/fpcoptions/optiontabs.h b/languages/pascal/compiler/fpcoptions/optiontabs.h index 9ae5c77b..af2a907f 100644 --- a/languages/pascal/compiler/fpcoptions/optiontabs.h +++ b/languages/pascal/compiler/fpcoptions/optiontabs.h @@ -91,7 +91,7 @@ private: class DebugOptimTab : public TQWidget { - Q_OBJECT + TQ_OBJECT public: DebugOptimTab( TQWidget *parent=0, const char *name=0 ); diff --git a/languages/pascal/configproblemreporter.ui b/languages/pascal/configproblemreporter.ui index 020557a1..3ba64c82 100644 --- a/languages/pascal/configproblemreporter.ui +++ b/languages/pascal/configproblemreporter.ui @@ -77,12 +77,12 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>accept()</slot> <slot>bgParserCheckbox_toggled( bool b )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/pascal/pascal.tree.g b/languages/pascal/pascal.tree.g index d90503c4..c50d5a9f 100644 --- a/languages/pascal/pascal.tree.g +++ b/languages/pascal/pascal.tree.g @@ -46,7 +46,7 @@ options { { private: - QString m_fileName; + TQString m_fileName; QStringList m_currentScope; int m_currentAccess; int m_anon; @@ -57,8 +57,8 @@ public: CodeModel* codeModel() { return m_model; } const CodeModel* codeModel() const { return m_model; } - QString fileName() const { return m_fileName; } - void setFileName( const QString& fileName ) { m_fileName = fileName; } + TQString fileName() const { return m_fileName; } + void setFileName( const TQString& fileName ) { m_fileName = fileName; } void init(){ m_currentScope.clear(); diff --git a/languages/pascal/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp index 90532c22..76758693 100644 --- a/languages/pascal/pascalsupport_part.cpp +++ b/languages/pascal/pascalsupport_part.cpp @@ -55,19 +55,19 @@ PascalSupportPart::PascalSupportPart(TQObject *parent, const char *name, const T setXMLFile("kdevpascalsupport.rc"); d->problemReporter = new ProblemReporter( this ); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), - d->problemReporter, TQT_SLOT(configWidget(KDialogBase*)) ); - - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), - this, TQT_SLOT(savedFile(const KURL&)) ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), - this, TQT_SLOT(configWidget(KDialogBase*)) ); - connect( core( ), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, - TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), + d->problemReporter, TQ_SLOT(configWidget(KDialogBase*)) ); + + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), + this, TQ_SLOT(savedFile(const KURL&)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), + this, TQ_SLOT(configWidget(KDialogBase*)) ); + connect( core( ), TQ_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, + TQ_SLOT( projectConfigWidget( KDialogBase* ) ) ); mainWindow()->embedOutputView( d->problemReporter, i18n("Problems"), i18n("problem reporter") ); TQWhatsThis::add(d->problemReporter, i18n("<b>Problem reporter</b><p>This window shows various \"problems\" in your project. " @@ -89,17 +89,17 @@ PascalSupportPart::Features PascalSupportPart::features() void PascalSupportPart::projectOpened() { - connect(project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), - this, TQT_SLOT(addedFilesToProject(const TQStringList &))); - connect(project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), - this, TQT_SLOT(removedFilesFromProject(const TQStringList &))); - connect(project(), TQT_SIGNAL(projectCompiled()), - this, TQT_SLOT(slotProjectCompiled()) ); + connect(project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQ_SLOT(addedFilesToProject(const TQStringList &))); + connect(project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQ_SLOT(removedFilesFromProject(const TQStringList &))); + connect(project(), TQ_SIGNAL(projectCompiled()), + this, TQ_SLOT(slotProjectCompiled()) ); m_projectFileList = project()->allFiles(); m_projectClosed = false; - TQTimer::singleShot(0, this, TQT_SLOT(initialParse())); + TQTimer::singleShot(0, this, TQ_SLOT(initialParse())); } void PascalSupportPart::projectClosed() diff --git a/languages/pascal/pascalsupport_part.h b/languages/pascal/pascalsupport_part.h index 5c99c2ae..4450f45d 100644 --- a/languages/pascal/pascalsupport_part.h +++ b/languages/pascal/pascalsupport_part.h @@ -21,7 +21,7 @@ class PascalSupportPartData; class PascalSupportPart : public KDevLanguageSupport { - Q_OBJECT + TQ_OBJECT public: PascalSupportPart(TQObject *parent, const char *name, const TQStringList &); diff --git a/languages/pascal/problemreporter.cpp b/languages/pascal/problemreporter.cpp index d0aaf01a..d88599e0 100644 --- a/languages/pascal/problemreporter.cpp +++ b/languages/pascal/problemreporter.cpp @@ -86,19 +86,19 @@ ProblemReporter::ProblemReporter( PascalSupportPart* part, TQWidget* parent, con m_timer = new TQTimer( this ); - connect( part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); - connect( part->partController(), TQT_SIGNAL(partAdded(KParts::Part*)), - this, TQT_SLOT(slotPartAdded(KParts::Part*)) ); - connect( part->partController(), TQT_SIGNAL(partRemoved(KParts::Part*)), - this, TQT_SLOT(slotPartRemoved(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(partAdded(KParts::Part*)), + this, TQ_SLOT(slotPartAdded(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(partRemoved(KParts::Part*)), + this, TQ_SLOT(slotPartRemoved(KParts::Part*)) ); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reparse()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(reparse()) ); - connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem*)) ); configure(); } @@ -128,7 +128,7 @@ void ProblemReporter::slotActivePartChanged( KParts::Part* part ) m_editor = dynamic_cast<KTextEditor::EditInterface*>( part ); if( m_editor ) - connect( m_document, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); + connect( m_document, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()) ); m_markIface = dynamic_cast<KTextEditor::MarkInterface*>( part ); @@ -262,8 +262,8 @@ void ProblemReporter::configWidget( KDialogBase* dlg ) Q_UNUSED(dlg); /* TQVBox *vbox = dlg->addVBoxPage(i18n("Pascal Parsing")); ConfigureProblemReporter* w = new ConfigureProblemReporter( vbox ); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); - connect(dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(configure()));*/ + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(configure()));*/ } void ProblemReporter::slotPartAdded( KParts::Part* part ) diff --git a/languages/pascal/problemreporter.h b/languages/pascal/problemreporter.h index e329f2fe..89010aa3 100644 --- a/languages/pascal/problemreporter.h +++ b/languages/pascal/problemreporter.h @@ -37,7 +37,7 @@ namespace KTextEditor{ } class ProblemReporter: public TQListView{ - Q_OBJECT + TQ_OBJECT public: ProblemReporter( PascalSupportPart* part, TQWidget* parent=0, const char* name=0 ); diff --git a/languages/perl/perlconfigwidget.h b/languages/perl/perlconfigwidget.h index 743bd1bc..1484d42b 100644 --- a/languages/perl/perlconfigwidget.h +++ b/languages/perl/perlconfigwidget.h @@ -18,7 +18,7 @@ class PerlConfigWidget : public PerlConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp index 1bcbb96b..a3ec40db 100644 --- a/languages/perl/perlsupportpart.cpp +++ b/languages/perl/perlsupportpart.cpp @@ -55,35 +55,35 @@ PerlSupportPart::PerlSupportPart(TQObject *parent, const char *name, const TQStr setXMLFile("kdevperlsupport.rc"); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), - this, TQT_SLOT(savedFile(const KURL&)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), + this, TQ_SLOT(savedFile(const KURL&)) ); TDEAction *action; action = new TDEAction( i18n("Execute Main Program"), "application-x-executable", 0, - this, TQT_SLOT(slotExecute()), + this, TQ_SLOT(slotExecute()), actionCollection(), "build_exec" ); action->setToolTip( i18n("Runs the Perl program") ); action = new TDEAction( i18n("Execute String..."), "application-x-executable", 0, - this, TQT_SLOT(slotExecuteString()), + this, TQ_SLOT(slotExecuteString()), actionCollection(), "build_execstring" ); action->setToolTip( i18n("Executes a string as Perl code") ); action = new TDEAction( i18n("Start Perl Interpreter"), "application-x-executable", 0, - this, TQT_SLOT(slotStartInterpreter()), + this, TQ_SLOT(slotStartInterpreter()), actionCollection(), "build_runinterpreter" ); action->setToolTip( i18n("Starts the Perl interpreter without a program") ); action = new TDEAction( i18n("Find Perl Function Documentation..."), 0, - this, TQT_SLOT(slotPerldocFunction()), + this, TQ_SLOT(slotPerldocFunction()), actionCollection(), "help_perldocfunction" ); action->setToolTip( i18n("Show the documentation page of a Perl function") ); action = new TDEAction( i18n("Find Perl FAQ Entry..."), 0, - this, TQT_SLOT(slotPerldocFAQ()), + this, TQ_SLOT(slotPerldocFAQ()), actionCollection(), "help_perldocfaq" ); action->setToolTip( i18n("Show the FAQ entry for a keyword") ); @@ -106,14 +106,14 @@ void PerlSupportPart::projectOpened() { kdDebug(9007) << "projectOpened()" << endl; - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), - this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), - this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQ_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQ_SLOT(removedFilesFromProject(const TQStringList &)) ); // We want to parse only after all components have been // properly initialized - TQTimer::singleShot(0, this, TQT_SLOT(initialParse())); + TQTimer::singleShot(0, this, TQ_SLOT(initialParse())); } diff --git a/languages/perl/perlsupportpart.h b/languages/perl/perlsupportpart.h index 00c6bc69..409d7bec 100644 --- a/languages/perl/perlsupportpart.h +++ b/languages/perl/perlsupportpart.h @@ -18,7 +18,7 @@ class PerlSupportPart : public KDevLanguageSupport { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/php/phpcodecompletion.cpp b/languages/php/phpcodecompletion.cpp index af301000..3ed864bc 100644 --- a/languages/php/phpcodecompletion.cpp +++ b/languages/php/phpcodecompletion.cpp @@ -119,11 +119,11 @@ void PHPCodeCompletion::setActiveEditorPart(KParts::Part *part) } disconnect(part->widget(), 0, this, 0 ); // to make sure that it is't connected twice -// connect(part->widget(), TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(cursorPositionChanged())); - connect( part, TQT_SIGNAL(textChanged()), this, TQT_SLOT(cursorPositionChanged()) ); - connect(part->widget(), TQT_SIGNAL(argHintHidden()), this, TQT_SLOT(argHintHided())); - connect(part->widget(), TQT_SIGNAL(completionAborted()), this, TQT_SLOT(completionBoxHided())); - connect(part->widget(), TQT_SIGNAL(completionDone()), this, TQT_SLOT(completionBoxHided())); +// connect(part->widget(), TQ_SIGNAL(cursorPositionChanged()), this, TQ_SLOT(cursorPositionChanged())); + connect( part, TQ_SIGNAL(textChanged()), this, TQ_SLOT(cursorPositionChanged()) ); + connect(part->widget(), TQ_SIGNAL(argHintHidden()), this, TQ_SLOT(argHintHided())); + connect(part->widget(), TQ_SIGNAL(completionAborted()), this, TQ_SLOT(completionBoxHided())); + connect(part->widget(), TQ_SIGNAL(completionDone()), this, TQ_SLOT(completionBoxHided())); } void PHPCodeCompletion::cursorPositionChanged(){ diff --git a/languages/php/phpcodecompletion.h b/languages/php/phpcodecompletion.h index 65905878..3277a64d 100644 --- a/languages/php/phpcodecompletion.h +++ b/languages/php/phpcodecompletion.h @@ -46,7 +46,7 @@ public: }; class PHPCodeCompletion : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/php/phpconfigdata.h b/languages/php/phpconfigdata.h index 40cf07f8..e5840034 100644 --- a/languages/php/phpconfigdata.h +++ b/languages/php/phpconfigdata.h @@ -29,7 +29,7 @@ */ class PHPConfigData : public TQObject { -Q_OBJECT +TQ_OBJECT signals: diff --git a/languages/php/phpconfigwidget.cpp b/languages/php/phpconfigwidget.cpp index 6cddabdf..ac9a8531 100644 --- a/languages/php/phpconfigwidget.cpp +++ b/languages/php/phpconfigwidget.cpp @@ -129,8 +129,8 @@ void PHPConfigWidget::slotAboutClicked() proc << exe_edit->text(); proc << "-m"; - connect( &proc, TQT_SIGNAL(receivedStdout (TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedPHPInfo (TDEProcess*, char*, int))); + connect( &proc, TQ_SIGNAL(receivedStdout (TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedPHPInfo (TDEProcess*, char*, int))); proc.start(TDEProcess::Block,TDEProcess::Stdout); PHPInfoDlg dlg(this,"phpinfo",true); dlg.php_edit->setText(m_phpInfo); diff --git a/languages/php/phpconfigwidget.h b/languages/php/phpconfigwidget.h index 185740fe..8ff34195 100644 --- a/languages/php/phpconfigwidget.h +++ b/languages/php/phpconfigwidget.h @@ -8,7 +8,7 @@ class PHPConfigData; class PHPConfigWidget : public PHPConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/php/phpconfigwidgetbase.ui b/languages/php/phpconfigwidgetbase.ui index 02228756..4213cca5 100644 --- a/languages/php/phpconfigwidgetbase.ui +++ b/languages/php/phpconfigwidgetbase.ui @@ -52,9 +52,6 @@ <property name="text"> <string>Use current file in editor</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>true</bool> </property> @@ -547,12 +544,12 @@ the internal web browser. Please make sure that the webserver was compiled with <tabstop>zend_edit</tabstop> <tabstop>zend_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotAboutClicked()</slot> <slot>slotPHPExeButtonClicked()</slot> <slot>slotPHPIniButtonClicked()</slot> <slot>slotZendButtonClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp index 2ee5bbf3..85cbf4e7 100644 --- a/languages/php/phperrorview.cpp +++ b/languages/php/phperrorview.cpp @@ -136,12 +136,12 @@ PHPErrorView::PHPErrorView( PHPSupportPart* part, TQWidget* parent, const char* m_gridLayout->addWidget(m_filterLabel,0,1,TQt::AlignRight); m_gridLayout->addWidget(m_filterEdit,0,2,TQt::AlignLeft); - connect( m_filterEdit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotFilter()) ); - connect( m_filterEdit, TQT_SIGNAL(textChanged( const TQString & )), this, TQT_SLOT(slotFilter()) ); - connect( m_tabBar, TQT_SIGNAL(selected(int)), this, TQT_SLOT(slotTabSelected(int)) ); - connect( part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); - connect( part->partController(), TQT_SIGNAL(partAdded(KParts::Part*)), this, TQT_SLOT(slotPartAdded(KParts::Part*)) ); - connect( part->partController(), TQT_SIGNAL(partRemoved(KParts::Part*)), this, TQT_SLOT(slotPartRemoved(KParts::Part*)) ); + connect( m_filterEdit, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotFilter()) ); + connect( m_filterEdit, TQ_SIGNAL(textChanged( const TQString & )), this, TQ_SLOT(slotFilter()) ); + connect( m_tabBar, TQ_SIGNAL(selected(int)), this, TQ_SLOT(slotTabSelected(int)) ); + connect( part->partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(partAdded(KParts::Part*)), this, TQ_SLOT(slotPartAdded(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(partRemoved(KParts::Part*)), this, TQ_SLOT(slotPartRemoved(KParts::Part*)) ); slotActivePartChanged( part->partController()->activePart() ); } @@ -186,11 +186,11 @@ void PHPErrorView::InitListView(TDEListView* listview) listview->addColumn( i18n("Problem") ); listview->setAllColumnsShowFocus( TRUE ); - connect( listview, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem*)) ); + connect( listview, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem*)) ); - connect( listview, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem* )) ); + connect( listview, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem* )) ); } diff --git a/languages/php/phperrorview.h b/languages/php/phperrorview.h index ced798a6..d7f2e73b 100644 --- a/languages/php/phperrorview.h +++ b/languages/php/phperrorview.h @@ -55,7 +55,7 @@ enum Errors }; class PHPErrorView: public TQWidget { -Q_OBJECT +TQ_OBJECT public: PHPErrorView( PHPSupportPart* part, TQWidget* parent=0, const char* name=0 ); diff --git a/languages/php/phpfile.cpp b/languages/php/phpfile.cpp index 92d2fc4c..a9861678 100644 --- a/languages/php/phpfile.cpp +++ b/languages/php/phpfile.cpp @@ -44,9 +44,9 @@ PHPFile::PHPFile(PHPSupportPart *phpSupport, const TQString& fileName) /* phpCheckProc = new KShellProcess("/bin/sh"); - connect(phpCheckProc, TQT_SIGNAL(receivedStdout (TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedPHPCheckStdout (TDEProcess*, char*, int))); - connect(phpCheckProc, TQT_SIGNAL(receivedStderr (TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedPHPCheckStderr (TDEProcess*, char*, int))); - connect(phpCheckProc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotPHPCheckExited(TDEProcess*))); + connect(phpCheckProc, TQ_SIGNAL(receivedStdout (TDEProcess*, char*, int)), this, TQ_SLOT(slotReceivedPHPCheckStdout (TDEProcess*, char*, int))); + connect(phpCheckProc, TQ_SIGNAL(receivedStderr (TDEProcess*, char*, int)), this, TQ_SLOT(slotReceivedPHPCheckStderr (TDEProcess*, char*, int))); + connect(phpCheckProc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotPHPCheckExited(TDEProcess*))); */ } diff --git a/languages/php/phpfile.h b/languages/php/phpfile.h index ac5a4525..da4da636 100644 --- a/languages/php/phpfile.h +++ b/languages/php/phpfile.h @@ -46,7 +46,7 @@ @author Escuder Nicolas */ class PHPFile : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/languages/php/phphtmlview.h b/languages/php/phphtmlview.h index e55be392..77ab302d 100644 --- a/languages/php/phphtmlview.h +++ b/languages/php/phphtmlview.h @@ -26,7 +26,7 @@ class PHPSupportPart; class PHPHTMLView : public KDevHTMLPart { -Q_OBJECT +TQ_OBJECT public: PHPHTMLView(PHPSupportPart *part); diff --git a/languages/php/phpnewclassdlg.cpp b/languages/php/phpnewclassdlg.cpp index 061bb956..f7836514 100644 --- a/languages/php/phpnewclassdlg.cpp +++ b/languages/php/phpnewclassdlg.cpp @@ -49,13 +49,13 @@ PHPNewClassDlg::PHPNewClassDlg(const TQStringList& baseClassNames,const TQString m_baseClassEdit->setCompletionObject( comp ); /// @todo change it to KLineEdit - connect(m_baseClassEdit,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&))); - connect(m_classNameEdit,TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(classNameTextChanged(const TQString&))); - connect(m_fileNameEdit,TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(fileNameTextChanged(const TQString&))); - connect(m_dirButton,TQT_SIGNAL(clicked()), - this,TQT_SLOT(slotDirButtonClicked())); + connect(m_baseClassEdit,TQ_SIGNAL(returnPressed(const TQString&)),comp,TQ_SLOT(addItem(const TQString&))); + connect(m_classNameEdit,TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(classNameTextChanged(const TQString&))); + connect(m_fileNameEdit,TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(fileNameTextChanged(const TQString&))); + connect(m_dirButton,TQ_SIGNAL(clicked()), + this,TQ_SLOT(slotDirButtonClicked())); } PHPNewClassDlg::~PHPNewClassDlg(){ } diff --git a/languages/php/phpnewclassdlg.h b/languages/php/phpnewclassdlg.h index 91c832e4..bf1a10e5 100644 --- a/languages/php/phpnewclassdlg.h +++ b/languages/php/phpnewclassdlg.h @@ -26,7 +26,7 @@ */ class PHPNewClassDlg : public PHPNewClassDlgBase { - Q_OBJECT + TQ_OBJECT public: PHPNewClassDlg(const TQStringList& baseClassNames,const TQString& directory,TQWidget *parent=0, const char *name=0); diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp index 252b2167..cf498060 100644 --- a/languages/php/phpsupportpart.cpp +++ b/languages/php/phpsupportpart.cpp @@ -79,23 +79,23 @@ PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStrin setXMLFile("kdevphpsupport.rc"); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), - this, TQT_SLOT(savedFile(const KURL&)) ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), + this, TQ_SLOT(savedFile(const KURL&)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); TDEAction *action; action = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9, - this, TQT_SLOT(slotRun()), + this, TQ_SLOT(slotRun()), actionCollection(), "build_execute" ); action->setToolTip(i18n("Run")); action->setWhatsThis(i18n("<b>Run</b><p>Executes script on a terminal or a webserver.")); action = new TDEAction( i18n("&New Class..."),0, - this, TQT_SLOT(slotNewClass()), + this, TQ_SLOT(slotNewClass()), actionCollection(), "project_new_class" ); action->setToolTip(i18n("New class")); action->setWhatsThis(i18n("<b>New class</b><p>Runs New Class wizard.")); @@ -107,29 +107,29 @@ PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStrin mainWindow()->embedOutputView(m_phpErrorView, i18n("Problems"), i18n("Problems")); phpExeProc = new KShellProcess("/bin/sh"); - connect( phpExeProc, TQT_SIGNAL(receivedStdout (TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedPHPExeStdout (TDEProcess*, char*, int))); - connect( phpExeProc, TQT_SIGNAL(receivedStderr (TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedPHPExeStderr (TDEProcess*, char*, int))); - connect( phpExeProc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotPHPExeExited(TDEProcess*))); + connect( phpExeProc, TQ_SIGNAL(receivedStdout (TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedPHPExeStdout (TDEProcess*, char*, int))); + connect( phpExeProc, TQ_SIGNAL(receivedStderr (TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedPHPExeStderr (TDEProcess*, char*, int))); + connect( phpExeProc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotPHPExeExited(TDEProcess*))); m_htmlView = new PHPHTMLView(this); mainWindow()->embedOutputView(m_htmlView->view(), i18n("PHP"), i18n("PHP")); - connect( m_htmlView, TQT_SIGNAL(started(TDEIO::Job*)), - this, TQT_SLOT(slotWebJobStarted(TDEIO::Job*))); + connect( m_htmlView, TQ_SIGNAL(started(TDEIO::Job*)), + this, TQ_SLOT(slotWebJobStarted(TDEIO::Job*))); configData = new PHPConfigData(projectDom()); - connect( configData, TQT_SIGNAL(configStored()), - this, TQT_SLOT(slotConfigStored())); + connect( configData, TQ_SIGNAL(configStored()), + this, TQ_SLOT(slotConfigStored())); m_codeCompletion = new PHPCodeCompletion(this, configData); - new TDEAction(i18n("Complete Text"), CTRL+Key_Space, m_codeCompletion, TQT_SLOT(cursorPositionChanged()), actionCollection(), "edit_complete_text"); + new TDEAction(i18n("Complete Text"), CTRL+Key_Space, m_codeCompletion, TQ_SLOT(cursorPositionChanged()), actionCollection(), "edit_complete_text"); - connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part *))); - connect( this, TQT_SIGNAL(fileParsed( PHPFile* )), this, TQT_SLOT(slotfileParsed( PHPFile* ))); + connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part *))); + connect( this, TQ_SIGNAL(fileParsed( PHPFile* )), this, TQ_SLOT(slotfileParsed( PHPFile* ))); } PHPSupportPart::~PHPSupportPart() @@ -180,7 +180,7 @@ void PHPSupportPart::slotActivePartChanged(KParts::Part *part) { if (m_editInterface) { // connect to the editor disconnect(part, 0, this, 0 ); // to make sure that it is't connected twice if (configData->getRealtimeParsing()) { - connect(part,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged())); + connect(part,TQ_SIGNAL(textChanged()),this,TQ_SLOT(slotTextChanged())); } m_codeCompletion->setActiveEditorPart(part); } @@ -210,7 +210,7 @@ void PHPSupportPart::slotConfigStored() { void PHPSupportPart::projectConfigWidget(KDialogBase *dlg) { TQVBox *vbox = dlg->addVBoxPage(i18n( "PHP Specific" ), i18n("PHP Settings"), BarIcon( "text-x-src", TDEIcon::SizeMedium )); PHPConfigWidget* w = new PHPConfigWidget(configData,vbox, "php config widget"); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } void PHPSupportPart::slotNewClass() { @@ -242,7 +242,7 @@ bool PHPSupportPart::validateConfig() { TQVBox *vbox = dlg.addVBoxPage(i18n("PHP Settings")); PHPConfigWidget* w = new PHPConfigWidget(configData,vbox, "php config widget"); - connect( &dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( &dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); dlg.exec(); } if (configData->validateConfig()) { @@ -298,10 +298,10 @@ void PHPSupportPart::slotWebJobStarted(TDEIO::Job* job) { if (job && job->className() == TQString("TDEIO::TransferJob")) { kdDebug(9018) << endl << "job started" << job->progressId(); TDEIO::TransferJob *tjob = static_cast<TDEIO::TransferJob*>(job); - connect( tjob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotWebData(TDEIO::Job*, const TQByteArray&))); - connect( tjob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotWebResult(TDEIO::Job*))); + connect( tjob, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQ_SLOT(slotWebData(TDEIO::Job*, const TQByteArray&))); + connect( tjob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotWebResult(TDEIO::Job*))); } } @@ -381,10 +381,10 @@ void PHPSupportPart::projectOpened() { kdDebug(9018) << "projectOpened()" << endl; - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), - this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), - this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQ_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQ_SLOT(removedFilesFromProject(const TQStringList &)) ); if (!m_parser) { m_parser = new PHPParser( this ); @@ -393,7 +393,7 @@ void PHPSupportPart::projectOpened() // We want to parse only after all components have been // properly initialized - TQTimer::singleShot(500, this, TQT_SLOT( initialParse() ) ); + TQTimer::singleShot(500, this, TQ_SLOT( initialParse() ) ); } void PHPSupportPart::initialParse( ) @@ -442,7 +442,7 @@ bool PHPSupportPart::parseProject() _jd->it = _jd->files.begin(); _jd->dir.setPath( project()->projectDirectory() ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) ); return TRUE; } @@ -470,7 +470,7 @@ void PHPSupportPart::slotParseFiles() ++( _jd->it ); } - TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) ); } else // finished or interrupted { diff --git a/languages/php/phpsupportpart.h b/languages/php/phpsupportpart.h index 4dca877b..a3f0e9e8 100644 --- a/languages/php/phpsupportpart.h +++ b/languages/php/phpsupportpart.h @@ -43,7 +43,7 @@ class PHPFile; class PHPSupportPart : public KDevLanguageSupport { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/python/app_templates/pyqt/app.py b/languages/python/app_templates/pyqt/app.py index ede8dc54..960dcf40 100644 --- a/languages/python/app_templates/pyqt/app.py +++ b/languages/python/app_templates/pyqt/app.py @@ -133,7 +133,7 @@ class %{APPNAME}(QMainWindow): def slotOpenFile(self): fileName = str(QFileDialog.getOpenFileName("", "", self)) - print fileName + print(fileName) if not fileName=="": self.load(fileName) else: @@ -262,7 +262,7 @@ def main(args): app=QApplication(args) mainWindow = %{APPNAME}() mainWindow.show() - app.connect(app, SIGNAL("lastWindowClosed()"), app, SLOT("quit()")) + app.connect(app, TQ_SIGNAL("lastWindowClosed()"), app, TQ_SLOT("quit()")) app.exec_loop() diff --git a/languages/python/app_templates/pyqt/pyqt-am-preproc.py b/languages/python/app_templates/pyqt/pyqt-am-preproc.py index ff7b5a16..b58f3328 100644 --- a/languages/python/app_templates/pyqt/pyqt-am-preproc.py +++ b/languages/python/app_templates/pyqt/pyqt-am-preproc.py @@ -7,7 +7,7 @@ # Test real_lines properly # Process Makefile.am's in sub-directories -from __future__ import generators + import sys import re @@ -49,13 +49,13 @@ for l in real_lines(mf): variables[lhs]=rhs # look for app sources -for (var,data) in variables.items(): +for (var,data) in list(variables.items()): spl = var.split("_",1) spl.append("") (prefix,primary) = (spl[0], spl[1]) if primary=="PROGRAMS": target=data - if variables.has_key(target + "_SOURCES"): + if target + "_SOURCES" in variables: sources = variables[target+"_SOURCES"].split() # change .ui into .py diff --git a/languages/python/app_templates/pyqt/templates-ui-dialog b/languages/python/app_templates/pyqt/templates-ui-dialog index 92e9bfff..16eb3a67 100644 --- a/languages/python/app_templates/pyqt/templates-ui-dialog +++ b/languages/python/app_templates/pyqt/templates-ui-dialog @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>Form1</class> -<widget class=TQDIALOG_OBJECT_NAME_STRING> +<widget class="TQDialog"> <property name="name"> <cstring>Form1</cstring> </property> diff --git a/languages/python/app_templates/pyqt/templates-ui-mainwin b/languages/python/app_templates/pyqt/templates-ui-mainwin index fd24b2f5..62d6d51a 100644 --- a/languages/python/app_templates/pyqt/templates-ui-mainwin +++ b/languages/python/app_templates/pyqt/templates-ui-mainwin @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>Form1</class> -<widget class=TQMAINWINDOW_OBJECT_NAME_STRING> +<widget class="TQMainWindow"> <property name="name"> <cstring>Form1</cstring> </property> @@ -111,9 +111,6 @@ <property name="menuText"> <string>Save &As...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -142,9 +139,6 @@ <property name="menuText"> <string>E&xit</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -258,9 +252,6 @@ <property name="menuText"> <string>&Contents...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -272,9 +263,6 @@ <property name="menuText"> <string>&Index...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -286,9 +274,6 @@ <property name="menuText"> <string>&About</string> </property> - <property name="accel"> - <string></string> - </property> </action> </actions> <images> @@ -415,7 +400,7 @@ <slot>helpAbout()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>fileNew()</slot> <slot>fileOpen()</slot> <slot>fileSave()</slot> @@ -431,6 +416,6 @@ <slot>helpIndex()</slot> <slot>helpContents()</slot> <slot>helpAbout()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/python/app_templates/pythonhello/app.py b/languages/python/app_templates/pythonhello/app.py index 3257ce62..33b8be2c 100644 --- a/languages/python/app_templates/pythonhello/app.py +++ b/languages/python/app_templates/pythonhello/app.py @@ -1,7 +1,7 @@ #!/usr/bin/env python def main(): - print 'Hello world!' + print('Hello world!') main() diff --git a/languages/python/app_templates/pytk/app.py b/languages/python/app_templates/pytk/app.py index 39f4aa84..d86508cf 100644 --- a/languages/python/app_templates/pytk/app.py +++ b/languages/python/app_templates/pytk/app.py @@ -1,4 +1,4 @@ -from Tkinter import * +from tkinter import * widget = Label(None, text='Hello world!') widget.pack() widget.mainloop() diff --git a/languages/python/kde_pydoc.py b/languages/python/kde_pydoc.py index 0516f172..c7c246bc 100755 --- a/languages/python/kde_pydoc.py +++ b/languages/python/kde_pydoc.py @@ -6,7 +6,7 @@ __author__ = "David Nolden<david.kde@art-master.de>, Ka-Ping Yee <ping@lfw.org> __version__ = "6 April 2006" import sys, imp, os, stat, re, types, cgi -from repr import Repr +from reprlib import Repr from string import expandtabs, find, join, lower, split, strip, rstrip import pydoc @@ -67,9 +67,9 @@ def writedocs(path, pkgpath='', depth=0, notprocessed=[]): if(depth == 1): if(len(notprocessed) != 0): - print "<br> the following paths were not processed because they are deeper than the maximum depth of " + str(__maxdepth) + ":<br>" + print("<br> the following paths were not processed because they are deeper than the maximum depth of " + str(__maxdepth) + ":<br>") for x in notprocessed: - print cgi.escape(x) + " <br>" + print(cgi.escape(x) + " <br>") def writedoc(key,top=False): """Write HTML documentation to a file in the current directory.""" @@ -86,19 +86,19 @@ def writedoc(key,top=False): seen = {} for dir in pydoc.pathdirs(): indices.append(pydoc.html.index(dir, seen)) - print cleanlinks(heading + join(indices)) + print(cleanlinks(heading + join(indices))) return if(type(key) != types.ModuleType): object = pydoc.locate(key) if(object == None and top): - print "could not locate module/object for key " + \ - cgi.escape(key) + "<br><a href=\"pydoc:modules\">go to index</a>"; + print("could not locate module/object for key " + \ + cgi.escape(key) + "<br><a href=\"pydoc:modules\">go to index</a>"); else: object = key if object: - print cleanlinks(pydoc.html.page(pydoc.describe(object), pydoc.html.document(object))) + print(cleanlinks(pydoc.html.page(pydoc.describe(object), pydoc.html.document(object)))) @@ -109,9 +109,9 @@ if __name__ == '__main__': try: opts, args = getopt.getopt(sys.argv[1:], 'k:p:w') - print "<html>" - print "<head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">" - print "</head><body>" + print("<html>") + print("<head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">") + print("</head><body>") if args: for arg in args: @@ -121,11 +121,11 @@ if __name__ == '__main__': if os.path.isfile(arg): arg = pydoc.importfile(arg) writedoc(arg, True) - except pydoc.ErrorDuringImport, value: - print 'problem in %s - %s' % ( - cgi.escape(value.filename), cgi.escape(value.exc)) + except pydoc.ErrorDuringImport as value: + print('problem in %s - %s' % ( + cgi.escape(value.filename), cgi.escape(value.exc))) else: raise BadUsage except (getopt.error, BadUsage): - print "need parameters\n" + print("need parameters\n") diff --git a/languages/python/pydoc.cpp b/languages/python/pydoc.cpp index bcb38b1e..86027d3a 100644 --- a/languages/python/pydoc.cpp +++ b/languages/python/pydoc.cpp @@ -19,8 +19,12 @@ using namespace TDEIO; PydocProtocol::PydocProtocol(const TQCString &pool, const TQCString &app) : SlaveBase("pydoc", pool, app), key() { - python = TDEGlobal::dirs()->findExe("python"); - script = locate("data", "tdeio_pydoc/kde_pydoc.py"); + python = TDEGlobal::dirs()->findExe("python3"); + if(python.isEmpty()) + { + python = TDEGlobal::dirs()->findExe("python"); + } + script = locate("data", "tdeio_pydoc/kde_pydoc.py"); } diff --git a/languages/python/pythonconfigwidget.h b/languages/python/pythonconfigwidget.h index ceb395d9..d2d2fcd6 100644 --- a/languages/python/pythonconfigwidget.h +++ b/languages/python/pythonconfigwidget.h @@ -18,7 +18,7 @@ class PythonConfigWidget : public PythonConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/python/pythonimplementationwidget.h b/languages/python/pythonimplementationwidget.h index c8e1cbde..52a806f0 100644 --- a/languages/python/pythonimplementationwidget.h +++ b/languages/python/pythonimplementationwidget.h @@ -24,7 +24,7 @@ class PythonImplementationWidget : public ImplementationWidget { -Q_OBJECT +TQ_OBJECT public: PythonImplementationWidget(KDevLanguageSupport* part, TQWidget* parent = 0, const char* name = 0, bool modal = true); diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp index 68baf71e..11e3d44f 100644 --- a/languages/python/pythonsupportpart.cpp +++ b/languages/python/pythonsupportpart.cpp @@ -49,37 +49,37 @@ PythonSupportPart::PythonSupportPart(TQObject *parent, const char *name, const T setXMLFile("kdevpythonsupport.rc"); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), - this, TQT_SLOT(savedFile(const KURL&)) ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), + this, TQ_SLOT(savedFile(const KURL&)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); TDEAction *action; action = new TDEAction( i18n("Execute Program"), "application-x-executable", 0, - this, TQT_SLOT(slotExecute()), + this, TQ_SLOT(slotExecute()), actionCollection(), "build_exec" ); action->setToolTip( i18n("Execute program") ); action->setWhatsThis(i18n("<b>Execute program</b><p>Runs the Python program.")); action = new TDEAction( i18n("Execute String..."), "application-x-executable", 0, - this, TQT_SLOT(slotExecuteString()), + this, TQ_SLOT(slotExecuteString()), actionCollection(), "build_execstring" ); action->setToolTip( i18n("Execute string") ); action->setWhatsThis(i18n("<b>Execute String</b><p>Executes a string as Python code.")); action = new TDEAction( i18n("Start Python Interpreter"), "application-x-executable", 0, - this, TQT_SLOT(slotStartInterpreter()), + this, TQ_SLOT(slotStartInterpreter()), actionCollection(), "build_runinterpreter" ); action->setToolTip( i18n("Start Python interpreter") ); action->setWhatsThis(i18n("<b>Start python interpreter</b><p>Starts the Python interpreter without a program")); action = new TDEAction( i18n("Python Documentation..."), 0, - this, TQT_SLOT(slotPydoc()), + this, TQ_SLOT(slotPydoc()), actionCollection(), "help_pydoc" ); action->setToolTip( i18n("Python documentation") ); action->setWhatsThis(i18n("<b>Python documentation</b><p>Shows a Python documentation page.")); @@ -99,7 +99,7 @@ void PythonSupportPart::contextMenu(TQPopupMenu *popup, const Context *context) if (url.fileName().endsWith(".ui")) { m_contextFileName = url.fileName(); - int id = popup->insertItem(i18n("Create or Select Implementation..."), this, TQT_SLOT(slotCreateSubclass())); + int id = popup->insertItem(i18n("Create or Select Implementation..."), this, TQ_SLOT(slotCreateSubclass())); popup->setWhatsThis(id, i18n("<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner.")); } } @@ -110,7 +110,7 @@ void PythonSupportPart::projectConfigWidget(KDialogBase *dlg) { TQVBox *vbox = dlg->addVBoxPage(i18n("Python")); PythonConfigWidget *w = new PythonConfigWidget(*projectDom(), vbox, "python config widget"); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } @@ -118,14 +118,14 @@ void PythonSupportPart::projectOpened() { kdDebug(9014) << "projectOpened()" << endl; - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), - this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), - this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQ_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQ_SLOT(removedFilesFromProject(const TQStringList &)) ); // We want to parse only after all components have been // properly initialized - TQTimer::singleShot(0, this, TQT_SLOT(initialParse())); + TQTimer::singleShot(0, this, TQ_SLOT(initialParse())); } diff --git a/languages/python/pythonsupportpart.h b/languages/python/pythonsupportpart.h index c60a2eb3..fcac6e6c 100644 --- a/languages/python/pythonsupportpart.h +++ b/languages/python/pythonsupportpart.h @@ -22,7 +22,7 @@ class Context; class PythonSupportPart : public KDevLanguageSupport { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/python/tqtdesignerpythonintegration.h b/languages/python/tqtdesignerpythonintegration.h index 9878acad..8d276817 100644 --- a/languages/python/tqtdesignerpythonintegration.h +++ b/languages/python/tqtdesignerpythonintegration.h @@ -24,7 +24,7 @@ class QtDesignerPythonIntegration : public QtDesignerIntegration { -Q_OBJECT +TQ_OBJECT public: QtDesignerPythonIntegration(KDevLanguageSupport* part, ImplementationWidget* impl); diff --git a/languages/ruby/app_templates/CMakeLists.txt b/languages/ruby/app_templates/CMakeLists.txt index 1f8c054a..6ff8a019 100644 --- a/languages/ruby/app_templates/CMakeLists.txt +++ b/languages/ruby/app_templates/CMakeLists.txt @@ -16,7 +16,6 @@ add_subdirectory( dcopservice ) add_subdirectory( kapp ) add_subdirectory( kxt ) add_subdirectory( rails ) -add_subdirectory( qtruby4app ) install( FILES ruby.appwizard diff --git a/languages/ruby/app_templates/Makefile.am b/languages/ruby/app_templates/Makefile.am index 3150485b..85a6b624 100644 --- a/languages/ruby/app_templates/Makefile.am +++ b/languages/ruby/app_templates/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = rubyhello qtruby qtrubyapp dcopservice kapp kxt rails qtruby4app +SUBDIRS = rubyhello qtruby qtrubyapp dcopservice kapp kxt rails profilesdir = $(kde_datadir)/tdevelop/profiles/IDE/ScriptingLanguageIDE/RubyIDE profiles_DATA = ruby.appwizard diff --git a/languages/ruby/app_templates/dcopservice/dcopservice.rb b/languages/ruby/app_templates/dcopservice/dcopservice.rb index 94a03ec9..b0e59b6d 100644 --- a/languages/ruby/app_templates/dcopservice/dcopservice.rb +++ b/languages/ruby/app_templates/dcopservice/dcopservice.rb @@ -1,10 +1,10 @@ class %{APPNAME} < KDE::DCOPObject - k_dcop 'QString string(int)', + k_dcop 'TQString string(int)', 'QStringList list()', - 'void add(QString)', - 'bool remove(QString)', + 'void add(TQString)', + 'bool remove(TQString)', 'bool exit()' def initialize() diff --git a/languages/ruby/app_templates/kapp/app.rb b/languages/ruby/app_templates/kapp/app.rb index 61531be2..f5b9927e 100644 --- a/languages/ruby/app_templates/kapp/app.rb +++ b/languages/ruby/app_templates/kapp/app.rb @@ -9,14 +9,14 @@ class %{APPNAMESC} < KDE::MainWindow - Q_SLOTS 'fileNew()', + slots 'fileNew()', 'fileOpen()', 'fileSave()', 'fileSaveAs()', 'filePrint()', 'optionsPreferences()', - 'changeStatusbar(const QString&)', - 'changeCaption(const QString&)' + 'changeStatusbar(const TQString&)', + 'changeCaption(const TQString&)' def initialize() super( nil, "%{APPNAMESC}" ) @@ -41,10 +41,10 @@ class %{APPNAMESC} < KDE::MainWindow setupGUI(); # allow the view to change the statusbar and caption - connect(@view, SIGNAL('signalChangeStatusbar(const QString&)'), - self, SLOT('changeStatusbar(const QString&)')) - connect(@view, SIGNAL('signalChangeCaption(const QString&)'), - self, SLOT('changeCaption(const QString&)')) + connect(@view, TQ_SIGNAL('signalChangeStatusbar(const TQString&)'), + self, TQ_SLOT('changeStatusbar(const TQString&)')) + connect(@view, TQ_SIGNAL('signalChangeCaption(const TQString&)'), + self, TQ_SLOT('changeCaption(const TQString&)')) end @@ -74,19 +74,19 @@ class %{APPNAMESC} < KDE::MainWindow end def setupActions() - KDE::StdAction.openNew(self, SLOT('fileNew()'), actionCollection()) - KDE::StdAction.open(self, SLOT('fileOpen()'), actionCollection()) - KDE::StdAction.save(self, SLOT('fileSave()'), actionCollection()) - KDE::StdAction.saveAs(self, SLOT('fileSaveAs()'), actionCollection()) - KDE::StdAction.print(self, SLOT('filePrint()'), actionCollection()) - KDE::StdAction.quit($kapp, SLOT('quit()'), actionCollection()) + KDE::StdAction.openNew(self, TQ_SLOT('fileNew()'), actionCollection()) + KDE::StdAction.open(self, TQ_SLOT('fileOpen()'), actionCollection()) + KDE::StdAction.save(self, TQ_SLOT('fileSave()'), actionCollection()) + KDE::StdAction.saveAs(self, TQ_SLOT('fileSaveAs()'), actionCollection()) + KDE::StdAction.print(self, TQ_SLOT('filePrint()'), actionCollection()) + KDE::StdAction.quit($kapp, TQ_SLOT('quit()'), actionCollection()) - KDE::StdAction.preferences(self, SLOT('optionsPreferences()'), actionCollection()) + KDE::StdAction.preferences(self, TQ_SLOT('optionsPreferences()'), actionCollection()) # this doesn't do anything useful. it's just here to illustrate # how to insert a custom menu and menu item custom = KDE::Action.new(i18n("Cus&tom Menuitem"), KDE::Shortcut.new(), - self, SLOT('optionsPreferences()'), + self, TQ_SLOT('optionsPreferences()'), actionCollection(), "custom_action") end @@ -181,13 +181,13 @@ class %{APPNAMESC} < KDE::MainWindow if @printer.nil? then @printer = KDE::Printer.new end if @printer.setup(self) # setup the printer. with Qt, you always "print" to a - # Qt::Painter.. whether the output medium is a pixmap, a screen, + # TQt::Painter.. whether the output medium is a pixmap, a screen, # or paper - p = Qt::Painter.new + p = TQt::Painter.new p.begin(@printer) # we let our view do the actual printing - metrics = Qt::PaintDeviceMetrics.new(@printer) + metrics = TQt::PaintDeviceMetrics.new(@printer) @view.print(p, metrics.height(), metrics.width()) # and send the result to the printer diff --git a/languages/ruby/app_templates/kapp/appiface.rb b/languages/ruby/app_templates/kapp/appiface.rb index a8be16b5..7ff96bd6 100644 --- a/languages/ruby/app_templates/kapp/appiface.rb +++ b/languages/ruby/app_templates/kapp/appiface.rb @@ -1,6 +1,6 @@ class %{APPNAMESC}Iface < KDE::DCOPObject
- k_dcop 'void openURL(QString)'
+ k_dcop 'void openURL(TQString)'
def initialize(app)
super("%{APPNAMESC}Iface")
diff --git a/languages/ruby/app_templates/kapp/appview.rb b/languages/ruby/app_templates/kapp/appview.rb index e7aabe3c..7ee8133f 100644 --- a/languages/ruby/app_templates/kapp/appview.rb +++ b/languages/ruby/app_templates/kapp/appview.rb @@ -10,20 +10,20 @@ @author %{AUTHOR} <%{EMAIL}> @version %{VERSION} =end -class %{APPNAMESC}View < Qt::Widget +class %{APPNAMESC}View < TQt::Widget # # Use this signal to change the content of the statusbar # - Q_SIGNALS 'signalChangeStatusbar(const QString&)' + signals 'signalChangeStatusbar(const TQString&)' # # Use this signal to change the content of the caption # - Q_SIGNALS 'signalChangeCaption(const QString&)' + signals 'signalChangeCaption(const TQString&)' - Q_SLOTS 'slotOnURL(const QString&)', - 'slotSetTitle(const QString&)' + slots 'slotOnURL(const TQString&)', + 'slotSetTitle(const TQString&)' def initialize(parent) super(parent) @@ -32,7 +32,7 @@ class %{APPNAMESC}View < Qt::Widget @dcop = %{APPNAMESC}Iface.new(self) # setup our layout manager to automatically add our widgets - top_layout = Qt::HBoxLayout.new(self) + top_layout = TQt::HBoxLayout.new(self) top_layout.setAutoAdd(true) # we want to look for all components that satisfy our needs. the @@ -71,10 +71,10 @@ class %{APPNAMESC}View < Qt::Widget return end - connect(@html, SIGNAL('setWindowCaption(const QString&)'), - self, SLOT('slotSetTitle(const QString&)')) - connect(@html, SIGNAL('setStatusBarText(const QString&)'), - self, SLOT('slotOnURL(const QString&)')) + connect(@html, TQ_SIGNAL('setWindowCaption(const TQString&)'), + self, TQ_SLOT('slotSetTitle(const TQString&)')) + connect(@html, TQ_SIGNAL('setStatusBarText(const TQString&)'), + self, TQ_SLOT('slotOnURL(const TQString&)')) end diff --git a/languages/ruby/app_templates/kapp/pref.rb b/languages/ruby/app_templates/kapp/pref.rb index 98669ad2..cf8339e9 100644 --- a/languages/ruby/app_templates/kapp/pref.rb +++ b/languages/ruby/app_templates/kapp/pref.rb @@ -15,24 +15,24 @@ class %{APPNAMESC}Preferences < KDE::DialogBase end end -class %{APPNAMESC}PrefPageOne < Qt::Frame +class %{APPNAMESC}PrefPageOne < TQt::Frame def initialize(parent) super(parent) - layout = Qt::HBoxLayout.new(self) + layout = TQt::HBoxLayout.new(self) layout.setAutoAdd(true) - Qt::Label.new(i18n("Add something here"), self) + TQt::Label.new(i18n("Add something here"), self) end end -class %{APPNAMESC}PrefPageTwo < Qt::Frame +class %{APPNAMESC}PrefPageTwo < TQt::Frame def initialize(parent) super(parent) - layout = Qt::HBoxLayout.new(self) + layout = TQt::HBoxLayout.new(self) layout.setAutoAdd(true) - Qt::Label.new(i18n("Add something here"), self) + TQt::Label.new(i18n("Add something here"), self) end end diff --git a/languages/ruby/app_templates/kxt/app.rb b/languages/ruby/app_templates/kxt/app.rb index 9ab56921..4ffcfe51 100644 --- a/languages/ruby/app_templates/kxt/app.rb +++ b/languages/ruby/app_templates/kxt/app.rb @@ -9,11 +9,11 @@ class %{APPNAMESC} < KDE::MainWindow - Q_SLOTS 'fileNew()', + slots 'fileNew()', 'optionsPreferences()', 'newToolbarConfig()', - 'changeStatusbar(const QString&)', - 'changeCaption(const QString&)' + 'changeStatusbar(const TQString&)', + 'changeCaption(const TQString&)' def initialize() super( nil, "%{APPNAMESC}" ) @@ -40,23 +40,23 @@ class %{APPNAMESC} < KDE::MainWindow setupGUI(); # allow the view to change the statusbar and caption - connect(@view, SIGNAL('signalChangeStatusbar(const QString&)'), - self, SLOT('changeStatusbar(const QString&)')) - connect(@view, SIGNAL('signalChangeCaption(const QString&)'), - self, SLOT('changeCaption(const QString&)')) + connect(@view, TQ_SIGNAL('signalChangeStatusbar(const TQString&)'), + self, TQ_SLOT('changeStatusbar(const TQString&)')) + connect(@view, TQ_SIGNAL('signalChangeCaption(const TQString&)'), + self, TQ_SLOT('changeCaption(const TQString&)')) end def setupActions() - KDE::StdAction.openNew(self, SLOT('fileNew()'), actionCollection()) - KDE::StdAction.quit($kapp, SLOT('quit()'), actionCollection()) + KDE::StdAction.openNew(self, TQ_SLOT('fileNew()'), actionCollection()) + KDE::StdAction.quit($kapp, TQ_SLOT('quit()'), actionCollection()) - KDE::StdAction.preferences(self, SLOT('optionsPreferences()'), actionCollection()) + KDE::StdAction.preferences(self, TQ_SLOT('optionsPreferences()'), actionCollection()) # this doesn't do anything useful. it's just here to illustrate # how to insert a custom menu and menu item custom = KDE::Action.new(i18n("Swi&tch Colors"), KDE::Shortcut.new(), - @view, SLOT('switchColors()'), + @view, TQ_SLOT('switchColors()'), actionCollection(), "switch_action") end @@ -76,7 +76,7 @@ class %{APPNAMESC} < KDE::MainWindow # to the names of the variables in the .kcfg file dialog = KDE::ConfigDialog.new(self, "settings", Settings.instance, KDE::DialogBase::Swallow) dialog.addPage(Prefs.new(), i18n("General"), "package_settings") - connect(dialog, SIGNAL('settingsChanged()'), @view, SLOT('settingsChanged()')) + connect(dialog, TQ_SIGNAL('settingsChanged()'), @view, TQ_SLOT('settingsChanged()')) dialog.show() end diff --git a/languages/ruby/app_templates/kxt/appview.rb b/languages/ruby/app_templates/kxt/appview.rb index 58327208..2557b9da 100644 --- a/languages/ruby/app_templates/kxt/appview.rb +++ b/languages/ruby/app_templates/kxt/appview.rb @@ -15,14 +15,14 @@ class %{APPNAMESC}View < %{APPNAMESC}view_base # # Use this signal to change the content of the statusbar # - Q_SIGNALS 'signalChangeStatusbar(const QString&)' + signals 'signalChangeStatusbar(const TQString&)' # # Use this signal to change the content of the caption # - Q_SIGNALS 'signalChangeCaption(const QString&)' + signals 'signalChangeCaption(const TQString&)' - Q_SLOTS 'switchColors()', + slots 'switchColors()', 'settingsChanged()' def initialize(parent) diff --git a/languages/ruby/app_templates/qtruby/app.rb b/languages/ruby/app_templates/qtruby/app.rb index da817328..68156edd 100755 --- a/languages/ruby/app_templates/qtruby/app.rb +++ b/languages/ruby/app_templates/qtruby/app.rb @@ -2,8 +2,8 @@ require 'Qt' -app = Qt::Application.new(ARGV) -widget = Qt::Widget.new +app = TQt::Application.new(ARGV) +widget = TQt::Widget.new widget.setGeometry(50, 500, 400, 400) widget.caption = "Hello World!" diff --git a/languages/ruby/app_templates/qtruby4app/CMakeLists.txt b/languages/ruby/app_templates/qtruby4app/CMakeLists.txt deleted file mode 100644 index 88476fe2..00000000 --- a/languages/ruby/app_templates/qtruby4app/CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -set( _tarball_content - main.rb qtruby4app.rb qtruby4app.png qtruby4app.kdevelop - application.qrc ReadMe filesave.xpm fileopen.xpm - filenew.xpm editcopy.xpm editpaste.xpm editcut.xpm - app-Makefile app.filelist -) -list( SORT _tarball_content ) - -tde_create_tarball( - TARGET qtruby4app.tar.gz - FILES ${_tarball_content} -) - - -install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/qtruby4app.tar.gz qtruby4app.png - DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) - - -tde_create_translated_desktop( - SOURCE qtruby4app.kdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates - KEYWORDS Category - PO_DIR tdevelop-desktops -) diff --git a/languages/ruby/app_templates/qtruby4app/Makefile.am b/languages/ruby/app_templates/qtruby4app/Makefile.am deleted file mode 100644 index 2bdc1ef9..00000000 --- a/languages/ruby/app_templates/qtruby4app/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -dataFiles = main.rb qtruby4app.rb qtruby4app.png qtruby4app.kdevelop \ - application.qrc ReadMe filesave.xpm fileopen.xpm filenew.xpm \ - editcopy.xpm editpaste.xpm editcut.xpm app-Makefile app.filelist - -templateName = qtruby4app - -### no need to change below: -template_DATA = $(templateName).kdevtemplate -templatedir = ${appwizarddatadir}/templates - -appwizarddatadir = ${kde_datadir}/kdevappwizard -$(templateName).tar.gz: ${dataFiles} - $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} - $(GZIP_COMMAND) -f9 $(templateName).tar - -archivedir = ${appwizarddatadir} -archive_DATA = $(templateName).tar.gz ${templateName}.png - -CLEANFILES = *.tar.gz - diff --git a/languages/ruby/app_templates/qtruby4app/ReadMe b/languages/ruby/app_templates/qtruby4app/ReadMe deleted file mode 100644 index da28297a..00000000 --- a/languages/ruby/app_templates/qtruby4app/ReadMe +++ /dev/null @@ -1,6 +0,0 @@ -READ THIS IN ORDER TO Run THE QtRuby4 APPLICATION -------------------------------------------------- - -Click the 'Build Project' button to generate the qrc_application.rb -file from the application.qrc resource with the rbrcc tool. - diff --git a/languages/ruby/app_templates/qtruby4app/app-Makefile b/languages/ruby/app_templates/qtruby4app/app-Makefile deleted file mode 100644 index 3b3e7944..00000000 --- a/languages/ruby/app_templates/qtruby4app/app-Makefile +++ /dev/null @@ -1,18 +0,0 @@ -qrcs := $(wildcard *.qrc) -uis := $(wildcard *.ui) - -all: gen_qrcs gen_uis - -gen_qrcs: $(qrcs) - @for name in $^; do rbrcc $$name > `echo $$name | awk -F '\\\.qrc$$' '{ printf("qrc_%s", $$1) }' 2> /dev/null`.rb; echo "Running rbrcc on $$name"; done - -gen_uis: $(uis) - @for name in $^; do rbuic4 $$name > `echo $$name | awk -F '\\\.ui$$' '{ print $$1 }' 2> /dev/null`.rb; echo "Running rbuic4 on $$name"; done - -clean: clean_qrcs clean_uis - -clean_qrcs: $(qrcs) - @for name in $^; do rm -f `echo $$name | awk -F '\\\.qrc$$' '{ printf("qrc_%s", $$1) }' 2> /dev/null`.rb; done - -clean_uis: $(uis) - @for name in $^; do rm -f `echo $$name | awk -F '\\\.ui$$' '{ print $$1 }' 2> /dev/null`.rb; done diff --git a/languages/ruby/app_templates/qtruby4app/app.filelist b/languages/ruby/app_templates/qtruby4app/app.filelist deleted file mode 100644 index 339e6998..00000000 --- a/languages/ruby/app_templates/qtruby4app/app.filelist +++ /dev/null @@ -1,3 +0,0 @@ -# KDevelop Custom Project File List -main.rb -%{APPNAMELC}.rb diff --git a/languages/ruby/app_templates/qtruby4app/application.qrc b/languages/ruby/app_templates/qtruby4app/application.qrc deleted file mode 100644 index c35b0695..00000000 --- a/languages/ruby/app_templates/qtruby4app/application.qrc +++ /dev/null @@ -1,10 +0,0 @@ -<!DOCTYPE RCC><RCC version="1.0"> -<qresource> - <file>editcopy.xpm</file> - <file>editcut.xpm</file> - <file>filenew.xpm</file> - <file>fileopen.xpm</file> - <file>editpaste.xpm</file> - <file>filesave.xpm</file> -</qresource> -</RCC>
\ No newline at end of file diff --git a/languages/ruby/app_templates/qtruby4app/editcopy.xpm b/languages/ruby/app_templates/qtruby4app/editcopy.xpm deleted file mode 100644 index 8350ed0e..00000000 --- a/languages/ruby/app_templates/qtruby4app/editcopy.xpm +++ /dev/null @@ -1,193 +0,0 @@ -/* XPM */ -static char *editcopy[] = { -/* columns rows colors chars-per-pixel */ -"32 32 155 2", -" c black", -". c #191000", -"X c #221700", -"o c #2E2300", -"O c #452E00", -"+ c #433200", -"@ c #493000", -"# c #553800", -"$ c #5D4600", -"% c #6B5000", -"& c #724B00", -"* c #7D5E00", -"= c #6E694F", -"- c #7E795F", -"; c #865900", -": c #8A5C00", -"> c #8B6800", -", c #936200", -"< c #926D00", -"1 c #926B1A", -"2 c #967000", -"3 c #9B721D", -"4 c #9B7625", -"5 c #9E792A", -"6 c #A47C00", -"7 c #AA7D00", -"8 c #A1761A", -"9 c #A57816", -"0 c #A4791D", -"q c #AD8200", -"w c #B28500", -"e c #AE8530", -"r c #B99626", -"t c #97906D", -"y c #B18D48", -"u c #B49049", -"i c #B89542", -"p c #BA9C4D", -"a c #BD9E52", -"s c #BFA053", -"d c #B8AE78", -"f c #BEB47E", -"g c #C49300", -"h c #C89600", -"j c #C19D2C", -"k c #C1A43F", -"l c #C09E4E", -"z c #CFB457", -"x c #C9B159", -"c c #CAB573", -"v c #D4BF7C", -"b c #FFDF62", -"n c #FFE064", -"m c #FFE16D", -"M c #FFE372", -"N c #FFE479", -"B c #A19D8E", -"V c #ABA89A", -"C c #BEB580", -"Z c #BDB488", -"A c #B8B496", -"S c #AEADAA", -"D c #B3AFA1", -"F c #BCBBB6", -"G c #BFBFB9", -"H c #C0B680", -"J c #C4BA85", -"K c #C6BD8B", -"L c #CBB589", -"P c #C8BE88", -"I c #C3BC90", -"U c #CBC18C", -"Y c #CCC493", -"T c #D7CB8C", -"R c #DAC786", -"E c #D8C789", -"W c #DAC98B", -"Q c #D0C690", -"! c #D4CA94", -"~ c #D4CC9B", -"^ c #D8CE98", -"/ c #DCD29C", -"( c #C6C3B7", -") c #C8C6BE", -"_ c #D5C5A5", -"` c #DBC8A1", -"' c #DBD4A2", -"] c #DED9AE", -"[ c #D9D5B1", -"{ c #E0CC82", -"} c #E8D98B", -"| c #E8D991", -" . c #E1D7A1", -".. c #E5DBA5", -"X. c #E4DCAB", -"o. c #E8DDAA", -"O. c #E1DCB2", -"+. c #E1DCB8", -"@. c #FFE683", -"#. c #FFE78A", -"$. c #FFE885", -"%. c #FFE88D", -"&. c #FFE992", -"*. c #FFEC9D", -"=. c #FFF09F", -"-. c #ECE2AC", -";. c #E5E0B6", -":. c #E5E1B8", -">. c #EBE4B6", -",. c #EAE5BC", -"<. c #F0E5A8", -"1. c #FFEDA3", -"2. c #FFEDA9", -"3. c #F1E8B8", -"4. c #FFEFB1", -"5. c #FFF1A5", -"6. c #FFF2AD", -"7. c #FFF2B4", -"8. c #FFF2BC", -"9. c #CAC8C2", -"0. c #D6D4CB", -"q. c #DFDAC5", -"w. c #D4D2D0", -"e. c #E0D7C5", -"r. c #E4DAC3", -"t. c #E8DEC7", -"y. c #E0DFD3", -"u. c #E6E2C2", -"i. c #E8E1C5", -"p. c #EBE3CB", -"a. c #EEE9C2", -"s. c #E8E6DC", -"d. c #F3EDC3", -"f. c #F2EDCB", -"g. c #F7F2CD", -"h. c #FFF3C3", -"j. c #FFF4CA", -"k. c #FFF8C5", -"l. c #FFF8CD", -"z. c #FDF5D2", -"x. c #FFF7D8", -"c. c #FFF9D4", -"v. c #FFF9DC", -"b. c #E9E8E7", -"n. c #F3EFE3", -"m. c #F2F0E3", -"M. c #F4F2EA", -"N. c #FBF7E6", -"B. c #FEF9E3", -"V. c #FFFBEC", -"C. c #F4F4F3", -"Z. c #F8F7F6", -"A. c #FEFCF4", -"S. c #FEFEFC", -"D. c None", -/* pixels */ -"D.D.D.D.D.D.D.D.D.D.D.D.h g g g g g g g g g g w * D.D.D.D.D.", -"D.D.D.D.D.D.D.D.D.D.D.D.g z.z.g.g.g.g.g.g.z.g.R 2 D.D.D.D.D.", -"D.D.D.D.D.D.D.D.D.D.D.D.g z.d.3.3.3.3.3.3.>.f.g.z < D.D.D.D.", -"D.D.D.D.D., : ; , : : : 7 a i a R -.-.-.-.' m.u.g.j > D.D.D.", -"D.D.D.D., u y y L L L L ` t.t.e.e v -.-.-.Y b.S.+.d.q D.D.D.", -"D.D.D.D., S.S.S.S.S.S.S.S.Z.b.S.e.i W o.o.K w.S.A.u.q D.D.D.", -"D.D.D.D., S.S.S.A.S.S.S.S.M.w.S.S._ a E ..K 0.S.S.q.7 D.D.D.", -"D.D.D.D., S.A.V.A.A.A.V.A.n.9.S.S.C._ a ..Y t = - A 6 D.D.D.", -"D.D.D.D., A.A.V.A.V.V.V.A.n.9.S.S.S.Z.3 ' ' K Z A ] 7 D.D.D.", -"D.D.D.D., A.V.B.V.V.B.V.V.n.( F S S G 5 ' | / / X.f.q D.D.D.", -"D.D.D.D., A.V.x.B.x.V.B.N.B.e.D B V ) 3 / / ^ ^ ' a.q D.D.D.", -"D.D.D.D., V.N.N.B.B.B.v.v.N.z.p.i.p.n.8 ^ / ! Q ' a.q D.D.D.", -"D.D.D.D., B.B.x.v.x.z.j.j.x.z.z.c.B.B.0 ! ! ! ^ ' ,.q D.D.D.", -"D.D.D.D., B.h.h.z.z.x.x.z.z.z.h.j.x.v.0 ! Q Y ! ~ ,.q D.D.D.", -"D.D.D.D., v.c.k.x.h.j.j.j.z.8.h.k.j.v.0 U T U U ~ ,.q D.D.D.", -"D.D.D.D., v.k.z.h.h.h.j.8.j.h.h.j.k.v.0 U U U U Y ;.q D.D.D.", -"D.D.D.D., x.h.8.8.h.j.8.8.4.h.4.8.h.x.8 P H P P ~ ;.q D.D.D.", -"D.D.D.D., v.h.4.4.8.8.4.1.z.h.8.4.h.c.8 H J H J Y ;.q D.D.D.", -"D.D.D.D., c.2.z.j.4.*.1.1.8.2.2.*.2.l.8 J J H J U ] q D.D.D.", -"D.D.D.D., l.h.2.4.4.1.%.1.&.2.4.8.7.k.8 f d f H U ] q D.D.D.", -"D.D.D.D., z.8.#.1.4.1.*.1.1.1.*.N 4.l.8 f f C K ~ :.q D.D.D.", -"D.D.D.D., 8.&.4.#.%.4.&.@.#.%.%.&.2.l.8 K K Y ~ ] ,.6 D.D.D.", -"D.D.D.D., h.&.#.*.1.1.%.N N #.&.*.1.l.0 ' ] T x r 6 % D.D.D.", -"D.D.D.D., 4.4.%.*.#.b &.N M b M 2.1.k.9 k 7 > $ o D.D.D.", -"D.D.D.D., 7.&.N 5.&.N @.*.b N M N =.k., + D.D.D.", -"D.D.D.D., 6.N N M M &.#.N 2.$.%.8.6.<.& D.D.D.D.D.", -"D.D.D.D., 5.&.7.n $.m M 1.7.7.o.c 5 & @ D.D.D.D.D.D.D.D.D.", -"D.D.D.D., 7.*.m %.=.&.7.} p 1 % # X D.D.D.D.D.D.D.D.D.D.", -"D.D.D.D., 6.5.5.5.| a 1 & + . D.D.D.D.D.D.D.D.D.D.", -"D.D.D.D., 6.-.a 1 & O . D.D.D.D.D.D.D.D.D.D.D.D.", -"D.D.D.D.; : % O . D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.", -"D.D.D.D. D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D." -}; diff --git a/languages/ruby/app_templates/qtruby4app/editcut.xpm b/languages/ruby/app_templates/qtruby4app/editcut.xpm deleted file mode 100644 index 9a118931..00000000 --- a/languages/ruby/app_templates/qtruby4app/editcut.xpm +++ /dev/null @@ -1,252 +0,0 @@ -/* XPM */ -static char *editcut[] = { -/* columns rows colors chars-per-pixel */ -"32 32 214 2", -" c #000000", -". c #0B0B0B", -"X c #181300", -"o c #1D190B", -"O c #131313", -"+ c #1B1B1B", -"@ c #211E11", -"# c #26231A", -"$ c #2A2513", -"% c #2E2912", -"& c #2E2A19", -"* c #372E0B", -"= c #302A12", -"- c #312C1B", -"; c #3A320F", -": c #3C3415", -"> c #3C351B", -", c #232323", -"< c #2B2922", -"1 c #2C2C2C", -"2 c #302E26", -"3 c #353120", -"4 c #3F3B2D", -"5 c #313131", -"6 c #3A3A3A", -"7 c #423814", -"8 c #493E17", -"9 c #413D2F", -"0 c #423F32", -"q c #4F4319", -"w c #5C4A00", -"e c #5F4F0D", -"r c #514410", -"t c #554813", -"y c #4E472C", -"u c #444136", -"i c #4A483F", -"p c #534B2B", -"a c #504B37", -"s c #514C3A", -"d c #654F04", -"f c #604F0B", -"g c #665200", -"h c #675509", -"j c #6B5405", -"k c #6C5807", -"l c #6C590B", -"z c #745B04", -"x c #715D0A", -"c c #7B5B02", -"v c #625B3B", -"b c #7E6815", -"n c #6C643E", -"m c #4D4B42", -"M c #494949", -"N c #504D43", -"B c #54534C", -"V c #515151", -"C c #5D5B54", -"Z c #656048", -"A c #736A44", -"S c #726C54", -"D c #77725B", -"F c #696968", -"G c gray50", -"H c #826203", -"J c #806609", -"K c #836907", -"L c #8D6A03", -"P c #9A6F00", -"I c #9B7005", -"U c #9E730E", -"Y c #9C7511", -"T c #85732C", -"R c #88783B", -"E c #AE7C00", -"W c #A87B13", -"Q c #847B53", -"! c #827D64", -"~ c #9C862E", -"^ c #A98A1F", -"/ c #B28D0A", -"( c #B88D00", -") c #B2821A", -"_ c #B18E1B", -"` c #B3941C", -"' c #A88E2C", -"] c #A28C36", -"[ c #AE9224", -"{ c #89815E", -"} c #87826D", -"| c #858174", -" . c #888370", -".. c #8E8A7D", -"X. c #928C71", -"o. c #A28E44", -"O. c #AA9F74", -"+. c #B9A456", -"@. c #BDA85B", -"#. c #B2A068", -"$. c #C28700", -"%. c #CC8E00", -"&. c #C29A00", -"*. c #C4962F", -"=. c #CCA100", -"-. c #D6A800", -";. c #D1AC1B", -":. c #DDB31A", -">. c #D2A922", -",. c #D4AE2B", -"<. c #DBA12E", -"1. c #DBA433", -"2. c #DDB428", -"3. c #D2B23B", -"4. c #E6A200", -"5. c #E8A509", -"6. c #EAAF00", -"7. c #EFAC1E", -"8. c #F5A100", -"9. c #FFAD02", -"0. c #FCAF0D", -"q. c #FCB005", -"w. c #FFB60C", -"e. c #FFBD00", -"r. c #FFBD16", -"t. c #E3B432", -"y. c #E8BF3C", -"u. c #F6BE2F", -"i. c #C6A949", -"p. c #D9A948", -"a. c #D8AB52", -"s. c #DBBA45", -"d. c #C5B162", -"f. c #ECB74D", -"g. c #EFB841", -"h. c #EFBE4A", -"j. c #EABA55", -"k. c #FDC006", -"l. c #FFC10B", -"z. c #FFC800", -"x. c #FFC90D", -"c. c #FAC113", -"v. c #FBC11C", -"b. c #FDC910", -"n. c #EDC233", -"m. c #F5C32D", -"M. c #FFC728", -"N. c #F4C537", -"B. c #F6C63A", -"V. c #F5CB36", -"C. c #FFD73D", -"Z. c #E9C659", -"A. c #EAC85A", -"S. c #FFDA4B", -"D. c #FFDD5D", -"F. c #E9CD6B", -"G. c #FFD560", -"H. c #FFE06C", -"J. c gray56", -"K. c #959595", -"L. c gray62", -"P. c #A6A18A", -"I. c #A8A69E", -"U. c #AEA895", -"Y. c #B3AC8F", -"T. c #B8AF8B", -"R. c #B4AD96", -"E. c #B8B199", -"W. c #A4A4A4", -"Q. c #AAAAAA", -"!. c #B0ADA3", -"~. c #BBB6A3", -"^. c #B1B1B1", -"/. c #B9B9B6", -"(. c #BBBBBA", -"). c #C5BC9D", -"_. c #C2BCA2", -"`. c #C1BEB5", -"'. c #D2C38E", -"]. c #DCC78C", -"[. c #C7C0A7", -"{. c #C7C2AE", -"}. c #C7C3B2", -"|. c #C5C2B8", -" X c #CAC6B6", -".X c #CBC9BE", -"XX c #D9D3BB", -"oX c #E6D08A", -"OX c #E7DEBD", -"+X c #ECDEB3", -"@X c #FFF0B9", -"#X c #C5C5C5", -"$X c #CECCC7", -"%X c #D0CEC5", -"&X c #D0CFC8", -"*X c #D2D1CB", -"=X c #DBD6C5", -"-X c #DBD7C9", -";X c #D3D3D1", -":X c #DBDBDB", -">X c #E5E1D6", -",X c #E5E3DA", -"<X c #E8E5D9", -"1X c #EDEADC", -"2X c #FEF6DE", -"3X c #E6E6E6", -"4X c #E9E7E2", -"5X c #E9E8E4", -"6X c #EDECEA", -"7X c #F2F1EB", -"8X c #F1F1F1", -"9X c #F8F7F4", -"0X c #F9F8F8", -"qX c None", -/* pixels */ -"qXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqXqXqX5 5 5 1 , qXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqXqX5 V /.&XQ.F 1 , qXqXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqXqX5 _.D.S.H.@X&X6 . qXqXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqXqX5 S.=.w g &.C...+ qXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqXqX5 -.' + o t z.d., qXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqX5 C V.@.+ 3 :.3., qXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqX5 '.b.F.6 , 1 s.,., qXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqX1 b ( n.OXE.E.F.^ + qXqXqXqXqXqXqXqX5 5 1 , ", -"qXqXqXqXqXqXqX l x K A.oXoXZ.i., qXqXqXqXqXqX5 V &X0X6X, ", -"qXqXqXqXqXqXqX 8 ( c.v.k.N.1 qXqXqXqX5 V $X0X0X9XXX, ", -"qXqXqXqXqXqXqXqX O t 6.e.e.k.S O 5 5 V $X8X8X8X1XD : O ", -"qXqXqXqXqXqXqXqXqXqX 3 J e.G.7X#.+ . 5 C |.3X3X5X4X_.4 % ", -"qXqXqXqXqXqXqXqXqXqX q ].0X0X+X, B }.:X:X:X:X=XS & o ", -"qXqXqXqXqXqXqXqXqXqXqX + M 8X8X7XU.Q.#X*X*X*XR.< % qX", -"qXqXqXqXqXqXqXqXqXqXqXqX, 1 X6XW.G Q.L.^.{.Z @ . qXqX", -"qXqXqXqXqXqXqXqXqXqX5 5 m P.W.:X6 . 3X/.X., @ qXqXqXqX", -"qXqXqXqXqXqXqX5 5 5 n +.R.W.J.K.W.^.:X:X1Xm + qXqXqXqXqX", -"qXqXqXqXqX5 5 i o.y.v.q./ P.I.} | R.&X*X;X8X ., qXqXqXqXqXqX", -"qXqX5 5 5 R 3.M.5.E L 7.4._ 0 + O + i ).#X#X5X~., O qXqXqXqX", -"qX5 u ] m.r.%.H r : , t.0.P 7 $ , { `.(.;X-X, + qXqXqX", -"5 u 2.w.$.k t o , ~ h.P l , u T.^.#X<XN , qXqX", -"5 >.9.U r . . , T B.*.x qX + , Q !.Q.<XC , qX", -"p q.1.> . + 1 [ m.p.k . qXqXqXqX , u O.W.;X! + ", -"4 8.j.` p 5 y ;.u.a.d % qXqXqXqXqXqX O , A P._., ", -"1 x <.f.m.x.b.y.a.g ; qXqXqXqXqXqXqXqX + 0 v O ", -" - h c W W W W z : qXqXqXqXqXqXqXqXqXqX . . ", -" * e l l f X qXqXqXqXqXqXqXqXqXqXqXqXqX ", -"qX qXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqX qX", -"qXqXqX qXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqX" -}; diff --git a/languages/ruby/app_templates/qtruby4app/editpaste.xpm b/languages/ruby/app_templates/qtruby4app/editpaste.xpm deleted file mode 100644 index c29ad36b..00000000 --- a/languages/ruby/app_templates/qtruby4app/editpaste.xpm +++ /dev/null @@ -1,295 +0,0 @@ -/* XPM */ -static char *editpaste[] = { -/* columns rows colors chars-per-pixel */ -"32 32 257 2", -" c black", -". c #0D0900", -"X c #191000", -"o c #221700", -"O c #2A1B00", -"+ c #332200", -"@ c #3E2900", -"# c #3A2804", -"$ c #4D3300", -"% c #4B3E15", -"& c #44391B", -"* c #543800", -"= c #5A3B00", -"- c #4D4015", -"; c #524E25", -": c #5A4F2C", -"> c #524E3D", -", c #58562F", -"< c #53503E", -"1 c #5E623B", -"2 c #634100", -"3 c #684500", -"4 c #6E4900", -"5 c #614F11", -"6 c #685416", -"7 c #734C00", -"8 c #784F00", -"9 c #755B00", -"0 c #7C5200", -"q c #7C5A00", -"w c #7B570F", -"e c #69562F", -"r c #786600", -"t c #7F6A00", -"y c #766300", -"u c #60613F", -"i c #7C6422", -"p c #545143", -"a c #54524B", -"s c gray32", -"d c #5D5D57", -"f c #616641", -"g c #67695D", -"h c #6B734D", -"j c #6C7553", -"k c #616261", -"l c #686A64", -"z c #6B7162", -"x c #727272", -"c c #003DFF", -"v c #0043FF", -"b c #004BFF", -"n c #0053FF", -"m c #015AFF", -"M c #0063FF", -"N c #046DFF", -"B c #0865FF", -"V c #0378FF", -"C c #1663FF", -"Z c #1576FF", -"A c #2678FF", -"S c #6F7B84", -"D c #77856D", -"F c #7B8B75", -"G c #0083FF", -"H c #0197FF", -"J c #0B92FF", -"K c #1385FF", -"L c #01A5FF", -"P c #0DB5FF", -"I c #3096FF", -"U c #2DADFF", -"Y c #2FBCFF", -"T c #22C6FF", -"R c #2AC5FF", -"E c #30D0FF", -"W c #38D5FF", -"Q c #4493F1", -"! c #5F83FF", -"~ c #5F8AFF", -"^ c #5290E4", -"/ c #5F92FF", -"( c #4CAAFE", -") c #40B8FF", -"_ c #779DCB", -"` c #6693E2", -"' c #6290FF", -"] c #649DFF", -"[ c #71A6E5", -"{ c #79A4FF", -"} c #7FB3FF", -"| c #68B8F3", -" . c #42DCFF", -".. c #47E0FF", -"X. c #58E9FF", -"o. c #64C0EB", -"O. c #6ADFEF", -"+. c #825600", -"@. c #845A00", -"#. c #8B5C00", -"$. c #905F00", -"%. c #8C6103", -"&. c #876807", -"*. c #8A6111", -"=. c #886E1B", -"-. c #887600", -";. c #8C7A00", -":. c #936200", -">. c #986800", -",. c #926C22", -"<. c #987A3F", -"1. c #A07200", -"2. c #A27511", -"3. c #A97D15", -"4. c #A77B14", -"5. c #998712", -"6. c #A68000", -"7. c #A78F00", -"8. c #AD8016", -"9. c #AC9600", -"0. c #BB8F00", -"q. c #A99B2A", -"w. c #B9A000", -"e. c #B3A63C", -"r. c #958D43", -"t. c #988F44", -"y. c #9A9346", -"u. c #9F9948", -"i. c #8B897C", -"p. c #958F6F", -"a. c #98937B", -"s. c #A68443", -"d. c #B08C41", -"f. c #AF9462", -"g. c #B39864", -"h. c #B2A850", -"j. c #BDB355", -"k. c #C3972F", -"l. c #C5A400", -"z. c #CCAC00", -"x. c #D7BB00", -"c. c #CCA030", -"v. c #CBB43E", -"b. c #E4AD0C", -"n. c #ECB600", -"m. c #EDB900", -"M. c #F2BB00", -"N. c #C1B84C", -"B. c #C1B757", -"V. c #C5BB58", -"C. c #C9BE5A", -"Z. c #C2A978", -"A. c #DFC000", -"S. c #FDCB00", -"D. c #F6C300", -"F. c #FFD100", -"G. c #FEDB00", -"H. c #FFDF0E", -"J. c #F5D500", -"K. c #FBCD39", -"L. c #FFE832", -"P. c #FFE432", -"I. c #CEC25C", -"U. c #D7C648", -"Y. c #DDC74B", -"T. c #D0C55E", -"R. c #D3C85F", -"E. c #D5C960", -"W. c #DDD264", -"Q. c #E0CA4C", -"!. c #E7D14E", -"~. c #EFDA51", -"^. c #F4D050", -"/. c #F9D452", -"(. c #FEDD53", -"). c #E2D765", -"_. c #E9DD69", -"`. c #E6DD68", -"'. c #FDDB6E", -"]. c #FFEE4F", -"[. c #FEE354", -"{. c #FEEA55", -"}. c #F7E153", -"|. c #FFF056", -" X c #ECE16A", -".X c #F1E56D", -"XX c #F7EA6F", -"oX c #F7EB70", -"OX c #F9EC70", -"+X c #FEF372", -"@X c #979486", -"#X c gray60", -"$X c #969596", -"%X c #8AA193", -"&X c #82A89B", -"*X c #8CAEA3", -"=X c #86A7A9", -"-X c #8BA2B1", -";X c #ACA580", -":X c #A5A291", -">X c #B3AF98", -",X c #B8B7AF", -"<X c #B3B2AB", -"1X c #B1B1B1", -"2X c #A6B8FF", -"3X c #88DEE0", -"4X c #8BF0FE", -"5X c #A4CFC6", -"6X c #BFD5FF", -"7X c #BFDCFF", -"8X c #C2AD82", -"9X c #CBB489", -"0X c #D2BF9B", -"qX c #D1C19F", -"wX c #C8C4AA", -"eX c #CFCBB7", -"rX c #D8C7A6", -"tX c #D2C2A3", -"yX c #D5CCB3", -"uX c #DAD1A1", -"iX c #DDD5BB", -"pX c #D7D1B3", -"aX c #ECE5BB", -"sX c #F5EBB5", -"dX c #F5ECBC", -"fX c #F8EEB8", -"gX c #FCF2BC", -"hX c #CBCBCB", -"jX c #D8D6C7", -"kX c #DDDDDD", -"lX c #E4DAC2", -"zX c #ECE6C7", -"xX c #EBE6D9", -"cX c #E9E3D0", -"vX c #F5EDC4", -"bX c #F6EFC9", -"nX c #F0EBD5", -"mX c #F3EFDB", -"MX c #FCF3C5", -"NX c #FCF4CA", -"BX c #F7F0CA", -"VX c #F6F0D2", -"CX c #F9F3D3", -"ZX c #F9F4DC", -"AX c #FFF8D4", -"SX c #FFF9DB", -"DX c #E7E7E4", -"FX c #EBEBE9", -"GX c #F1EDE1", -"HX c #F9F6E5", -"JX c #FDF9E4", -"KX c #FEFBEB", -"LX c #F6F2E6", -"PX c #FEFCF3", -"IX c #FEFDFD", -"UX c #F4F4F3", -"YX c None", -/* pixels */ -"YXYXYXYXYXYX YXYXYXYXYXYXYXYXYXYXYXYXYX", -"YXYXYXYX:.:.+ IXIXIXIXIXIXIXIXFX# +.7 YXYXYXYXYXYXYXYXYXYXYX", -"YXYXYX>.k.c.6 FXkXkXkXDXkXkXkXx i b.>.+ YXYXYXYXYXYXYXYXYXYX", -"YXYXYX:.'.K.=.hX1X1X1X1X1X1X1Xd &.0.%.* 7 #.#.:.$.#.2 YXYXYX", -"YXYXYX:./.M.%.$Xk k d s s s e w >.2.d.s.Z.9XrXlXxX0X7 YXYXYX", -"YXYXYX:.^.M.1.: % % - % 5 6 &.GXIXIXPXPXPXPXPXLXIXIXg.3 YXYX", -"YXYX#X:.^.m.v.y.r.r.r.r.h.h.2.IXPXPXKXKXPXKXHXxXUXIXIXf.4 YX", -"YXYX#X:.^.m.Y.I.B.j.j.j.V.I.4.PXKXJXKXJXKXKXmXjXFXIXIXUX+. YX", -"YXYX#X:.^.m.Y.E.I.j.j.j.I.R.8.PXKXSXJXJXJXSXnXeXDXIXIXUX<. YX", -"YXYXYX:./.M.!.W.R.I.T.R.E.W.8.UXJXJXSXSXSXSXnXeX:X@Xi.<X7 ", -"YXYXYX:./.D.~._.`.W.W.W.W. X8.PXJXSXAXSXSXSXVXjX>X@X@X,X4 ", -"YXYXYX:.(.S.}..X X X X X X X8.PXSXAXAXAXAXAXNXzXpXwXwXjX7 ", -"YXYXYX:.(.S.[.OXOXOXoXoXt.; O s a p p p p a.AXMXvXaXzXGX+. ", -"YXYXYX:.(.S.[.+X+X+XOX+X; 7X2X] / / ~ ! 2Xp MXNXNXNXSXKX+. YX", -"YXYXYX:.(.F.|.+X+X+X+X+Xy., _ A m b v c ! p MXMXgXMXAXKX+. YX", -"YXYXYX:.(.F.|.+X+X+X+X+X+Xj.& ^ B n b v ' < gXMXgXgXNXKX+. YX", -"YXYXYX:.(.F.U.W.+X+X+X+X).y.g Q N m n b ~ < gXgXgXgXAXJXq YX", -"YXYXYX:.[.l.j j y.I.j.r.1 =X( K N M m b ~ < gXgXgXgXNXKX+. YX", -"YXYXYX:.[.t 5X4X&XD F =X| U J G V Z A C / < fXgXgXgXMXHX+. YX", -"YXYXYX:.[.l.h 3XX...W T P L H K I [ S ` { < fXfXfXfXMXKX+. YX", -"YXYXYX:.[.G.e.1 *XO...E R Y Y | -Xd Z.k 6X> fXfXfXfXBXJX+. YX", -"YXYXYX:.[.G.{.`.u.1 F &X*X%Xz l a.uXfXp.> p.sXsXsXfXBXJX+. YX", -"YXYXYX:.{.G.|.+X+X XN.q.5.7.q cXvXsXsXsXsXsXsXsXsXsXBXKX+. YX", -"YXYXYX:.|.G.].|.L.H.G.G.G.A.1.JXvXsXsXsXsXsXsXsXfXdXCXPX+. YX", -"YXYXYX:.{.G.G.G.G.G.x.w.;.t :.HXdXsXsXsXsXsXdXvXBXZXLXtX= YX", -"YXYXYX:.{.G.J.x.9.;.r 9 q 0 #.KXvXsXaXsXvXBXCXHXiXg.*.= O YX", -"YXYXYX:.L.9.-.y 9 q 0 = + #.HXbXdXbXVXZXcX8X,.3 $ . YX", -"YXYXYX%.z.9 q 7 * o $.PXZXmXmX0Xs.0 $ X YX", -"YXYXYX8 0 = o :.IXpXg.*.= O YXYXYXYX", -"YXYXYX YXYX@.#.2 @ . YXYXYXYXYXYX", -"YXYXYX YXYXYXYXYX YXYXYXYXYXYXYXYXYX", -"YXYXYXYXYXYXYXYXYXYXYXYXYXYX YXYXYXYXYXYXYXYXYXYXYXYX" -}; diff --git a/languages/ruby/app_templates/qtruby4app/filenew.xpm b/languages/ruby/app_templates/qtruby4app/filenew.xpm deleted file mode 100644 index 85efceb2..00000000 --- a/languages/ruby/app_templates/qtruby4app/filenew.xpm +++ /dev/null @@ -1,216 +0,0 @@ -/* XPM */ -static char *filenew[] = { -/* columns rows colors chars-per-pixel */ -"32 32 178 2", -" c black", -". c #191000", -"X c #221700", -"o c #452E00", -"O c #4A3100", -"+ c #4E3400", -"@ c #553800", -"# c #604000", -"$ c #6A4600", -"% c #6D4800", -"& c #704A00", -"* c #724C00", -"= c #744C00", -"- c #764E00", -"; c #785000", -": c #805500", -"> c #815500", -", c #835700", -"< c #865900", -"1 c #875A00", -"2 c #8A5B00", -"3 c #8A5C00", -"4 c #8B5C00", -"5 c #8C5D00", -"6 c #8D5D00", -"7 c #8F5E00", -"8 c #805911", -"9 c #905F00", -"0 c #906000", -"q c #926000", -"w c #946200", -"e c #956300", -"r c #966400", -"t c #976400", -"y c #956913", -"u c #926C22", -"i c #9B7732", -"p c #B18D48", -"a c #B28E49", -"s c #B4904A", -"d c #BAA373", -"f c #A1A195", -"g c #ABAB9F", -"h c #ADADAB", -"j c #AFAFAB", -"k c #B3B3A6", -"l c #BCBCB8", -"z c #BFBFBC", -"x c #CBB489", -"c c #CBB58A", -"v c #CDB78B", -"b c #CAB891", -"n c #C9BB9E", -"m c #CEBEA2", -"M c #C6C6BC", -"N c #D9C8A8", -"B c #E8E1BA", -"V c #E8E1BB", -"C c #FEFFA1", -"Z c #FFFFA0", -"A c #FEFFA3", -"S c #FEFFA4", -"D c #FEFFA6", -"F c #FEFFA8", -"G c #FEFFA9", -"H c #FFFFA8", -"J c #FEFFAA", -"K c #FEFFAB", -"L c #FFFFAB", -"P c #FEFFAC", -"I c #FFFFAC", -"U c #FEFFAE", -"Y c #FEFFAF", -"T c #FEFFB0", -"R c #FEFFB1", -"E c #FFFFB0", -"W c #FEFFB4", -"Q c #FEFFB5", -"! c #FFFFB4", -"~ c #FEFFB8", -"^ c #FEFFB9", -"/ c #FFFFB8", -"( c #FFFFB9", -") c #FEFFBB", -"_ c #FFFFBA", -"` c #FEFFBD", -"' c #FFFFBD", -"] c #FEFFBE", -"[ c #FFFFBE", -"{ c #C8C8C1", -"} c #CACAC4", -"| c #CBCBC6", -" . c #DBD2C1", -".. c #DEDFCF", -"X. c #D4D4D1", -"o. c #E1D5C1", -"O. c #E3D9C3", -"+. c #E5DCCC", -"@. c #E8E8D3", -"#. c #ECECD7", -"$. c #F0EBDA", -"%. c #FEFFC2", -"&. c #FEFFC3", -"*. c #FFFFC2", -"=. c #FEFFC7", -"-. c #FFFFC7", -";. c #FEFFCB", -":. c #FEFFCC", -">. c #FFFFCC", -",. c #FEFFCE", -"<. c #FEFFD0", -"1. c #FEFFD1", -"2. c #FFFFD0", -"3. c #FFFFD1", -"4. c #FFFFD3", -"5. c #FEFFD5", -"6. c #FFFFD5", -"7. c #FEFFD6", -"8. c #FEFFD7", -"9. c #FFFFD6", -"0. c #FFFFD8", -"q. c #FEFFDA", -"w. c #FFFFDA", -"e. c #FFFFDB", -"r. c #FFFFDC", -"t. c #FEFFDE", -"y. c #FEFFDF", -"u. c #FFFFDE", -"i. c #FFFFDF", -"p. c #E9E9E7", -"a. c #F3F3E9", -"s. c #F3F3EB", -"d. c #F5F5E8", -"f. c #F8F8E3", -"g. c #FEFFE0", -"h. c LightYellow", -"j. c #FFFFE1", -"k. c #FEFFE3", -"l. c #FFFFE3", -"z. c #FDFEE7", -"x. c #FEFFE4", -"c. c #FEFFE5", -"v. c #FFFFE4", -"b. c #FBFBE9", -"n. c #FEFFE8", -"m. c #FFFFE8", -"M. c #FFFFE9", -"N. c #FFFFEA", -"B. c #FEFFEC", -"V. c #FEFFED", -"C. c #FFFFEC", -"Z. c #FFFFED", -"A. c #FEFFEF", -"S. c #F4F4F0", -"D. c #F4F4F3", -"F. c #F5F5F4", -"G. c #F8F8F6", -"H. c ivory", -"J. c #FFFFF1", -"K. c #FEFFF3", -"L. c #FFFFF3", -"P. c #FEFFF4", -"I. c #FFFFF4", -"U. c #FEFFF7", -"Y. c #FFFFF6", -"T. c #FFFFF7", -"R. c #FBFBFB", -"E. c #FFFFF8", -"W. c #FFFFF9", -"Q. c #FFFFFA", -"!. c #FFFFFB", -"~. c gray99", -"^. c #FEFFFD", -"/. c #FFFFFC", -"(. c #FFFFFD", -"). c #FFFFFE", -"_. c gray100", -"`. c None", -/* pixels */ -"`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.`.w 2 1 w 4 4 4 6 w 9 6 - `.`.`.`.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.r s p p c c c c N O.+.o.y # `.`.`.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.r ).).).).).).).).F.p.). .& o `.`.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w ).E.).E.).E.E.E.S.X.).R.n $ + `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w E.Y.Y.E.Y.E.E.E.a.| ).).D.m % `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w E.Y.Y.J.Y.J.Y.Y.a.| ).).).D.> `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w Y.J.J.J.J.J.J.J.a.M l h h { ; `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w Y.B.B.B.N.N.B.B.b...k f h } ; `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w J.N.N.N.N.N.N.N.l.f.#.@.#.a.> `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w J.l.l.l.l.l.l.l.l.l.l.l.l.J.> `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w J.r.l.l.r.l.r.l.r.l.r.l.r.J.1 `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w B.r.r.q.q.q.q.q.q.r.q.q.r.B.> `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w N.5.5.5.5.q.5.5.5.5.5.5.5.B., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w N.<.<.<.<.<.<.<.5.<.<.<.<.N., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w l.,.;.;.;.,.;.,.;.,.;.;.;.l., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w l.-.-.-.-.-.-.;.-.-.-.-.;.l.> `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w l.-.%.%.%.%.%.%.%.%.%.%.%.l., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w r.' ' ' ' ' ) ' ' ' ' ' ' r., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w r.) ) W ) ) ) ) ) ) W ) ) q., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w q.W W W W W W W W W W W W q., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w 5.Y Y W Y Y Y Y Y Y Y Y Y 5., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w 5.J J J Y J Y Y J Y J J Y q., `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w 5.J J D J J D J D J W ) ,.$.- `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w <.Z D D Z D J Y ' ,.B b i - O `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w <.Z Z Z Y ) <.B d u & @ X `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w ,.J ) ,.B d y & o . `.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.w Y.V d u & o . `.`.`.`.`.`.`.`.", -"`.`.`.`.`.`.`.`.1 4 & o . `.`.`.`.`.`.`.`.`.`.`.", -"`.`.`.`.`.`.`.`. `.`.`.`.`.`.`.`.`.`.`.`.`.`.", -"`.`.`.`.`.`.`.`. `.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`." -}; diff --git a/languages/ruby/app_templates/qtruby4app/fileopen.xpm b/languages/ruby/app_templates/qtruby4app/fileopen.xpm deleted file mode 100644 index a6c33b62..00000000 --- a/languages/ruby/app_templates/qtruby4app/fileopen.xpm +++ /dev/null @@ -1,295 +0,0 @@ -/* XPM */ -static char *fileopen[] = { -/* columns rows colors chars-per-pixel */ -"32 32 257 2", -" c black", -". c #0B0900", -"X c #130E00", -"o c #161100", -"O c #231A00", -"+ c #352600", -"@ c #3B311C", -"# c #433100", -"$ c #4F3B00", -"% c #4A3E16", -"& c #4A3D22", -"* c #4D421A", -"= c #54420D", -"- c #4E4529", -"; c #484338", -": c #484233", -"> c #5B4B24", -", c #624500", -"< c #674D00", -"1 c #6D4D00", -"2 c #6E4F17", -"3 c #6D5200", -"4 c #775500", -"5 c #745B0F", -"6 c #795200", -"7 c #7A5A00", -"8 c #715C18", -"9 c #764B0A", -"0 c #6C5423", -"q c #6D592E", -"w c #785E27", -"e c #735626", -"r c #665736", -"t c #7A631D", -"y c #7A672E", -"u c #776535", -"i c #5C5956", -"p c #78704F", -"a c #75726E", -"s c #8D4F00", -"d c #815700", -"f c #835A00", -"g c #8A5C00", -"h c #866400", -"j c #966100", -"k c #956F00", -"l c #9C6100", -"z c #9D7500", -"x c #856B2A", -"c c #8C752A", -"v c #8C723B", -"b c #977939", -"n c #A45D00", -"m c #A26100", -"M c #AA680D", -"N c #AB6700", -"B c #A07700", -"V c #A57B00", -"C c #AB7A00", -"Z c #AA7300", -"A c #AF721A", -"S c #B87E00", -"D c #B57B00", -"F c #B0731A", -"G c #B47C26", -"H c #B77E28", -"J c #897F59", -"K c #977C40", -"L c #927F58", -"P c #807A6C", -"I c #9C821D", -"U c #9F8A35", -"Y c #AC8000", -"T c #B28500", -"R c #B68800", -"E c #BB8B00", -"W c #A78337", -"Q c #A28B31", -"! c #AF9535", -"~ c #B58E3A", -"^ c #B88633", -"/ c #B49936", -"( c #BCA039", -") c #998445", -"_ c #978657", -"` c #8B8264", -"' c #8E8572", -"] c #978864", -"[ c #978C75", -"{ c #9F9072", -"} c #A38845", -"| c #A48952", -" . c #AA965C", -".. c #A89156", -"X. c #B5934D", -"o. c #B39D45", -"O. c #B49755", -"+. c #AB984A", -"@. c #AD9A65", -"#. c #A79778", -"$. c #A59874", -"%. c #A29B7A", -"&. c #A79775", -"*. c #BDA959", -"=. c #B3A46C", -"-. c #B1A07F", -";. c #B5A97A", -":. c #BEB37B", -">. c #C49200", -",. c #C89500", -"<. c #CC9800", -"1. c #C69812", -"2. c #D2A31C", -"3. c #C2A63E", -"4. c #D7AE37", -"5. c #C29840", -"6. c #C29B4E", -"7. c #C2A641", -"8. c #C6AA43", -"9. c #C8AC45", -"0. c #CBAF49", -"q. c #CAA746", -"w. c #C4A158", -"e. c #CAA65D", -"r. c #CEA857", -"t. c #CFA95A", -"y. c #C5AC50", -"u. c #CDB14B", -"i. c #CBB358", -"p. c #CAB152", -"a. c #D2AB59", -"s. c #D1B54D", -"d. c #D4B951", -"f. c #D6BC5B", -"g. c #DDB45E", -"h. c #D9BD56", -"j. c #D2B753", -"k. c #DAAB48", -"l. c #CEAE69", -"z. c #CCAD67", -"x. c #CCB662", -"c. c #CAB26B", -"v. c #C8B66B", -"b. c #CEB775", -"n. c #CEBE7F", -"m. c #D3AD66", -"M. c #D5BE64", -"N. c #D4BF6D", -"B. c #E4B34B", -"V. c #E0B75F", -"C. c #E1B85F", -"Z. c #E4BA61", -"A. c #E9BE63", -"S. c #DDC159", -"D. c #DAC269", -"F. c #D4C176", -"G. c #D8C67F", -"H. c #E1C55D", -"J. c #EFC05D", -"K. c #F1C15E", -"L. c #E0C264", -"P. c #E5C961", -"I. c #EDC164", -"U. c #E9CD65", -"Y. c #EFD36B", -"T. c #F2C564", -"R. c #F6C868", -"E. c #F8C760", -"W. c #FBCC6A", -"Q. c #FDCB63", -"!. c #F1D56D", -"~. c #FFD06C", -"^. c #F5D972", -"/. c #FED175", -"(. c #FADE77", -"). c #E4C87A", -"_. c #FEE27C", -"`. c #8F9192", -"'. c #9A9A96", -"]. c #A79F83", -"[. c #ADA583", -"{. c #A7A399", -"}. c #BBAC86", -"|. c #BDB088", -" X c #BBB298", -".X c #A7A8A6", -"XX c #ADAEB0", -"oX c #B5B6B4", -"OX c #BABCBC", -"+X c #C6B38E", -"@X c #D3BE80", -"#X c #D0BC95", -"$X c #C6BFA6", -"%X c #C5C29D", -"&X c #D2C283", -"*X c #DAC789", -"=X c #DBCA8B", -"-X c #D5C489", -";X c #DBCD94", -":X c #D6C699", -">X c #CFC8B1", -",X c #C8C6B7", -"<X c #D1C9A6", -"1X c #DBD3BA", -"2X c #E1C981", -"3X c #E0CD91", -"4X c #ECD686", -"5X c #EBD69E", -"6X c #FED682", -"7X c #FED88B", -"8X c #FEDC95", -"9X c #E3CEA3", -"0X c #EED9A9", -"qX c #E7DCB9", -"wX c #F4DDAF", -"eX c #FFE68A", -"rX c #FFE893", -"tX c #FFEA9F", -"yX c #FFE2A5", -"uX c #FFE3AC", -"iX c #FFECA7", -"pX c #FFEDAE", -"aX c #F1E0B6", -"sX c #FDE5B4", -"dX c #FFEEB4", -"fX c #F8E5BB", -"gX c #FFF0BC", -"hX c #C5C7C8", -"jX c #C7C8CA", -"kX c #CCCECF", -"lX c #CCCAC0", -"zX c #CDCED0", -"xX c #D1D1CF", -"cX c #D1D3D4", -"vX c #D6D8DA", -"bX c #DADCDE", -"nX c #DCDEE0", -"mX c #DEE0E2", -"MX c #E7DEC2", -"NX c #EBE1C5", -"BX c #F4E9C3", -"VX c #F7EACE", -"CX c #FEEAC3", -"ZX c #FAEBCA", -"AX c #FFF1C1", -"SX c #FFF3CC", -"DX c #FFF6DA", -"FX c #E1E3E5", -"GX c #E4E6E8", -"HX c #E7E9EA", -"JX c #E8E6E0", -"KX c #E9EAEC", -"LX c #ECEEF0", -"PX c #EEF0F2", -"IX c #F8F4E8", -"UX c #F1F3F5", -"YX c None", -/* pixels */ -"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX V E <.,.T YXYXYXYXYXYX", -"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX< E 2.aXCXVXE 3 E <.E YXYX", -"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX R ,.5XCX8XQ.wX<.1.$.OX<. YXYX", -"YXYXYXYXYXYXYXYXYXYXYXYXYXYX R >.L.ZXyXT.K.E.wX ..XKXKXR YXYX", -"YXYXYXYXYXYXYXYXYXYXYXYX V E 4.ZXsXW.K.I.Z.O.{.KXUXUXMXk YXYX", -"YXYXYXYXYXYX R E 7 YX< E 2.aXsX6XC.T.Z.w.[ xXUXUXUXUX2X3 YXYX", -"YXYXYXYX R >.).5X,.T ,.5XCX8XK.T.A.a.] OXUXUXUXUXUXUX2.O YXYX", -"YXYX Y E Z.ZXsX7XsX0XCXyXR.K.I.V._ .XUXUXUXUXUXLXKXJXV D N S 7 ", -" z E 4.fXsX/.K.~./.6X~.I.I.C...'.KXUXPXPXPXLXKXGXbXl.N m.SXm.D ", -" E 0XgX7XE.W.W.~.~.R.I.Z.w.' bXUXUXUXPXPXLXmXbX$X) ~ aXSXpXBXn ", -" <.CXT.Q.~.W.W.R.I.A.t._ hXUXUXUXUXPXLXGXnX,X .t XAXSXeX4Xl.Z ", -" <.sXB.W.W.W.T.A.g._ oXUXUXUXUXUXLXLXmXcX=.5 $.BXgXeX!.D.3Xm + ", -" <.sXB.R.R.A.V.| {.KXUXUXUXUXLXKXGXvX|.c u qXdXgX^.U.f.3XH f ", -" <.sXB.T.Z.m.[ nXUXUXUXUXPXKXHXbX,X) e <XdXiX_.S.u.P.F.t.h ", -" <.sXk.Z.r.K jXUXUXUXPXLXKXmXcX@.5 %.DXiX_.Y.S.d.h.D.*Xl X ", -" <.wXq.r.X.r UXUXPXPXKXmXvX|.y _ NXdXrX!.S.d.h.d.f.=XF 4 YX", -" ,.0X5.X.) a PXPXKXGXnX>X) y >XAXAX_.S.h.h.u.s.d.F.6.g YX", -" >.9X~ } u '.LXKXmXxX .5 [.IXAX_.!.S.h.h.d.8.s.D.n.j YXYX", -" >.:XW v & kXmXvX;.t ] BXAXrX!.U.u.S.9.u.3.7.i.;XM 1 YXYXYX", -" E #Xb u : nXcX_ u 1XSXgX^.U.H.S.d.8.s.d.u.b.-XG g YXYXYXYX", -" R +Xc r a zX[.= -XdX_.U.d.P.h.d.u.3.8.N.=Xw.l 1 YXYXYXYX", -" T }.x > `.oX> %.*.S.S.h.S.7.d.h.0.p.n.c.M d . YXYXYXYXYX", -" C ].w @ XXu p *.( h.S.s.u.u.u.p.N.*X^ g + YXYXYXYXYXYX", -" Z &.e ; ` * :.o.S.S.S.u.( 9.x.&XX.j , YXYXYXYXYXYX", -" B { 0 i % [.o.u.S.d.h.9.M.&Xz.M 6 YXYXYXYXYXYXYXYX", -" z { 0 - J *./ S.9.d.i.G.&XF g O YXYXYXYXYXYXYXYXYXYX", -" z $.2 w =.! s.d.p.N.;X^ l , YXYXYXYXYXYXYXYXYXYXYX", -" B &.9 ;.Q / j.x.@Xl.m 6 YXYXYXYXYXYXYXYXYXYXYXYXYX", -" h W @.+.I y.&Xb.F 7 O YXYXYXYXYXYXYXYXYXYXYXYXYXYXYX", -" $ s %XU F.=X^ j # YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX", -" g O.<Xe.l 1 YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX", -" o f n d . YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX" -}; diff --git a/languages/ruby/app_templates/qtruby4app/filesave.xpm b/languages/ruby/app_templates/qtruby4app/filesave.xpm deleted file mode 100644 index 86ea7d63..00000000 --- a/languages/ruby/app_templates/qtruby4app/filesave.xpm +++ /dev/null @@ -1,295 +0,0 @@ -/* XPM */ -static char *filesave[] = { -/* columns rows colors chars-per-pixel */ -"32 32 257 2", -" c #000000", -". c #06060A", -"X c #09090D", -"o c #0B0B16", -"O c #101022", -"+ c #1E1E28", -"@ c #181829", -"# c #151F3A", -"$ c #1A263F", -"% c #1D2A3F", -"& c #272730", -"* c #2E2E3F", -"= c #212140", -"- c #212E41", -"; c #2F2F41", -": c #292A4A", -"> c #23224B", -", c #262353", -"< c #292655", -"1 c #2B2C54", -"2 c #2C2C5B", -"3 c #293746", -"4 c #2D304F", -"5 c #243243", -"6 c #2E315D", -"7 c #363647", -"8 c #303E4A", -"9 c #30325E", -"0 c #3C3C53", -"q c #2E2E60", -"w c #2F3160", -"e c #302E63", -"r c #313164", -"t c #363861", -"y c #353868", -"u c #384650", -"i c #284F6B", -"p c #2D547B", -"a c #3B486A", -"s c #36597D", -"d c #3D5D7C", -"f c #4C4C4C", -"g c #40405A", -"h c #414E56", -"j c #4B585E", -"k c #49545E", -"l c #555555", -"z c #4D4D6B", -"x c #434675", -"c c #4B5660", -"v c #4F5962", -"b c #41517E", -"n c #4B507D", -"m c #515C67", -"M c #505D6E", -"N c #5C5D7D", -"B c #546066", -"V c #54626D", -"C c #5B646D", -"Z c #55677A", -"A c #556B78", -"S c #5D6772", -"D c #6B6B6B", -"F c #646464", -"G c #616C73", -"H c #63707D", -"J c #6B7679", -"K c gray45", -"L c #00418E", -"P c #004494", -"I c #004894", -"U c #044F98", -"Y c #03509B", -"T c #0A5198", -"R c #13579C", -"E c #185DA1", -"W c #285888", -"Q c #2B6094", -"! c #396D9A", -"~ c #336A96", -"^ c #3D719B", -"/ c #226EB8", -"( c #326EA8", -") c #326BA3", -"_ c #3673AE", -"` c #3A76B4", -"' c #0B6FD1", -"] c #0F75D8", -"[ c #1479DA", -"{ c #1B7CDC", -"} c #466481", -"| c #42749C", -" . c #4A799E", -".. c #506A84", -"X. c #5F678D", -"o. c #576391", -"O. c #5A6592", -"+. c #5F6893", -"@. c #5B738B", -"#. c #507DA1", -"$. c #626283", -"%. c #636A94", -"&. c #656F98", -"*. c #657A8F", -"=. c #6B7299", -"-. c #717191", -";. c #797998", -":. c #687BA6", -">. c #2281DC", -",. c #3F81C0", -"<. c #3988D7", -"1. c #2785E1", -"2. c #2E8AE3", -"3. c #368FE5", -"4. c #3690E6", -"5. c #3D93E7", -"6. c #3D94E9", -"7. c #57839E", -"8. c #4787BC", -"9. c #5480A1", -"0. c #5B84A3", -"q. c #6E8496", -"w. c #6E8B9A", -"e. c #7D848E", -"r. c #728597", -"t. c #738598", -"y. c #768899", -"u. c #7B8B9B", -"i. c #6489A5", -"p. c #698EA7", -"a. c #6D8FA9", -"s. c #6E81AB", -"d. c #7683A6", -"f. c #768CB7", -"g. c #7395AD", -"h. c #7C96B0", -"j. c #4086CA", -"k. c #4986C3", -"l. c #4284C3", -"z. c #498ED2", -"x. c #4D95DB", -"c. c #548DC5", -"v. c #5D92C8", -"b. c #5593C9", -"n. c #5097DE", -"m. c #5198DE", -"M. c #4296E7", -"N. c #4895E2", -"B. c #4B99E5", -"V. c #4A9CEB", -"C. c #4599EB", -"Z. c #529DE6", -"A. c #589EE2", -"S. c #54A1EB", -"D. c #5AA1E6", -"F. c #5AA5EB", -"G. c #5EA8EF", -"H. c #53A3F1", -"J. c #5EAAF2", -"K. c #6699CB", -"L. c #799BC8", -"P. c #7EA6C9", -"I. c #60A2E5", -"U. c #65A7E8", -"Y. c #6BABE9", -"T. c #68ADF2", -"R. c #67B0F5", -"E. c #6DB3F6", -"W. c #70ADEA", -"Q. c #75B0E9", -"!. c #7CB5EB", -"~. c #73B9F8", -"^. c #7BBDFB", -"/. c #7CBAF6", -"(. c gray55", -"). c #828899", -"_. c #84949E", -"`. c #918E8A", -"'. c #949494", -"]. c #8F8FA9", -"[. c #8997A5", -"{. c #8A9AA9", -"}. c #9A9BAF", -"|. c #9399A9", -" X c #9FAAB5", -".X c #A29E9B", -"XX c #A7A7A7", -"oX c #ABABAB", -"OX c #A3A3B4", -"+X c #A8A8B7", -"@X c #A3ABB3", -"#X c #B4B5B5", -"$X c #B0B0BC", -"%X c #B7B9BC", -"&X c #BBB7B3", -"*X c #BBBBBB", -"=X c #82B1DB", -"-X c #81B7EC", -";X c #88BBED", -":X c #86BAED", -">X c #AEBBC8", -",X c #A6BDCD", -"<X c #BBBCC3", -"1X c #81C1F6", -"2X c #83C2FA", -"3X c #89C4FA", -"4X c #8CC8FC", -"5X c #95C2EF", -"6X c #93CBFD", -"7X c #9BCFFF", -"8X c #97D0FC", -"9X c #9CD3FE", -"0X c #BEC0C1", -"qX c #A3C7E7", -"wX c #A2CAF1", -"eX c #A1D4FF", -"rX c #A3D8FF", -"tX c #AADBFF", -"yX c #B0D1F2", -"uX c #BDD9F4", -"iX c #AAE0FF", -"pX c #B3E1FF", -"aX c #B9E6FF", -"sX c #BEE9FF", -"dX c #C4C4C4", -"fX c #C6C5CD", -"gX c #C6C8CB", -"hX c #CAC7C4", -"jX c #CAC8C6", -"kX c #CBCCCB", -"lX c #D1D0CE", -"zX c #D3D3D3", -"xX c #D4D7D9", -"cX c #D8D8D7", -"vX c #DBDBDB", -"bX c #C4ECFF", -"nX c #C9E0F6", -"mX c #C4F5FF", -"MX c #CCF2FF", -"NX c #D5E6F7", -"BX c #DDEBF9", -"VX c #DCFDFF", -"CX c #D3F1F5", -"ZX c #E1E0DE", -"AX c #E4E3E3", -"SX c #E4E7EA", -"DX c #E7E8E9", -"FX c #E8E6E4", -"GX c #EDE9E5", -"HX c #EBEBEB", -"JX c #E7EEF5", -"KX c #EAF2FA", -"LX c #F1EEEA", -"PX c #F3F3F3", -"IX c #F4F8FC", -"UX c #FDFDFC", -"YX c None", -/* pixels */ -"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXy y e 6 6 2 < < , , 1 YXYX", -"YXYXYX2 < , , q w 2 e r r r w e w r e 2 6 1 6 s :.f.L.y YXYX", -"YXYXYXx d.s.:.a # $ $ % - 5 3 8 u h k B S J ).,XF.b.7.r YXYX", -"YXYXYX&.mX~.8.V #X#X%XdXfXzXxXvXZXZXDXFXFXDXLXDX>.U i 9 YXYX", -"YXYXYXo.2X] L C UXDXcXzXkXkXkXjXjXdXdX%X%X&X%X*XN.' ~ 6 YXYX", -"YXYXYXo.1X] P k hXoXXXXXoXoX#X#X*X%X&X%X%XdXkXxXx.[ ~ 6 YXYX", -"YXYXYXO.3X[ I m FXkXjXjXkXkXkXkXkXkXzXzXzXcXZXSXx.{ ! 6 YXYX", -"YXYXYXo.3X{ I S UXvXxXzXkXkXkXkXkXjXdX*X%X#X&X%XZ.1.^ 9 YXYX", -"YXYXYXO.4X>.U j jX#X#X#X%XdXdXkXzXkXzXzXcXvXDXJXA.1.| 6 YXYX", -"YXYXYXO.6X>.T V PXZXZXZXAXSXDXDXFXHXDXHXHXHXHXSXI.2.| 9 YXYX", -"YXYXYXO.6X2.T G UXLXDXDXAXZXZXAXZXvXcXzXkXkXkXgXY.3. .6 YXYX", -"YXYXYXO.9X4.R m zXdXdXkXzXvXAXDXHXLXPXPXIXUXUXUXQ.6. .9 YXYX", -"YXYXYXO.9X5.R H UXIXUXUXUXUXUXUXUXUXUXUXIXKXJXBX-XC.#.9 YXYX", -"YXYXYXO.eXM./ h.UXUXIXKXBXNXnXuXyXwX5X:X!.Y.Y.Y.D.H.9.6 YXYX", -"YXYXYX+.rXB.<.x.Q.;X-XQ.Y.U.U.D.Z.Z.B.B.C.V.V.B.B.T.0.9 YXYX", -"YXYXYX+.tXB.N.B.B.B.B.C.V.V.H.H.H.D.N.z.8._ ( <.D.R.0.9 YXYX", -"YXYXYX+.tXS.Z.F.D.m.z.l.` ) Q W p s } @.r.[. X>XG.E.0.9 YXYX", -"YXYXYX+.pXU.m.) p d ..*.u.|.+X<XzXZXGXLXGXZXzXjX/.~.p.r YXYX", -"YXYXYX%.aXT.k.*.GXlX&X.X`..XhXlXzXvXvXvXvXxXkXgX2X^.a.w YXYX", -"YXYXYX%.aXE.k.r.LXoXl f l F *XlXzXvXvXvXvXcXzXgX4X:Xa.w YXYX", -"YXYXYX%.bX~.c.y.LX'.f D K D 0XkXzXvXvXvXvXvXzXfX6X4Xg.9 YXYX", -"YXYXYX%.bX^.c.y.LX'.l D K D 0XlXzXcXvXvXvXxXkXkX9X6Xw.r YXYX", -"YXYXYX%.bX2Xv.u.LX'.l K K K 0XlXzXcXvXvXvXvXkXfX9XP.M = YXYX", -"YXYXYX%.bX2XK.u.LX'.l K K D 0XlXxXcXvXZXvXxXzXkXqXZ : . YXYX", -"YXYXYX%.MX6XK.u.LX'.f F D D 0XkXzXcXvXvXvXvXcXkX_.: o YXYX", -"YXYXYX%.MX6XK.u.LXXX(.XX&XdXkXzXvXZXDXAXzX<X+X}.N O YXYX", -"YXYXYX%.VXiX=X{.FXzXkXkXjXdX<X$XOX].;.$.z 0 7 & X YXYXYX", -"YXYXYX=.CXq.A ).fX+X|.).-.N z 0 * + o YXYXYXYX", -"YXYXYXn $.t 6 , 4 0 * + . YXYXYXYXYXYX", -"YXYXYX> @ o YXYXYXYXYXYXYXYXYXYXYXYX", -"YXYXYX YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX", -"YXYXYX YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX" -}; diff --git a/languages/ruby/app_templates/qtruby4app/main.rb b/languages/ruby/app_templates/qtruby4app/main.rb deleted file mode 100644 index 7b5aaf60..00000000 --- a/languages/ruby/app_templates/qtruby4app/main.rb +++ /dev/null @@ -1,10 +0,0 @@ -require 'Qt4' -require '%{APPNAMELC}.rb' -require 'qrc_application.rb' - -app = Qt::Application.new(ARGV) -mw = %{APPNAME}.new -mw.show -app.exec - - diff --git a/languages/ruby/app_templates/qtruby4app/qrc_application.rb b/languages/ruby/app_templates/qtruby4app/qrc_application.rb deleted file mode 100644 index 861ea1e0..00000000 --- a/languages/ruby/app_templates/qtruby4app/qrc_application.rb +++ /dev/null @@ -1,2281 +0,0 @@ -#**************************************************************************** -#** Ruby Resource object code -#** -#** Created: Mon Dec 3 14:03:30 2007 -#** by: The Ruby Resource Compiler for Qt version 4.3.0 -#** -#** WARNING! All changes made in this file will be lost! -#****************************************************************************/ - -class QCleanupResources__dest_class__ - def self.qt_resource_data - return @@qt_resource_data - end - - def self.qt_resource_name - return @@qt_resource_name - end - - def self.qt_resource_struct - return @@qt_resource_struct - end - -@@qt_resource_data = [ - # /home/rdale/src/kde/branches/KDE/3.5/tdevelop/languages/ruby/app_templates/qtruby4makeapp/fileopen.xpm - 0x0,0x0,0x18,0xf9, - 0x2f, - 0x2a,0x20,0x58,0x50,0x4d,0x20,0x2a,0x2f,0xa,0x73,0x74,0x61,0x74,0x69,0x63,0x20, - 0x63,0x68,0x61,0x72,0x20,0x2a,0x66,0x69,0x6c,0x65,0x6f,0x70,0x65,0x6e,0x5b,0x5d, - 0x20,0x3d,0x20,0x7b,0xa,0x2f,0x2a,0x20,0x63,0x6f,0x6c,0x75,0x6d,0x6e,0x73,0x20, - 0x72,0x6f,0x77,0x73,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x73,0x20,0x63,0x68,0x61,0x72, - 0x73,0x2d,0x70,0x65,0x72,0x2d,0x70,0x69,0x78,0x65,0x6c,0x20,0x2a,0x2f,0xa,0x22, - 0x33,0x32,0x20,0x33,0x32,0x20,0x32,0x35,0x37,0x20,0x32,0x22,0x2c,0xa,0x22,0x20, - 0x20,0x20,0x63,0x20,0x62,0x6c,0x61,0x63,0x6b,0x22,0x2c,0xa,0x22,0x2e,0x20,0x20, - 0x63,0x20,0x23,0x30,0x42,0x30,0x39,0x30,0x30,0x22,0x2c,0xa,0x22,0x58,0x20,0x20, - 0x63,0x20,0x23,0x31,0x33,0x30,0x45,0x30,0x30,0x22,0x2c,0xa,0x22,0x6f,0x20,0x20, - 0x63,0x20,0x23,0x31,0x36,0x31,0x31,0x30,0x30,0x22,0x2c,0xa,0x22,0x4f,0x20,0x20, - 0x63,0x20,0x23,0x32,0x33,0x31,0x41,0x30,0x30,0x22,0x2c,0xa,0x22,0x2b,0x20,0x20, - 0x63,0x20,0x23,0x33,0x35,0x32,0x36,0x30,0x30,0x22,0x2c,0xa,0x22,0x40,0x20,0x20, - 0x63,0x20,0x23,0x33,0x42,0x33,0x31,0x31,0x43,0x22,0x2c,0xa,0x22,0x23,0x20,0x20, - 0x63,0x20,0x23,0x34,0x33,0x33,0x31,0x30,0x30,0x22,0x2c,0xa,0x22,0x24,0x20,0x20, - 0x63,0x20,0x23,0x34,0x46,0x33,0x42,0x30,0x30,0x22,0x2c,0xa,0x22,0x25,0x20,0x20, - 0x63,0x20,0x23,0x34,0x41,0x33,0x45,0x31,0x36,0x22,0x2c,0xa,0x22,0x26,0x20,0x20, - 0x63,0x20,0x23,0x34,0x41,0x33,0x44,0x32,0x32,0x22,0x2c,0xa,0x22,0x2a,0x20,0x20, - 0x63,0x20,0x23,0x34,0x44,0x34,0x32,0x31,0x41,0x22,0x2c,0xa,0x22,0x3d,0x20,0x20, - 0x63,0x20,0x23,0x35,0x34,0x34,0x32,0x30,0x44,0x22,0x2c,0xa,0x22,0x2d,0x20,0x20, - 0x63,0x20,0x23,0x34,0x45,0x34,0x35,0x32,0x39,0x22,0x2c,0xa,0x22,0x3b,0x20,0x20, - 0x63,0x20,0x23,0x34,0x38,0x34,0x33,0x33,0x38,0x22,0x2c,0xa,0x22,0x3a,0x20,0x20, - 0x63,0x20,0x23,0x34,0x38,0x34,0x32,0x33,0x33,0x22,0x2c,0xa,0x22,0x3e,0x20,0x20, - 0x63,0x20,0x23,0x35,0x42,0x34,0x42,0x32,0x34,0x22,0x2c,0xa,0x22,0x2c,0x20,0x20, - 0x63,0x20,0x23,0x36,0x32,0x34,0x35,0x30,0x30,0x22,0x2c,0xa,0x22,0x3c,0x20,0x20, - 0x63,0x20,0x23,0x36,0x37,0x34,0x44,0x30,0x30,0x22,0x2c,0xa,0x22,0x31,0x20,0x20, - 0x63,0x20,0x23,0x36,0x44,0x34,0x44,0x30,0x30,0x22,0x2c,0xa,0x22,0x32,0x20,0x20, - 0x63,0x20,0x23,0x36,0x45,0x34,0x46,0x31,0x37,0x22,0x2c,0xa,0x22,0x33,0x20,0x20, - 0x63,0x20,0x23,0x36,0x44,0x35,0x32,0x30,0x30,0x22,0x2c,0xa,0x22,0x34,0x20,0x20, - 0x63,0x20,0x23,0x37,0x37,0x35,0x35,0x30,0x30,0x22,0x2c,0xa,0x22,0x35,0x20,0x20, - 0x63,0x20,0x23,0x37,0x34,0x35,0x42,0x30,0x46,0x22,0x2c,0xa,0x22,0x36,0x20,0x20, - 0x63,0x20,0x23,0x37,0x39,0x35,0x32,0x30,0x30,0x22,0x2c,0xa,0x22,0x37,0x20,0x20, - 0x63,0x20,0x23,0x37,0x41,0x35,0x41,0x30,0x30,0x22,0x2c,0xa,0x22,0x38,0x20,0x20, - 0x63,0x20,0x23,0x37,0x31,0x35,0x43,0x31,0x38,0x22,0x2c,0xa,0x22,0x39,0x20,0x20, - 0x63,0x20,0x23,0x37,0x36,0x34,0x42,0x30,0x41,0x22,0x2c,0xa,0x22,0x30,0x20,0x20, - 0x63,0x20,0x23,0x36,0x43,0x35,0x34,0x32,0x33,0x22,0x2c,0xa,0x22,0x71,0x20,0x20, - 0x63,0x20,0x23,0x36,0x44,0x35,0x39,0x32,0x45,0x22,0x2c,0xa,0x22,0x77,0x20,0x20, - 0x63,0x20,0x23,0x37,0x38,0x35,0x45,0x32,0x37,0x22,0x2c,0xa,0x22,0x65,0x20,0x20, - 0x63,0x20,0x23,0x37,0x33,0x35,0x36,0x32,0x36,0x22,0x2c,0xa,0x22,0x72,0x20,0x20, - 0x63,0x20,0x23,0x36,0x36,0x35,0x37,0x33,0x36,0x22,0x2c,0xa,0x22,0x74,0x20,0x20, - 0x63,0x20,0x23,0x37,0x41,0x36,0x33,0x31,0x44,0x22,0x2c,0xa,0x22,0x79,0x20,0x20, - 0x63,0x20,0x23,0x37,0x41,0x36,0x37,0x32,0x45,0x22,0x2c,0xa,0x22,0x75,0x20,0x20, - 0x63,0x20,0x23,0x37,0x37,0x36,0x35,0x33,0x35,0x22,0x2c,0xa,0x22,0x69,0x20,0x20, - 0x63,0x20,0x23,0x35,0x43,0x35,0x39,0x35,0x36,0x22,0x2c,0xa,0x22,0x70,0x20,0x20, - 0x63,0x20,0x23,0x37,0x38,0x37,0x30,0x34,0x46,0x22,0x2c,0xa,0x22,0x61,0x20,0x20, - 0x63,0x20,0x23,0x37,0x35,0x37,0x32,0x36,0x45,0x22,0x2c,0xa,0x22,0x73,0x20,0x20, - 0x63,0x20,0x23,0x38,0x44,0x34,0x46,0x30,0x30,0x22,0x2c,0xa,0x22,0x64,0x20,0x20, - 0x63,0x20,0x23,0x38,0x31,0x35,0x37,0x30,0x30,0x22,0x2c,0xa,0x22,0x66,0x20,0x20, - 0x63,0x20,0x23,0x38,0x33,0x35,0x41,0x30,0x30,0x22,0x2c,0xa,0x22,0x67,0x20,0x20, - 0x63,0x20,0x23,0x38,0x41,0x35,0x43,0x30,0x30,0x22,0x2c,0xa,0x22,0x68,0x20,0x20, - 0x63,0x20,0x23,0x38,0x36,0x36,0x34,0x30,0x30,0x22,0x2c,0xa,0x22,0x6a,0x20,0x20, - 0x63,0x20,0x23,0x39,0x36,0x36,0x31,0x30,0x30,0x22,0x2c,0xa,0x22,0x6b,0x20,0x20, - 0x63,0x20,0x23,0x39,0x35,0x36,0x46,0x30,0x30,0x22,0x2c,0xa,0x22,0x6c,0x20,0x20, - 0x63,0x20,0x23,0x39,0x43,0x36,0x31,0x30,0x30,0x22,0x2c,0xa,0x22,0x7a,0x20,0x20, - 0x63,0x20,0x23,0x39,0x44,0x37,0x35,0x30,0x30,0x22,0x2c,0xa,0x22,0x78,0x20,0x20, - 0x63,0x20,0x23,0x38,0x35,0x36,0x42,0x32,0x41,0x22,0x2c,0xa,0x22,0x63,0x20,0x20, - 0x63,0x20,0x23,0x38,0x43,0x37,0x35,0x32,0x41,0x22,0x2c,0xa,0x22,0x76,0x20,0x20, - 0x63,0x20,0x23,0x38,0x43,0x37,0x32,0x33,0x42,0x22,0x2c,0xa,0x22,0x62,0x20,0x20, - 0x63,0x20,0x23,0x39,0x37,0x37,0x39,0x33,0x39,0x22,0x2c,0xa,0x22,0x6e,0x20,0x20, - 0x63,0x20,0x23,0x41,0x34,0x35,0x44,0x30,0x30,0x22,0x2c,0xa,0x22,0x6d,0x20,0x20, - 0x63,0x20,0x23,0x41,0x32,0x36,0x31,0x30,0x30,0x22,0x2c,0xa,0x22,0x4d,0x20,0x20, - 0x63,0x20,0x23,0x41,0x41,0x36,0x38,0x30,0x44,0x22,0x2c,0xa,0x22,0x4e,0x20,0x20, - 0x63,0x20,0x23,0x41,0x42,0x36,0x37,0x30,0x30,0x22,0x2c,0xa,0x22,0x42,0x20,0x20, - 0x63,0x20,0x23,0x41,0x30,0x37,0x37,0x30,0x30,0x22,0x2c,0xa,0x22,0x56,0x20,0x20, - 0x63,0x20,0x23,0x41,0x35,0x37,0x42,0x30,0x30,0x22,0x2c,0xa,0x22,0x43,0x20,0x20, - 0x63,0x20,0x23,0x41,0x42,0x37,0x41,0x30,0x30,0x22,0x2c,0xa,0x22,0x5a,0x20,0x20, - 0x63,0x20,0x23,0x41,0x41,0x37,0x33,0x30,0x30,0x22,0x2c,0xa,0x22,0x41,0x20,0x20, - 0x63,0x20,0x23,0x41,0x46,0x37,0x32,0x31,0x41,0x22,0x2c,0xa,0x22,0x53,0x20,0x20, - 0x63,0x20,0x23,0x42,0x38,0x37,0x45,0x30,0x30,0x22,0x2c,0xa,0x22,0x44,0x20,0x20, - 0x63,0x20,0x23,0x42,0x35,0x37,0x42,0x30,0x30,0x22,0x2c,0xa,0x22,0x46,0x20,0x20, - 0x63,0x20,0x23,0x42,0x30,0x37,0x33,0x31,0x41,0x22,0x2c,0xa,0x22,0x47,0x20,0x20, - 0x63,0x20,0x23,0x42,0x34,0x37,0x43,0x32,0x36,0x22,0x2c,0xa,0x22,0x48,0x20,0x20, - 0x63,0x20,0x23,0x42,0x37,0x37,0x45,0x32,0x38,0x22,0x2c,0xa,0x22,0x4a,0x20,0x20, - 0x63,0x20,0x23,0x38,0x39,0x37,0x46,0x35,0x39,0x22,0x2c,0xa,0x22,0x4b,0x20,0x20, - 0x63,0x20,0x23,0x39,0x37,0x37,0x43,0x34,0x30,0x22,0x2c,0xa,0x22,0x4c,0x20,0x20, - 0x63,0x20,0x23,0x39,0x32,0x37,0x46,0x35,0x38,0x22,0x2c,0xa,0x22,0x50,0x20,0x20, - 0x63,0x20,0x23,0x38,0x30,0x37,0x41,0x36,0x43,0x22,0x2c,0xa,0x22,0x49,0x20,0x20, - 0x63,0x20,0x23,0x39,0x43,0x38,0x32,0x31,0x44,0x22,0x2c,0xa,0x22,0x55,0x20,0x20, - 0x63,0x20,0x23,0x39,0x46,0x38,0x41,0x33,0x35,0x22,0x2c,0xa,0x22,0x59,0x20,0x20, - 0x63,0x20,0x23,0x41,0x43,0x38,0x30,0x30,0x30,0x22,0x2c,0xa,0x22,0x54,0x20,0x20, - 0x63,0x20,0x23,0x42,0x32,0x38,0x35,0x30,0x30,0x22,0x2c,0xa,0x22,0x52,0x20,0x20, - 0x63,0x20,0x23,0x42,0x36,0x38,0x38,0x30,0x30,0x22,0x2c,0xa,0x22,0x45,0x20,0x20, - 0x63,0x20,0x23,0x42,0x42,0x38,0x42,0x30,0x30,0x22,0x2c,0xa,0x22,0x57,0x20,0x20, - 0x63,0x20,0x23,0x41,0x37,0x38,0x33,0x33,0x37,0x22,0x2c,0xa,0x22,0x51,0x20,0x20, - 0x63,0x20,0x23,0x41,0x32,0x38,0x42,0x33,0x31,0x22,0x2c,0xa,0x22,0x21,0x20,0x20, - 0x63,0x20,0x23,0x41,0x46,0x39,0x35,0x33,0x35,0x22,0x2c,0xa,0x22,0x7e,0x20,0x20, - 0x63,0x20,0x23,0x42,0x35,0x38,0x45,0x33,0x41,0x22,0x2c,0xa,0x22,0x5e,0x20,0x20, - 0x63,0x20,0x23,0x42,0x38,0x38,0x36,0x33,0x33,0x22,0x2c,0xa,0x22,0x2f,0x20,0x20, - 0x63,0x20,0x23,0x42,0x34,0x39,0x39,0x33,0x36,0x22,0x2c,0xa,0x22,0x28,0x20,0x20, - 0x63,0x20,0x23,0x42,0x43,0x41,0x30,0x33,0x39,0x22,0x2c,0xa,0x22,0x29,0x20,0x20, - 0x63,0x20,0x23,0x39,0x39,0x38,0x34,0x34,0x35,0x22,0x2c,0xa,0x22,0x5f,0x20,0x20, - 0x63,0x20,0x23,0x39,0x37,0x38,0x36,0x35,0x37,0x22,0x2c,0xa,0x22,0x60,0x20,0x20, - 0x63,0x20,0x23,0x38,0x42,0x38,0x32,0x36,0x34,0x22,0x2c,0xa,0x22,0x27,0x20,0x20, - 0x63,0x20,0x23,0x38,0x45,0x38,0x35,0x37,0x32,0x22,0x2c,0xa,0x22,0x5d,0x20,0x20, - 0x63,0x20,0x23,0x39,0x37,0x38,0x38,0x36,0x34,0x22,0x2c,0xa,0x22,0x5b,0x20,0x20, - 0x63,0x20,0x23,0x39,0x37,0x38,0x43,0x37,0x35,0x22,0x2c,0xa,0x22,0x7b,0x20,0x20, - 0x63,0x20,0x23,0x39,0x46,0x39,0x30,0x37,0x32,0x22,0x2c,0xa,0x22,0x7d,0x20,0x20, - 0x63,0x20,0x23,0x41,0x33,0x38,0x38,0x34,0x35,0x22,0x2c,0xa,0x22,0x7c,0x20,0x20, - 0x63,0x20,0x23,0x41,0x34,0x38,0x39,0x35,0x32,0x22,0x2c,0xa,0x22,0x20,0x2e,0x20, - 0x63,0x20,0x23,0x41,0x41,0x39,0x36,0x35,0x43,0x22,0x2c,0xa,0x22,0x2e,0x2e,0x20, - 0x63,0x20,0x23,0x41,0x38,0x39,0x31,0x35,0x36,0x22,0x2c,0xa,0x22,0x58,0x2e,0x20, - 0x63,0x20,0x23,0x42,0x35,0x39,0x33,0x34,0x44,0x22,0x2c,0xa,0x22,0x6f,0x2e,0x20, - 0x63,0x20,0x23,0x42,0x33,0x39,0x44,0x34,0x35,0x22,0x2c,0xa,0x22,0x4f,0x2e,0x20, - 0x63,0x20,0x23,0x42,0x34,0x39,0x37,0x35,0x35,0x22,0x2c,0xa,0x22,0x2b,0x2e,0x20, - 0x63,0x20,0x23,0x41,0x42,0x39,0x38,0x34,0x41,0x22,0x2c,0xa,0x22,0x40,0x2e,0x20, - 0x63,0x20,0x23,0x41,0x44,0x39,0x41,0x36,0x35,0x22,0x2c,0xa,0x22,0x23,0x2e,0x20, - 0x63,0x20,0x23,0x41,0x37,0x39,0x37,0x37,0x38,0x22,0x2c,0xa,0x22,0x24,0x2e,0x20, - 0x63,0x20,0x23,0x41,0x35,0x39,0x38,0x37,0x34,0x22,0x2c,0xa,0x22,0x25,0x2e,0x20, - 0x63,0x20,0x23,0x41,0x32,0x39,0x42,0x37,0x41,0x22,0x2c,0xa,0x22,0x26,0x2e,0x20, - 0x63,0x20,0x23,0x41,0x37,0x39,0x37,0x37,0x35,0x22,0x2c,0xa,0x22,0x2a,0x2e,0x20, - 0x63,0x20,0x23,0x42,0x44,0x41,0x39,0x35,0x39,0x22,0x2c,0xa,0x22,0x3d,0x2e,0x20, - 0x63,0x20,0x23,0x42,0x33,0x41,0x34,0x36,0x43,0x22,0x2c,0xa,0x22,0x2d,0x2e,0x20, - 0x63,0x20,0x23,0x42,0x31,0x41,0x30,0x37,0x46,0x22,0x2c,0xa,0x22,0x3b,0x2e,0x20, - 0x63,0x20,0x23,0x42,0x35,0x41,0x39,0x37,0x41,0x22,0x2c,0xa,0x22,0x3a,0x2e,0x20, - 0x63,0x20,0x23,0x42,0x45,0x42,0x33,0x37,0x42,0x22,0x2c,0xa,0x22,0x3e,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x34,0x39,0x32,0x30,0x30,0x22,0x2c,0xa,0x22,0x2c,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x38,0x39,0x35,0x30,0x30,0x22,0x2c,0xa,0x22,0x3c,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x43,0x39,0x38,0x30,0x30,0x22,0x2c,0xa,0x22,0x31,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x36,0x39,0x38,0x31,0x32,0x22,0x2c,0xa,0x22,0x32,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x32,0x41,0x33,0x31,0x43,0x22,0x2c,0xa,0x22,0x33,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x32,0x41,0x36,0x33,0x45,0x22,0x2c,0xa,0x22,0x34,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x37,0x41,0x45,0x33,0x37,0x22,0x2c,0xa,0x22,0x35,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x32,0x39,0x38,0x34,0x30,0x22,0x2c,0xa,0x22,0x36,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x32,0x39,0x42,0x34,0x45,0x22,0x2c,0xa,0x22,0x37,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x32,0x41,0x36,0x34,0x31,0x22,0x2c,0xa,0x22,0x38,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x36,0x41,0x41,0x34,0x33,0x22,0x2c,0xa,0x22,0x39,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x38,0x41,0x43,0x34,0x35,0x22,0x2c,0xa,0x22,0x30,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x42,0x41,0x46,0x34,0x39,0x22,0x2c,0xa,0x22,0x71,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x41,0x41,0x37,0x34,0x36,0x22,0x2c,0xa,0x22,0x77,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x34,0x41,0x31,0x35,0x38,0x22,0x2c,0xa,0x22,0x65,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x41,0x41,0x36,0x35,0x44,0x22,0x2c,0xa,0x22,0x72,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x45,0x41,0x38,0x35,0x37,0x22,0x2c,0xa,0x22,0x74,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x46,0x41,0x39,0x35,0x41,0x22,0x2c,0xa,0x22,0x79,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x35,0x41,0x43,0x35,0x30,0x22,0x2c,0xa,0x22,0x75,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x44,0x42,0x31,0x34,0x42,0x22,0x2c,0xa,0x22,0x69,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x42,0x42,0x33,0x35,0x38,0x22,0x2c,0xa,0x22,0x70,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x41,0x42,0x31,0x35,0x32,0x22,0x2c,0xa,0x22,0x61,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x32,0x41,0x42,0x35,0x39,0x22,0x2c,0xa,0x22,0x73,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x31,0x42,0x35,0x34,0x44,0x22,0x2c,0xa,0x22,0x64,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x34,0x42,0x39,0x35,0x31,0x22,0x2c,0xa,0x22,0x66,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x36,0x42,0x43,0x35,0x42,0x22,0x2c,0xa,0x22,0x67,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x44,0x42,0x34,0x35,0x45,0x22,0x2c,0xa,0x22,0x68,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x39,0x42,0x44,0x35,0x36,0x22,0x2c,0xa,0x22,0x6a,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x32,0x42,0x37,0x35,0x33,0x22,0x2c,0xa,0x22,0x6b,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x41,0x41,0x42,0x34,0x38,0x22,0x2c,0xa,0x22,0x6c,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x45,0x41,0x45,0x36,0x39,0x22,0x2c,0xa,0x22,0x7a,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x43,0x41,0x44,0x36,0x37,0x22,0x2c,0xa,0x22,0x78,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x43,0x42,0x36,0x36,0x32,0x22,0x2c,0xa,0x22,0x63,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x41,0x42,0x32,0x36,0x42,0x22,0x2c,0xa,0x22,0x76,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x38,0x42,0x36,0x36,0x42,0x22,0x2c,0xa,0x22,0x62,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x45,0x42,0x37,0x37,0x35,0x22,0x2c,0xa,0x22,0x6e,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x45,0x42,0x45,0x37,0x46,0x22,0x2c,0xa,0x22,0x6d,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x33,0x41,0x44,0x36,0x36,0x22,0x2c,0xa,0x22,0x4d,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x35,0x42,0x45,0x36,0x34,0x22,0x2c,0xa,0x22,0x4e,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x34,0x42,0x46,0x36,0x44,0x22,0x2c,0xa,0x22,0x42,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x34,0x42,0x33,0x34,0x42,0x22,0x2c,0xa,0x22,0x56,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x30,0x42,0x37,0x35,0x46,0x22,0x2c,0xa,0x22,0x43,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x31,0x42,0x38,0x35,0x46,0x22,0x2c,0xa,0x22,0x5a,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x34,0x42,0x41,0x36,0x31,0x22,0x2c,0xa,0x22,0x41,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x39,0x42,0x45,0x36,0x33,0x22,0x2c,0xa,0x22,0x53,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x44,0x43,0x31,0x35,0x39,0x22,0x2c,0xa,0x22,0x44,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x41,0x43,0x32,0x36,0x39,0x22,0x2c,0xa,0x22,0x46,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x34,0x43,0x31,0x37,0x36,0x22,0x2c,0xa,0x22,0x47,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x38,0x43,0x36,0x37,0x46,0x22,0x2c,0xa,0x22,0x48,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x31,0x43,0x35,0x35,0x44,0x22,0x2c,0xa,0x22,0x4a,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x46,0x43,0x30,0x35,0x44,0x22,0x2c,0xa,0x22,0x4b,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x31,0x43,0x31,0x35,0x45,0x22,0x2c,0xa,0x22,0x4c,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x30,0x43,0x32,0x36,0x34,0x22,0x2c,0xa,0x22,0x50,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x35,0x43,0x39,0x36,0x31,0x22,0x2c,0xa,0x22,0x49,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x44,0x43,0x31,0x36,0x34,0x22,0x2c,0xa,0x22,0x55,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x39,0x43,0x44,0x36,0x35,0x22,0x2c,0xa,0x22,0x59,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x46,0x44,0x33,0x36,0x42,0x22,0x2c,0xa,0x22,0x54,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x32,0x43,0x35,0x36,0x34,0x22,0x2c,0xa,0x22,0x52,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x36,0x43,0x38,0x36,0x38,0x22,0x2c,0xa,0x22,0x45,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x38,0x43,0x37,0x36,0x30,0x22,0x2c,0xa,0x22,0x57,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x42,0x43,0x43,0x36,0x41,0x22,0x2c,0xa,0x22,0x51,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x44,0x43,0x42,0x36,0x33,0x22,0x2c,0xa,0x22,0x21,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x31,0x44,0x35,0x36,0x44,0x22,0x2c,0xa,0x22,0x7e,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x44,0x30,0x36,0x43,0x22,0x2c,0xa,0x22,0x5e,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x35,0x44,0x39,0x37,0x32,0x22,0x2c,0xa,0x22,0x2f,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x45,0x44,0x31,0x37,0x35,0x22,0x2c,0xa,0x22,0x28,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x41,0x44,0x45,0x37,0x37,0x22,0x2c,0xa,0x22,0x29,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x34,0x43,0x38,0x37,0x41,0x22,0x2c,0xa,0x22,0x5f,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x45,0x45,0x32,0x37,0x43,0x22,0x2c,0xa,0x22,0x60,0x2e,0x20, - 0x63,0x20,0x23,0x38,0x46,0x39,0x31,0x39,0x32,0x22,0x2c,0xa,0x22,0x27,0x2e,0x20, - 0x63,0x20,0x23,0x39,0x41,0x39,0x41,0x39,0x36,0x22,0x2c,0xa,0x22,0x5d,0x2e,0x20, - 0x63,0x20,0x23,0x41,0x37,0x39,0x46,0x38,0x33,0x22,0x2c,0xa,0x22,0x5b,0x2e,0x20, - 0x63,0x20,0x23,0x41,0x44,0x41,0x35,0x38,0x33,0x22,0x2c,0xa,0x22,0x7b,0x2e,0x20, - 0x63,0x20,0x23,0x41,0x37,0x41,0x33,0x39,0x39,0x22,0x2c,0xa,0x22,0x7d,0x2e,0x20, - 0x63,0x20,0x23,0x42,0x42,0x41,0x43,0x38,0x36,0x22,0x2c,0xa,0x22,0x7c,0x2e,0x20, - 0x63,0x20,0x23,0x42,0x44,0x42,0x30,0x38,0x38,0x22,0x2c,0xa,0x22,0x20,0x58,0x20, - 0x63,0x20,0x23,0x42,0x42,0x42,0x32,0x39,0x38,0x22,0x2c,0xa,0x22,0x2e,0x58,0x20, - 0x63,0x20,0x23,0x41,0x37,0x41,0x38,0x41,0x36,0x22,0x2c,0xa,0x22,0x58,0x58,0x20, - 0x63,0x20,0x23,0x41,0x44,0x41,0x45,0x42,0x30,0x22,0x2c,0xa,0x22,0x6f,0x58,0x20, - 0x63,0x20,0x23,0x42,0x35,0x42,0x36,0x42,0x34,0x22,0x2c,0xa,0x22,0x4f,0x58,0x20, - 0x63,0x20,0x23,0x42,0x41,0x42,0x43,0x42,0x43,0x22,0x2c,0xa,0x22,0x2b,0x58,0x20, - 0x63,0x20,0x23,0x43,0x36,0x42,0x33,0x38,0x45,0x22,0x2c,0xa,0x22,0x40,0x58,0x20, - 0x63,0x20,0x23,0x44,0x33,0x42,0x45,0x38,0x30,0x22,0x2c,0xa,0x22,0x23,0x58,0x20, - 0x63,0x20,0x23,0x44,0x30,0x42,0x43,0x39,0x35,0x22,0x2c,0xa,0x22,0x24,0x58,0x20, - 0x63,0x20,0x23,0x43,0x36,0x42,0x46,0x41,0x36,0x22,0x2c,0xa,0x22,0x25,0x58,0x20, - 0x63,0x20,0x23,0x43,0x35,0x43,0x32,0x39,0x44,0x22,0x2c,0xa,0x22,0x26,0x58,0x20, - 0x63,0x20,0x23,0x44,0x32,0x43,0x32,0x38,0x33,0x22,0x2c,0xa,0x22,0x2a,0x58,0x20, - 0x63,0x20,0x23,0x44,0x41,0x43,0x37,0x38,0x39,0x22,0x2c,0xa,0x22,0x3d,0x58,0x20, - 0x63,0x20,0x23,0x44,0x42,0x43,0x41,0x38,0x42,0x22,0x2c,0xa,0x22,0x2d,0x58,0x20, - 0x63,0x20,0x23,0x44,0x35,0x43,0x34,0x38,0x39,0x22,0x2c,0xa,0x22,0x3b,0x58,0x20, - 0x63,0x20,0x23,0x44,0x42,0x43,0x44,0x39,0x34,0x22,0x2c,0xa,0x22,0x3a,0x58,0x20, - 0x63,0x20,0x23,0x44,0x36,0x43,0x36,0x39,0x39,0x22,0x2c,0xa,0x22,0x3e,0x58,0x20, - 0x63,0x20,0x23,0x43,0x46,0x43,0x38,0x42,0x31,0x22,0x2c,0xa,0x22,0x2c,0x58,0x20, - 0x63,0x20,0x23,0x43,0x38,0x43,0x36,0x42,0x37,0x22,0x2c,0xa,0x22,0x3c,0x58,0x20, - 0x63,0x20,0x23,0x44,0x31,0x43,0x39,0x41,0x36,0x22,0x2c,0xa,0x22,0x31,0x58,0x20, - 0x63,0x20,0x23,0x44,0x42,0x44,0x33,0x42,0x41,0x22,0x2c,0xa,0x22,0x32,0x58,0x20, - 0x63,0x20,0x23,0x45,0x31,0x43,0x39,0x38,0x31,0x22,0x2c,0xa,0x22,0x33,0x58,0x20, - 0x63,0x20,0x23,0x45,0x30,0x43,0x44,0x39,0x31,0x22,0x2c,0xa,0x22,0x34,0x58,0x20, - 0x63,0x20,0x23,0x45,0x43,0x44,0x36,0x38,0x36,0x22,0x2c,0xa,0x22,0x35,0x58,0x20, - 0x63,0x20,0x23,0x45,0x42,0x44,0x36,0x39,0x45,0x22,0x2c,0xa,0x22,0x36,0x58,0x20, - 0x63,0x20,0x23,0x46,0x45,0x44,0x36,0x38,0x32,0x22,0x2c,0xa,0x22,0x37,0x58,0x20, - 0x63,0x20,0x23,0x46,0x45,0x44,0x38,0x38,0x42,0x22,0x2c,0xa,0x22,0x38,0x58,0x20, - 0x63,0x20,0x23,0x46,0x45,0x44,0x43,0x39,0x35,0x22,0x2c,0xa,0x22,0x39,0x58,0x20, - 0x63,0x20,0x23,0x45,0x33,0x43,0x45,0x41,0x33,0x22,0x2c,0xa,0x22,0x30,0x58,0x20, - 0x63,0x20,0x23,0x45,0x45,0x44,0x39,0x41,0x39,0x22,0x2c,0xa,0x22,0x71,0x58,0x20, - 0x63,0x20,0x23,0x45,0x37,0x44,0x43,0x42,0x39,0x22,0x2c,0xa,0x22,0x77,0x58,0x20, - 0x63,0x20,0x23,0x46,0x34,0x44,0x44,0x41,0x46,0x22,0x2c,0xa,0x22,0x65,0x58,0x20, - 0x63,0x20,0x23,0x46,0x46,0x45,0x36,0x38,0x41,0x22,0x2c,0xa,0x22,0x72,0x58,0x20, - 0x63,0x20,0x23,0x46,0x46,0x45,0x38,0x39,0x33,0x22,0x2c,0xa,0x22,0x74,0x58,0x20, - 0x63,0x20,0x23,0x46,0x46,0x45,0x41,0x39,0x46,0x22,0x2c,0xa,0x22,0x79,0x58,0x20, - 0x63,0x20,0x23,0x46,0x46,0x45,0x32,0x41,0x35,0x22,0x2c,0xa,0x22,0x75,0x58,0x20, - 0x63,0x20,0x23,0x46,0x46,0x45,0x33,0x41,0x43,0x22,0x2c,0xa,0x22,0x69,0x58,0x20, - 0x63,0x20,0x23,0x46,0x46,0x45,0x43,0x41,0x37,0x22,0x2c,0xa,0x22,0x70,0x58,0x20, - 0x63,0x20,0x23,0x46,0x46,0x45,0x44,0x41,0x45,0x22,0x2c,0xa,0x22,0x61,0x58,0x20, - 0x63,0x20,0x23,0x46,0x31,0x45,0x30,0x42,0x36,0x22,0x2c,0xa,0x22,0x73,0x58,0x20, - 0x63,0x20,0x23,0x46,0x44,0x45,0x35,0x42,0x34,0x22,0x2c,0xa,0x22,0x64,0x58,0x20, - 0x63,0x20,0x23,0x46,0x46,0x45,0x45,0x42,0x34,0x22,0x2c,0xa,0x22,0x66,0x58,0x20, - 0x63,0x20,0x23,0x46,0x38,0x45,0x35,0x42,0x42,0x22,0x2c,0xa,0x22,0x67,0x58,0x20, - 0x63,0x20,0x23,0x46,0x46,0x46,0x30,0x42,0x43,0x22,0x2c,0xa,0x22,0x68,0x58,0x20, - 0x63,0x20,0x23,0x43,0x35,0x43,0x37,0x43,0x38,0x22,0x2c,0xa,0x22,0x6a,0x58,0x20, - 0x63,0x20,0x23,0x43,0x37,0x43,0x38,0x43,0x41,0x22,0x2c,0xa,0x22,0x6b,0x58,0x20, - 0x63,0x20,0x23,0x43,0x43,0x43,0x45,0x43,0x46,0x22,0x2c,0xa,0x22,0x6c,0x58,0x20, - 0x63,0x20,0x23,0x43,0x43,0x43,0x41,0x43,0x30,0x22,0x2c,0xa,0x22,0x7a,0x58,0x20, - 0x63,0x20,0x23,0x43,0x44,0x43,0x45,0x44,0x30,0x22,0x2c,0xa,0x22,0x78,0x58,0x20, - 0x63,0x20,0x23,0x44,0x31,0x44,0x31,0x43,0x46,0x22,0x2c,0xa,0x22,0x63,0x58,0x20, - 0x63,0x20,0x23,0x44,0x31,0x44,0x33,0x44,0x34,0x22,0x2c,0xa,0x22,0x76,0x58,0x20, - 0x63,0x20,0x23,0x44,0x36,0x44,0x38,0x44,0x41,0x22,0x2c,0xa,0x22,0x62,0x58,0x20, - 0x63,0x20,0x23,0x44,0x41,0x44,0x43,0x44,0x45,0x22,0x2c,0xa,0x22,0x6e,0x58,0x20, - 0x63,0x20,0x23,0x44,0x43,0x44,0x45,0x45,0x30,0x22,0x2c,0xa,0x22,0x6d,0x58,0x20, - 0x63,0x20,0x23,0x44,0x45,0x45,0x30,0x45,0x32,0x22,0x2c,0xa,0x22,0x4d,0x58,0x20, - 0x63,0x20,0x23,0x45,0x37,0x44,0x45,0x43,0x32,0x22,0x2c,0xa,0x22,0x4e,0x58,0x20, - 0x63,0x20,0x23,0x45,0x42,0x45,0x31,0x43,0x35,0x22,0x2c,0xa,0x22,0x42,0x58,0x20, - 0x63,0x20,0x23,0x46,0x34,0x45,0x39,0x43,0x33,0x22,0x2c,0xa,0x22,0x56,0x58,0x20, - 0x63,0x20,0x23,0x46,0x37,0x45,0x41,0x43,0x45,0x22,0x2c,0xa,0x22,0x43,0x58,0x20, - 0x63,0x20,0x23,0x46,0x45,0x45,0x41,0x43,0x33,0x22,0x2c,0xa,0x22,0x5a,0x58,0x20, - 0x63,0x20,0x23,0x46,0x41,0x45,0x42,0x43,0x41,0x22,0x2c,0xa,0x22,0x41,0x58,0x20, - 0x63,0x20,0x23,0x46,0x46,0x46,0x31,0x43,0x31,0x22,0x2c,0xa,0x22,0x53,0x58,0x20, - 0x63,0x20,0x23,0x46,0x46,0x46,0x33,0x43,0x43,0x22,0x2c,0xa,0x22,0x44,0x58,0x20, - 0x63,0x20,0x23,0x46,0x46,0x46,0x36,0x44,0x41,0x22,0x2c,0xa,0x22,0x46,0x58,0x20, - 0x63,0x20,0x23,0x45,0x31,0x45,0x33,0x45,0x35,0x22,0x2c,0xa,0x22,0x47,0x58,0x20, - 0x63,0x20,0x23,0x45,0x34,0x45,0x36,0x45,0x38,0x22,0x2c,0xa,0x22,0x48,0x58,0x20, - 0x63,0x20,0x23,0x45,0x37,0x45,0x39,0x45,0x41,0x22,0x2c,0xa,0x22,0x4a,0x58,0x20, - 0x63,0x20,0x23,0x45,0x38,0x45,0x36,0x45,0x30,0x22,0x2c,0xa,0x22,0x4b,0x58,0x20, - 0x63,0x20,0x23,0x45,0x39,0x45,0x41,0x45,0x43,0x22,0x2c,0xa,0x22,0x4c,0x58,0x20, - 0x63,0x20,0x23,0x45,0x43,0x45,0x45,0x46,0x30,0x22,0x2c,0xa,0x22,0x50,0x58,0x20, - 0x63,0x20,0x23,0x45,0x45,0x46,0x30,0x46,0x32,0x22,0x2c,0xa,0x22,0x49,0x58,0x20, - 0x63,0x20,0x23,0x46,0x38,0x46,0x34,0x45,0x38,0x22,0x2c,0xa,0x22,0x55,0x58,0x20, - 0x63,0x20,0x23,0x46,0x31,0x46,0x33,0x46,0x35,0x22,0x2c,0xa,0x22,0x59,0x58,0x20, - 0x63,0x20,0x4e,0x6f,0x6e,0x65,0x22,0x2c,0xa,0x2f,0x2a,0x20,0x70,0x69,0x78,0x65, - 0x6c,0x73,0x20,0x2a,0x2f,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x20,0x20,0x56, - 0x20,0x45,0x20,0x3c,0x2e,0x2c,0x2e,0x54,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x3c, - 0x20,0x45,0x20,0x32,0x2e,0x61,0x58,0x43,0x58,0x56,0x58,0x45,0x20,0x33,0x20,0x45, - 0x20,0x3c,0x2e,0x45,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x20, - 0x20,0x52,0x20,0x2c,0x2e,0x35,0x58,0x43,0x58,0x38,0x58,0x51,0x2e,0x77,0x58,0x3c, - 0x2e,0x31,0x2e,0x24,0x2e,0x4f,0x58,0x3c,0x2e,0x20,0x20,0x59,0x58,0x59,0x58,0x22, - 0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x20, - 0x20,0x52,0x20,0x3e,0x2e,0x4c,0x2e,0x5a,0x58,0x79,0x58,0x54,0x2e,0x4b,0x2e,0x45, - 0x2e,0x77,0x58,0x20,0x2e,0x2e,0x58,0x4b,0x58,0x4b,0x58,0x52,0x20,0x20,0x20,0x59, - 0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x20, - 0x20,0x56,0x20,0x45,0x20,0x34,0x2e,0x5a,0x58,0x73,0x58,0x57,0x2e,0x4b,0x2e,0x49, - 0x2e,0x5a,0x2e,0x4f,0x2e,0x7b,0x2e,0x4b,0x58,0x55,0x58,0x55,0x58,0x4d,0x58,0x6b, - 0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x20,0x20,0x52,0x20,0x45,0x20,0x37,0x20,0x59, - 0x58,0x3c,0x20,0x45,0x20,0x32,0x2e,0x61,0x58,0x73,0x58,0x36,0x58,0x43,0x2e,0x54, - 0x2e,0x5a,0x2e,0x77,0x2e,0x5b,0x20,0x78,0x58,0x55,0x58,0x55,0x58,0x55,0x58,0x55, - 0x58,0x32,0x58,0x33,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x20,0x20,0x52,0x20,0x3e,0x2e,0x29,0x2e,0x35, - 0x58,0x2c,0x2e,0x54,0x20,0x2c,0x2e,0x35,0x58,0x43,0x58,0x38,0x58,0x4b,0x2e,0x54, - 0x2e,0x41,0x2e,0x61,0x2e,0x5d,0x20,0x4f,0x58,0x55,0x58,0x55,0x58,0x55,0x58,0x55, - 0x58,0x55,0x58,0x55,0x58,0x32,0x2e,0x4f,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22, - 0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x20,0x20,0x59,0x20,0x45,0x20,0x5a,0x2e,0x5a, - 0x58,0x73,0x58,0x37,0x58,0x73,0x58,0x30,0x58,0x43,0x58,0x79,0x58,0x52,0x2e,0x4b, - 0x2e,0x49,0x2e,0x56,0x2e,0x5f,0x20,0x2e,0x58,0x55,0x58,0x55,0x58,0x55,0x58,0x55, - 0x58,0x55,0x58,0x4c,0x58,0x4b,0x58,0x4a,0x58,0x56,0x20,0x44,0x20,0x4e,0x20,0x53, - 0x20,0x37,0x20,0x22,0x2c,0xa,0x22,0x20,0x20,0x7a,0x20,0x45,0x20,0x34,0x2e,0x66, - 0x58,0x73,0x58,0x2f,0x2e,0x4b,0x2e,0x7e,0x2e,0x2f,0x2e,0x36,0x58,0x7e,0x2e,0x49, - 0x2e,0x49,0x2e,0x43,0x2e,0x2e,0x2e,0x27,0x2e,0x4b,0x58,0x55,0x58,0x50,0x58,0x50, - 0x58,0x50,0x58,0x4c,0x58,0x4b,0x58,0x47,0x58,0x62,0x58,0x6c,0x2e,0x4e,0x20,0x6d, - 0x2e,0x53,0x58,0x6d,0x2e,0x44,0x20,0x22,0x2c,0xa,0x22,0x20,0x20,0x45,0x20,0x30, - 0x58,0x67,0x58,0x37,0x58,0x45,0x2e,0x57,0x2e,0x57,0x2e,0x7e,0x2e,0x7e,0x2e,0x52, - 0x2e,0x49,0x2e,0x5a,0x2e,0x77,0x2e,0x27,0x20,0x62,0x58,0x55,0x58,0x55,0x58,0x55, - 0x58,0x50,0x58,0x50,0x58,0x4c,0x58,0x6d,0x58,0x62,0x58,0x24,0x58,0x29,0x20,0x7e, - 0x20,0x61,0x58,0x53,0x58,0x70,0x58,0x42,0x58,0x6e,0x20,0x22,0x2c,0xa,0x22,0x20, - 0x20,0x3c,0x2e,0x43,0x58,0x54,0x2e,0x51,0x2e,0x7e,0x2e,0x57,0x2e,0x57,0x2e,0x52, - 0x2e,0x49,0x2e,0x41,0x2e,0x74,0x2e,0x5f,0x20,0x68,0x58,0x55,0x58,0x55,0x58,0x55, - 0x58,0x55,0x58,0x50,0x58,0x4c,0x58,0x47,0x58,0x6e,0x58,0x2c,0x58,0x20,0x2e,0x74, - 0x20,0x20,0x58,0x41,0x58,0x53,0x58,0x65,0x58,0x34,0x58,0x6c,0x2e,0x5a,0x20,0x22, - 0x2c,0xa,0x22,0x20,0x20,0x3c,0x2e,0x73,0x58,0x42,0x2e,0x57,0x2e,0x57,0x2e,0x57, - 0x2e,0x54,0x2e,0x41,0x2e,0x67,0x2e,0x5f,0x20,0x6f,0x58,0x55,0x58,0x55,0x58,0x55, - 0x58,0x55,0x58,0x55,0x58,0x4c,0x58,0x4c,0x58,0x6d,0x58,0x63,0x58,0x3d,0x2e,0x35, - 0x20,0x24,0x2e,0x42,0x58,0x67,0x58,0x65,0x58,0x21,0x2e,0x44,0x2e,0x33,0x58,0x6d, - 0x20,0x2b,0x20,0x22,0x2c,0xa,0x22,0x20,0x20,0x3c,0x2e,0x73,0x58,0x42,0x2e,0x52, - 0x2e,0x52,0x2e,0x41,0x2e,0x56,0x2e,0x7c,0x20,0x7b,0x2e,0x4b,0x58,0x55,0x58,0x55, - 0x58,0x55,0x58,0x55,0x58,0x4c,0x58,0x4b,0x58,0x47,0x58,0x76,0x58,0x7c,0x2e,0x63, - 0x20,0x75,0x20,0x71,0x58,0x64,0x58,0x67,0x58,0x5e,0x2e,0x55,0x2e,0x66,0x2e,0x33, - 0x58,0x48,0x20,0x66,0x20,0x20,0x20,0x22,0x2c,0xa,0x22,0x20,0x20,0x3c,0x2e,0x73, - 0x58,0x42,0x2e,0x54,0x2e,0x5a,0x2e,0x6d,0x2e,0x5b,0x20,0x6e,0x58,0x55,0x58,0x55, - 0x58,0x55,0x58,0x55,0x58,0x50,0x58,0x4b,0x58,0x48,0x58,0x62,0x58,0x2c,0x58,0x29, - 0x20,0x65,0x20,0x3c,0x58,0x64,0x58,0x69,0x58,0x5f,0x2e,0x53,0x2e,0x75,0x2e,0x50, - 0x2e,0x46,0x2e,0x74,0x2e,0x68,0x20,0x20,0x20,0x20,0x20,0x22,0x2c,0xa,0x22,0x20, - 0x20,0x3c,0x2e,0x73,0x58,0x6b,0x2e,0x5a,0x2e,0x72,0x2e,0x4b,0x20,0x6a,0x58,0x55, - 0x58,0x55,0x58,0x55,0x58,0x50,0x58,0x4c,0x58,0x4b,0x58,0x6d,0x58,0x63,0x58,0x40, - 0x2e,0x35,0x20,0x25,0x2e,0x44,0x58,0x69,0x58,0x5f,0x2e,0x59,0x2e,0x53,0x2e,0x64, - 0x2e,0x68,0x2e,0x44,0x2e,0x2a,0x58,0x6c,0x20,0x58,0x20,0x20,0x20,0x20,0x20,0x22, - 0x2c,0xa,0x22,0x20,0x20,0x3c,0x2e,0x77,0x58,0x71,0x2e,0x72,0x2e,0x58,0x2e,0x72, - 0x20,0x55,0x58,0x55,0x58,0x50,0x58,0x50,0x58,0x4b,0x58,0x6d,0x58,0x76,0x58,0x7c, - 0x2e,0x79,0x20,0x5f,0x20,0x4e,0x58,0x64,0x58,0x72,0x58,0x21,0x2e,0x53,0x2e,0x64, - 0x2e,0x68,0x2e,0x64,0x2e,0x66,0x2e,0x3d,0x58,0x46,0x20,0x34,0x20,0x20,0x20,0x20, - 0x20,0x59,0x58,0x22,0x2c,0xa,0x22,0x20,0x20,0x2c,0x2e,0x30,0x58,0x35,0x2e,0x58, - 0x2e,0x29,0x20,0x61,0x20,0x50,0x58,0x50,0x58,0x4b,0x58,0x47,0x58,0x6e,0x58,0x3e, - 0x58,0x29,0x20,0x79,0x20,0x3e,0x58,0x41,0x58,0x41,0x58,0x5f,0x2e,0x53,0x2e,0x68, - 0x2e,0x68,0x2e,0x75,0x2e,0x73,0x2e,0x64,0x2e,0x46,0x2e,0x36,0x2e,0x67,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x22,0x2c,0xa,0x22,0x20,0x20,0x3e,0x2e,0x39, - 0x58,0x7e,0x20,0x7d,0x20,0x75,0x20,0x27,0x2e,0x4c,0x58,0x4b,0x58,0x6d,0x58,0x78, - 0x58,0x20,0x2e,0x35,0x20,0x5b,0x2e,0x49,0x58,0x41,0x58,0x5f,0x2e,0x21,0x2e,0x53, - 0x2e,0x68,0x2e,0x68,0x2e,0x64,0x2e,0x38,0x2e,0x73,0x2e,0x44,0x2e,0x6e,0x2e,0x6a, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x20, - 0x20,0x3e,0x2e,0x3a,0x58,0x57,0x20,0x76,0x20,0x26,0x20,0x6b,0x58,0x6d,0x58,0x76, - 0x58,0x3b,0x2e,0x74,0x20,0x5d,0x20,0x42,0x58,0x41,0x58,0x72,0x58,0x21,0x2e,0x55, - 0x2e,0x75,0x2e,0x53,0x2e,0x39,0x2e,0x75,0x2e,0x33,0x2e,0x37,0x2e,0x69,0x2e,0x3b, - 0x58,0x4d,0x20,0x31,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x59,0x58,0x22, - 0x2c,0xa,0x22,0x20,0x20,0x45,0x20,0x23,0x58,0x62,0x20,0x75,0x20,0x3a,0x20,0x6e, - 0x58,0x63,0x58,0x5f,0x20,0x75,0x20,0x31,0x58,0x53,0x58,0x67,0x58,0x5e,0x2e,0x55, - 0x2e,0x48,0x2e,0x53,0x2e,0x64,0x2e,0x38,0x2e,0x73,0x2e,0x64,0x2e,0x75,0x2e,0x62, - 0x2e,0x2d,0x58,0x47,0x20,0x67,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x20,0x20,0x52,0x20,0x2b,0x58,0x63,0x20,0x72, - 0x20,0x61,0x20,0x7a,0x58,0x5b,0x2e,0x3d,0x20,0x2d,0x58,0x64,0x58,0x5f,0x2e,0x55, - 0x2e,0x64,0x2e,0x50,0x2e,0x68,0x2e,0x64,0x2e,0x75,0x2e,0x33,0x2e,0x38,0x2e,0x4e, - 0x2e,0x3d,0x58,0x77,0x2e,0x6c,0x20,0x31,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x20,0x20,0x54,0x20,0x7d, - 0x2e,0x78,0x20,0x3e,0x20,0x60,0x2e,0x6f,0x58,0x3e,0x20,0x25,0x2e,0x2a,0x2e,0x53, - 0x2e,0x53,0x2e,0x68,0x2e,0x53,0x2e,0x37,0x2e,0x64,0x2e,0x68,0x2e,0x30,0x2e,0x70, - 0x2e,0x6e,0x2e,0x63,0x2e,0x4d,0x20,0x64,0x20,0x2e,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x20, - 0x20,0x43,0x20,0x5d,0x2e,0x77,0x20,0x40,0x20,0x58,0x58,0x75,0x20,0x70,0x20,0x2a, - 0x2e,0x28,0x20,0x68,0x2e,0x53,0x2e,0x73,0x2e,0x75,0x2e,0x75,0x2e,0x75,0x2e,0x70, - 0x2e,0x4e,0x2e,0x2a,0x58,0x5e,0x20,0x67,0x20,0x2b,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x22, - 0x2c,0xa,0x22,0x20,0x20,0x5a,0x20,0x26,0x2e,0x65,0x20,0x3b,0x20,0x60,0x20,0x2a, - 0x20,0x3a,0x2e,0x6f,0x2e,0x53,0x2e,0x53,0x2e,0x53,0x2e,0x75,0x2e,0x28,0x20,0x39, - 0x2e,0x78,0x2e,0x26,0x58,0x58,0x2e,0x6a,0x20,0x2c,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x20,0x20,0x42,0x20,0x7b,0x20,0x30,0x20,0x69, - 0x20,0x25,0x20,0x5b,0x2e,0x6f,0x2e,0x75,0x2e,0x53,0x2e,0x64,0x2e,0x68,0x2e,0x39, - 0x2e,0x4d,0x2e,0x26,0x58,0x7a,0x2e,0x4d,0x20,0x36,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x20,0x20,0x7a,0x20,0x7b, - 0x20,0x30,0x20,0x2d,0x20,0x4a,0x20,0x2a,0x2e,0x2f,0x20,0x53,0x2e,0x39,0x2e,0x64, - 0x2e,0x69,0x2e,0x47,0x2e,0x26,0x58,0x46,0x20,0x67,0x20,0x4f,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x20, - 0x20,0x7a,0x20,0x24,0x2e,0x32,0x20,0x77,0x20,0x3d,0x2e,0x21,0x20,0x73,0x2e,0x64, - 0x2e,0x70,0x2e,0x4e,0x2e,0x3b,0x58,0x5e,0x20,0x6c,0x20,0x2c,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x22, - 0x2c,0xa,0x22,0x20,0x20,0x42,0x20,0x26,0x2e,0x39,0x20,0x3b,0x2e,0x51,0x20,0x2f, - 0x20,0x6a,0x2e,0x78,0x2e,0x40,0x58,0x6c,0x2e,0x6d,0x20,0x36,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x20,0x20,0x68,0x20,0x57,0x20,0x40,0x2e,0x2b, - 0x2e,0x49,0x20,0x79,0x2e,0x26,0x58,0x62,0x2e,0x46,0x20,0x37,0x20,0x4f,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x20,0x20,0x24,0x20,0x73, - 0x20,0x25,0x58,0x55,0x20,0x46,0x2e,0x3d,0x58,0x5e,0x20,0x6a,0x20,0x23,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x20, - 0x20,0x20,0x20,0x67,0x20,0x4f,0x2e,0x3c,0x58,0x65,0x2e,0x6c,0x20,0x31,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x22, - 0x2c,0xa,0x22,0x20,0x20,0x20,0x20,0x6f,0x20,0x66,0x20,0x6e,0x20,0x64,0x20,0x2e, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x22,0xa,0x7d,0x3b,0xa, - # /home/rdale/src/kde/branches/KDE/3.5/tdevelop/languages/ruby/app_templates/qtruby4makeapp/filesave.xpm - 0x0,0x0,0x18,0xf9, - 0x2f, - 0x2a,0x20,0x58,0x50,0x4d,0x20,0x2a,0x2f,0xa,0x73,0x74,0x61,0x74,0x69,0x63,0x20, - 0x63,0x68,0x61,0x72,0x20,0x2a,0x66,0x69,0x6c,0x65,0x73,0x61,0x76,0x65,0x5b,0x5d, - 0x20,0x3d,0x20,0x7b,0xa,0x2f,0x2a,0x20,0x63,0x6f,0x6c,0x75,0x6d,0x6e,0x73,0x20, - 0x72,0x6f,0x77,0x73,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x73,0x20,0x63,0x68,0x61,0x72, - 0x73,0x2d,0x70,0x65,0x72,0x2d,0x70,0x69,0x78,0x65,0x6c,0x20,0x2a,0x2f,0xa,0x22, - 0x33,0x32,0x20,0x33,0x32,0x20,0x32,0x35,0x37,0x20,0x32,0x22,0x2c,0xa,0x22,0x20, - 0x20,0x20,0x63,0x20,0x23,0x30,0x30,0x30,0x30,0x30,0x30,0x22,0x2c,0xa,0x22,0x2e, - 0x20,0x20,0x63,0x20,0x23,0x30,0x36,0x30,0x36,0x30,0x41,0x22,0x2c,0xa,0x22,0x58, - 0x20,0x20,0x63,0x20,0x23,0x30,0x39,0x30,0x39,0x30,0x44,0x22,0x2c,0xa,0x22,0x6f, - 0x20,0x20,0x63,0x20,0x23,0x30,0x42,0x30,0x42,0x31,0x36,0x22,0x2c,0xa,0x22,0x4f, - 0x20,0x20,0x63,0x20,0x23,0x31,0x30,0x31,0x30,0x32,0x32,0x22,0x2c,0xa,0x22,0x2b, - 0x20,0x20,0x63,0x20,0x23,0x31,0x45,0x31,0x45,0x32,0x38,0x22,0x2c,0xa,0x22,0x40, - 0x20,0x20,0x63,0x20,0x23,0x31,0x38,0x31,0x38,0x32,0x39,0x22,0x2c,0xa,0x22,0x23, - 0x20,0x20,0x63,0x20,0x23,0x31,0x35,0x31,0x46,0x33,0x41,0x22,0x2c,0xa,0x22,0x24, - 0x20,0x20,0x63,0x20,0x23,0x31,0x41,0x32,0x36,0x33,0x46,0x22,0x2c,0xa,0x22,0x25, - 0x20,0x20,0x63,0x20,0x23,0x31,0x44,0x32,0x41,0x33,0x46,0x22,0x2c,0xa,0x22,0x26, - 0x20,0x20,0x63,0x20,0x23,0x32,0x37,0x32,0x37,0x33,0x30,0x22,0x2c,0xa,0x22,0x2a, - 0x20,0x20,0x63,0x20,0x23,0x32,0x45,0x32,0x45,0x33,0x46,0x22,0x2c,0xa,0x22,0x3d, - 0x20,0x20,0x63,0x20,0x23,0x32,0x31,0x32,0x31,0x34,0x30,0x22,0x2c,0xa,0x22,0x2d, - 0x20,0x20,0x63,0x20,0x23,0x32,0x31,0x32,0x45,0x34,0x31,0x22,0x2c,0xa,0x22,0x3b, - 0x20,0x20,0x63,0x20,0x23,0x32,0x46,0x32,0x46,0x34,0x31,0x22,0x2c,0xa,0x22,0x3a, - 0x20,0x20,0x63,0x20,0x23,0x32,0x39,0x32,0x41,0x34,0x41,0x22,0x2c,0xa,0x22,0x3e, - 0x20,0x20,0x63,0x20,0x23,0x32,0x33,0x32,0x32,0x34,0x42,0x22,0x2c,0xa,0x22,0x2c, - 0x20,0x20,0x63,0x20,0x23,0x32,0x36,0x32,0x33,0x35,0x33,0x22,0x2c,0xa,0x22,0x3c, - 0x20,0x20,0x63,0x20,0x23,0x32,0x39,0x32,0x36,0x35,0x35,0x22,0x2c,0xa,0x22,0x31, - 0x20,0x20,0x63,0x20,0x23,0x32,0x42,0x32,0x43,0x35,0x34,0x22,0x2c,0xa,0x22,0x32, - 0x20,0x20,0x63,0x20,0x23,0x32,0x43,0x32,0x43,0x35,0x42,0x22,0x2c,0xa,0x22,0x33, - 0x20,0x20,0x63,0x20,0x23,0x32,0x39,0x33,0x37,0x34,0x36,0x22,0x2c,0xa,0x22,0x34, - 0x20,0x20,0x63,0x20,0x23,0x32,0x44,0x33,0x30,0x34,0x46,0x22,0x2c,0xa,0x22,0x35, - 0x20,0x20,0x63,0x20,0x23,0x32,0x34,0x33,0x32,0x34,0x33,0x22,0x2c,0xa,0x22,0x36, - 0x20,0x20,0x63,0x20,0x23,0x32,0x45,0x33,0x31,0x35,0x44,0x22,0x2c,0xa,0x22,0x37, - 0x20,0x20,0x63,0x20,0x23,0x33,0x36,0x33,0x36,0x34,0x37,0x22,0x2c,0xa,0x22,0x38, - 0x20,0x20,0x63,0x20,0x23,0x33,0x30,0x33,0x45,0x34,0x41,0x22,0x2c,0xa,0x22,0x39, - 0x20,0x20,0x63,0x20,0x23,0x33,0x30,0x33,0x32,0x35,0x45,0x22,0x2c,0xa,0x22,0x30, - 0x20,0x20,0x63,0x20,0x23,0x33,0x43,0x33,0x43,0x35,0x33,0x22,0x2c,0xa,0x22,0x71, - 0x20,0x20,0x63,0x20,0x23,0x32,0x45,0x32,0x45,0x36,0x30,0x22,0x2c,0xa,0x22,0x77, - 0x20,0x20,0x63,0x20,0x23,0x32,0x46,0x33,0x31,0x36,0x30,0x22,0x2c,0xa,0x22,0x65, - 0x20,0x20,0x63,0x20,0x23,0x33,0x30,0x32,0x45,0x36,0x33,0x22,0x2c,0xa,0x22,0x72, - 0x20,0x20,0x63,0x20,0x23,0x33,0x31,0x33,0x31,0x36,0x34,0x22,0x2c,0xa,0x22,0x74, - 0x20,0x20,0x63,0x20,0x23,0x33,0x36,0x33,0x38,0x36,0x31,0x22,0x2c,0xa,0x22,0x79, - 0x20,0x20,0x63,0x20,0x23,0x33,0x35,0x33,0x38,0x36,0x38,0x22,0x2c,0xa,0x22,0x75, - 0x20,0x20,0x63,0x20,0x23,0x33,0x38,0x34,0x36,0x35,0x30,0x22,0x2c,0xa,0x22,0x69, - 0x20,0x20,0x63,0x20,0x23,0x32,0x38,0x34,0x46,0x36,0x42,0x22,0x2c,0xa,0x22,0x70, - 0x20,0x20,0x63,0x20,0x23,0x32,0x44,0x35,0x34,0x37,0x42,0x22,0x2c,0xa,0x22,0x61, - 0x20,0x20,0x63,0x20,0x23,0x33,0x42,0x34,0x38,0x36,0x41,0x22,0x2c,0xa,0x22,0x73, - 0x20,0x20,0x63,0x20,0x23,0x33,0x36,0x35,0x39,0x37,0x44,0x22,0x2c,0xa,0x22,0x64, - 0x20,0x20,0x63,0x20,0x23,0x33,0x44,0x35,0x44,0x37,0x43,0x22,0x2c,0xa,0x22,0x66, - 0x20,0x20,0x63,0x20,0x23,0x34,0x43,0x34,0x43,0x34,0x43,0x22,0x2c,0xa,0x22,0x67, - 0x20,0x20,0x63,0x20,0x23,0x34,0x30,0x34,0x30,0x35,0x41,0x22,0x2c,0xa,0x22,0x68, - 0x20,0x20,0x63,0x20,0x23,0x34,0x31,0x34,0x45,0x35,0x36,0x22,0x2c,0xa,0x22,0x6a, - 0x20,0x20,0x63,0x20,0x23,0x34,0x42,0x35,0x38,0x35,0x45,0x22,0x2c,0xa,0x22,0x6b, - 0x20,0x20,0x63,0x20,0x23,0x34,0x39,0x35,0x34,0x35,0x45,0x22,0x2c,0xa,0x22,0x6c, - 0x20,0x20,0x63,0x20,0x23,0x35,0x35,0x35,0x35,0x35,0x35,0x22,0x2c,0xa,0x22,0x7a, - 0x20,0x20,0x63,0x20,0x23,0x34,0x44,0x34,0x44,0x36,0x42,0x22,0x2c,0xa,0x22,0x78, - 0x20,0x20,0x63,0x20,0x23,0x34,0x33,0x34,0x36,0x37,0x35,0x22,0x2c,0xa,0x22,0x63, - 0x20,0x20,0x63,0x20,0x23,0x34,0x42,0x35,0x36,0x36,0x30,0x22,0x2c,0xa,0x22,0x76, - 0x20,0x20,0x63,0x20,0x23,0x34,0x46,0x35,0x39,0x36,0x32,0x22,0x2c,0xa,0x22,0x62, - 0x20,0x20,0x63,0x20,0x23,0x34,0x31,0x35,0x31,0x37,0x45,0x22,0x2c,0xa,0x22,0x6e, - 0x20,0x20,0x63,0x20,0x23,0x34,0x42,0x35,0x30,0x37,0x44,0x22,0x2c,0xa,0x22,0x6d, - 0x20,0x20,0x63,0x20,0x23,0x35,0x31,0x35,0x43,0x36,0x37,0x22,0x2c,0xa,0x22,0x4d, - 0x20,0x20,0x63,0x20,0x23,0x35,0x30,0x35,0x44,0x36,0x45,0x22,0x2c,0xa,0x22,0x4e, - 0x20,0x20,0x63,0x20,0x23,0x35,0x43,0x35,0x44,0x37,0x44,0x22,0x2c,0xa,0x22,0x42, - 0x20,0x20,0x63,0x20,0x23,0x35,0x34,0x36,0x30,0x36,0x36,0x22,0x2c,0xa,0x22,0x56, - 0x20,0x20,0x63,0x20,0x23,0x35,0x34,0x36,0x32,0x36,0x44,0x22,0x2c,0xa,0x22,0x43, - 0x20,0x20,0x63,0x20,0x23,0x35,0x42,0x36,0x34,0x36,0x44,0x22,0x2c,0xa,0x22,0x5a, - 0x20,0x20,0x63,0x20,0x23,0x35,0x35,0x36,0x37,0x37,0x41,0x22,0x2c,0xa,0x22,0x41, - 0x20,0x20,0x63,0x20,0x23,0x35,0x35,0x36,0x42,0x37,0x38,0x22,0x2c,0xa,0x22,0x53, - 0x20,0x20,0x63,0x20,0x23,0x35,0x44,0x36,0x37,0x37,0x32,0x22,0x2c,0xa,0x22,0x44, - 0x20,0x20,0x63,0x20,0x23,0x36,0x42,0x36,0x42,0x36,0x42,0x22,0x2c,0xa,0x22,0x46, - 0x20,0x20,0x63,0x20,0x23,0x36,0x34,0x36,0x34,0x36,0x34,0x22,0x2c,0xa,0x22,0x47, - 0x20,0x20,0x63,0x20,0x23,0x36,0x31,0x36,0x43,0x37,0x33,0x22,0x2c,0xa,0x22,0x48, - 0x20,0x20,0x63,0x20,0x23,0x36,0x33,0x37,0x30,0x37,0x44,0x22,0x2c,0xa,0x22,0x4a, - 0x20,0x20,0x63,0x20,0x23,0x36,0x42,0x37,0x36,0x37,0x39,0x22,0x2c,0xa,0x22,0x4b, - 0x20,0x20,0x63,0x20,0x67,0x72,0x61,0x79,0x34,0x35,0x22,0x2c,0xa,0x22,0x4c,0x20, - 0x20,0x63,0x20,0x23,0x30,0x30,0x34,0x31,0x38,0x45,0x22,0x2c,0xa,0x22,0x50,0x20, - 0x20,0x63,0x20,0x23,0x30,0x30,0x34,0x34,0x39,0x34,0x22,0x2c,0xa,0x22,0x49,0x20, - 0x20,0x63,0x20,0x23,0x30,0x30,0x34,0x38,0x39,0x34,0x22,0x2c,0xa,0x22,0x55,0x20, - 0x20,0x63,0x20,0x23,0x30,0x34,0x34,0x46,0x39,0x38,0x22,0x2c,0xa,0x22,0x59,0x20, - 0x20,0x63,0x20,0x23,0x30,0x33,0x35,0x30,0x39,0x42,0x22,0x2c,0xa,0x22,0x54,0x20, - 0x20,0x63,0x20,0x23,0x30,0x41,0x35,0x31,0x39,0x38,0x22,0x2c,0xa,0x22,0x52,0x20, - 0x20,0x63,0x20,0x23,0x31,0x33,0x35,0x37,0x39,0x43,0x22,0x2c,0xa,0x22,0x45,0x20, - 0x20,0x63,0x20,0x23,0x31,0x38,0x35,0x44,0x41,0x31,0x22,0x2c,0xa,0x22,0x57,0x20, - 0x20,0x63,0x20,0x23,0x32,0x38,0x35,0x38,0x38,0x38,0x22,0x2c,0xa,0x22,0x51,0x20, - 0x20,0x63,0x20,0x23,0x32,0x42,0x36,0x30,0x39,0x34,0x22,0x2c,0xa,0x22,0x21,0x20, - 0x20,0x63,0x20,0x23,0x33,0x39,0x36,0x44,0x39,0x41,0x22,0x2c,0xa,0x22,0x7e,0x20, - 0x20,0x63,0x20,0x23,0x33,0x33,0x36,0x41,0x39,0x36,0x22,0x2c,0xa,0x22,0x5e,0x20, - 0x20,0x63,0x20,0x23,0x33,0x44,0x37,0x31,0x39,0x42,0x22,0x2c,0xa,0x22,0x2f,0x20, - 0x20,0x63,0x20,0x23,0x32,0x32,0x36,0x45,0x42,0x38,0x22,0x2c,0xa,0x22,0x28,0x20, - 0x20,0x63,0x20,0x23,0x33,0x32,0x36,0x45,0x41,0x38,0x22,0x2c,0xa,0x22,0x29,0x20, - 0x20,0x63,0x20,0x23,0x33,0x32,0x36,0x42,0x41,0x33,0x22,0x2c,0xa,0x22,0x5f,0x20, - 0x20,0x63,0x20,0x23,0x33,0x36,0x37,0x33,0x41,0x45,0x22,0x2c,0xa,0x22,0x60,0x20, - 0x20,0x63,0x20,0x23,0x33,0x41,0x37,0x36,0x42,0x34,0x22,0x2c,0xa,0x22,0x27,0x20, - 0x20,0x63,0x20,0x23,0x30,0x42,0x36,0x46,0x44,0x31,0x22,0x2c,0xa,0x22,0x5d,0x20, - 0x20,0x63,0x20,0x23,0x30,0x46,0x37,0x35,0x44,0x38,0x22,0x2c,0xa,0x22,0x5b,0x20, - 0x20,0x63,0x20,0x23,0x31,0x34,0x37,0x39,0x44,0x41,0x22,0x2c,0xa,0x22,0x7b,0x20, - 0x20,0x63,0x20,0x23,0x31,0x42,0x37,0x43,0x44,0x43,0x22,0x2c,0xa,0x22,0x7d,0x20, - 0x20,0x63,0x20,0x23,0x34,0x36,0x36,0x34,0x38,0x31,0x22,0x2c,0xa,0x22,0x7c,0x20, - 0x20,0x63,0x20,0x23,0x34,0x32,0x37,0x34,0x39,0x43,0x22,0x2c,0xa,0x22,0x20,0x2e, - 0x20,0x63,0x20,0x23,0x34,0x41,0x37,0x39,0x39,0x45,0x22,0x2c,0xa,0x22,0x2e,0x2e, - 0x20,0x63,0x20,0x23,0x35,0x30,0x36,0x41,0x38,0x34,0x22,0x2c,0xa,0x22,0x58,0x2e, - 0x20,0x63,0x20,0x23,0x35,0x46,0x36,0x37,0x38,0x44,0x22,0x2c,0xa,0x22,0x6f,0x2e, - 0x20,0x63,0x20,0x23,0x35,0x37,0x36,0x33,0x39,0x31,0x22,0x2c,0xa,0x22,0x4f,0x2e, - 0x20,0x63,0x20,0x23,0x35,0x41,0x36,0x35,0x39,0x32,0x22,0x2c,0xa,0x22,0x2b,0x2e, - 0x20,0x63,0x20,0x23,0x35,0x46,0x36,0x38,0x39,0x33,0x22,0x2c,0xa,0x22,0x40,0x2e, - 0x20,0x63,0x20,0x23,0x35,0x42,0x37,0x33,0x38,0x42,0x22,0x2c,0xa,0x22,0x23,0x2e, - 0x20,0x63,0x20,0x23,0x35,0x30,0x37,0x44,0x41,0x31,0x22,0x2c,0xa,0x22,0x24,0x2e, - 0x20,0x63,0x20,0x23,0x36,0x32,0x36,0x32,0x38,0x33,0x22,0x2c,0xa,0x22,0x25,0x2e, - 0x20,0x63,0x20,0x23,0x36,0x33,0x36,0x41,0x39,0x34,0x22,0x2c,0xa,0x22,0x26,0x2e, - 0x20,0x63,0x20,0x23,0x36,0x35,0x36,0x46,0x39,0x38,0x22,0x2c,0xa,0x22,0x2a,0x2e, - 0x20,0x63,0x20,0x23,0x36,0x35,0x37,0x41,0x38,0x46,0x22,0x2c,0xa,0x22,0x3d,0x2e, - 0x20,0x63,0x20,0x23,0x36,0x42,0x37,0x32,0x39,0x39,0x22,0x2c,0xa,0x22,0x2d,0x2e, - 0x20,0x63,0x20,0x23,0x37,0x31,0x37,0x31,0x39,0x31,0x22,0x2c,0xa,0x22,0x3b,0x2e, - 0x20,0x63,0x20,0x23,0x37,0x39,0x37,0x39,0x39,0x38,0x22,0x2c,0xa,0x22,0x3a,0x2e, - 0x20,0x63,0x20,0x23,0x36,0x38,0x37,0x42,0x41,0x36,0x22,0x2c,0xa,0x22,0x3e,0x2e, - 0x20,0x63,0x20,0x23,0x32,0x32,0x38,0x31,0x44,0x43,0x22,0x2c,0xa,0x22,0x2c,0x2e, - 0x20,0x63,0x20,0x23,0x33,0x46,0x38,0x31,0x43,0x30,0x22,0x2c,0xa,0x22,0x3c,0x2e, - 0x20,0x63,0x20,0x23,0x33,0x39,0x38,0x38,0x44,0x37,0x22,0x2c,0xa,0x22,0x31,0x2e, - 0x20,0x63,0x20,0x23,0x32,0x37,0x38,0x35,0x45,0x31,0x22,0x2c,0xa,0x22,0x32,0x2e, - 0x20,0x63,0x20,0x23,0x32,0x45,0x38,0x41,0x45,0x33,0x22,0x2c,0xa,0x22,0x33,0x2e, - 0x20,0x63,0x20,0x23,0x33,0x36,0x38,0x46,0x45,0x35,0x22,0x2c,0xa,0x22,0x34,0x2e, - 0x20,0x63,0x20,0x23,0x33,0x36,0x39,0x30,0x45,0x36,0x22,0x2c,0xa,0x22,0x35,0x2e, - 0x20,0x63,0x20,0x23,0x33,0x44,0x39,0x33,0x45,0x37,0x22,0x2c,0xa,0x22,0x36,0x2e, - 0x20,0x63,0x20,0x23,0x33,0x44,0x39,0x34,0x45,0x39,0x22,0x2c,0xa,0x22,0x37,0x2e, - 0x20,0x63,0x20,0x23,0x35,0x37,0x38,0x33,0x39,0x45,0x22,0x2c,0xa,0x22,0x38,0x2e, - 0x20,0x63,0x20,0x23,0x34,0x37,0x38,0x37,0x42,0x43,0x22,0x2c,0xa,0x22,0x39,0x2e, - 0x20,0x63,0x20,0x23,0x35,0x34,0x38,0x30,0x41,0x31,0x22,0x2c,0xa,0x22,0x30,0x2e, - 0x20,0x63,0x20,0x23,0x35,0x42,0x38,0x34,0x41,0x33,0x22,0x2c,0xa,0x22,0x71,0x2e, - 0x20,0x63,0x20,0x23,0x36,0x45,0x38,0x34,0x39,0x36,0x22,0x2c,0xa,0x22,0x77,0x2e, - 0x20,0x63,0x20,0x23,0x36,0x45,0x38,0x42,0x39,0x41,0x22,0x2c,0xa,0x22,0x65,0x2e, - 0x20,0x63,0x20,0x23,0x37,0x44,0x38,0x34,0x38,0x45,0x22,0x2c,0xa,0x22,0x72,0x2e, - 0x20,0x63,0x20,0x23,0x37,0x32,0x38,0x35,0x39,0x37,0x22,0x2c,0xa,0x22,0x74,0x2e, - 0x20,0x63,0x20,0x23,0x37,0x33,0x38,0x35,0x39,0x38,0x22,0x2c,0xa,0x22,0x79,0x2e, - 0x20,0x63,0x20,0x23,0x37,0x36,0x38,0x38,0x39,0x39,0x22,0x2c,0xa,0x22,0x75,0x2e, - 0x20,0x63,0x20,0x23,0x37,0x42,0x38,0x42,0x39,0x42,0x22,0x2c,0xa,0x22,0x69,0x2e, - 0x20,0x63,0x20,0x23,0x36,0x34,0x38,0x39,0x41,0x35,0x22,0x2c,0xa,0x22,0x70,0x2e, - 0x20,0x63,0x20,0x23,0x36,0x39,0x38,0x45,0x41,0x37,0x22,0x2c,0xa,0x22,0x61,0x2e, - 0x20,0x63,0x20,0x23,0x36,0x44,0x38,0x46,0x41,0x39,0x22,0x2c,0xa,0x22,0x73,0x2e, - 0x20,0x63,0x20,0x23,0x36,0x45,0x38,0x31,0x41,0x42,0x22,0x2c,0xa,0x22,0x64,0x2e, - 0x20,0x63,0x20,0x23,0x37,0x36,0x38,0x33,0x41,0x36,0x22,0x2c,0xa,0x22,0x66,0x2e, - 0x20,0x63,0x20,0x23,0x37,0x36,0x38,0x43,0x42,0x37,0x22,0x2c,0xa,0x22,0x67,0x2e, - 0x20,0x63,0x20,0x23,0x37,0x33,0x39,0x35,0x41,0x44,0x22,0x2c,0xa,0x22,0x68,0x2e, - 0x20,0x63,0x20,0x23,0x37,0x43,0x39,0x36,0x42,0x30,0x22,0x2c,0xa,0x22,0x6a,0x2e, - 0x20,0x63,0x20,0x23,0x34,0x30,0x38,0x36,0x43,0x41,0x22,0x2c,0xa,0x22,0x6b,0x2e, - 0x20,0x63,0x20,0x23,0x34,0x39,0x38,0x36,0x43,0x33,0x22,0x2c,0xa,0x22,0x6c,0x2e, - 0x20,0x63,0x20,0x23,0x34,0x32,0x38,0x34,0x43,0x33,0x22,0x2c,0xa,0x22,0x7a,0x2e, - 0x20,0x63,0x20,0x23,0x34,0x39,0x38,0x45,0x44,0x32,0x22,0x2c,0xa,0x22,0x78,0x2e, - 0x20,0x63,0x20,0x23,0x34,0x44,0x39,0x35,0x44,0x42,0x22,0x2c,0xa,0x22,0x63,0x2e, - 0x20,0x63,0x20,0x23,0x35,0x34,0x38,0x44,0x43,0x35,0x22,0x2c,0xa,0x22,0x76,0x2e, - 0x20,0x63,0x20,0x23,0x35,0x44,0x39,0x32,0x43,0x38,0x22,0x2c,0xa,0x22,0x62,0x2e, - 0x20,0x63,0x20,0x23,0x35,0x35,0x39,0x33,0x43,0x39,0x22,0x2c,0xa,0x22,0x6e,0x2e, - 0x20,0x63,0x20,0x23,0x35,0x30,0x39,0x37,0x44,0x45,0x22,0x2c,0xa,0x22,0x6d,0x2e, - 0x20,0x63,0x20,0x23,0x35,0x31,0x39,0x38,0x44,0x45,0x22,0x2c,0xa,0x22,0x4d,0x2e, - 0x20,0x63,0x20,0x23,0x34,0x32,0x39,0x36,0x45,0x37,0x22,0x2c,0xa,0x22,0x4e,0x2e, - 0x20,0x63,0x20,0x23,0x34,0x38,0x39,0x35,0x45,0x32,0x22,0x2c,0xa,0x22,0x42,0x2e, - 0x20,0x63,0x20,0x23,0x34,0x42,0x39,0x39,0x45,0x35,0x22,0x2c,0xa,0x22,0x56,0x2e, - 0x20,0x63,0x20,0x23,0x34,0x41,0x39,0x43,0x45,0x42,0x22,0x2c,0xa,0x22,0x43,0x2e, - 0x20,0x63,0x20,0x23,0x34,0x35,0x39,0x39,0x45,0x42,0x22,0x2c,0xa,0x22,0x5a,0x2e, - 0x20,0x63,0x20,0x23,0x35,0x32,0x39,0x44,0x45,0x36,0x22,0x2c,0xa,0x22,0x41,0x2e, - 0x20,0x63,0x20,0x23,0x35,0x38,0x39,0x45,0x45,0x32,0x22,0x2c,0xa,0x22,0x53,0x2e, - 0x20,0x63,0x20,0x23,0x35,0x34,0x41,0x31,0x45,0x42,0x22,0x2c,0xa,0x22,0x44,0x2e, - 0x20,0x63,0x20,0x23,0x35,0x41,0x41,0x31,0x45,0x36,0x22,0x2c,0xa,0x22,0x46,0x2e, - 0x20,0x63,0x20,0x23,0x35,0x41,0x41,0x35,0x45,0x42,0x22,0x2c,0xa,0x22,0x47,0x2e, - 0x20,0x63,0x20,0x23,0x35,0x45,0x41,0x38,0x45,0x46,0x22,0x2c,0xa,0x22,0x48,0x2e, - 0x20,0x63,0x20,0x23,0x35,0x33,0x41,0x33,0x46,0x31,0x22,0x2c,0xa,0x22,0x4a,0x2e, - 0x20,0x63,0x20,0x23,0x35,0x45,0x41,0x41,0x46,0x32,0x22,0x2c,0xa,0x22,0x4b,0x2e, - 0x20,0x63,0x20,0x23,0x36,0x36,0x39,0x39,0x43,0x42,0x22,0x2c,0xa,0x22,0x4c,0x2e, - 0x20,0x63,0x20,0x23,0x37,0x39,0x39,0x42,0x43,0x38,0x22,0x2c,0xa,0x22,0x50,0x2e, - 0x20,0x63,0x20,0x23,0x37,0x45,0x41,0x36,0x43,0x39,0x22,0x2c,0xa,0x22,0x49,0x2e, - 0x20,0x63,0x20,0x23,0x36,0x30,0x41,0x32,0x45,0x35,0x22,0x2c,0xa,0x22,0x55,0x2e, - 0x20,0x63,0x20,0x23,0x36,0x35,0x41,0x37,0x45,0x38,0x22,0x2c,0xa,0x22,0x59,0x2e, - 0x20,0x63,0x20,0x23,0x36,0x42,0x41,0x42,0x45,0x39,0x22,0x2c,0xa,0x22,0x54,0x2e, - 0x20,0x63,0x20,0x23,0x36,0x38,0x41,0x44,0x46,0x32,0x22,0x2c,0xa,0x22,0x52,0x2e, - 0x20,0x63,0x20,0x23,0x36,0x37,0x42,0x30,0x46,0x35,0x22,0x2c,0xa,0x22,0x45,0x2e, - 0x20,0x63,0x20,0x23,0x36,0x44,0x42,0x33,0x46,0x36,0x22,0x2c,0xa,0x22,0x57,0x2e, - 0x20,0x63,0x20,0x23,0x37,0x30,0x41,0x44,0x45,0x41,0x22,0x2c,0xa,0x22,0x51,0x2e, - 0x20,0x63,0x20,0x23,0x37,0x35,0x42,0x30,0x45,0x39,0x22,0x2c,0xa,0x22,0x21,0x2e, - 0x20,0x63,0x20,0x23,0x37,0x43,0x42,0x35,0x45,0x42,0x22,0x2c,0xa,0x22,0x7e,0x2e, - 0x20,0x63,0x20,0x23,0x37,0x33,0x42,0x39,0x46,0x38,0x22,0x2c,0xa,0x22,0x5e,0x2e, - 0x20,0x63,0x20,0x23,0x37,0x42,0x42,0x44,0x46,0x42,0x22,0x2c,0xa,0x22,0x2f,0x2e, - 0x20,0x63,0x20,0x23,0x37,0x43,0x42,0x41,0x46,0x36,0x22,0x2c,0xa,0x22,0x28,0x2e, - 0x20,0x63,0x20,0x67,0x72,0x61,0x79,0x35,0x35,0x22,0x2c,0xa,0x22,0x29,0x2e,0x20, - 0x63,0x20,0x23,0x38,0x32,0x38,0x38,0x39,0x39,0x22,0x2c,0xa,0x22,0x5f,0x2e,0x20, - 0x63,0x20,0x23,0x38,0x34,0x39,0x34,0x39,0x45,0x22,0x2c,0xa,0x22,0x60,0x2e,0x20, - 0x63,0x20,0x23,0x39,0x31,0x38,0x45,0x38,0x41,0x22,0x2c,0xa,0x22,0x27,0x2e,0x20, - 0x63,0x20,0x23,0x39,0x34,0x39,0x34,0x39,0x34,0x22,0x2c,0xa,0x22,0x5d,0x2e,0x20, - 0x63,0x20,0x23,0x38,0x46,0x38,0x46,0x41,0x39,0x22,0x2c,0xa,0x22,0x5b,0x2e,0x20, - 0x63,0x20,0x23,0x38,0x39,0x39,0x37,0x41,0x35,0x22,0x2c,0xa,0x22,0x7b,0x2e,0x20, - 0x63,0x20,0x23,0x38,0x41,0x39,0x41,0x41,0x39,0x22,0x2c,0xa,0x22,0x7d,0x2e,0x20, - 0x63,0x20,0x23,0x39,0x41,0x39,0x42,0x41,0x46,0x22,0x2c,0xa,0x22,0x7c,0x2e,0x20, - 0x63,0x20,0x23,0x39,0x33,0x39,0x39,0x41,0x39,0x22,0x2c,0xa,0x22,0x20,0x58,0x20, - 0x63,0x20,0x23,0x39,0x46,0x41,0x41,0x42,0x35,0x22,0x2c,0xa,0x22,0x2e,0x58,0x20, - 0x63,0x20,0x23,0x41,0x32,0x39,0x45,0x39,0x42,0x22,0x2c,0xa,0x22,0x58,0x58,0x20, - 0x63,0x20,0x23,0x41,0x37,0x41,0x37,0x41,0x37,0x22,0x2c,0xa,0x22,0x6f,0x58,0x20, - 0x63,0x20,0x23,0x41,0x42,0x41,0x42,0x41,0x42,0x22,0x2c,0xa,0x22,0x4f,0x58,0x20, - 0x63,0x20,0x23,0x41,0x33,0x41,0x33,0x42,0x34,0x22,0x2c,0xa,0x22,0x2b,0x58,0x20, - 0x63,0x20,0x23,0x41,0x38,0x41,0x38,0x42,0x37,0x22,0x2c,0xa,0x22,0x40,0x58,0x20, - 0x63,0x20,0x23,0x41,0x33,0x41,0x42,0x42,0x33,0x22,0x2c,0xa,0x22,0x23,0x58,0x20, - 0x63,0x20,0x23,0x42,0x34,0x42,0x35,0x42,0x35,0x22,0x2c,0xa,0x22,0x24,0x58,0x20, - 0x63,0x20,0x23,0x42,0x30,0x42,0x30,0x42,0x43,0x22,0x2c,0xa,0x22,0x25,0x58,0x20, - 0x63,0x20,0x23,0x42,0x37,0x42,0x39,0x42,0x43,0x22,0x2c,0xa,0x22,0x26,0x58,0x20, - 0x63,0x20,0x23,0x42,0x42,0x42,0x37,0x42,0x33,0x22,0x2c,0xa,0x22,0x2a,0x58,0x20, - 0x63,0x20,0x23,0x42,0x42,0x42,0x42,0x42,0x42,0x22,0x2c,0xa,0x22,0x3d,0x58,0x20, - 0x63,0x20,0x23,0x38,0x32,0x42,0x31,0x44,0x42,0x22,0x2c,0xa,0x22,0x2d,0x58,0x20, - 0x63,0x20,0x23,0x38,0x31,0x42,0x37,0x45,0x43,0x22,0x2c,0xa,0x22,0x3b,0x58,0x20, - 0x63,0x20,0x23,0x38,0x38,0x42,0x42,0x45,0x44,0x22,0x2c,0xa,0x22,0x3a,0x58,0x20, - 0x63,0x20,0x23,0x38,0x36,0x42,0x41,0x45,0x44,0x22,0x2c,0xa,0x22,0x3e,0x58,0x20, - 0x63,0x20,0x23,0x41,0x45,0x42,0x42,0x43,0x38,0x22,0x2c,0xa,0x22,0x2c,0x58,0x20, - 0x63,0x20,0x23,0x41,0x36,0x42,0x44,0x43,0x44,0x22,0x2c,0xa,0x22,0x3c,0x58,0x20, - 0x63,0x20,0x23,0x42,0x42,0x42,0x43,0x43,0x33,0x22,0x2c,0xa,0x22,0x31,0x58,0x20, - 0x63,0x20,0x23,0x38,0x31,0x43,0x31,0x46,0x36,0x22,0x2c,0xa,0x22,0x32,0x58,0x20, - 0x63,0x20,0x23,0x38,0x33,0x43,0x32,0x46,0x41,0x22,0x2c,0xa,0x22,0x33,0x58,0x20, - 0x63,0x20,0x23,0x38,0x39,0x43,0x34,0x46,0x41,0x22,0x2c,0xa,0x22,0x34,0x58,0x20, - 0x63,0x20,0x23,0x38,0x43,0x43,0x38,0x46,0x43,0x22,0x2c,0xa,0x22,0x35,0x58,0x20, - 0x63,0x20,0x23,0x39,0x35,0x43,0x32,0x45,0x46,0x22,0x2c,0xa,0x22,0x36,0x58,0x20, - 0x63,0x20,0x23,0x39,0x33,0x43,0x42,0x46,0x44,0x22,0x2c,0xa,0x22,0x37,0x58,0x20, - 0x63,0x20,0x23,0x39,0x42,0x43,0x46,0x46,0x46,0x22,0x2c,0xa,0x22,0x38,0x58,0x20, - 0x63,0x20,0x23,0x39,0x37,0x44,0x30,0x46,0x43,0x22,0x2c,0xa,0x22,0x39,0x58,0x20, - 0x63,0x20,0x23,0x39,0x43,0x44,0x33,0x46,0x45,0x22,0x2c,0xa,0x22,0x30,0x58,0x20, - 0x63,0x20,0x23,0x42,0x45,0x43,0x30,0x43,0x31,0x22,0x2c,0xa,0x22,0x71,0x58,0x20, - 0x63,0x20,0x23,0x41,0x33,0x43,0x37,0x45,0x37,0x22,0x2c,0xa,0x22,0x77,0x58,0x20, - 0x63,0x20,0x23,0x41,0x32,0x43,0x41,0x46,0x31,0x22,0x2c,0xa,0x22,0x65,0x58,0x20, - 0x63,0x20,0x23,0x41,0x31,0x44,0x34,0x46,0x46,0x22,0x2c,0xa,0x22,0x72,0x58,0x20, - 0x63,0x20,0x23,0x41,0x33,0x44,0x38,0x46,0x46,0x22,0x2c,0xa,0x22,0x74,0x58,0x20, - 0x63,0x20,0x23,0x41,0x41,0x44,0x42,0x46,0x46,0x22,0x2c,0xa,0x22,0x79,0x58,0x20, - 0x63,0x20,0x23,0x42,0x30,0x44,0x31,0x46,0x32,0x22,0x2c,0xa,0x22,0x75,0x58,0x20, - 0x63,0x20,0x23,0x42,0x44,0x44,0x39,0x46,0x34,0x22,0x2c,0xa,0x22,0x69,0x58,0x20, - 0x63,0x20,0x23,0x41,0x41,0x45,0x30,0x46,0x46,0x22,0x2c,0xa,0x22,0x70,0x58,0x20, - 0x63,0x20,0x23,0x42,0x33,0x45,0x31,0x46,0x46,0x22,0x2c,0xa,0x22,0x61,0x58,0x20, - 0x63,0x20,0x23,0x42,0x39,0x45,0x36,0x46,0x46,0x22,0x2c,0xa,0x22,0x73,0x58,0x20, - 0x63,0x20,0x23,0x42,0x45,0x45,0x39,0x46,0x46,0x22,0x2c,0xa,0x22,0x64,0x58,0x20, - 0x63,0x20,0x23,0x43,0x34,0x43,0x34,0x43,0x34,0x22,0x2c,0xa,0x22,0x66,0x58,0x20, - 0x63,0x20,0x23,0x43,0x36,0x43,0x35,0x43,0x44,0x22,0x2c,0xa,0x22,0x67,0x58,0x20, - 0x63,0x20,0x23,0x43,0x36,0x43,0x38,0x43,0x42,0x22,0x2c,0xa,0x22,0x68,0x58,0x20, - 0x63,0x20,0x23,0x43,0x41,0x43,0x37,0x43,0x34,0x22,0x2c,0xa,0x22,0x6a,0x58,0x20, - 0x63,0x20,0x23,0x43,0x41,0x43,0x38,0x43,0x36,0x22,0x2c,0xa,0x22,0x6b,0x58,0x20, - 0x63,0x20,0x23,0x43,0x42,0x43,0x43,0x43,0x42,0x22,0x2c,0xa,0x22,0x6c,0x58,0x20, - 0x63,0x20,0x23,0x44,0x31,0x44,0x30,0x43,0x45,0x22,0x2c,0xa,0x22,0x7a,0x58,0x20, - 0x63,0x20,0x23,0x44,0x33,0x44,0x33,0x44,0x33,0x22,0x2c,0xa,0x22,0x78,0x58,0x20, - 0x63,0x20,0x23,0x44,0x34,0x44,0x37,0x44,0x39,0x22,0x2c,0xa,0x22,0x63,0x58,0x20, - 0x63,0x20,0x23,0x44,0x38,0x44,0x38,0x44,0x37,0x22,0x2c,0xa,0x22,0x76,0x58,0x20, - 0x63,0x20,0x23,0x44,0x42,0x44,0x42,0x44,0x42,0x22,0x2c,0xa,0x22,0x62,0x58,0x20, - 0x63,0x20,0x23,0x43,0x34,0x45,0x43,0x46,0x46,0x22,0x2c,0xa,0x22,0x6e,0x58,0x20, - 0x63,0x20,0x23,0x43,0x39,0x45,0x30,0x46,0x36,0x22,0x2c,0xa,0x22,0x6d,0x58,0x20, - 0x63,0x20,0x23,0x43,0x34,0x46,0x35,0x46,0x46,0x22,0x2c,0xa,0x22,0x4d,0x58,0x20, - 0x63,0x20,0x23,0x43,0x43,0x46,0x32,0x46,0x46,0x22,0x2c,0xa,0x22,0x4e,0x58,0x20, - 0x63,0x20,0x23,0x44,0x35,0x45,0x36,0x46,0x37,0x22,0x2c,0xa,0x22,0x42,0x58,0x20, - 0x63,0x20,0x23,0x44,0x44,0x45,0x42,0x46,0x39,0x22,0x2c,0xa,0x22,0x56,0x58,0x20, - 0x63,0x20,0x23,0x44,0x43,0x46,0x44,0x46,0x46,0x22,0x2c,0xa,0x22,0x43,0x58,0x20, - 0x63,0x20,0x23,0x44,0x33,0x46,0x31,0x46,0x35,0x22,0x2c,0xa,0x22,0x5a,0x58,0x20, - 0x63,0x20,0x23,0x45,0x31,0x45,0x30,0x44,0x45,0x22,0x2c,0xa,0x22,0x41,0x58,0x20, - 0x63,0x20,0x23,0x45,0x34,0x45,0x33,0x45,0x33,0x22,0x2c,0xa,0x22,0x53,0x58,0x20, - 0x63,0x20,0x23,0x45,0x34,0x45,0x37,0x45,0x41,0x22,0x2c,0xa,0x22,0x44,0x58,0x20, - 0x63,0x20,0x23,0x45,0x37,0x45,0x38,0x45,0x39,0x22,0x2c,0xa,0x22,0x46,0x58,0x20, - 0x63,0x20,0x23,0x45,0x38,0x45,0x36,0x45,0x34,0x22,0x2c,0xa,0x22,0x47,0x58,0x20, - 0x63,0x20,0x23,0x45,0x44,0x45,0x39,0x45,0x35,0x22,0x2c,0xa,0x22,0x48,0x58,0x20, - 0x63,0x20,0x23,0x45,0x42,0x45,0x42,0x45,0x42,0x22,0x2c,0xa,0x22,0x4a,0x58,0x20, - 0x63,0x20,0x23,0x45,0x37,0x45,0x45,0x46,0x35,0x22,0x2c,0xa,0x22,0x4b,0x58,0x20, - 0x63,0x20,0x23,0x45,0x41,0x46,0x32,0x46,0x41,0x22,0x2c,0xa,0x22,0x4c,0x58,0x20, - 0x63,0x20,0x23,0x46,0x31,0x45,0x45,0x45,0x41,0x22,0x2c,0xa,0x22,0x50,0x58,0x20, - 0x63,0x20,0x23,0x46,0x33,0x46,0x33,0x46,0x33,0x22,0x2c,0xa,0x22,0x49,0x58,0x20, - 0x63,0x20,0x23,0x46,0x34,0x46,0x38,0x46,0x43,0x22,0x2c,0xa,0x22,0x55,0x58,0x20, - 0x63,0x20,0x23,0x46,0x44,0x46,0x44,0x46,0x43,0x22,0x2c,0xa,0x22,0x59,0x58,0x20, - 0x63,0x20,0x4e,0x6f,0x6e,0x65,0x22,0x2c,0xa,0x2f,0x2a,0x20,0x70,0x69,0x78,0x65, - 0x6c,0x73,0x20,0x2a,0x2f,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x79,0x20,0x79,0x20,0x65,0x20,0x36, - 0x20,0x36,0x20,0x32,0x20,0x3c,0x20,0x3c,0x20,0x2c,0x20,0x2c,0x20,0x31,0x20,0x20, - 0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59, - 0x58,0x32,0x20,0x3c,0x20,0x2c,0x20,0x2c,0x20,0x71,0x20,0x77,0x20,0x32,0x20,0x65, - 0x20,0x72,0x20,0x72,0x20,0x72,0x20,0x77,0x20,0x65,0x20,0x77,0x20,0x72,0x20,0x65, - 0x20,0x32,0x20,0x36,0x20,0x31,0x20,0x36,0x20,0x73,0x20,0x3a,0x2e,0x66,0x2e,0x4c, - 0x2e,0x79,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59, - 0x58,0x59,0x58,0x59,0x58,0x78,0x20,0x64,0x2e,0x73,0x2e,0x3a,0x2e,0x61,0x20,0x23, - 0x20,0x24,0x20,0x24,0x20,0x25,0x20,0x2d,0x20,0x35,0x20,0x33,0x20,0x38,0x20,0x75, - 0x20,0x68,0x20,0x6b,0x20,0x42,0x20,0x53,0x20,0x4a,0x20,0x29,0x2e,0x2c,0x58,0x46, - 0x2e,0x62,0x2e,0x37,0x2e,0x72,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22, - 0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x26,0x2e,0x6d,0x58,0x7e,0x2e,0x38, - 0x2e,0x56,0x20,0x23,0x58,0x23,0x58,0x25,0x58,0x64,0x58,0x66,0x58,0x7a,0x58,0x78, - 0x58,0x76,0x58,0x5a,0x58,0x5a,0x58,0x44,0x58,0x46,0x58,0x46,0x58,0x44,0x58,0x4c, - 0x58,0x44,0x58,0x3e,0x2e,0x55,0x20,0x69,0x20,0x39,0x20,0x20,0x20,0x20,0x20,0x59, - 0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x6f,0x2e,0x32, - 0x58,0x5d,0x20,0x4c,0x20,0x43,0x20,0x55,0x58,0x44,0x58,0x63,0x58,0x7a,0x58,0x6b, - 0x58,0x6b,0x58,0x6b,0x58,0x6a,0x58,0x6a,0x58,0x64,0x58,0x64,0x58,0x25,0x58,0x25, - 0x58,0x26,0x58,0x25,0x58,0x2a,0x58,0x4e,0x2e,0x27,0x20,0x7e,0x20,0x36,0x20,0x20, - 0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59, - 0x58,0x6f,0x2e,0x31,0x58,0x5d,0x20,0x50,0x20,0x6b,0x20,0x68,0x58,0x6f,0x58,0x58, - 0x58,0x58,0x58,0x6f,0x58,0x6f,0x58,0x23,0x58,0x23,0x58,0x2a,0x58,0x25,0x58,0x26, - 0x58,0x25,0x58,0x25,0x58,0x64,0x58,0x6b,0x58,0x78,0x58,0x78,0x2e,0x5b,0x20,0x7e, - 0x20,0x36,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59, - 0x58,0x59,0x58,0x59,0x58,0x4f,0x2e,0x33,0x58,0x5b,0x20,0x49,0x20,0x6d,0x20,0x46, - 0x58,0x6b,0x58,0x6a,0x58,0x6a,0x58,0x6b,0x58,0x6b,0x58,0x6b,0x58,0x6b,0x58,0x6b, - 0x58,0x6b,0x58,0x7a,0x58,0x7a,0x58,0x7a,0x58,0x63,0x58,0x5a,0x58,0x53,0x58,0x78, - 0x2e,0x7b,0x20,0x21,0x20,0x36,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22, - 0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x6f,0x2e,0x33,0x58,0x7b,0x20,0x49, - 0x20,0x53,0x20,0x55,0x58,0x76,0x58,0x78,0x58,0x7a,0x58,0x6b,0x58,0x6b,0x58,0x6b, - 0x58,0x6b,0x58,0x6b,0x58,0x6a,0x58,0x64,0x58,0x2a,0x58,0x25,0x58,0x23,0x58,0x26, - 0x58,0x25,0x58,0x5a,0x2e,0x31,0x2e,0x5e,0x20,0x39,0x20,0x20,0x20,0x20,0x20,0x59, - 0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x4f,0x2e,0x34, - 0x58,0x3e,0x2e,0x55,0x20,0x6a,0x20,0x6a,0x58,0x23,0x58,0x23,0x58,0x23,0x58,0x25, - 0x58,0x64,0x58,0x64,0x58,0x6b,0x58,0x7a,0x58,0x6b,0x58,0x7a,0x58,0x7a,0x58,0x63, - 0x58,0x76,0x58,0x44,0x58,0x4a,0x58,0x41,0x2e,0x31,0x2e,0x7c,0x20,0x36,0x20,0x20, - 0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59, - 0x58,0x4f,0x2e,0x36,0x58,0x3e,0x2e,0x54,0x20,0x56,0x20,0x50,0x58,0x5a,0x58,0x5a, - 0x58,0x5a,0x58,0x41,0x58,0x53,0x58,0x44,0x58,0x44,0x58,0x46,0x58,0x48,0x58,0x44, - 0x58,0x48,0x58,0x48,0x58,0x48,0x58,0x48,0x58,0x53,0x58,0x49,0x2e,0x32,0x2e,0x7c, - 0x20,0x39,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59, - 0x58,0x59,0x58,0x59,0x58,0x4f,0x2e,0x36,0x58,0x32,0x2e,0x54,0x20,0x47,0x20,0x55, - 0x58,0x4c,0x58,0x44,0x58,0x44,0x58,0x41,0x58,0x5a,0x58,0x5a,0x58,0x41,0x58,0x5a, - 0x58,0x76,0x58,0x63,0x58,0x7a,0x58,0x6b,0x58,0x6b,0x58,0x6b,0x58,0x67,0x58,0x59, - 0x2e,0x33,0x2e,0x20,0x2e,0x36,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22, - 0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x4f,0x2e,0x39,0x58,0x34,0x2e,0x52, - 0x20,0x6d,0x20,0x7a,0x58,0x64,0x58,0x64,0x58,0x6b,0x58,0x7a,0x58,0x76,0x58,0x41, - 0x58,0x44,0x58,0x48,0x58,0x4c,0x58,0x50,0x58,0x50,0x58,0x49,0x58,0x55,0x58,0x55, - 0x58,0x55,0x58,0x51,0x2e,0x36,0x2e,0x20,0x2e,0x39,0x20,0x20,0x20,0x20,0x20,0x59, - 0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x4f,0x2e,0x39, - 0x58,0x35,0x2e,0x52,0x20,0x48,0x20,0x55,0x58,0x49,0x58,0x55,0x58,0x55,0x58,0x55, - 0x58,0x55,0x58,0x55,0x58,0x55,0x58,0x55,0x58,0x55,0x58,0x55,0x58,0x55,0x58,0x49, - 0x58,0x4b,0x58,0x4a,0x58,0x42,0x58,0x2d,0x58,0x43,0x2e,0x23,0x2e,0x39,0x20,0x20, - 0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59, - 0x58,0x4f,0x2e,0x65,0x58,0x4d,0x2e,0x2f,0x20,0x68,0x2e,0x55,0x58,0x55,0x58,0x49, - 0x58,0x4b,0x58,0x42,0x58,0x4e,0x58,0x6e,0x58,0x75,0x58,0x79,0x58,0x77,0x58,0x35, - 0x58,0x3a,0x58,0x21,0x2e,0x59,0x2e,0x59,0x2e,0x59,0x2e,0x44,0x2e,0x48,0x2e,0x39, - 0x2e,0x36,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59, - 0x58,0x59,0x58,0x59,0x58,0x2b,0x2e,0x72,0x58,0x42,0x2e,0x3c,0x2e,0x78,0x2e,0x51, - 0x2e,0x3b,0x58,0x2d,0x58,0x51,0x2e,0x59,0x2e,0x55,0x2e,0x55,0x2e,0x44,0x2e,0x5a, - 0x2e,0x5a,0x2e,0x42,0x2e,0x42,0x2e,0x43,0x2e,0x56,0x2e,0x56,0x2e,0x42,0x2e,0x42, - 0x2e,0x54,0x2e,0x30,0x2e,0x39,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22, - 0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x2b,0x2e,0x74,0x58,0x42,0x2e,0x4e, - 0x2e,0x42,0x2e,0x42,0x2e,0x42,0x2e,0x42,0x2e,0x43,0x2e,0x56,0x2e,0x56,0x2e,0x48, - 0x2e,0x48,0x2e,0x48,0x2e,0x44,0x2e,0x4e,0x2e,0x7a,0x2e,0x38,0x2e,0x5f,0x20,0x28, - 0x20,0x3c,0x2e,0x44,0x2e,0x52,0x2e,0x30,0x2e,0x39,0x20,0x20,0x20,0x20,0x20,0x59, - 0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x2b,0x2e,0x74, - 0x58,0x53,0x2e,0x5a,0x2e,0x46,0x2e,0x44,0x2e,0x6d,0x2e,0x7a,0x2e,0x6c,0x2e,0x60, - 0x20,0x29,0x20,0x51,0x20,0x57,0x20,0x70,0x20,0x73,0x20,0x7d,0x20,0x40,0x2e,0x72, - 0x2e,0x5b,0x2e,0x20,0x58,0x3e,0x58,0x47,0x2e,0x45,0x2e,0x30,0x2e,0x39,0x20,0x20, - 0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59, - 0x58,0x2b,0x2e,0x70,0x58,0x55,0x2e,0x6d,0x2e,0x29,0x20,0x70,0x20,0x64,0x20,0x2e, - 0x2e,0x2a,0x2e,0x75,0x2e,0x7c,0x2e,0x2b,0x58,0x3c,0x58,0x7a,0x58,0x5a,0x58,0x47, - 0x58,0x4c,0x58,0x47,0x58,0x5a,0x58,0x7a,0x58,0x6a,0x58,0x2f,0x2e,0x7e,0x2e,0x70, - 0x2e,0x72,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59, - 0x58,0x59,0x58,0x59,0x58,0x25,0x2e,0x61,0x58,0x54,0x2e,0x6b,0x2e,0x2a,0x2e,0x47, - 0x58,0x6c,0x58,0x26,0x58,0x2e,0x58,0x60,0x2e,0x2e,0x58,0x68,0x58,0x6c,0x58,0x7a, - 0x58,0x76,0x58,0x76,0x58,0x76,0x58,0x76,0x58,0x78,0x58,0x6b,0x58,0x67,0x58,0x32, - 0x58,0x5e,0x2e,0x61,0x2e,0x77,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22, - 0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x25,0x2e,0x61,0x58,0x45,0x2e,0x6b, - 0x2e,0x72,0x2e,0x4c,0x58,0x6f,0x58,0x6c,0x20,0x66,0x20,0x6c,0x20,0x46,0x20,0x2a, - 0x58,0x6c,0x58,0x7a,0x58,0x76,0x58,0x76,0x58,0x76,0x58,0x76,0x58,0x63,0x58,0x7a, - 0x58,0x67,0x58,0x34,0x58,0x3a,0x58,0x61,0x2e,0x77,0x20,0x20,0x20,0x20,0x20,0x59, - 0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x25,0x2e,0x62, - 0x58,0x7e,0x2e,0x63,0x2e,0x79,0x2e,0x4c,0x58,0x27,0x2e,0x66,0x20,0x44,0x20,0x4b, - 0x20,0x44,0x20,0x30,0x58,0x6b,0x58,0x7a,0x58,0x76,0x58,0x76,0x58,0x76,0x58,0x76, - 0x58,0x76,0x58,0x7a,0x58,0x66,0x58,0x36,0x58,0x34,0x58,0x67,0x2e,0x39,0x20,0x20, - 0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59, - 0x58,0x25,0x2e,0x62,0x58,0x5e,0x2e,0x63,0x2e,0x79,0x2e,0x4c,0x58,0x27,0x2e,0x6c, - 0x20,0x44,0x20,0x4b,0x20,0x44,0x20,0x30,0x58,0x6c,0x58,0x7a,0x58,0x63,0x58,0x76, - 0x58,0x76,0x58,0x76,0x58,0x78,0x58,0x6b,0x58,0x6b,0x58,0x39,0x58,0x36,0x58,0x77, - 0x2e,0x72,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59, - 0x58,0x59,0x58,0x59,0x58,0x25,0x2e,0x62,0x58,0x32,0x58,0x76,0x2e,0x75,0x2e,0x4c, - 0x58,0x27,0x2e,0x6c,0x20,0x4b,0x20,0x4b,0x20,0x4b,0x20,0x30,0x58,0x6c,0x58,0x7a, - 0x58,0x63,0x58,0x76,0x58,0x76,0x58,0x76,0x58,0x76,0x58,0x6b,0x58,0x66,0x58,0x39, - 0x58,0x50,0x2e,0x4d,0x20,0x3d,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22, - 0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x25,0x2e,0x62,0x58,0x32,0x58,0x4b, - 0x2e,0x75,0x2e,0x4c,0x58,0x27,0x2e,0x6c,0x20,0x4b,0x20,0x4b,0x20,0x44,0x20,0x30, - 0x58,0x6c,0x58,0x78,0x58,0x63,0x58,0x76,0x58,0x5a,0x58,0x76,0x58,0x78,0x58,0x7a, - 0x58,0x6b,0x58,0x71,0x58,0x5a,0x20,0x3a,0x20,0x2e,0x20,0x20,0x20,0x20,0x20,0x59, - 0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x25,0x2e,0x4d, - 0x58,0x36,0x58,0x4b,0x2e,0x75,0x2e,0x4c,0x58,0x27,0x2e,0x66,0x20,0x46,0x20,0x44, - 0x20,0x44,0x20,0x30,0x58,0x6b,0x58,0x7a,0x58,0x63,0x58,0x76,0x58,0x76,0x58,0x76, - 0x58,0x76,0x58,0x63,0x58,0x6b,0x58,0x5f,0x2e,0x3a,0x20,0x6f,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59, - 0x58,0x25,0x2e,0x4d,0x58,0x36,0x58,0x4b,0x2e,0x75,0x2e,0x4c,0x58,0x58,0x58,0x28, - 0x2e,0x58,0x58,0x26,0x58,0x64,0x58,0x6b,0x58,0x7a,0x58,0x76,0x58,0x5a,0x58,0x44, - 0x58,0x41,0x58,0x7a,0x58,0x3c,0x58,0x2b,0x58,0x7d,0x2e,0x4e,0x20,0x4f,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59, - 0x58,0x59,0x58,0x59,0x58,0x25,0x2e,0x56,0x58,0x69,0x58,0x3d,0x58,0x7b,0x2e,0x46, - 0x58,0x7a,0x58,0x6b,0x58,0x6b,0x58,0x6a,0x58,0x64,0x58,0x3c,0x58,0x24,0x58,0x4f, - 0x58,0x5d,0x2e,0x3b,0x2e,0x24,0x2e,0x7a,0x20,0x30,0x20,0x37,0x20,0x26,0x20,0x58, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x59,0x58,0x22, - 0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x3d,0x2e,0x43,0x58,0x71,0x2e,0x41, - 0x20,0x29,0x2e,0x66,0x58,0x2b,0x58,0x7c,0x2e,0x29,0x2e,0x2d,0x2e,0x4e,0x20,0x7a, - 0x20,0x30,0x20,0x2a,0x20,0x2b,0x20,0x6f,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x6e,0x20,0x24, - 0x2e,0x74,0x20,0x36,0x20,0x2c,0x20,0x34,0x20,0x30,0x20,0x2a,0x20,0x2b,0x20,0x2e, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59, - 0x58,0x3e,0x20,0x40,0x20,0x6f,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59, - 0x58,0x59,0x58,0x59,0x58,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x22, - 0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59, - 0x58,0x59,0x58,0x22,0xa,0x7d,0x3b,0xa, - # /home/rdale/src/kde/branches/KDE/3.5/tdevelop/languages/ruby/app_templates/qtruby4makeapp/editcopy.xpm - 0x0,0x0,0x12,0x99, - 0x2f, - 0x2a,0x20,0x58,0x50,0x4d,0x20,0x2a,0x2f,0xa,0x73,0x74,0x61,0x74,0x69,0x63,0x20, - 0x63,0x68,0x61,0x72,0x20,0x2a,0x65,0x64,0x69,0x74,0x63,0x6f,0x70,0x79,0x5b,0x5d, - 0x20,0x3d,0x20,0x7b,0xa,0x2f,0x2a,0x20,0x63,0x6f,0x6c,0x75,0x6d,0x6e,0x73,0x20, - 0x72,0x6f,0x77,0x73,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x73,0x20,0x63,0x68,0x61,0x72, - 0x73,0x2d,0x70,0x65,0x72,0x2d,0x70,0x69,0x78,0x65,0x6c,0x20,0x2a,0x2f,0xa,0x22, - 0x33,0x32,0x20,0x33,0x32,0x20,0x31,0x35,0x35,0x20,0x32,0x22,0x2c,0xa,0x22,0x20, - 0x20,0x20,0x63,0x20,0x62,0x6c,0x61,0x63,0x6b,0x22,0x2c,0xa,0x22,0x2e,0x20,0x20, - 0x63,0x20,0x23,0x31,0x39,0x31,0x30,0x30,0x30,0x22,0x2c,0xa,0x22,0x58,0x20,0x20, - 0x63,0x20,0x23,0x32,0x32,0x31,0x37,0x30,0x30,0x22,0x2c,0xa,0x22,0x6f,0x20,0x20, - 0x63,0x20,0x23,0x32,0x45,0x32,0x33,0x30,0x30,0x22,0x2c,0xa,0x22,0x4f,0x20,0x20, - 0x63,0x20,0x23,0x34,0x35,0x32,0x45,0x30,0x30,0x22,0x2c,0xa,0x22,0x2b,0x20,0x20, - 0x63,0x20,0x23,0x34,0x33,0x33,0x32,0x30,0x30,0x22,0x2c,0xa,0x22,0x40,0x20,0x20, - 0x63,0x20,0x23,0x34,0x39,0x33,0x30,0x30,0x30,0x22,0x2c,0xa,0x22,0x23,0x20,0x20, - 0x63,0x20,0x23,0x35,0x35,0x33,0x38,0x30,0x30,0x22,0x2c,0xa,0x22,0x24,0x20,0x20, - 0x63,0x20,0x23,0x35,0x44,0x34,0x36,0x30,0x30,0x22,0x2c,0xa,0x22,0x25,0x20,0x20, - 0x63,0x20,0x23,0x36,0x42,0x35,0x30,0x30,0x30,0x22,0x2c,0xa,0x22,0x26,0x20,0x20, - 0x63,0x20,0x23,0x37,0x32,0x34,0x42,0x30,0x30,0x22,0x2c,0xa,0x22,0x2a,0x20,0x20, - 0x63,0x20,0x23,0x37,0x44,0x35,0x45,0x30,0x30,0x22,0x2c,0xa,0x22,0x3d,0x20,0x20, - 0x63,0x20,0x23,0x36,0x45,0x36,0x39,0x34,0x46,0x22,0x2c,0xa,0x22,0x2d,0x20,0x20, - 0x63,0x20,0x23,0x37,0x45,0x37,0x39,0x35,0x46,0x22,0x2c,0xa,0x22,0x3b,0x20,0x20, - 0x63,0x20,0x23,0x38,0x36,0x35,0x39,0x30,0x30,0x22,0x2c,0xa,0x22,0x3a,0x20,0x20, - 0x63,0x20,0x23,0x38,0x41,0x35,0x43,0x30,0x30,0x22,0x2c,0xa,0x22,0x3e,0x20,0x20, - 0x63,0x20,0x23,0x38,0x42,0x36,0x38,0x30,0x30,0x22,0x2c,0xa,0x22,0x2c,0x20,0x20, - 0x63,0x20,0x23,0x39,0x33,0x36,0x32,0x30,0x30,0x22,0x2c,0xa,0x22,0x3c,0x20,0x20, - 0x63,0x20,0x23,0x39,0x32,0x36,0x44,0x30,0x30,0x22,0x2c,0xa,0x22,0x31,0x20,0x20, - 0x63,0x20,0x23,0x39,0x32,0x36,0x42,0x31,0x41,0x22,0x2c,0xa,0x22,0x32,0x20,0x20, - 0x63,0x20,0x23,0x39,0x36,0x37,0x30,0x30,0x30,0x22,0x2c,0xa,0x22,0x33,0x20,0x20, - 0x63,0x20,0x23,0x39,0x42,0x37,0x32,0x31,0x44,0x22,0x2c,0xa,0x22,0x34,0x20,0x20, - 0x63,0x20,0x23,0x39,0x42,0x37,0x36,0x32,0x35,0x22,0x2c,0xa,0x22,0x35,0x20,0x20, - 0x63,0x20,0x23,0x39,0x45,0x37,0x39,0x32,0x41,0x22,0x2c,0xa,0x22,0x36,0x20,0x20, - 0x63,0x20,0x23,0x41,0x34,0x37,0x43,0x30,0x30,0x22,0x2c,0xa,0x22,0x37,0x20,0x20, - 0x63,0x20,0x23,0x41,0x41,0x37,0x44,0x30,0x30,0x22,0x2c,0xa,0x22,0x38,0x20,0x20, - 0x63,0x20,0x23,0x41,0x31,0x37,0x36,0x31,0x41,0x22,0x2c,0xa,0x22,0x39,0x20,0x20, - 0x63,0x20,0x23,0x41,0x35,0x37,0x38,0x31,0x36,0x22,0x2c,0xa,0x22,0x30,0x20,0x20, - 0x63,0x20,0x23,0x41,0x34,0x37,0x39,0x31,0x44,0x22,0x2c,0xa,0x22,0x71,0x20,0x20, - 0x63,0x20,0x23,0x41,0x44,0x38,0x32,0x30,0x30,0x22,0x2c,0xa,0x22,0x77,0x20,0x20, - 0x63,0x20,0x23,0x42,0x32,0x38,0x35,0x30,0x30,0x22,0x2c,0xa,0x22,0x65,0x20,0x20, - 0x63,0x20,0x23,0x41,0x45,0x38,0x35,0x33,0x30,0x22,0x2c,0xa,0x22,0x72,0x20,0x20, - 0x63,0x20,0x23,0x42,0x39,0x39,0x36,0x32,0x36,0x22,0x2c,0xa,0x22,0x74,0x20,0x20, - 0x63,0x20,0x23,0x39,0x37,0x39,0x30,0x36,0x44,0x22,0x2c,0xa,0x22,0x79,0x20,0x20, - 0x63,0x20,0x23,0x42,0x31,0x38,0x44,0x34,0x38,0x22,0x2c,0xa,0x22,0x75,0x20,0x20, - 0x63,0x20,0x23,0x42,0x34,0x39,0x30,0x34,0x39,0x22,0x2c,0xa,0x22,0x69,0x20,0x20, - 0x63,0x20,0x23,0x42,0x38,0x39,0x35,0x34,0x32,0x22,0x2c,0xa,0x22,0x70,0x20,0x20, - 0x63,0x20,0x23,0x42,0x41,0x39,0x43,0x34,0x44,0x22,0x2c,0xa,0x22,0x61,0x20,0x20, - 0x63,0x20,0x23,0x42,0x44,0x39,0x45,0x35,0x32,0x22,0x2c,0xa,0x22,0x73,0x20,0x20, - 0x63,0x20,0x23,0x42,0x46,0x41,0x30,0x35,0x33,0x22,0x2c,0xa,0x22,0x64,0x20,0x20, - 0x63,0x20,0x23,0x42,0x38,0x41,0x45,0x37,0x38,0x22,0x2c,0xa,0x22,0x66,0x20,0x20, - 0x63,0x20,0x23,0x42,0x45,0x42,0x34,0x37,0x45,0x22,0x2c,0xa,0x22,0x67,0x20,0x20, - 0x63,0x20,0x23,0x43,0x34,0x39,0x33,0x30,0x30,0x22,0x2c,0xa,0x22,0x68,0x20,0x20, - 0x63,0x20,0x23,0x43,0x38,0x39,0x36,0x30,0x30,0x22,0x2c,0xa,0x22,0x6a,0x20,0x20, - 0x63,0x20,0x23,0x43,0x31,0x39,0x44,0x32,0x43,0x22,0x2c,0xa,0x22,0x6b,0x20,0x20, - 0x63,0x20,0x23,0x43,0x31,0x41,0x34,0x33,0x46,0x22,0x2c,0xa,0x22,0x6c,0x20,0x20, - 0x63,0x20,0x23,0x43,0x30,0x39,0x45,0x34,0x45,0x22,0x2c,0xa,0x22,0x7a,0x20,0x20, - 0x63,0x20,0x23,0x43,0x46,0x42,0x34,0x35,0x37,0x22,0x2c,0xa,0x22,0x78,0x20,0x20, - 0x63,0x20,0x23,0x43,0x39,0x42,0x31,0x35,0x39,0x22,0x2c,0xa,0x22,0x63,0x20,0x20, - 0x63,0x20,0x23,0x43,0x41,0x42,0x35,0x37,0x33,0x22,0x2c,0xa,0x22,0x76,0x20,0x20, - 0x63,0x20,0x23,0x44,0x34,0x42,0x46,0x37,0x43,0x22,0x2c,0xa,0x22,0x62,0x20,0x20, - 0x63,0x20,0x23,0x46,0x46,0x44,0x46,0x36,0x32,0x22,0x2c,0xa,0x22,0x6e,0x20,0x20, - 0x63,0x20,0x23,0x46,0x46,0x45,0x30,0x36,0x34,0x22,0x2c,0xa,0x22,0x6d,0x20,0x20, - 0x63,0x20,0x23,0x46,0x46,0x45,0x31,0x36,0x44,0x22,0x2c,0xa,0x22,0x4d,0x20,0x20, - 0x63,0x20,0x23,0x46,0x46,0x45,0x33,0x37,0x32,0x22,0x2c,0xa,0x22,0x4e,0x20,0x20, - 0x63,0x20,0x23,0x46,0x46,0x45,0x34,0x37,0x39,0x22,0x2c,0xa,0x22,0x42,0x20,0x20, - 0x63,0x20,0x23,0x41,0x31,0x39,0x44,0x38,0x45,0x22,0x2c,0xa,0x22,0x56,0x20,0x20, - 0x63,0x20,0x23,0x41,0x42,0x41,0x38,0x39,0x41,0x22,0x2c,0xa,0x22,0x43,0x20,0x20, - 0x63,0x20,0x23,0x42,0x45,0x42,0x35,0x38,0x30,0x22,0x2c,0xa,0x22,0x5a,0x20,0x20, - 0x63,0x20,0x23,0x42,0x44,0x42,0x34,0x38,0x38,0x22,0x2c,0xa,0x22,0x41,0x20,0x20, - 0x63,0x20,0x23,0x42,0x38,0x42,0x34,0x39,0x36,0x22,0x2c,0xa,0x22,0x53,0x20,0x20, - 0x63,0x20,0x23,0x41,0x45,0x41,0x44,0x41,0x41,0x22,0x2c,0xa,0x22,0x44,0x20,0x20, - 0x63,0x20,0x23,0x42,0x33,0x41,0x46,0x41,0x31,0x22,0x2c,0xa,0x22,0x46,0x20,0x20, - 0x63,0x20,0x23,0x42,0x43,0x42,0x42,0x42,0x36,0x22,0x2c,0xa,0x22,0x47,0x20,0x20, - 0x63,0x20,0x23,0x42,0x46,0x42,0x46,0x42,0x39,0x22,0x2c,0xa,0x22,0x48,0x20,0x20, - 0x63,0x20,0x23,0x43,0x30,0x42,0x36,0x38,0x30,0x22,0x2c,0xa,0x22,0x4a,0x20,0x20, - 0x63,0x20,0x23,0x43,0x34,0x42,0x41,0x38,0x35,0x22,0x2c,0xa,0x22,0x4b,0x20,0x20, - 0x63,0x20,0x23,0x43,0x36,0x42,0x44,0x38,0x42,0x22,0x2c,0xa,0x22,0x4c,0x20,0x20, - 0x63,0x20,0x23,0x43,0x42,0x42,0x35,0x38,0x39,0x22,0x2c,0xa,0x22,0x50,0x20,0x20, - 0x63,0x20,0x23,0x43,0x38,0x42,0x45,0x38,0x38,0x22,0x2c,0xa,0x22,0x49,0x20,0x20, - 0x63,0x20,0x23,0x43,0x33,0x42,0x43,0x39,0x30,0x22,0x2c,0xa,0x22,0x55,0x20,0x20, - 0x63,0x20,0x23,0x43,0x42,0x43,0x31,0x38,0x43,0x22,0x2c,0xa,0x22,0x59,0x20,0x20, - 0x63,0x20,0x23,0x43,0x43,0x43,0x34,0x39,0x33,0x22,0x2c,0xa,0x22,0x54,0x20,0x20, - 0x63,0x20,0x23,0x44,0x37,0x43,0x42,0x38,0x43,0x22,0x2c,0xa,0x22,0x52,0x20,0x20, - 0x63,0x20,0x23,0x44,0x41,0x43,0x37,0x38,0x36,0x22,0x2c,0xa,0x22,0x45,0x20,0x20, - 0x63,0x20,0x23,0x44,0x38,0x43,0x37,0x38,0x39,0x22,0x2c,0xa,0x22,0x57,0x20,0x20, - 0x63,0x20,0x23,0x44,0x41,0x43,0x39,0x38,0x42,0x22,0x2c,0xa,0x22,0x51,0x20,0x20, - 0x63,0x20,0x23,0x44,0x30,0x43,0x36,0x39,0x30,0x22,0x2c,0xa,0x22,0x21,0x20,0x20, - 0x63,0x20,0x23,0x44,0x34,0x43,0x41,0x39,0x34,0x22,0x2c,0xa,0x22,0x7e,0x20,0x20, - 0x63,0x20,0x23,0x44,0x34,0x43,0x43,0x39,0x42,0x22,0x2c,0xa,0x22,0x5e,0x20,0x20, - 0x63,0x20,0x23,0x44,0x38,0x43,0x45,0x39,0x38,0x22,0x2c,0xa,0x22,0x2f,0x20,0x20, - 0x63,0x20,0x23,0x44,0x43,0x44,0x32,0x39,0x43,0x22,0x2c,0xa,0x22,0x28,0x20,0x20, - 0x63,0x20,0x23,0x43,0x36,0x43,0x33,0x42,0x37,0x22,0x2c,0xa,0x22,0x29,0x20,0x20, - 0x63,0x20,0x23,0x43,0x38,0x43,0x36,0x42,0x45,0x22,0x2c,0xa,0x22,0x5f,0x20,0x20, - 0x63,0x20,0x23,0x44,0x35,0x43,0x35,0x41,0x35,0x22,0x2c,0xa,0x22,0x60,0x20,0x20, - 0x63,0x20,0x23,0x44,0x42,0x43,0x38,0x41,0x31,0x22,0x2c,0xa,0x22,0x27,0x20,0x20, - 0x63,0x20,0x23,0x44,0x42,0x44,0x34,0x41,0x32,0x22,0x2c,0xa,0x22,0x5d,0x20,0x20, - 0x63,0x20,0x23,0x44,0x45,0x44,0x39,0x41,0x45,0x22,0x2c,0xa,0x22,0x5b,0x20,0x20, - 0x63,0x20,0x23,0x44,0x39,0x44,0x35,0x42,0x31,0x22,0x2c,0xa,0x22,0x7b,0x20,0x20, - 0x63,0x20,0x23,0x45,0x30,0x43,0x43,0x38,0x32,0x22,0x2c,0xa,0x22,0x7d,0x20,0x20, - 0x63,0x20,0x23,0x45,0x38,0x44,0x39,0x38,0x42,0x22,0x2c,0xa,0x22,0x7c,0x20,0x20, - 0x63,0x20,0x23,0x45,0x38,0x44,0x39,0x39,0x31,0x22,0x2c,0xa,0x22,0x20,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x31,0x44,0x37,0x41,0x31,0x22,0x2c,0xa,0x22,0x2e,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x35,0x44,0x42,0x41,0x35,0x22,0x2c,0xa,0x22,0x58,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x34,0x44,0x43,0x41,0x42,0x22,0x2c,0xa,0x22,0x6f,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x38,0x44,0x44,0x41,0x41,0x22,0x2c,0xa,0x22,0x4f,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x31,0x44,0x43,0x42,0x32,0x22,0x2c,0xa,0x22,0x2b,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x31,0x44,0x43,0x42,0x38,0x22,0x2c,0xa,0x22,0x40,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x45,0x36,0x38,0x33,0x22,0x2c,0xa,0x22,0x23,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x45,0x37,0x38,0x41,0x22,0x2c,0xa,0x22,0x24,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x45,0x38,0x38,0x35,0x22,0x2c,0xa,0x22,0x25,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x45,0x38,0x38,0x44,0x22,0x2c,0xa,0x22,0x26,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x45,0x39,0x39,0x32,0x22,0x2c,0xa,0x22,0x2a,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x45,0x43,0x39,0x44,0x22,0x2c,0xa,0x22,0x3d,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x46,0x30,0x39,0x46,0x22,0x2c,0xa,0x22,0x2d,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x43,0x45,0x32,0x41,0x43,0x22,0x2c,0xa,0x22,0x3b,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x35,0x45,0x30,0x42,0x36,0x22,0x2c,0xa,0x22,0x3a,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x35,0x45,0x31,0x42,0x38,0x22,0x2c,0xa,0x22,0x3e,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x42,0x45,0x34,0x42,0x36,0x22,0x2c,0xa,0x22,0x2c,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x41,0x45,0x35,0x42,0x43,0x22,0x2c,0xa,0x22,0x3c,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x30,0x45,0x35,0x41,0x38,0x22,0x2c,0xa,0x22,0x31,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x45,0x44,0x41,0x33,0x22,0x2c,0xa,0x22,0x32,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x45,0x44,0x41,0x39,0x22,0x2c,0xa,0x22,0x33,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x31,0x45,0x38,0x42,0x38,0x22,0x2c,0xa,0x22,0x34,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x45,0x46,0x42,0x31,0x22,0x2c,0xa,0x22,0x35,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x46,0x31,0x41,0x35,0x22,0x2c,0xa,0x22,0x36,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x46,0x32,0x41,0x44,0x22,0x2c,0xa,0x22,0x37,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x46,0x32,0x42,0x34,0x22,0x2c,0xa,0x22,0x38,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x46,0x32,0x42,0x43,0x22,0x2c,0xa,0x22,0x39,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x41,0x43,0x38,0x43,0x32,0x22,0x2c,0xa,0x22,0x30,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x36,0x44,0x34,0x43,0x42,0x22,0x2c,0xa,0x22,0x71,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x46,0x44,0x41,0x43,0x35,0x22,0x2c,0xa,0x22,0x77,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x34,0x44,0x32,0x44,0x30,0x22,0x2c,0xa,0x22,0x65,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x30,0x44,0x37,0x43,0x35,0x22,0x2c,0xa,0x22,0x72,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x34,0x44,0x41,0x43,0x33,0x22,0x2c,0xa,0x22,0x74,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x38,0x44,0x45,0x43,0x37,0x22,0x2c,0xa,0x22,0x79,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x30,0x44,0x46,0x44,0x33,0x22,0x2c,0xa,0x22,0x75,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x36,0x45,0x32,0x43,0x32,0x22,0x2c,0xa,0x22,0x69,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x38,0x45,0x31,0x43,0x35,0x22,0x2c,0xa,0x22,0x70,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x42,0x45,0x33,0x43,0x42,0x22,0x2c,0xa,0x22,0x61,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x45,0x45,0x39,0x43,0x32,0x22,0x2c,0xa,0x22,0x73,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x38,0x45,0x36,0x44,0x43,0x22,0x2c,0xa,0x22,0x64,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x33,0x45,0x44,0x43,0x33,0x22,0x2c,0xa,0x22,0x66,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x32,0x45,0x44,0x43,0x42,0x22,0x2c,0xa,0x22,0x67,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x37,0x46,0x32,0x43,0x44,0x22,0x2c,0xa,0x22,0x68,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x46,0x33,0x43,0x33,0x22,0x2c,0xa,0x22,0x6a,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x46,0x34,0x43,0x41,0x22,0x2c,0xa,0x22,0x6b,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x46,0x38,0x43,0x35,0x22,0x2c,0xa,0x22,0x6c,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x46,0x38,0x43,0x44,0x22,0x2c,0xa,0x22,0x7a,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x44,0x46,0x35,0x44,0x32,0x22,0x2c,0xa,0x22,0x78,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x46,0x37,0x44,0x38,0x22,0x2c,0xa,0x22,0x63,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x46,0x39,0x44,0x34,0x22,0x2c,0xa,0x22,0x76,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x46,0x39,0x44,0x43,0x22,0x2c,0xa,0x22,0x62,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x39,0x45,0x38,0x45,0x37,0x22,0x2c,0xa,0x22,0x6e,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x33,0x45,0x46,0x45,0x33,0x22,0x2c,0xa,0x22,0x6d,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x32,0x46,0x30,0x45,0x33,0x22,0x2c,0xa,0x22,0x4d,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x34,0x46,0x32,0x45,0x41,0x22,0x2c,0xa,0x22,0x4e,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x42,0x46,0x37,0x45,0x36,0x22,0x2c,0xa,0x22,0x42,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x45,0x46,0x39,0x45,0x33,0x22,0x2c,0xa,0x22,0x56,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x46,0x42,0x45,0x43,0x22,0x2c,0xa,0x22,0x43,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x34,0x46,0x34,0x46,0x33,0x22,0x2c,0xa,0x22,0x5a,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x38,0x46,0x37,0x46,0x36,0x22,0x2c,0xa,0x22,0x41,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x45,0x46,0x43,0x46,0x34,0x22,0x2c,0xa,0x22,0x53,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x45,0x46,0x45,0x46,0x43,0x22,0x2c,0xa,0x22,0x44,0x2e,0x20, - 0x63,0x20,0x4e,0x6f,0x6e,0x65,0x22,0x2c,0xa,0x2f,0x2a,0x20,0x70,0x69,0x78,0x65, - 0x6c,0x73,0x20,0x2a,0x2f,0xa,0x22,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44, - 0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x68, - 0x20,0x67,0x20,0x67,0x20,0x67,0x20,0x67,0x20,0x67,0x20,0x67,0x20,0x67,0x20,0x67, - 0x20,0x67,0x20,0x67,0x20,0x77,0x20,0x2a,0x20,0x20,0x20,0x20,0x20,0x44,0x2e,0x44, - 0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x22,0x2c,0xa,0x22,0x44,0x2e,0x44,0x2e,0x44, - 0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44, - 0x2e,0x44,0x2e,0x67,0x20,0x7a,0x2e,0x7a,0x2e,0x67,0x2e,0x67,0x2e,0x67,0x2e,0x67, - 0x2e,0x67,0x2e,0x67,0x2e,0x7a,0x2e,0x67,0x2e,0x52,0x20,0x32,0x20,0x20,0x20,0x20, - 0x20,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x22,0x2c,0xa,0x22,0x44, - 0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44, - 0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x67,0x20,0x7a,0x2e,0x64,0x2e,0x33,0x2e,0x33, - 0x2e,0x33,0x2e,0x33,0x2e,0x33,0x2e,0x33,0x2e,0x3e,0x2e,0x66,0x2e,0x67,0x2e,0x7a, - 0x20,0x3c,0x20,0x20,0x20,0x20,0x20,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x22, - 0x2c,0xa,0x22,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x2c,0x20,0x3a, - 0x20,0x3b,0x20,0x2c,0x20,0x3a,0x20,0x3a,0x20,0x3a,0x20,0x37,0x20,0x61,0x20,0x69, - 0x20,0x61,0x20,0x52,0x20,0x2d,0x2e,0x2d,0x2e,0x2d,0x2e,0x2d,0x2e,0x27,0x20,0x6d, - 0x2e,0x75,0x2e,0x67,0x2e,0x6a,0x20,0x3e,0x20,0x20,0x20,0x20,0x20,0x44,0x2e,0x44, - 0x2e,0x44,0x2e,0x22,0x2c,0xa,0x22,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x2c, - 0x20,0x75,0x20,0x79,0x20,0x79,0x20,0x4c,0x20,0x4c,0x20,0x4c,0x20,0x4c,0x20,0x60, - 0x20,0x74,0x2e,0x74,0x2e,0x65,0x2e,0x65,0x20,0x76,0x20,0x2d,0x2e,0x2d,0x2e,0x2d, - 0x2e,0x59,0x20,0x62,0x2e,0x53,0x2e,0x2b,0x2e,0x64,0x2e,0x71,0x20,0x20,0x20,0x20, - 0x20,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x22,0x2c,0xa,0x22,0x44,0x2e,0x44,0x2e,0x44, - 0x2e,0x44,0x2e,0x2c,0x20,0x53,0x2e,0x53,0x2e,0x53,0x2e,0x53,0x2e,0x53,0x2e,0x53, - 0x2e,0x53,0x2e,0x53,0x2e,0x5a,0x2e,0x62,0x2e,0x53,0x2e,0x65,0x2e,0x69,0x20,0x57, - 0x20,0x6f,0x2e,0x6f,0x2e,0x4b,0x20,0x77,0x2e,0x53,0x2e,0x41,0x2e,0x75,0x2e,0x71, - 0x20,0x20,0x20,0x20,0x20,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x22,0x2c,0xa,0x22,0x44, - 0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x2c,0x20,0x53,0x2e,0x53,0x2e,0x53,0x2e,0x41, - 0x2e,0x53,0x2e,0x53,0x2e,0x53,0x2e,0x53,0x2e,0x4d,0x2e,0x77,0x2e,0x53,0x2e,0x53, - 0x2e,0x5f,0x20,0x61,0x20,0x45,0x20,0x2e,0x2e,0x4b,0x20,0x30,0x2e,0x53,0x2e,0x53, - 0x2e,0x71,0x2e,0x37,0x20,0x20,0x20,0x20,0x20,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x22, - 0x2c,0xa,0x22,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x2c,0x20,0x53,0x2e,0x41, - 0x2e,0x56,0x2e,0x41,0x2e,0x41,0x2e,0x41,0x2e,0x56,0x2e,0x41,0x2e,0x6e,0x2e,0x39, - 0x2e,0x53,0x2e,0x53,0x2e,0x43,0x2e,0x5f,0x20,0x61,0x20,0x2e,0x2e,0x59,0x20,0x74, - 0x20,0x3d,0x20,0x2d,0x20,0x41,0x20,0x36,0x20,0x20,0x20,0x20,0x20,0x44,0x2e,0x44, - 0x2e,0x44,0x2e,0x22,0x2c,0xa,0x22,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x2c, - 0x20,0x41,0x2e,0x41,0x2e,0x56,0x2e,0x41,0x2e,0x56,0x2e,0x56,0x2e,0x56,0x2e,0x41, - 0x2e,0x6e,0x2e,0x39,0x2e,0x53,0x2e,0x53,0x2e,0x53,0x2e,0x5a,0x2e,0x33,0x20,0x27, - 0x20,0x27,0x20,0x4b,0x20,0x5a,0x20,0x41,0x20,0x5d,0x20,0x37,0x20,0x20,0x20,0x20, - 0x20,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x22,0x2c,0xa,0x22,0x44,0x2e,0x44,0x2e,0x44, - 0x2e,0x44,0x2e,0x2c,0x20,0x41,0x2e,0x56,0x2e,0x42,0x2e,0x56,0x2e,0x56,0x2e,0x42, - 0x2e,0x56,0x2e,0x56,0x2e,0x6e,0x2e,0x28,0x20,0x46,0x20,0x53,0x20,0x53,0x20,0x47, - 0x20,0x35,0x20,0x27,0x20,0x7c,0x20,0x2f,0x20,0x2f,0x20,0x58,0x2e,0x66,0x2e,0x71, - 0x20,0x20,0x20,0x20,0x20,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x22,0x2c,0xa,0x22,0x44, - 0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x2c,0x20,0x41,0x2e,0x56,0x2e,0x78,0x2e,0x42, - 0x2e,0x78,0x2e,0x56,0x2e,0x42,0x2e,0x4e,0x2e,0x42,0x2e,0x65,0x2e,0x44,0x20,0x42, - 0x20,0x56,0x20,0x29,0x20,0x33,0x20,0x2f,0x20,0x2f,0x20,0x5e,0x20,0x5e,0x20,0x27, - 0x20,0x61,0x2e,0x71,0x20,0x20,0x20,0x20,0x20,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x22, - 0x2c,0xa,0x22,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x2c,0x20,0x56,0x2e,0x4e, - 0x2e,0x4e,0x2e,0x42,0x2e,0x42,0x2e,0x42,0x2e,0x76,0x2e,0x76,0x2e,0x4e,0x2e,0x7a, - 0x2e,0x70,0x2e,0x69,0x2e,0x70,0x2e,0x6e,0x2e,0x38,0x20,0x5e,0x20,0x2f,0x20,0x21, - 0x20,0x51,0x20,0x27,0x20,0x61,0x2e,0x71,0x20,0x20,0x20,0x20,0x20,0x44,0x2e,0x44, - 0x2e,0x44,0x2e,0x22,0x2c,0xa,0x22,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x2c, - 0x20,0x42,0x2e,0x42,0x2e,0x78,0x2e,0x76,0x2e,0x78,0x2e,0x7a,0x2e,0x6a,0x2e,0x6a, - 0x2e,0x78,0x2e,0x7a,0x2e,0x7a,0x2e,0x63,0x2e,0x42,0x2e,0x42,0x2e,0x30,0x20,0x21, - 0x20,0x21,0x20,0x21,0x20,0x5e,0x20,0x27,0x20,0x2c,0x2e,0x71,0x20,0x20,0x20,0x20, - 0x20,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x22,0x2c,0xa,0x22,0x44,0x2e,0x44,0x2e,0x44, - 0x2e,0x44,0x2e,0x2c,0x20,0x42,0x2e,0x68,0x2e,0x68,0x2e,0x7a,0x2e,0x7a,0x2e,0x78, - 0x2e,0x78,0x2e,0x7a,0x2e,0x7a,0x2e,0x7a,0x2e,0x68,0x2e,0x6a,0x2e,0x78,0x2e,0x76, - 0x2e,0x30,0x20,0x21,0x20,0x51,0x20,0x59,0x20,0x21,0x20,0x7e,0x20,0x2c,0x2e,0x71, - 0x20,0x20,0x20,0x20,0x20,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x22,0x2c,0xa,0x22,0x44, - 0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x2c,0x20,0x76,0x2e,0x63,0x2e,0x6b,0x2e,0x78, - 0x2e,0x68,0x2e,0x6a,0x2e,0x6a,0x2e,0x6a,0x2e,0x7a,0x2e,0x38,0x2e,0x68,0x2e,0x6b, - 0x2e,0x6a,0x2e,0x76,0x2e,0x30,0x20,0x55,0x20,0x54,0x20,0x55,0x20,0x55,0x20,0x7e, - 0x20,0x2c,0x2e,0x71,0x20,0x20,0x20,0x20,0x20,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x22, - 0x2c,0xa,0x22,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x2c,0x20,0x76,0x2e,0x6b, - 0x2e,0x7a,0x2e,0x68,0x2e,0x68,0x2e,0x68,0x2e,0x6a,0x2e,0x38,0x2e,0x6a,0x2e,0x68, - 0x2e,0x68,0x2e,0x6a,0x2e,0x6b,0x2e,0x76,0x2e,0x30,0x20,0x55,0x20,0x55,0x20,0x55, - 0x20,0x55,0x20,0x59,0x20,0x3b,0x2e,0x71,0x20,0x20,0x20,0x20,0x20,0x44,0x2e,0x44, - 0x2e,0x44,0x2e,0x22,0x2c,0xa,0x22,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x2c, - 0x20,0x78,0x2e,0x68,0x2e,0x38,0x2e,0x38,0x2e,0x68,0x2e,0x6a,0x2e,0x38,0x2e,0x38, - 0x2e,0x34,0x2e,0x68,0x2e,0x34,0x2e,0x38,0x2e,0x68,0x2e,0x78,0x2e,0x38,0x20,0x50, - 0x20,0x48,0x20,0x50,0x20,0x50,0x20,0x7e,0x20,0x3b,0x2e,0x71,0x20,0x20,0x20,0x20, - 0x20,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x22,0x2c,0xa,0x22,0x44,0x2e,0x44,0x2e,0x44, - 0x2e,0x44,0x2e,0x2c,0x20,0x76,0x2e,0x68,0x2e,0x34,0x2e,0x34,0x2e,0x38,0x2e,0x38, - 0x2e,0x34,0x2e,0x31,0x2e,0x7a,0x2e,0x68,0x2e,0x38,0x2e,0x34,0x2e,0x68,0x2e,0x63, - 0x2e,0x38,0x20,0x48,0x20,0x4a,0x20,0x48,0x20,0x4a,0x20,0x59,0x20,0x3b,0x2e,0x71, - 0x20,0x20,0x20,0x20,0x20,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x22,0x2c,0xa,0x22,0x44, - 0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x2c,0x20,0x63,0x2e,0x32,0x2e,0x7a,0x2e,0x6a, - 0x2e,0x34,0x2e,0x2a,0x2e,0x31,0x2e,0x31,0x2e,0x38,0x2e,0x32,0x2e,0x32,0x2e,0x2a, - 0x2e,0x32,0x2e,0x6c,0x2e,0x38,0x20,0x4a,0x20,0x4a,0x20,0x48,0x20,0x4a,0x20,0x55, - 0x20,0x5d,0x20,0x71,0x20,0x20,0x20,0x20,0x20,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x22, - 0x2c,0xa,0x22,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x2c,0x20,0x6c,0x2e,0x68, - 0x2e,0x32,0x2e,0x34,0x2e,0x34,0x2e,0x31,0x2e,0x25,0x2e,0x31,0x2e,0x26,0x2e,0x32, - 0x2e,0x34,0x2e,0x38,0x2e,0x37,0x2e,0x6b,0x2e,0x38,0x20,0x66,0x20,0x64,0x20,0x66, - 0x20,0x48,0x20,0x55,0x20,0x5d,0x20,0x71,0x20,0x20,0x20,0x20,0x20,0x44,0x2e,0x44, - 0x2e,0x44,0x2e,0x22,0x2c,0xa,0x22,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x2c, - 0x20,0x7a,0x2e,0x38,0x2e,0x23,0x2e,0x31,0x2e,0x34,0x2e,0x31,0x2e,0x2a,0x2e,0x31, - 0x2e,0x31,0x2e,0x31,0x2e,0x2a,0x2e,0x4e,0x20,0x34,0x2e,0x6c,0x2e,0x38,0x20,0x66, - 0x20,0x66,0x20,0x43,0x20,0x4b,0x20,0x7e,0x20,0x3a,0x2e,0x71,0x20,0x20,0x20,0x20, - 0x20,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x22,0x2c,0xa,0x22,0x44,0x2e,0x44,0x2e,0x44, - 0x2e,0x44,0x2e,0x2c,0x20,0x38,0x2e,0x26,0x2e,0x34,0x2e,0x23,0x2e,0x25,0x2e,0x34, - 0x2e,0x26,0x2e,0x40,0x2e,0x23,0x2e,0x25,0x2e,0x25,0x2e,0x26,0x2e,0x32,0x2e,0x6c, - 0x2e,0x38,0x20,0x4b,0x20,0x4b,0x20,0x59,0x20,0x7e,0x20,0x5d,0x20,0x2c,0x2e,0x36, - 0x20,0x20,0x20,0x20,0x20,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x22,0x2c,0xa,0x22,0x44, - 0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x2c,0x20,0x68,0x2e,0x26,0x2e,0x23,0x2e,0x2a, - 0x2e,0x31,0x2e,0x31,0x2e,0x25,0x2e,0x4e,0x20,0x4e,0x20,0x23,0x2e,0x26,0x2e,0x2a, - 0x2e,0x31,0x2e,0x6c,0x2e,0x30,0x20,0x27,0x20,0x5d,0x20,0x54,0x20,0x78,0x20,0x72, - 0x20,0x36,0x20,0x25,0x20,0x20,0x20,0x20,0x20,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x22, - 0x2c,0xa,0x22,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x2c,0x20,0x34,0x2e,0x34, - 0x2e,0x25,0x2e,0x2a,0x2e,0x23,0x2e,0x62,0x20,0x26,0x2e,0x4e,0x20,0x4d,0x20,0x62, - 0x20,0x4d,0x20,0x32,0x2e,0x31,0x2e,0x6b,0x2e,0x39,0x20,0x6b,0x20,0x37,0x20,0x3e, - 0x20,0x24,0x20,0x6f,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x44,0x2e,0x44, - 0x2e,0x44,0x2e,0x22,0x2c,0xa,0x22,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x2c, - 0x20,0x37,0x2e,0x26,0x2e,0x4e,0x20,0x35,0x2e,0x26,0x2e,0x4e,0x20,0x40,0x2e,0x2a, - 0x2e,0x62,0x20,0x4e,0x20,0x4d,0x20,0x4e,0x20,0x3d,0x2e,0x6b,0x2e,0x2c,0x20,0x2b, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x22,0x2c,0xa,0x22,0x44,0x2e,0x44,0x2e,0x44, - 0x2e,0x44,0x2e,0x2c,0x20,0x36,0x2e,0x4e,0x20,0x4e,0x20,0x4d,0x20,0x4d,0x20,0x26, - 0x2e,0x23,0x2e,0x4e,0x20,0x32,0x2e,0x24,0x2e,0x25,0x2e,0x38,0x2e,0x36,0x2e,0x3c, - 0x2e,0x26,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x22,0x2c,0xa,0x22,0x44, - 0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x2c,0x20,0x35,0x2e,0x26,0x2e,0x37,0x2e,0x6e, - 0x20,0x24,0x2e,0x6d,0x20,0x4d,0x20,0x31,0x2e,0x37,0x2e,0x37,0x2e,0x6f,0x2e,0x63, - 0x20,0x35,0x20,0x26,0x20,0x40,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x44,0x2e,0x44, - 0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x22, - 0x2c,0xa,0x22,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x2c,0x20,0x37,0x2e,0x2a, - 0x2e,0x6d,0x20,0x25,0x2e,0x3d,0x2e,0x26,0x2e,0x37,0x2e,0x7d,0x20,0x70,0x20,0x31, - 0x20,0x25,0x20,0x23,0x20,0x58,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x44, - 0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44, - 0x2e,0x44,0x2e,0x22,0x2c,0xa,0x22,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x2c, - 0x20,0x36,0x2e,0x35,0x2e,0x35,0x2e,0x35,0x2e,0x7c,0x20,0x61,0x20,0x31,0x20,0x26, - 0x20,0x2b,0x20,0x2e,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44, - 0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x22,0x2c,0xa,0x22,0x44,0x2e,0x44,0x2e,0x44, - 0x2e,0x44,0x2e,0x2c,0x20,0x36,0x2e,0x2d,0x2e,0x61,0x20,0x31,0x20,0x26,0x20,0x4f, - 0x20,0x2e,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44, - 0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x22,0x2c,0xa,0x22,0x44, - 0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x3b,0x20,0x3a,0x20,0x25,0x20,0x4f,0x20,0x2e, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44, - 0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x22, - 0x2c,0xa,0x22,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x44, - 0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44, - 0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44,0x2e,0x44, - 0x2e,0x44,0x2e,0x22,0xa,0x7d,0x3b,0xa, - # /home/rdale/src/kde/branches/KDE/3.5/tdevelop/languages/ruby/app_templates/qtruby4makeapp/filenew.xpm - 0x0,0x0,0x14,0x9, - 0x2f, - 0x2a,0x20,0x58,0x50,0x4d,0x20,0x2a,0x2f,0xa,0x73,0x74,0x61,0x74,0x69,0x63,0x20, - 0x63,0x68,0x61,0x72,0x20,0x2a,0x66,0x69,0x6c,0x65,0x6e,0x65,0x77,0x5b,0x5d,0x20, - 0x3d,0x20,0x7b,0xa,0x2f,0x2a,0x20,0x63,0x6f,0x6c,0x75,0x6d,0x6e,0x73,0x20,0x72, - 0x6f,0x77,0x73,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x73,0x20,0x63,0x68,0x61,0x72,0x73, - 0x2d,0x70,0x65,0x72,0x2d,0x70,0x69,0x78,0x65,0x6c,0x20,0x2a,0x2f,0xa,0x22,0x33, - 0x32,0x20,0x33,0x32,0x20,0x31,0x37,0x38,0x20,0x32,0x22,0x2c,0xa,0x22,0x20,0x20, - 0x20,0x63,0x20,0x62,0x6c,0x61,0x63,0x6b,0x22,0x2c,0xa,0x22,0x2e,0x20,0x20,0x63, - 0x20,0x23,0x31,0x39,0x31,0x30,0x30,0x30,0x22,0x2c,0xa,0x22,0x58,0x20,0x20,0x63, - 0x20,0x23,0x32,0x32,0x31,0x37,0x30,0x30,0x22,0x2c,0xa,0x22,0x6f,0x20,0x20,0x63, - 0x20,0x23,0x34,0x35,0x32,0x45,0x30,0x30,0x22,0x2c,0xa,0x22,0x4f,0x20,0x20,0x63, - 0x20,0x23,0x34,0x41,0x33,0x31,0x30,0x30,0x22,0x2c,0xa,0x22,0x2b,0x20,0x20,0x63, - 0x20,0x23,0x34,0x45,0x33,0x34,0x30,0x30,0x22,0x2c,0xa,0x22,0x40,0x20,0x20,0x63, - 0x20,0x23,0x35,0x35,0x33,0x38,0x30,0x30,0x22,0x2c,0xa,0x22,0x23,0x20,0x20,0x63, - 0x20,0x23,0x36,0x30,0x34,0x30,0x30,0x30,0x22,0x2c,0xa,0x22,0x24,0x20,0x20,0x63, - 0x20,0x23,0x36,0x41,0x34,0x36,0x30,0x30,0x22,0x2c,0xa,0x22,0x25,0x20,0x20,0x63, - 0x20,0x23,0x36,0x44,0x34,0x38,0x30,0x30,0x22,0x2c,0xa,0x22,0x26,0x20,0x20,0x63, - 0x20,0x23,0x37,0x30,0x34,0x41,0x30,0x30,0x22,0x2c,0xa,0x22,0x2a,0x20,0x20,0x63, - 0x20,0x23,0x37,0x32,0x34,0x43,0x30,0x30,0x22,0x2c,0xa,0x22,0x3d,0x20,0x20,0x63, - 0x20,0x23,0x37,0x34,0x34,0x43,0x30,0x30,0x22,0x2c,0xa,0x22,0x2d,0x20,0x20,0x63, - 0x20,0x23,0x37,0x36,0x34,0x45,0x30,0x30,0x22,0x2c,0xa,0x22,0x3b,0x20,0x20,0x63, - 0x20,0x23,0x37,0x38,0x35,0x30,0x30,0x30,0x22,0x2c,0xa,0x22,0x3a,0x20,0x20,0x63, - 0x20,0x23,0x38,0x30,0x35,0x35,0x30,0x30,0x22,0x2c,0xa,0x22,0x3e,0x20,0x20,0x63, - 0x20,0x23,0x38,0x31,0x35,0x35,0x30,0x30,0x22,0x2c,0xa,0x22,0x2c,0x20,0x20,0x63, - 0x20,0x23,0x38,0x33,0x35,0x37,0x30,0x30,0x22,0x2c,0xa,0x22,0x3c,0x20,0x20,0x63, - 0x20,0x23,0x38,0x36,0x35,0x39,0x30,0x30,0x22,0x2c,0xa,0x22,0x31,0x20,0x20,0x63, - 0x20,0x23,0x38,0x37,0x35,0x41,0x30,0x30,0x22,0x2c,0xa,0x22,0x32,0x20,0x20,0x63, - 0x20,0x23,0x38,0x41,0x35,0x42,0x30,0x30,0x22,0x2c,0xa,0x22,0x33,0x20,0x20,0x63, - 0x20,0x23,0x38,0x41,0x35,0x43,0x30,0x30,0x22,0x2c,0xa,0x22,0x34,0x20,0x20,0x63, - 0x20,0x23,0x38,0x42,0x35,0x43,0x30,0x30,0x22,0x2c,0xa,0x22,0x35,0x20,0x20,0x63, - 0x20,0x23,0x38,0x43,0x35,0x44,0x30,0x30,0x22,0x2c,0xa,0x22,0x36,0x20,0x20,0x63, - 0x20,0x23,0x38,0x44,0x35,0x44,0x30,0x30,0x22,0x2c,0xa,0x22,0x37,0x20,0x20,0x63, - 0x20,0x23,0x38,0x46,0x35,0x45,0x30,0x30,0x22,0x2c,0xa,0x22,0x38,0x20,0x20,0x63, - 0x20,0x23,0x38,0x30,0x35,0x39,0x31,0x31,0x22,0x2c,0xa,0x22,0x39,0x20,0x20,0x63, - 0x20,0x23,0x39,0x30,0x35,0x46,0x30,0x30,0x22,0x2c,0xa,0x22,0x30,0x20,0x20,0x63, - 0x20,0x23,0x39,0x30,0x36,0x30,0x30,0x30,0x22,0x2c,0xa,0x22,0x71,0x20,0x20,0x63, - 0x20,0x23,0x39,0x32,0x36,0x30,0x30,0x30,0x22,0x2c,0xa,0x22,0x77,0x20,0x20,0x63, - 0x20,0x23,0x39,0x34,0x36,0x32,0x30,0x30,0x22,0x2c,0xa,0x22,0x65,0x20,0x20,0x63, - 0x20,0x23,0x39,0x35,0x36,0x33,0x30,0x30,0x22,0x2c,0xa,0x22,0x72,0x20,0x20,0x63, - 0x20,0x23,0x39,0x36,0x36,0x34,0x30,0x30,0x22,0x2c,0xa,0x22,0x74,0x20,0x20,0x63, - 0x20,0x23,0x39,0x37,0x36,0x34,0x30,0x30,0x22,0x2c,0xa,0x22,0x79,0x20,0x20,0x63, - 0x20,0x23,0x39,0x35,0x36,0x39,0x31,0x33,0x22,0x2c,0xa,0x22,0x75,0x20,0x20,0x63, - 0x20,0x23,0x39,0x32,0x36,0x43,0x32,0x32,0x22,0x2c,0xa,0x22,0x69,0x20,0x20,0x63, - 0x20,0x23,0x39,0x42,0x37,0x37,0x33,0x32,0x22,0x2c,0xa,0x22,0x70,0x20,0x20,0x63, - 0x20,0x23,0x42,0x31,0x38,0x44,0x34,0x38,0x22,0x2c,0xa,0x22,0x61,0x20,0x20,0x63, - 0x20,0x23,0x42,0x32,0x38,0x45,0x34,0x39,0x22,0x2c,0xa,0x22,0x73,0x20,0x20,0x63, - 0x20,0x23,0x42,0x34,0x39,0x30,0x34,0x41,0x22,0x2c,0xa,0x22,0x64,0x20,0x20,0x63, - 0x20,0x23,0x42,0x41,0x41,0x33,0x37,0x33,0x22,0x2c,0xa,0x22,0x66,0x20,0x20,0x63, - 0x20,0x23,0x41,0x31,0x41,0x31,0x39,0x35,0x22,0x2c,0xa,0x22,0x67,0x20,0x20,0x63, - 0x20,0x23,0x41,0x42,0x41,0x42,0x39,0x46,0x22,0x2c,0xa,0x22,0x68,0x20,0x20,0x63, - 0x20,0x23,0x41,0x44,0x41,0x44,0x41,0x42,0x22,0x2c,0xa,0x22,0x6a,0x20,0x20,0x63, - 0x20,0x23,0x41,0x46,0x41,0x46,0x41,0x42,0x22,0x2c,0xa,0x22,0x6b,0x20,0x20,0x63, - 0x20,0x23,0x42,0x33,0x42,0x33,0x41,0x36,0x22,0x2c,0xa,0x22,0x6c,0x20,0x20,0x63, - 0x20,0x23,0x42,0x43,0x42,0x43,0x42,0x38,0x22,0x2c,0xa,0x22,0x7a,0x20,0x20,0x63, - 0x20,0x23,0x42,0x46,0x42,0x46,0x42,0x43,0x22,0x2c,0xa,0x22,0x78,0x20,0x20,0x63, - 0x20,0x23,0x43,0x42,0x42,0x34,0x38,0x39,0x22,0x2c,0xa,0x22,0x63,0x20,0x20,0x63, - 0x20,0x23,0x43,0x42,0x42,0x35,0x38,0x41,0x22,0x2c,0xa,0x22,0x76,0x20,0x20,0x63, - 0x20,0x23,0x43,0x44,0x42,0x37,0x38,0x42,0x22,0x2c,0xa,0x22,0x62,0x20,0x20,0x63, - 0x20,0x23,0x43,0x41,0x42,0x38,0x39,0x31,0x22,0x2c,0xa,0x22,0x6e,0x20,0x20,0x63, - 0x20,0x23,0x43,0x39,0x42,0x42,0x39,0x45,0x22,0x2c,0xa,0x22,0x6d,0x20,0x20,0x63, - 0x20,0x23,0x43,0x45,0x42,0x45,0x41,0x32,0x22,0x2c,0xa,0x22,0x4d,0x20,0x20,0x63, - 0x20,0x23,0x43,0x36,0x43,0x36,0x42,0x43,0x22,0x2c,0xa,0x22,0x4e,0x20,0x20,0x63, - 0x20,0x23,0x44,0x39,0x43,0x38,0x41,0x38,0x22,0x2c,0xa,0x22,0x42,0x20,0x20,0x63, - 0x20,0x23,0x45,0x38,0x45,0x31,0x42,0x41,0x22,0x2c,0xa,0x22,0x56,0x20,0x20,0x63, - 0x20,0x23,0x45,0x38,0x45,0x31,0x42,0x42,0x22,0x2c,0xa,0x22,0x43,0x20,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x41,0x31,0x22,0x2c,0xa,0x22,0x5a,0x20,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x46,0x41,0x30,0x22,0x2c,0xa,0x22,0x41,0x20,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x41,0x33,0x22,0x2c,0xa,0x22,0x53,0x20,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x41,0x34,0x22,0x2c,0xa,0x22,0x44,0x20,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x41,0x36,0x22,0x2c,0xa,0x22,0x46,0x20,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x41,0x38,0x22,0x2c,0xa,0x22,0x47,0x20,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x41,0x39,0x22,0x2c,0xa,0x22,0x48,0x20,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x46,0x41,0x38,0x22,0x2c,0xa,0x22,0x4a,0x20,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x41,0x41,0x22,0x2c,0xa,0x22,0x4b,0x20,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x41,0x42,0x22,0x2c,0xa,0x22,0x4c,0x20,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x46,0x41,0x42,0x22,0x2c,0xa,0x22,0x50,0x20,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x41,0x43,0x22,0x2c,0xa,0x22,0x49,0x20,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x46,0x41,0x43,0x22,0x2c,0xa,0x22,0x55,0x20,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x41,0x45,0x22,0x2c,0xa,0x22,0x59,0x20,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x41,0x46,0x22,0x2c,0xa,0x22,0x54,0x20,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x42,0x30,0x22,0x2c,0xa,0x22,0x52,0x20,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x42,0x31,0x22,0x2c,0xa,0x22,0x45,0x20,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x46,0x42,0x30,0x22,0x2c,0xa,0x22,0x57,0x20,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x42,0x34,0x22,0x2c,0xa,0x22,0x51,0x20,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x42,0x35,0x22,0x2c,0xa,0x22,0x21,0x20,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x46,0x42,0x34,0x22,0x2c,0xa,0x22,0x7e,0x20,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x42,0x38,0x22,0x2c,0xa,0x22,0x5e,0x20,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x42,0x39,0x22,0x2c,0xa,0x22,0x2f,0x20,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x46,0x42,0x38,0x22,0x2c,0xa,0x22,0x28,0x20,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x46,0x42,0x39,0x22,0x2c,0xa,0x22,0x29,0x20,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x42,0x42,0x22,0x2c,0xa,0x22,0x5f,0x20,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x46,0x42,0x41,0x22,0x2c,0xa,0x22,0x60,0x20,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x42,0x44,0x22,0x2c,0xa,0x22,0x27,0x20,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x46,0x42,0x44,0x22,0x2c,0xa,0x22,0x5d,0x20,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x42,0x45,0x22,0x2c,0xa,0x22,0x5b,0x20,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x46,0x42,0x45,0x22,0x2c,0xa,0x22,0x7b,0x20,0x20,0x63, - 0x20,0x23,0x43,0x38,0x43,0x38,0x43,0x31,0x22,0x2c,0xa,0x22,0x7d,0x20,0x20,0x63, - 0x20,0x23,0x43,0x41,0x43,0x41,0x43,0x34,0x22,0x2c,0xa,0x22,0x7c,0x20,0x20,0x63, - 0x20,0x23,0x43,0x42,0x43,0x42,0x43,0x36,0x22,0x2c,0xa,0x22,0x20,0x2e,0x20,0x63, - 0x20,0x23,0x44,0x42,0x44,0x32,0x43,0x31,0x22,0x2c,0xa,0x22,0x2e,0x2e,0x20,0x63, - 0x20,0x23,0x44,0x45,0x44,0x46,0x43,0x46,0x22,0x2c,0xa,0x22,0x58,0x2e,0x20,0x63, - 0x20,0x23,0x44,0x34,0x44,0x34,0x44,0x31,0x22,0x2c,0xa,0x22,0x6f,0x2e,0x20,0x63, - 0x20,0x23,0x45,0x31,0x44,0x35,0x43,0x31,0x22,0x2c,0xa,0x22,0x4f,0x2e,0x20,0x63, - 0x20,0x23,0x45,0x33,0x44,0x39,0x43,0x33,0x22,0x2c,0xa,0x22,0x2b,0x2e,0x20,0x63, - 0x20,0x23,0x45,0x35,0x44,0x43,0x43,0x43,0x22,0x2c,0xa,0x22,0x40,0x2e,0x20,0x63, - 0x20,0x23,0x45,0x38,0x45,0x38,0x44,0x33,0x22,0x2c,0xa,0x22,0x23,0x2e,0x20,0x63, - 0x20,0x23,0x45,0x43,0x45,0x43,0x44,0x37,0x22,0x2c,0xa,0x22,0x24,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x30,0x45,0x42,0x44,0x41,0x22,0x2c,0xa,0x22,0x25,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x43,0x32,0x22,0x2c,0xa,0x22,0x26,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x43,0x33,0x22,0x2c,0xa,0x22,0x2a,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x46,0x43,0x32,0x22,0x2c,0xa,0x22,0x3d,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x43,0x37,0x22,0x2c,0xa,0x22,0x2d,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x46,0x43,0x37,0x22,0x2c,0xa,0x22,0x3b,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x43,0x42,0x22,0x2c,0xa,0x22,0x3a,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x43,0x43,0x22,0x2c,0xa,0x22,0x3e,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x46,0x43,0x43,0x22,0x2c,0xa,0x22,0x2c,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x43,0x45,0x22,0x2c,0xa,0x22,0x3c,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x44,0x30,0x22,0x2c,0xa,0x22,0x31,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x44,0x31,0x22,0x2c,0xa,0x22,0x32,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x46,0x44,0x30,0x22,0x2c,0xa,0x22,0x33,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x46,0x44,0x31,0x22,0x2c,0xa,0x22,0x34,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x46,0x44,0x33,0x22,0x2c,0xa,0x22,0x35,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x44,0x35,0x22,0x2c,0xa,0x22,0x36,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x46,0x44,0x35,0x22,0x2c,0xa,0x22,0x37,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x44,0x36,0x22,0x2c,0xa,0x22,0x38,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x44,0x37,0x22,0x2c,0xa,0x22,0x39,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x46,0x44,0x36,0x22,0x2c,0xa,0x22,0x30,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x46,0x44,0x38,0x22,0x2c,0xa,0x22,0x71,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x44,0x41,0x22,0x2c,0xa,0x22,0x77,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x46,0x44,0x41,0x22,0x2c,0xa,0x22,0x65,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x46,0x44,0x42,0x22,0x2c,0xa,0x22,0x72,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x46,0x44,0x43,0x22,0x2c,0xa,0x22,0x74,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x44,0x45,0x22,0x2c,0xa,0x22,0x79,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x44,0x46,0x22,0x2c,0xa,0x22,0x75,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x46,0x44,0x45,0x22,0x2c,0xa,0x22,0x69,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x46,0x44,0x46,0x22,0x2c,0xa,0x22,0x70,0x2e,0x20,0x63, - 0x20,0x23,0x45,0x39,0x45,0x39,0x45,0x37,0x22,0x2c,0xa,0x22,0x61,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x33,0x46,0x33,0x45,0x39,0x22,0x2c,0xa,0x22,0x73,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x33,0x46,0x33,0x45,0x42,0x22,0x2c,0xa,0x22,0x64,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x35,0x46,0x35,0x45,0x38,0x22,0x2c,0xa,0x22,0x66,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x38,0x46,0x38,0x45,0x33,0x22,0x2c,0xa,0x22,0x67,0x2e,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x46,0x45,0x30,0x22,0x2c,0xa,0x22,0x68,0x2e,0x20,0x63, - 0x20,0x4c,0x69,0x67,0x68,0x74,0x59,0x65,0x6c,0x6c,0x6f,0x77,0x22,0x2c,0xa,0x22, - 0x6a,0x2e,0x20,0x63,0x20,0x23,0x46,0x46,0x46,0x46,0x45,0x31,0x22,0x2c,0xa,0x22, - 0x6b,0x2e,0x20,0x63,0x20,0x23,0x46,0x45,0x46,0x46,0x45,0x33,0x22,0x2c,0xa,0x22, - 0x6c,0x2e,0x20,0x63,0x20,0x23,0x46,0x46,0x46,0x46,0x45,0x33,0x22,0x2c,0xa,0x22, - 0x7a,0x2e,0x20,0x63,0x20,0x23,0x46,0x44,0x46,0x45,0x45,0x37,0x22,0x2c,0xa,0x22, - 0x78,0x2e,0x20,0x63,0x20,0x23,0x46,0x45,0x46,0x46,0x45,0x34,0x22,0x2c,0xa,0x22, - 0x63,0x2e,0x20,0x63,0x20,0x23,0x46,0x45,0x46,0x46,0x45,0x35,0x22,0x2c,0xa,0x22, - 0x76,0x2e,0x20,0x63,0x20,0x23,0x46,0x46,0x46,0x46,0x45,0x34,0x22,0x2c,0xa,0x22, - 0x62,0x2e,0x20,0x63,0x20,0x23,0x46,0x42,0x46,0x42,0x45,0x39,0x22,0x2c,0xa,0x22, - 0x6e,0x2e,0x20,0x63,0x20,0x23,0x46,0x45,0x46,0x46,0x45,0x38,0x22,0x2c,0xa,0x22, - 0x6d,0x2e,0x20,0x63,0x20,0x23,0x46,0x46,0x46,0x46,0x45,0x38,0x22,0x2c,0xa,0x22, - 0x4d,0x2e,0x20,0x63,0x20,0x23,0x46,0x46,0x46,0x46,0x45,0x39,0x22,0x2c,0xa,0x22, - 0x4e,0x2e,0x20,0x63,0x20,0x23,0x46,0x46,0x46,0x46,0x45,0x41,0x22,0x2c,0xa,0x22, - 0x42,0x2e,0x20,0x63,0x20,0x23,0x46,0x45,0x46,0x46,0x45,0x43,0x22,0x2c,0xa,0x22, - 0x56,0x2e,0x20,0x63,0x20,0x23,0x46,0x45,0x46,0x46,0x45,0x44,0x22,0x2c,0xa,0x22, - 0x43,0x2e,0x20,0x63,0x20,0x23,0x46,0x46,0x46,0x46,0x45,0x43,0x22,0x2c,0xa,0x22, - 0x5a,0x2e,0x20,0x63,0x20,0x23,0x46,0x46,0x46,0x46,0x45,0x44,0x22,0x2c,0xa,0x22, - 0x41,0x2e,0x20,0x63,0x20,0x23,0x46,0x45,0x46,0x46,0x45,0x46,0x22,0x2c,0xa,0x22, - 0x53,0x2e,0x20,0x63,0x20,0x23,0x46,0x34,0x46,0x34,0x46,0x30,0x22,0x2c,0xa,0x22, - 0x44,0x2e,0x20,0x63,0x20,0x23,0x46,0x34,0x46,0x34,0x46,0x33,0x22,0x2c,0xa,0x22, - 0x46,0x2e,0x20,0x63,0x20,0x23,0x46,0x35,0x46,0x35,0x46,0x34,0x22,0x2c,0xa,0x22, - 0x47,0x2e,0x20,0x63,0x20,0x23,0x46,0x38,0x46,0x38,0x46,0x36,0x22,0x2c,0xa,0x22, - 0x48,0x2e,0x20,0x63,0x20,0x69,0x76,0x6f,0x72,0x79,0x22,0x2c,0xa,0x22,0x4a,0x2e, - 0x20,0x63,0x20,0x23,0x46,0x46,0x46,0x46,0x46,0x31,0x22,0x2c,0xa,0x22,0x4b,0x2e, - 0x20,0x63,0x20,0x23,0x46,0x45,0x46,0x46,0x46,0x33,0x22,0x2c,0xa,0x22,0x4c,0x2e, - 0x20,0x63,0x20,0x23,0x46,0x46,0x46,0x46,0x46,0x33,0x22,0x2c,0xa,0x22,0x50,0x2e, - 0x20,0x63,0x20,0x23,0x46,0x45,0x46,0x46,0x46,0x34,0x22,0x2c,0xa,0x22,0x49,0x2e, - 0x20,0x63,0x20,0x23,0x46,0x46,0x46,0x46,0x46,0x34,0x22,0x2c,0xa,0x22,0x55,0x2e, - 0x20,0x63,0x20,0x23,0x46,0x45,0x46,0x46,0x46,0x37,0x22,0x2c,0xa,0x22,0x59,0x2e, - 0x20,0x63,0x20,0x23,0x46,0x46,0x46,0x46,0x46,0x36,0x22,0x2c,0xa,0x22,0x54,0x2e, - 0x20,0x63,0x20,0x23,0x46,0x46,0x46,0x46,0x46,0x37,0x22,0x2c,0xa,0x22,0x52,0x2e, - 0x20,0x63,0x20,0x23,0x46,0x42,0x46,0x42,0x46,0x42,0x22,0x2c,0xa,0x22,0x45,0x2e, - 0x20,0x63,0x20,0x23,0x46,0x46,0x46,0x46,0x46,0x38,0x22,0x2c,0xa,0x22,0x57,0x2e, - 0x20,0x63,0x20,0x23,0x46,0x46,0x46,0x46,0x46,0x39,0x22,0x2c,0xa,0x22,0x51,0x2e, - 0x20,0x63,0x20,0x23,0x46,0x46,0x46,0x46,0x46,0x41,0x22,0x2c,0xa,0x22,0x21,0x2e, - 0x20,0x63,0x20,0x23,0x46,0x46,0x46,0x46,0x46,0x42,0x22,0x2c,0xa,0x22,0x7e,0x2e, - 0x20,0x63,0x20,0x67,0x72,0x61,0x79,0x39,0x39,0x22,0x2c,0xa,0x22,0x5e,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x45,0x46,0x46,0x46,0x44,0x22,0x2c,0xa,0x22,0x2f,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x46,0x46,0x46,0x43,0x22,0x2c,0xa,0x22,0x28,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x46,0x46,0x46,0x44,0x22,0x2c,0xa,0x22,0x29,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x46,0x46,0x46,0x45,0x22,0x2c,0xa,0x22,0x5f,0x2e,0x20, - 0x63,0x20,0x67,0x72,0x61,0x79,0x31,0x30,0x30,0x22,0x2c,0xa,0x22,0x60,0x2e,0x20, - 0x63,0x20,0x4e,0x6f,0x6e,0x65,0x22,0x2c,0xa,0x2f,0x2a,0x20,0x70,0x69,0x78,0x65, - 0x6c,0x73,0x20,0x2a,0x2f,0xa,0x22,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x22,0x2c,0xa,0x22,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x22,0x2c,0xa,0x22,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x77,0x20,0x32,0x20,0x31,0x20,0x77,0x20,0x34,0x20,0x34,0x20,0x34,0x20,0x36, - 0x20,0x77,0x20,0x39,0x20,0x36,0x20,0x2d,0x20,0x20,0x20,0x20,0x20,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x22, - 0x2c,0xa,0x22,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x72,0x20,0x73,0x20,0x70,0x20,0x70,0x20,0x63,0x20,0x63,0x20,0x63, - 0x20,0x63,0x20,0x4e,0x20,0x4f,0x2e,0x2b,0x2e,0x6f,0x2e,0x79,0x20,0x23,0x20,0x20, - 0x20,0x20,0x20,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x22,0x2c,0xa,0x22,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x72,0x20,0x29,0x2e,0x29,0x2e,0x29,0x2e,0x29, - 0x2e,0x29,0x2e,0x29,0x2e,0x29,0x2e,0x29,0x2e,0x46,0x2e,0x70,0x2e,0x29,0x2e,0x20, - 0x2e,0x26,0x20,0x6f,0x20,0x20,0x20,0x20,0x20,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x22,0x2c,0xa,0x22,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x77,0x20,0x29,0x2e,0x45, - 0x2e,0x29,0x2e,0x45,0x2e,0x29,0x2e,0x45,0x2e,0x45,0x2e,0x45,0x2e,0x53,0x2e,0x58, - 0x2e,0x29,0x2e,0x52,0x2e,0x6e,0x20,0x24,0x20,0x2b,0x20,0x20,0x20,0x20,0x20,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x22,0x2c,0xa,0x22,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x77, - 0x20,0x45,0x2e,0x59,0x2e,0x59,0x2e,0x45,0x2e,0x59,0x2e,0x45,0x2e,0x45,0x2e,0x45, - 0x2e,0x61,0x2e,0x7c,0x20,0x29,0x2e,0x29,0x2e,0x44,0x2e,0x6d,0x20,0x25,0x20,0x20, - 0x20,0x20,0x20,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x22, - 0x2c,0xa,0x22,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x77,0x20,0x45,0x2e,0x59,0x2e,0x59,0x2e,0x4a,0x2e,0x59,0x2e,0x4a, - 0x2e,0x59,0x2e,0x59,0x2e,0x61,0x2e,0x7c,0x20,0x29,0x2e,0x29,0x2e,0x29,0x2e,0x44, - 0x2e,0x3e,0x20,0x20,0x20,0x20,0x20,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x22,0x2c,0xa,0x22,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x77,0x20,0x59,0x2e,0x4a,0x2e,0x4a,0x2e,0x4a, - 0x2e,0x4a,0x2e,0x4a,0x2e,0x4a,0x2e,0x4a,0x2e,0x61,0x2e,0x4d,0x20,0x6c,0x20,0x68, - 0x20,0x68,0x20,0x7b,0x20,0x3b,0x20,0x20,0x20,0x20,0x20,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x22,0x2c,0xa,0x22,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x77,0x20,0x59,0x2e,0x42, - 0x2e,0x42,0x2e,0x42,0x2e,0x4e,0x2e,0x4e,0x2e,0x42,0x2e,0x42,0x2e,0x62,0x2e,0x2e, - 0x2e,0x6b,0x20,0x66,0x20,0x68,0x20,0x7d,0x20,0x3b,0x20,0x20,0x20,0x20,0x20,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x22,0x2c,0xa,0x22,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x77, - 0x20,0x4a,0x2e,0x4e,0x2e,0x4e,0x2e,0x4e,0x2e,0x4e,0x2e,0x4e,0x2e,0x4e,0x2e,0x4e, - 0x2e,0x6c,0x2e,0x66,0x2e,0x23,0x2e,0x40,0x2e,0x23,0x2e,0x61,0x2e,0x3e,0x20,0x20, - 0x20,0x20,0x20,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x22, - 0x2c,0xa,0x22,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x77,0x20,0x4a,0x2e,0x6c,0x2e,0x6c,0x2e,0x6c,0x2e,0x6c,0x2e,0x6c, - 0x2e,0x6c,0x2e,0x6c,0x2e,0x6c,0x2e,0x6c,0x2e,0x6c,0x2e,0x6c,0x2e,0x6c,0x2e,0x4a, - 0x2e,0x3e,0x20,0x20,0x20,0x20,0x20,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x22,0x2c,0xa,0x22,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x77,0x20,0x4a,0x2e,0x72,0x2e,0x6c,0x2e,0x6c, - 0x2e,0x72,0x2e,0x6c,0x2e,0x72,0x2e,0x6c,0x2e,0x72,0x2e,0x6c,0x2e,0x72,0x2e,0x6c, - 0x2e,0x72,0x2e,0x4a,0x2e,0x31,0x20,0x20,0x20,0x20,0x20,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x22,0x2c,0xa,0x22,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x77,0x20,0x42,0x2e,0x72, - 0x2e,0x72,0x2e,0x71,0x2e,0x71,0x2e,0x71,0x2e,0x71,0x2e,0x71,0x2e,0x71,0x2e,0x72, - 0x2e,0x71,0x2e,0x71,0x2e,0x72,0x2e,0x42,0x2e,0x3e,0x20,0x20,0x20,0x20,0x20,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x22,0x2c,0xa,0x22,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x77, - 0x20,0x4e,0x2e,0x35,0x2e,0x35,0x2e,0x35,0x2e,0x35,0x2e,0x71,0x2e,0x35,0x2e,0x35, - 0x2e,0x35,0x2e,0x35,0x2e,0x35,0x2e,0x35,0x2e,0x35,0x2e,0x42,0x2e,0x2c,0x20,0x20, - 0x20,0x20,0x20,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x22, - 0x2c,0xa,0x22,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x77,0x20,0x4e,0x2e,0x3c,0x2e,0x3c,0x2e,0x3c,0x2e,0x3c,0x2e,0x3c, - 0x2e,0x3c,0x2e,0x3c,0x2e,0x35,0x2e,0x3c,0x2e,0x3c,0x2e,0x3c,0x2e,0x3c,0x2e,0x4e, - 0x2e,0x2c,0x20,0x20,0x20,0x20,0x20,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x22,0x2c,0xa,0x22,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x77,0x20,0x6c,0x2e,0x2c,0x2e,0x3b,0x2e,0x3b, - 0x2e,0x3b,0x2e,0x2c,0x2e,0x3b,0x2e,0x2c,0x2e,0x3b,0x2e,0x2c,0x2e,0x3b,0x2e,0x3b, - 0x2e,0x3b,0x2e,0x6c,0x2e,0x2c,0x20,0x20,0x20,0x20,0x20,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x22,0x2c,0xa,0x22,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x77,0x20,0x6c,0x2e,0x2d, - 0x2e,0x2d,0x2e,0x2d,0x2e,0x2d,0x2e,0x2d,0x2e,0x2d,0x2e,0x3b,0x2e,0x2d,0x2e,0x2d, - 0x2e,0x2d,0x2e,0x2d,0x2e,0x3b,0x2e,0x6c,0x2e,0x3e,0x20,0x20,0x20,0x20,0x20,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x22,0x2c,0xa,0x22,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x77, - 0x20,0x6c,0x2e,0x2d,0x2e,0x25,0x2e,0x25,0x2e,0x25,0x2e,0x25,0x2e,0x25,0x2e,0x25, - 0x2e,0x25,0x2e,0x25,0x2e,0x25,0x2e,0x25,0x2e,0x25,0x2e,0x6c,0x2e,0x2c,0x20,0x20, - 0x20,0x20,0x20,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x22, - 0x2c,0xa,0x22,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x77,0x20,0x72,0x2e,0x27,0x20,0x27,0x20,0x27,0x20,0x27,0x20,0x27, - 0x20,0x29,0x20,0x27,0x20,0x27,0x20,0x27,0x20,0x27,0x20,0x27,0x20,0x27,0x20,0x72, - 0x2e,0x2c,0x20,0x20,0x20,0x20,0x20,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x22,0x2c,0xa,0x22,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x77,0x20,0x72,0x2e,0x29,0x20,0x29,0x20,0x57, - 0x20,0x29,0x20,0x29,0x20,0x29,0x20,0x29,0x20,0x29,0x20,0x29,0x20,0x57,0x20,0x29, - 0x20,0x29,0x20,0x71,0x2e,0x2c,0x20,0x20,0x20,0x20,0x20,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x22,0x2c,0xa,0x22,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x77,0x20,0x71,0x2e,0x57, - 0x20,0x57,0x20,0x57,0x20,0x57,0x20,0x57,0x20,0x57,0x20,0x57,0x20,0x57,0x20,0x57, - 0x20,0x57,0x20,0x57,0x20,0x57,0x20,0x71,0x2e,0x2c,0x20,0x20,0x20,0x20,0x20,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x22,0x2c,0xa,0x22,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x77, - 0x20,0x35,0x2e,0x59,0x20,0x59,0x20,0x57,0x20,0x59,0x20,0x59,0x20,0x59,0x20,0x59, - 0x20,0x59,0x20,0x59,0x20,0x59,0x20,0x59,0x20,0x59,0x20,0x35,0x2e,0x2c,0x20,0x20, - 0x20,0x20,0x20,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x22, - 0x2c,0xa,0x22,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x77,0x20,0x35,0x2e,0x4a,0x20,0x4a,0x20,0x4a,0x20,0x59,0x20,0x4a, - 0x20,0x59,0x20,0x59,0x20,0x4a,0x20,0x59,0x20,0x4a,0x20,0x4a,0x20,0x59,0x20,0x71, - 0x2e,0x2c,0x20,0x20,0x20,0x20,0x20,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x22,0x2c,0xa,0x22,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x77,0x20,0x35,0x2e,0x4a,0x20,0x4a,0x20,0x44, - 0x20,0x4a,0x20,0x4a,0x20,0x44,0x20,0x4a,0x20,0x44,0x20,0x4a,0x20,0x57,0x20,0x29, - 0x20,0x2c,0x2e,0x24,0x2e,0x2d,0x20,0x20,0x20,0x20,0x20,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x22,0x2c,0xa,0x22,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x77,0x20,0x3c,0x2e,0x5a, - 0x20,0x44,0x20,0x44,0x20,0x5a,0x20,0x44,0x20,0x4a,0x20,0x59,0x20,0x27,0x20,0x2c, - 0x2e,0x42,0x20,0x62,0x20,0x69,0x20,0x2d,0x20,0x4f,0x20,0x20,0x20,0x20,0x20,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x22,0x2c,0xa,0x22,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x77, - 0x20,0x3c,0x2e,0x5a,0x20,0x5a,0x20,0x5a,0x20,0x59,0x20,0x29,0x20,0x3c,0x2e,0x42, - 0x20,0x64,0x20,0x75,0x20,0x26,0x20,0x40,0x20,0x58,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x22, - 0x2c,0xa,0x22,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x77,0x20,0x2c,0x2e,0x4a,0x20,0x29,0x20,0x2c,0x2e,0x42,0x20,0x64, - 0x20,0x79,0x20,0x26,0x20,0x6f,0x20,0x2e,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x22,0x2c,0xa,0x22,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x77,0x20,0x59,0x2e,0x56,0x20,0x64,0x20,0x75, - 0x20,0x26,0x20,0x6f,0x20,0x2e,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x22,0x2c,0xa,0x22,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x31,0x20,0x34,0x20,0x26, - 0x20,0x6f,0x20,0x2e,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x22,0x2c,0xa,0x22,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x20, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x22, - 0x2c,0xa,0x22,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60,0x2e,0x60, - 0x2e,0x60,0x2e,0x22,0xa,0x7d,0x3b,0xa, - # /home/rdale/src/kde/branches/KDE/3.5/tdevelop/languages/ruby/app_templates/qtruby4makeapp/editpaste.xpm - 0x0,0x0,0x18,0xf8, - 0x2f, - 0x2a,0x20,0x58,0x50,0x4d,0x20,0x2a,0x2f,0xa,0x73,0x74,0x61,0x74,0x69,0x63,0x20, - 0x63,0x68,0x61,0x72,0x20,0x2a,0x65,0x64,0x69,0x74,0x70,0x61,0x73,0x74,0x65,0x5b, - 0x5d,0x20,0x3d,0x20,0x7b,0xa,0x2f,0x2a,0x20,0x63,0x6f,0x6c,0x75,0x6d,0x6e,0x73, - 0x20,0x72,0x6f,0x77,0x73,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x73,0x20,0x63,0x68,0x61, - 0x72,0x73,0x2d,0x70,0x65,0x72,0x2d,0x70,0x69,0x78,0x65,0x6c,0x20,0x2a,0x2f,0xa, - 0x22,0x33,0x32,0x20,0x33,0x32,0x20,0x32,0x35,0x37,0x20,0x32,0x22,0x2c,0xa,0x22, - 0x20,0x20,0x20,0x63,0x20,0x62,0x6c,0x61,0x63,0x6b,0x22,0x2c,0xa,0x22,0x2e,0x20, - 0x20,0x63,0x20,0x23,0x30,0x44,0x30,0x39,0x30,0x30,0x22,0x2c,0xa,0x22,0x58,0x20, - 0x20,0x63,0x20,0x23,0x31,0x39,0x31,0x30,0x30,0x30,0x22,0x2c,0xa,0x22,0x6f,0x20, - 0x20,0x63,0x20,0x23,0x32,0x32,0x31,0x37,0x30,0x30,0x22,0x2c,0xa,0x22,0x4f,0x20, - 0x20,0x63,0x20,0x23,0x32,0x41,0x31,0x42,0x30,0x30,0x22,0x2c,0xa,0x22,0x2b,0x20, - 0x20,0x63,0x20,0x23,0x33,0x33,0x32,0x32,0x30,0x30,0x22,0x2c,0xa,0x22,0x40,0x20, - 0x20,0x63,0x20,0x23,0x33,0x45,0x32,0x39,0x30,0x30,0x22,0x2c,0xa,0x22,0x23,0x20, - 0x20,0x63,0x20,0x23,0x33,0x41,0x32,0x38,0x30,0x34,0x22,0x2c,0xa,0x22,0x24,0x20, - 0x20,0x63,0x20,0x23,0x34,0x44,0x33,0x33,0x30,0x30,0x22,0x2c,0xa,0x22,0x25,0x20, - 0x20,0x63,0x20,0x23,0x34,0x42,0x33,0x45,0x31,0x35,0x22,0x2c,0xa,0x22,0x26,0x20, - 0x20,0x63,0x20,0x23,0x34,0x34,0x33,0x39,0x31,0x42,0x22,0x2c,0xa,0x22,0x2a,0x20, - 0x20,0x63,0x20,0x23,0x35,0x34,0x33,0x38,0x30,0x30,0x22,0x2c,0xa,0x22,0x3d,0x20, - 0x20,0x63,0x20,0x23,0x35,0x41,0x33,0x42,0x30,0x30,0x22,0x2c,0xa,0x22,0x2d,0x20, - 0x20,0x63,0x20,0x23,0x34,0x44,0x34,0x30,0x31,0x35,0x22,0x2c,0xa,0x22,0x3b,0x20, - 0x20,0x63,0x20,0x23,0x35,0x32,0x34,0x45,0x32,0x35,0x22,0x2c,0xa,0x22,0x3a,0x20, - 0x20,0x63,0x20,0x23,0x35,0x41,0x34,0x46,0x32,0x43,0x22,0x2c,0xa,0x22,0x3e,0x20, - 0x20,0x63,0x20,0x23,0x35,0x32,0x34,0x45,0x33,0x44,0x22,0x2c,0xa,0x22,0x2c,0x20, - 0x20,0x63,0x20,0x23,0x35,0x38,0x35,0x36,0x32,0x46,0x22,0x2c,0xa,0x22,0x3c,0x20, - 0x20,0x63,0x20,0x23,0x35,0x33,0x35,0x30,0x33,0x45,0x22,0x2c,0xa,0x22,0x31,0x20, - 0x20,0x63,0x20,0x23,0x35,0x45,0x36,0x32,0x33,0x42,0x22,0x2c,0xa,0x22,0x32,0x20, - 0x20,0x63,0x20,0x23,0x36,0x33,0x34,0x31,0x30,0x30,0x22,0x2c,0xa,0x22,0x33,0x20, - 0x20,0x63,0x20,0x23,0x36,0x38,0x34,0x35,0x30,0x30,0x22,0x2c,0xa,0x22,0x34,0x20, - 0x20,0x63,0x20,0x23,0x36,0x45,0x34,0x39,0x30,0x30,0x22,0x2c,0xa,0x22,0x35,0x20, - 0x20,0x63,0x20,0x23,0x36,0x31,0x34,0x46,0x31,0x31,0x22,0x2c,0xa,0x22,0x36,0x20, - 0x20,0x63,0x20,0x23,0x36,0x38,0x35,0x34,0x31,0x36,0x22,0x2c,0xa,0x22,0x37,0x20, - 0x20,0x63,0x20,0x23,0x37,0x33,0x34,0x43,0x30,0x30,0x22,0x2c,0xa,0x22,0x38,0x20, - 0x20,0x63,0x20,0x23,0x37,0x38,0x34,0x46,0x30,0x30,0x22,0x2c,0xa,0x22,0x39,0x20, - 0x20,0x63,0x20,0x23,0x37,0x35,0x35,0x42,0x30,0x30,0x22,0x2c,0xa,0x22,0x30,0x20, - 0x20,0x63,0x20,0x23,0x37,0x43,0x35,0x32,0x30,0x30,0x22,0x2c,0xa,0x22,0x71,0x20, - 0x20,0x63,0x20,0x23,0x37,0x43,0x35,0x41,0x30,0x30,0x22,0x2c,0xa,0x22,0x77,0x20, - 0x20,0x63,0x20,0x23,0x37,0x42,0x35,0x37,0x30,0x46,0x22,0x2c,0xa,0x22,0x65,0x20, - 0x20,0x63,0x20,0x23,0x36,0x39,0x35,0x36,0x32,0x46,0x22,0x2c,0xa,0x22,0x72,0x20, - 0x20,0x63,0x20,0x23,0x37,0x38,0x36,0x36,0x30,0x30,0x22,0x2c,0xa,0x22,0x74,0x20, - 0x20,0x63,0x20,0x23,0x37,0x46,0x36,0x41,0x30,0x30,0x22,0x2c,0xa,0x22,0x79,0x20, - 0x20,0x63,0x20,0x23,0x37,0x36,0x36,0x33,0x30,0x30,0x22,0x2c,0xa,0x22,0x75,0x20, - 0x20,0x63,0x20,0x23,0x36,0x30,0x36,0x31,0x33,0x46,0x22,0x2c,0xa,0x22,0x69,0x20, - 0x20,0x63,0x20,0x23,0x37,0x43,0x36,0x34,0x32,0x32,0x22,0x2c,0xa,0x22,0x70,0x20, - 0x20,0x63,0x20,0x23,0x35,0x34,0x35,0x31,0x34,0x33,0x22,0x2c,0xa,0x22,0x61,0x20, - 0x20,0x63,0x20,0x23,0x35,0x34,0x35,0x32,0x34,0x42,0x22,0x2c,0xa,0x22,0x73,0x20, - 0x20,0x63,0x20,0x67,0x72,0x61,0x79,0x33,0x32,0x22,0x2c,0xa,0x22,0x64,0x20,0x20, - 0x63,0x20,0x23,0x35,0x44,0x35,0x44,0x35,0x37,0x22,0x2c,0xa,0x22,0x66,0x20,0x20, - 0x63,0x20,0x23,0x36,0x31,0x36,0x36,0x34,0x31,0x22,0x2c,0xa,0x22,0x67,0x20,0x20, - 0x63,0x20,0x23,0x36,0x37,0x36,0x39,0x35,0x44,0x22,0x2c,0xa,0x22,0x68,0x20,0x20, - 0x63,0x20,0x23,0x36,0x42,0x37,0x33,0x34,0x44,0x22,0x2c,0xa,0x22,0x6a,0x20,0x20, - 0x63,0x20,0x23,0x36,0x43,0x37,0x35,0x35,0x33,0x22,0x2c,0xa,0x22,0x6b,0x20,0x20, - 0x63,0x20,0x23,0x36,0x31,0x36,0x32,0x36,0x31,0x22,0x2c,0xa,0x22,0x6c,0x20,0x20, - 0x63,0x20,0x23,0x36,0x38,0x36,0x41,0x36,0x34,0x22,0x2c,0xa,0x22,0x7a,0x20,0x20, - 0x63,0x20,0x23,0x36,0x42,0x37,0x31,0x36,0x32,0x22,0x2c,0xa,0x22,0x78,0x20,0x20, - 0x63,0x20,0x23,0x37,0x32,0x37,0x32,0x37,0x32,0x22,0x2c,0xa,0x22,0x63,0x20,0x20, - 0x63,0x20,0x23,0x30,0x30,0x33,0x44,0x46,0x46,0x22,0x2c,0xa,0x22,0x76,0x20,0x20, - 0x63,0x20,0x23,0x30,0x30,0x34,0x33,0x46,0x46,0x22,0x2c,0xa,0x22,0x62,0x20,0x20, - 0x63,0x20,0x23,0x30,0x30,0x34,0x42,0x46,0x46,0x22,0x2c,0xa,0x22,0x6e,0x20,0x20, - 0x63,0x20,0x23,0x30,0x30,0x35,0x33,0x46,0x46,0x22,0x2c,0xa,0x22,0x6d,0x20,0x20, - 0x63,0x20,0x23,0x30,0x31,0x35,0x41,0x46,0x46,0x22,0x2c,0xa,0x22,0x4d,0x20,0x20, - 0x63,0x20,0x23,0x30,0x30,0x36,0x33,0x46,0x46,0x22,0x2c,0xa,0x22,0x4e,0x20,0x20, - 0x63,0x20,0x23,0x30,0x34,0x36,0x44,0x46,0x46,0x22,0x2c,0xa,0x22,0x42,0x20,0x20, - 0x63,0x20,0x23,0x30,0x38,0x36,0x35,0x46,0x46,0x22,0x2c,0xa,0x22,0x56,0x20,0x20, - 0x63,0x20,0x23,0x30,0x33,0x37,0x38,0x46,0x46,0x22,0x2c,0xa,0x22,0x43,0x20,0x20, - 0x63,0x20,0x23,0x31,0x36,0x36,0x33,0x46,0x46,0x22,0x2c,0xa,0x22,0x5a,0x20,0x20, - 0x63,0x20,0x23,0x31,0x35,0x37,0x36,0x46,0x46,0x22,0x2c,0xa,0x22,0x41,0x20,0x20, - 0x63,0x20,0x23,0x32,0x36,0x37,0x38,0x46,0x46,0x22,0x2c,0xa,0x22,0x53,0x20,0x20, - 0x63,0x20,0x23,0x36,0x46,0x37,0x42,0x38,0x34,0x22,0x2c,0xa,0x22,0x44,0x20,0x20, - 0x63,0x20,0x23,0x37,0x37,0x38,0x35,0x36,0x44,0x22,0x2c,0xa,0x22,0x46,0x20,0x20, - 0x63,0x20,0x23,0x37,0x42,0x38,0x42,0x37,0x35,0x22,0x2c,0xa,0x22,0x47,0x20,0x20, - 0x63,0x20,0x23,0x30,0x30,0x38,0x33,0x46,0x46,0x22,0x2c,0xa,0x22,0x48,0x20,0x20, - 0x63,0x20,0x23,0x30,0x31,0x39,0x37,0x46,0x46,0x22,0x2c,0xa,0x22,0x4a,0x20,0x20, - 0x63,0x20,0x23,0x30,0x42,0x39,0x32,0x46,0x46,0x22,0x2c,0xa,0x22,0x4b,0x20,0x20, - 0x63,0x20,0x23,0x31,0x33,0x38,0x35,0x46,0x46,0x22,0x2c,0xa,0x22,0x4c,0x20,0x20, - 0x63,0x20,0x23,0x30,0x31,0x41,0x35,0x46,0x46,0x22,0x2c,0xa,0x22,0x50,0x20,0x20, - 0x63,0x20,0x23,0x30,0x44,0x42,0x35,0x46,0x46,0x22,0x2c,0xa,0x22,0x49,0x20,0x20, - 0x63,0x20,0x23,0x33,0x30,0x39,0x36,0x46,0x46,0x22,0x2c,0xa,0x22,0x55,0x20,0x20, - 0x63,0x20,0x23,0x32,0x44,0x41,0x44,0x46,0x46,0x22,0x2c,0xa,0x22,0x59,0x20,0x20, - 0x63,0x20,0x23,0x32,0x46,0x42,0x43,0x46,0x46,0x22,0x2c,0xa,0x22,0x54,0x20,0x20, - 0x63,0x20,0x23,0x32,0x32,0x43,0x36,0x46,0x46,0x22,0x2c,0xa,0x22,0x52,0x20,0x20, - 0x63,0x20,0x23,0x32,0x41,0x43,0x35,0x46,0x46,0x22,0x2c,0xa,0x22,0x45,0x20,0x20, - 0x63,0x20,0x23,0x33,0x30,0x44,0x30,0x46,0x46,0x22,0x2c,0xa,0x22,0x57,0x20,0x20, - 0x63,0x20,0x23,0x33,0x38,0x44,0x35,0x46,0x46,0x22,0x2c,0xa,0x22,0x51,0x20,0x20, - 0x63,0x20,0x23,0x34,0x34,0x39,0x33,0x46,0x31,0x22,0x2c,0xa,0x22,0x21,0x20,0x20, - 0x63,0x20,0x23,0x35,0x46,0x38,0x33,0x46,0x46,0x22,0x2c,0xa,0x22,0x7e,0x20,0x20, - 0x63,0x20,0x23,0x35,0x46,0x38,0x41,0x46,0x46,0x22,0x2c,0xa,0x22,0x5e,0x20,0x20, - 0x63,0x20,0x23,0x35,0x32,0x39,0x30,0x45,0x34,0x22,0x2c,0xa,0x22,0x2f,0x20,0x20, - 0x63,0x20,0x23,0x35,0x46,0x39,0x32,0x46,0x46,0x22,0x2c,0xa,0x22,0x28,0x20,0x20, - 0x63,0x20,0x23,0x34,0x43,0x41,0x41,0x46,0x45,0x22,0x2c,0xa,0x22,0x29,0x20,0x20, - 0x63,0x20,0x23,0x34,0x30,0x42,0x38,0x46,0x46,0x22,0x2c,0xa,0x22,0x5f,0x20,0x20, - 0x63,0x20,0x23,0x37,0x37,0x39,0x44,0x43,0x42,0x22,0x2c,0xa,0x22,0x60,0x20,0x20, - 0x63,0x20,0x23,0x36,0x36,0x39,0x33,0x45,0x32,0x22,0x2c,0xa,0x22,0x27,0x20,0x20, - 0x63,0x20,0x23,0x36,0x32,0x39,0x30,0x46,0x46,0x22,0x2c,0xa,0x22,0x5d,0x20,0x20, - 0x63,0x20,0x23,0x36,0x34,0x39,0x44,0x46,0x46,0x22,0x2c,0xa,0x22,0x5b,0x20,0x20, - 0x63,0x20,0x23,0x37,0x31,0x41,0x36,0x45,0x35,0x22,0x2c,0xa,0x22,0x7b,0x20,0x20, - 0x63,0x20,0x23,0x37,0x39,0x41,0x34,0x46,0x46,0x22,0x2c,0xa,0x22,0x7d,0x20,0x20, - 0x63,0x20,0x23,0x37,0x46,0x42,0x33,0x46,0x46,0x22,0x2c,0xa,0x22,0x7c,0x20,0x20, - 0x63,0x20,0x23,0x36,0x38,0x42,0x38,0x46,0x33,0x22,0x2c,0xa,0x22,0x20,0x2e,0x20, - 0x63,0x20,0x23,0x34,0x32,0x44,0x43,0x46,0x46,0x22,0x2c,0xa,0x22,0x2e,0x2e,0x20, - 0x63,0x20,0x23,0x34,0x37,0x45,0x30,0x46,0x46,0x22,0x2c,0xa,0x22,0x58,0x2e,0x20, - 0x63,0x20,0x23,0x35,0x38,0x45,0x39,0x46,0x46,0x22,0x2c,0xa,0x22,0x6f,0x2e,0x20, - 0x63,0x20,0x23,0x36,0x34,0x43,0x30,0x45,0x42,0x22,0x2c,0xa,0x22,0x4f,0x2e,0x20, - 0x63,0x20,0x23,0x36,0x41,0x44,0x46,0x45,0x46,0x22,0x2c,0xa,0x22,0x2b,0x2e,0x20, - 0x63,0x20,0x23,0x38,0x32,0x35,0x36,0x30,0x30,0x22,0x2c,0xa,0x22,0x40,0x2e,0x20, - 0x63,0x20,0x23,0x38,0x34,0x35,0x41,0x30,0x30,0x22,0x2c,0xa,0x22,0x23,0x2e,0x20, - 0x63,0x20,0x23,0x38,0x42,0x35,0x43,0x30,0x30,0x22,0x2c,0xa,0x22,0x24,0x2e,0x20, - 0x63,0x20,0x23,0x39,0x30,0x35,0x46,0x30,0x30,0x22,0x2c,0xa,0x22,0x25,0x2e,0x20, - 0x63,0x20,0x23,0x38,0x43,0x36,0x31,0x30,0x33,0x22,0x2c,0xa,0x22,0x26,0x2e,0x20, - 0x63,0x20,0x23,0x38,0x37,0x36,0x38,0x30,0x37,0x22,0x2c,0xa,0x22,0x2a,0x2e,0x20, - 0x63,0x20,0x23,0x38,0x41,0x36,0x31,0x31,0x31,0x22,0x2c,0xa,0x22,0x3d,0x2e,0x20, - 0x63,0x20,0x23,0x38,0x38,0x36,0x45,0x31,0x42,0x22,0x2c,0xa,0x22,0x2d,0x2e,0x20, - 0x63,0x20,0x23,0x38,0x38,0x37,0x36,0x30,0x30,0x22,0x2c,0xa,0x22,0x3b,0x2e,0x20, - 0x63,0x20,0x23,0x38,0x43,0x37,0x41,0x30,0x30,0x22,0x2c,0xa,0x22,0x3a,0x2e,0x20, - 0x63,0x20,0x23,0x39,0x33,0x36,0x32,0x30,0x30,0x22,0x2c,0xa,0x22,0x3e,0x2e,0x20, - 0x63,0x20,0x23,0x39,0x38,0x36,0x38,0x30,0x30,0x22,0x2c,0xa,0x22,0x2c,0x2e,0x20, - 0x63,0x20,0x23,0x39,0x32,0x36,0x43,0x32,0x32,0x22,0x2c,0xa,0x22,0x3c,0x2e,0x20, - 0x63,0x20,0x23,0x39,0x38,0x37,0x41,0x33,0x46,0x22,0x2c,0xa,0x22,0x31,0x2e,0x20, - 0x63,0x20,0x23,0x41,0x30,0x37,0x32,0x30,0x30,0x22,0x2c,0xa,0x22,0x32,0x2e,0x20, - 0x63,0x20,0x23,0x41,0x32,0x37,0x35,0x31,0x31,0x22,0x2c,0xa,0x22,0x33,0x2e,0x20, - 0x63,0x20,0x23,0x41,0x39,0x37,0x44,0x31,0x35,0x22,0x2c,0xa,0x22,0x34,0x2e,0x20, - 0x63,0x20,0x23,0x41,0x37,0x37,0x42,0x31,0x34,0x22,0x2c,0xa,0x22,0x35,0x2e,0x20, - 0x63,0x20,0x23,0x39,0x39,0x38,0x37,0x31,0x32,0x22,0x2c,0xa,0x22,0x36,0x2e,0x20, - 0x63,0x20,0x23,0x41,0x36,0x38,0x30,0x30,0x30,0x22,0x2c,0xa,0x22,0x37,0x2e,0x20, - 0x63,0x20,0x23,0x41,0x37,0x38,0x46,0x30,0x30,0x22,0x2c,0xa,0x22,0x38,0x2e,0x20, - 0x63,0x20,0x23,0x41,0x44,0x38,0x30,0x31,0x36,0x22,0x2c,0xa,0x22,0x39,0x2e,0x20, - 0x63,0x20,0x23,0x41,0x43,0x39,0x36,0x30,0x30,0x22,0x2c,0xa,0x22,0x30,0x2e,0x20, - 0x63,0x20,0x23,0x42,0x42,0x38,0x46,0x30,0x30,0x22,0x2c,0xa,0x22,0x71,0x2e,0x20, - 0x63,0x20,0x23,0x41,0x39,0x39,0x42,0x32,0x41,0x22,0x2c,0xa,0x22,0x77,0x2e,0x20, - 0x63,0x20,0x23,0x42,0x39,0x41,0x30,0x30,0x30,0x22,0x2c,0xa,0x22,0x65,0x2e,0x20, - 0x63,0x20,0x23,0x42,0x33,0x41,0x36,0x33,0x43,0x22,0x2c,0xa,0x22,0x72,0x2e,0x20, - 0x63,0x20,0x23,0x39,0x35,0x38,0x44,0x34,0x33,0x22,0x2c,0xa,0x22,0x74,0x2e,0x20, - 0x63,0x20,0x23,0x39,0x38,0x38,0x46,0x34,0x34,0x22,0x2c,0xa,0x22,0x79,0x2e,0x20, - 0x63,0x20,0x23,0x39,0x41,0x39,0x33,0x34,0x36,0x22,0x2c,0xa,0x22,0x75,0x2e,0x20, - 0x63,0x20,0x23,0x39,0x46,0x39,0x39,0x34,0x38,0x22,0x2c,0xa,0x22,0x69,0x2e,0x20, - 0x63,0x20,0x23,0x38,0x42,0x38,0x39,0x37,0x43,0x22,0x2c,0xa,0x22,0x70,0x2e,0x20, - 0x63,0x20,0x23,0x39,0x35,0x38,0x46,0x36,0x46,0x22,0x2c,0xa,0x22,0x61,0x2e,0x20, - 0x63,0x20,0x23,0x39,0x38,0x39,0x33,0x37,0x42,0x22,0x2c,0xa,0x22,0x73,0x2e,0x20, - 0x63,0x20,0x23,0x41,0x36,0x38,0x34,0x34,0x33,0x22,0x2c,0xa,0x22,0x64,0x2e,0x20, - 0x63,0x20,0x23,0x42,0x30,0x38,0x43,0x34,0x31,0x22,0x2c,0xa,0x22,0x66,0x2e,0x20, - 0x63,0x20,0x23,0x41,0x46,0x39,0x34,0x36,0x32,0x22,0x2c,0xa,0x22,0x67,0x2e,0x20, - 0x63,0x20,0x23,0x42,0x33,0x39,0x38,0x36,0x34,0x22,0x2c,0xa,0x22,0x68,0x2e,0x20, - 0x63,0x20,0x23,0x42,0x32,0x41,0x38,0x35,0x30,0x22,0x2c,0xa,0x22,0x6a,0x2e,0x20, - 0x63,0x20,0x23,0x42,0x44,0x42,0x33,0x35,0x35,0x22,0x2c,0xa,0x22,0x6b,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x33,0x39,0x37,0x32,0x46,0x22,0x2c,0xa,0x22,0x6c,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x35,0x41,0x34,0x30,0x30,0x22,0x2c,0xa,0x22,0x7a,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x43,0x41,0x43,0x30,0x30,0x22,0x2c,0xa,0x22,0x78,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x37,0x42,0x42,0x30,0x30,0x22,0x2c,0xa,0x22,0x63,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x43,0x41,0x30,0x33,0x30,0x22,0x2c,0xa,0x22,0x76,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x42,0x42,0x34,0x33,0x45,0x22,0x2c,0xa,0x22,0x62,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x34,0x41,0x44,0x30,0x43,0x22,0x2c,0xa,0x22,0x6e,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x43,0x42,0x36,0x30,0x30,0x22,0x2c,0xa,0x22,0x6d,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x44,0x42,0x39,0x30,0x30,0x22,0x2c,0xa,0x22,0x4d,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x32,0x42,0x42,0x30,0x30,0x22,0x2c,0xa,0x22,0x4e,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x31,0x42,0x38,0x34,0x43,0x22,0x2c,0xa,0x22,0x42,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x31,0x42,0x37,0x35,0x37,0x22,0x2c,0xa,0x22,0x56,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x35,0x42,0x42,0x35,0x38,0x22,0x2c,0xa,0x22,0x43,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x39,0x42,0x45,0x35,0x41,0x22,0x2c,0xa,0x22,0x5a,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x32,0x41,0x39,0x37,0x38,0x22,0x2c,0xa,0x22,0x41,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x46,0x43,0x30,0x30,0x30,0x22,0x2c,0xa,0x22,0x53,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x44,0x43,0x42,0x30,0x30,0x22,0x2c,0xa,0x22,0x44,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x36,0x43,0x33,0x30,0x30,0x22,0x2c,0xa,0x22,0x46,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x44,0x31,0x30,0x30,0x22,0x2c,0xa,0x22,0x47,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x45,0x44,0x42,0x30,0x30,0x22,0x2c,0xa,0x22,0x48,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x44,0x46,0x30,0x45,0x22,0x2c,0xa,0x22,0x4a,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x35,0x44,0x35,0x30,0x30,0x22,0x2c,0xa,0x22,0x4b,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x42,0x43,0x44,0x33,0x39,0x22,0x2c,0xa,0x22,0x4c,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x45,0x38,0x33,0x32,0x22,0x2c,0xa,0x22,0x50,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x45,0x34,0x33,0x32,0x22,0x2c,0xa,0x22,0x49,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x45,0x43,0x32,0x35,0x43,0x22,0x2c,0xa,0x22,0x55,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x37,0x43,0x36,0x34,0x38,0x22,0x2c,0xa,0x22,0x59,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x44,0x43,0x37,0x34,0x42,0x22,0x2c,0xa,0x22,0x54,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x30,0x43,0x35,0x35,0x45,0x22,0x2c,0xa,0x22,0x52,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x33,0x43,0x38,0x35,0x46,0x22,0x2c,0xa,0x22,0x45,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x35,0x43,0x39,0x36,0x30,0x22,0x2c,0xa,0x22,0x57,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x44,0x44,0x32,0x36,0x34,0x22,0x2c,0xa,0x22,0x51,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x30,0x43,0x41,0x34,0x43,0x22,0x2c,0xa,0x22,0x21,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x37,0x44,0x31,0x34,0x45,0x22,0x2c,0xa,0x22,0x7e,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x46,0x44,0x41,0x35,0x31,0x22,0x2c,0xa,0x22,0x5e,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x34,0x44,0x30,0x35,0x30,0x22,0x2c,0xa,0x22,0x2f,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x39,0x44,0x34,0x35,0x32,0x22,0x2c,0xa,0x22,0x28,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x45,0x44,0x44,0x35,0x33,0x22,0x2c,0xa,0x22,0x29,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x32,0x44,0x37,0x36,0x35,0x22,0x2c,0xa,0x22,0x5f,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x39,0x44,0x44,0x36,0x39,0x22,0x2c,0xa,0x22,0x60,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x36,0x44,0x44,0x36,0x38,0x22,0x2c,0xa,0x22,0x27,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x44,0x44,0x42,0x36,0x45,0x22,0x2c,0xa,0x22,0x5d,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x45,0x45,0x34,0x46,0x22,0x2c,0xa,0x22,0x5b,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x45,0x45,0x33,0x35,0x34,0x22,0x2c,0xa,0x22,0x7b,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x45,0x45,0x41,0x35,0x35,0x22,0x2c,0xa,0x22,0x7d,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x37,0x45,0x31,0x35,0x33,0x22,0x2c,0xa,0x22,0x7c,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x46,0x30,0x35,0x36,0x22,0x2c,0xa,0x22,0x20,0x58,0x20, - 0x63,0x20,0x23,0x45,0x43,0x45,0x31,0x36,0x41,0x22,0x2c,0xa,0x22,0x2e,0x58,0x20, - 0x63,0x20,0x23,0x46,0x31,0x45,0x35,0x36,0x44,0x22,0x2c,0xa,0x22,0x58,0x58,0x20, - 0x63,0x20,0x23,0x46,0x37,0x45,0x41,0x36,0x46,0x22,0x2c,0xa,0x22,0x6f,0x58,0x20, - 0x63,0x20,0x23,0x46,0x37,0x45,0x42,0x37,0x30,0x22,0x2c,0xa,0x22,0x4f,0x58,0x20, - 0x63,0x20,0x23,0x46,0x39,0x45,0x43,0x37,0x30,0x22,0x2c,0xa,0x22,0x2b,0x58,0x20, - 0x63,0x20,0x23,0x46,0x45,0x46,0x33,0x37,0x32,0x22,0x2c,0xa,0x22,0x40,0x58,0x20, - 0x63,0x20,0x23,0x39,0x37,0x39,0x34,0x38,0x36,0x22,0x2c,0xa,0x22,0x23,0x58,0x20, - 0x63,0x20,0x67,0x72,0x61,0x79,0x36,0x30,0x22,0x2c,0xa,0x22,0x24,0x58,0x20,0x63, - 0x20,0x23,0x39,0x36,0x39,0x35,0x39,0x36,0x22,0x2c,0xa,0x22,0x25,0x58,0x20,0x63, - 0x20,0x23,0x38,0x41,0x41,0x31,0x39,0x33,0x22,0x2c,0xa,0x22,0x26,0x58,0x20,0x63, - 0x20,0x23,0x38,0x32,0x41,0x38,0x39,0x42,0x22,0x2c,0xa,0x22,0x2a,0x58,0x20,0x63, - 0x20,0x23,0x38,0x43,0x41,0x45,0x41,0x33,0x22,0x2c,0xa,0x22,0x3d,0x58,0x20,0x63, - 0x20,0x23,0x38,0x36,0x41,0x37,0x41,0x39,0x22,0x2c,0xa,0x22,0x2d,0x58,0x20,0x63, - 0x20,0x23,0x38,0x42,0x41,0x32,0x42,0x31,0x22,0x2c,0xa,0x22,0x3b,0x58,0x20,0x63, - 0x20,0x23,0x41,0x43,0x41,0x35,0x38,0x30,0x22,0x2c,0xa,0x22,0x3a,0x58,0x20,0x63, - 0x20,0x23,0x41,0x35,0x41,0x32,0x39,0x31,0x22,0x2c,0xa,0x22,0x3e,0x58,0x20,0x63, - 0x20,0x23,0x42,0x33,0x41,0x46,0x39,0x38,0x22,0x2c,0xa,0x22,0x2c,0x58,0x20,0x63, - 0x20,0x23,0x42,0x38,0x42,0x37,0x41,0x46,0x22,0x2c,0xa,0x22,0x3c,0x58,0x20,0x63, - 0x20,0x23,0x42,0x33,0x42,0x32,0x41,0x42,0x22,0x2c,0xa,0x22,0x31,0x58,0x20,0x63, - 0x20,0x23,0x42,0x31,0x42,0x31,0x42,0x31,0x22,0x2c,0xa,0x22,0x32,0x58,0x20,0x63, - 0x20,0x23,0x41,0x36,0x42,0x38,0x46,0x46,0x22,0x2c,0xa,0x22,0x33,0x58,0x20,0x63, - 0x20,0x23,0x38,0x38,0x44,0x45,0x45,0x30,0x22,0x2c,0xa,0x22,0x34,0x58,0x20,0x63, - 0x20,0x23,0x38,0x42,0x46,0x30,0x46,0x45,0x22,0x2c,0xa,0x22,0x35,0x58,0x20,0x63, - 0x20,0x23,0x41,0x34,0x43,0x46,0x43,0x36,0x22,0x2c,0xa,0x22,0x36,0x58,0x20,0x63, - 0x20,0x23,0x42,0x46,0x44,0x35,0x46,0x46,0x22,0x2c,0xa,0x22,0x37,0x58,0x20,0x63, - 0x20,0x23,0x42,0x46,0x44,0x43,0x46,0x46,0x22,0x2c,0xa,0x22,0x38,0x58,0x20,0x63, - 0x20,0x23,0x43,0x32,0x41,0x44,0x38,0x32,0x22,0x2c,0xa,0x22,0x39,0x58,0x20,0x63, - 0x20,0x23,0x43,0x42,0x42,0x34,0x38,0x39,0x22,0x2c,0xa,0x22,0x30,0x58,0x20,0x63, - 0x20,0x23,0x44,0x32,0x42,0x46,0x39,0x42,0x22,0x2c,0xa,0x22,0x71,0x58,0x20,0x63, - 0x20,0x23,0x44,0x31,0x43,0x31,0x39,0x46,0x22,0x2c,0xa,0x22,0x77,0x58,0x20,0x63, - 0x20,0x23,0x43,0x38,0x43,0x34,0x41,0x41,0x22,0x2c,0xa,0x22,0x65,0x58,0x20,0x63, - 0x20,0x23,0x43,0x46,0x43,0x42,0x42,0x37,0x22,0x2c,0xa,0x22,0x72,0x58,0x20,0x63, - 0x20,0x23,0x44,0x38,0x43,0x37,0x41,0x36,0x22,0x2c,0xa,0x22,0x74,0x58,0x20,0x63, - 0x20,0x23,0x44,0x32,0x43,0x32,0x41,0x33,0x22,0x2c,0xa,0x22,0x79,0x58,0x20,0x63, - 0x20,0x23,0x44,0x35,0x43,0x43,0x42,0x33,0x22,0x2c,0xa,0x22,0x75,0x58,0x20,0x63, - 0x20,0x23,0x44,0x41,0x44,0x31,0x41,0x31,0x22,0x2c,0xa,0x22,0x69,0x58,0x20,0x63, - 0x20,0x23,0x44,0x44,0x44,0x35,0x42,0x42,0x22,0x2c,0xa,0x22,0x70,0x58,0x20,0x63, - 0x20,0x23,0x44,0x37,0x44,0x31,0x42,0x33,0x22,0x2c,0xa,0x22,0x61,0x58,0x20,0x63, - 0x20,0x23,0x45,0x43,0x45,0x35,0x42,0x42,0x22,0x2c,0xa,0x22,0x73,0x58,0x20,0x63, - 0x20,0x23,0x46,0x35,0x45,0x42,0x42,0x35,0x22,0x2c,0xa,0x22,0x64,0x58,0x20,0x63, - 0x20,0x23,0x46,0x35,0x45,0x43,0x42,0x43,0x22,0x2c,0xa,0x22,0x66,0x58,0x20,0x63, - 0x20,0x23,0x46,0x38,0x45,0x45,0x42,0x38,0x22,0x2c,0xa,0x22,0x67,0x58,0x20,0x63, - 0x20,0x23,0x46,0x43,0x46,0x32,0x42,0x43,0x22,0x2c,0xa,0x22,0x68,0x58,0x20,0x63, - 0x20,0x23,0x43,0x42,0x43,0x42,0x43,0x42,0x22,0x2c,0xa,0x22,0x6a,0x58,0x20,0x63, - 0x20,0x23,0x44,0x38,0x44,0x36,0x43,0x37,0x22,0x2c,0xa,0x22,0x6b,0x58,0x20,0x63, - 0x20,0x23,0x44,0x44,0x44,0x44,0x44,0x44,0x22,0x2c,0xa,0x22,0x6c,0x58,0x20,0x63, - 0x20,0x23,0x45,0x34,0x44,0x41,0x43,0x32,0x22,0x2c,0xa,0x22,0x7a,0x58,0x20,0x63, - 0x20,0x23,0x45,0x43,0x45,0x36,0x43,0x37,0x22,0x2c,0xa,0x22,0x78,0x58,0x20,0x63, - 0x20,0x23,0x45,0x42,0x45,0x36,0x44,0x39,0x22,0x2c,0xa,0x22,0x63,0x58,0x20,0x63, - 0x20,0x23,0x45,0x39,0x45,0x33,0x44,0x30,0x22,0x2c,0xa,0x22,0x76,0x58,0x20,0x63, - 0x20,0x23,0x46,0x35,0x45,0x44,0x43,0x34,0x22,0x2c,0xa,0x22,0x62,0x58,0x20,0x63, - 0x20,0x23,0x46,0x36,0x45,0x46,0x43,0x39,0x22,0x2c,0xa,0x22,0x6e,0x58,0x20,0x63, - 0x20,0x23,0x46,0x30,0x45,0x42,0x44,0x35,0x22,0x2c,0xa,0x22,0x6d,0x58,0x20,0x63, - 0x20,0x23,0x46,0x33,0x45,0x46,0x44,0x42,0x22,0x2c,0xa,0x22,0x4d,0x58,0x20,0x63, - 0x20,0x23,0x46,0x43,0x46,0x33,0x43,0x35,0x22,0x2c,0xa,0x22,0x4e,0x58,0x20,0x63, - 0x20,0x23,0x46,0x43,0x46,0x34,0x43,0x41,0x22,0x2c,0xa,0x22,0x42,0x58,0x20,0x63, - 0x20,0x23,0x46,0x37,0x46,0x30,0x43,0x41,0x22,0x2c,0xa,0x22,0x56,0x58,0x20,0x63, - 0x20,0x23,0x46,0x36,0x46,0x30,0x44,0x32,0x22,0x2c,0xa,0x22,0x43,0x58,0x20,0x63, - 0x20,0x23,0x46,0x39,0x46,0x33,0x44,0x33,0x22,0x2c,0xa,0x22,0x5a,0x58,0x20,0x63, - 0x20,0x23,0x46,0x39,0x46,0x34,0x44,0x43,0x22,0x2c,0xa,0x22,0x41,0x58,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x38,0x44,0x34,0x22,0x2c,0xa,0x22,0x53,0x58,0x20,0x63, - 0x20,0x23,0x46,0x46,0x46,0x39,0x44,0x42,0x22,0x2c,0xa,0x22,0x44,0x58,0x20,0x63, - 0x20,0x23,0x45,0x37,0x45,0x37,0x45,0x34,0x22,0x2c,0xa,0x22,0x46,0x58,0x20,0x63, - 0x20,0x23,0x45,0x42,0x45,0x42,0x45,0x39,0x22,0x2c,0xa,0x22,0x47,0x58,0x20,0x63, - 0x20,0x23,0x46,0x31,0x45,0x44,0x45,0x31,0x22,0x2c,0xa,0x22,0x48,0x58,0x20,0x63, - 0x20,0x23,0x46,0x39,0x46,0x36,0x45,0x35,0x22,0x2c,0xa,0x22,0x4a,0x58,0x20,0x63, - 0x20,0x23,0x46,0x44,0x46,0x39,0x45,0x34,0x22,0x2c,0xa,0x22,0x4b,0x58,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x42,0x45,0x42,0x22,0x2c,0xa,0x22,0x4c,0x58,0x20,0x63, - 0x20,0x23,0x46,0x36,0x46,0x32,0x45,0x36,0x22,0x2c,0xa,0x22,0x50,0x58,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x43,0x46,0x33,0x22,0x2c,0xa,0x22,0x49,0x58,0x20,0x63, - 0x20,0x23,0x46,0x45,0x46,0x44,0x46,0x44,0x22,0x2c,0xa,0x22,0x55,0x58,0x20,0x63, - 0x20,0x23,0x46,0x34,0x46,0x34,0x46,0x33,0x22,0x2c,0xa,0x22,0x59,0x58,0x20,0x63, - 0x20,0x4e,0x6f,0x6e,0x65,0x22,0x2c,0xa,0x2f,0x2a,0x20,0x70,0x69,0x78,0x65,0x6c, - 0x73,0x20,0x2a,0x2f,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58, - 0x59,0x58,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58, - 0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58, - 0x59,0x58,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58, - 0x59,0x58,0x3a,0x2e,0x3a,0x2e,0x2b,0x20,0x49,0x58,0x49,0x58,0x49,0x58,0x49,0x58, - 0x49,0x58,0x49,0x58,0x49,0x58,0x49,0x58,0x46,0x58,0x23,0x20,0x2b,0x2e,0x37,0x20, - 0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58, - 0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58, - 0x59,0x58,0x59,0x58,0x3e,0x2e,0x6b,0x2e,0x63,0x2e,0x36,0x20,0x46,0x58,0x6b,0x58, - 0x6b,0x58,0x6b,0x58,0x44,0x58,0x6b,0x58,0x6b,0x58,0x6b,0x58,0x78,0x20,0x69,0x20, - 0x62,0x2e,0x3e,0x2e,0x2b,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x59,0x58, - 0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x22,0x2c, - 0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x3a,0x2e,0x27,0x2e,0x4b,0x2e,0x3d,0x2e, - 0x68,0x58,0x31,0x58,0x31,0x58,0x31,0x58,0x31,0x58,0x31,0x58,0x31,0x58,0x31,0x58, - 0x64,0x20,0x26,0x2e,0x30,0x2e,0x25,0x2e,0x2a,0x20,0x37,0x20,0x23,0x2e,0x23,0x2e, - 0x3a,0x2e,0x24,0x2e,0x23,0x2e,0x32,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58, - 0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x3a,0x2e,0x2f,0x2e, - 0x4d,0x2e,0x25,0x2e,0x24,0x58,0x6b,0x20,0x6b,0x20,0x64,0x20,0x73,0x20,0x73,0x20, - 0x73,0x20,0x65,0x20,0x77,0x20,0x3e,0x2e,0x32,0x2e,0x64,0x2e,0x73,0x2e,0x5a,0x2e, - 0x39,0x58,0x72,0x58,0x6c,0x58,0x78,0x58,0x30,0x58,0x37,0x20,0x20,0x20,0x20,0x20, - 0x59,0x58,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58, - 0x3a,0x2e,0x5e,0x2e,0x4d,0x2e,0x31,0x2e,0x3a,0x20,0x25,0x20,0x25,0x20,0x2d,0x20, - 0x25,0x20,0x35,0x20,0x36,0x20,0x26,0x2e,0x47,0x58,0x49,0x58,0x49,0x58,0x50,0x58, - 0x50,0x58,0x50,0x58,0x50,0x58,0x50,0x58,0x4c,0x58,0x49,0x58,0x49,0x58,0x67,0x2e, - 0x33,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58, - 0x59,0x58,0x23,0x58,0x3a,0x2e,0x5e,0x2e,0x6d,0x2e,0x76,0x2e,0x79,0x2e,0x72,0x2e, - 0x72,0x2e,0x72,0x2e,0x72,0x2e,0x68,0x2e,0x68,0x2e,0x32,0x2e,0x49,0x58,0x50,0x58, - 0x50,0x58,0x4b,0x58,0x4b,0x58,0x50,0x58,0x4b,0x58,0x48,0x58,0x78,0x58,0x55,0x58, - 0x49,0x58,0x49,0x58,0x66,0x2e,0x34,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x22,0x2c, - 0xa,0x22,0x59,0x58,0x59,0x58,0x23,0x58,0x3a,0x2e,0x5e,0x2e,0x6d,0x2e,0x59,0x2e, - 0x49,0x2e,0x42,0x2e,0x6a,0x2e,0x6a,0x2e,0x6a,0x2e,0x56,0x2e,0x49,0x2e,0x34,0x2e, - 0x50,0x58,0x4b,0x58,0x4a,0x58,0x4b,0x58,0x4a,0x58,0x4b,0x58,0x4b,0x58,0x6d,0x58, - 0x6a,0x58,0x46,0x58,0x49,0x58,0x49,0x58,0x55,0x58,0x2b,0x2e,0x20,0x20,0x20,0x20, - 0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x23,0x58,0x3a,0x2e,0x5e,0x2e, - 0x6d,0x2e,0x59,0x2e,0x45,0x2e,0x49,0x2e,0x6a,0x2e,0x6a,0x2e,0x6a,0x2e,0x49,0x2e, - 0x52,0x2e,0x38,0x2e,0x50,0x58,0x4b,0x58,0x53,0x58,0x4a,0x58,0x4a,0x58,0x4a,0x58, - 0x53,0x58,0x6e,0x58,0x65,0x58,0x44,0x58,0x49,0x58,0x49,0x58,0x55,0x58,0x3c,0x2e, - 0x20,0x20,0x20,0x20,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58, - 0x3a,0x2e,0x2f,0x2e,0x4d,0x2e,0x21,0x2e,0x57,0x2e,0x52,0x2e,0x49,0x2e,0x54,0x2e, - 0x52,0x2e,0x45,0x2e,0x57,0x2e,0x38,0x2e,0x55,0x58,0x4a,0x58,0x4a,0x58,0x53,0x58, - 0x53,0x58,0x53,0x58,0x53,0x58,0x6e,0x58,0x65,0x58,0x3a,0x58,0x40,0x58,0x69,0x2e, - 0x3c,0x58,0x37,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x22,0x2c,0xa,0x22,0x59,0x58, - 0x59,0x58,0x59,0x58,0x3a,0x2e,0x2f,0x2e,0x44,0x2e,0x7e,0x2e,0x5f,0x2e,0x60,0x2e, - 0x57,0x2e,0x57,0x2e,0x57,0x2e,0x57,0x2e,0x20,0x58,0x38,0x2e,0x50,0x58,0x4a,0x58, - 0x53,0x58,0x41,0x58,0x53,0x58,0x53,0x58,0x53,0x58,0x56,0x58,0x6a,0x58,0x3e,0x58, - 0x40,0x58,0x40,0x58,0x2c,0x58,0x34,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x22,0x2c, - 0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x3a,0x2e,0x28,0x2e,0x53,0x2e,0x7d,0x2e, - 0x2e,0x58,0x20,0x58,0x20,0x58,0x20,0x58,0x20,0x58,0x20,0x58,0x20,0x58,0x38,0x2e, - 0x50,0x58,0x53,0x58,0x41,0x58,0x41,0x58,0x41,0x58,0x41,0x58,0x41,0x58,0x4e,0x58, - 0x7a,0x58,0x70,0x58,0x77,0x58,0x77,0x58,0x6a,0x58,0x37,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x3a,0x2e,0x28,0x2e, - 0x53,0x2e,0x5b,0x2e,0x4f,0x58,0x4f,0x58,0x4f,0x58,0x6f,0x58,0x6f,0x58,0x74,0x2e, - 0x3b,0x20,0x4f,0x20,0x73,0x20,0x61,0x20,0x70,0x20,0x70,0x20,0x70,0x20,0x70,0x20, - 0x61,0x2e,0x41,0x58,0x4d,0x58,0x76,0x58,0x61,0x58,0x7a,0x58,0x47,0x58,0x2b,0x2e, - 0x20,0x20,0x20,0x20,0x20,0x20,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58, - 0x3a,0x2e,0x28,0x2e,0x53,0x2e,0x5b,0x2e,0x2b,0x58,0x2b,0x58,0x2b,0x58,0x4f,0x58, - 0x2b,0x58,0x3b,0x20,0x37,0x58,0x32,0x58,0x5d,0x20,0x2f,0x20,0x2f,0x20,0x7e,0x20, - 0x21,0x20,0x32,0x58,0x70,0x20,0x4d,0x58,0x4e,0x58,0x4e,0x58,0x4e,0x58,0x53,0x58, - 0x4b,0x58,0x2b,0x2e,0x20,0x20,0x20,0x20,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58, - 0x59,0x58,0x59,0x58,0x3a,0x2e,0x28,0x2e,0x46,0x2e,0x7c,0x2e,0x2b,0x58,0x2b,0x58, - 0x2b,0x58,0x2b,0x58,0x2b,0x58,0x79,0x2e,0x2c,0x20,0x5f,0x20,0x41,0x20,0x6d,0x20, - 0x62,0x20,0x76,0x20,0x63,0x20,0x21,0x20,0x70,0x20,0x4d,0x58,0x4d,0x58,0x67,0x58, - 0x4d,0x58,0x41,0x58,0x4b,0x58,0x2b,0x2e,0x20,0x20,0x20,0x20,0x59,0x58,0x22,0x2c, - 0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x3a,0x2e,0x28,0x2e,0x46,0x2e,0x7c,0x2e, - 0x2b,0x58,0x2b,0x58,0x2b,0x58,0x2b,0x58,0x2b,0x58,0x2b,0x58,0x6a,0x2e,0x26,0x20, - 0x5e,0x20,0x42,0x20,0x6e,0x20,0x62,0x20,0x76,0x20,0x27,0x20,0x3c,0x20,0x67,0x58, - 0x4d,0x58,0x67,0x58,0x67,0x58,0x4e,0x58,0x4b,0x58,0x2b,0x2e,0x20,0x20,0x20,0x20, - 0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x3a,0x2e,0x28,0x2e, - 0x46,0x2e,0x55,0x2e,0x57,0x2e,0x2b,0x58,0x2b,0x58,0x2b,0x58,0x2b,0x58,0x29,0x2e, - 0x79,0x2e,0x67,0x20,0x51,0x20,0x4e,0x20,0x6d,0x20,0x6e,0x20,0x62,0x20,0x7e,0x20, - 0x3c,0x20,0x67,0x58,0x67,0x58,0x67,0x58,0x67,0x58,0x41,0x58,0x4a,0x58,0x71,0x20, - 0x20,0x20,0x20,0x20,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58, - 0x3a,0x2e,0x5b,0x2e,0x6c,0x2e,0x6a,0x20,0x6a,0x20,0x79,0x2e,0x49,0x2e,0x6a,0x2e, - 0x72,0x2e,0x31,0x20,0x3d,0x58,0x28,0x20,0x4b,0x20,0x4e,0x20,0x4d,0x20,0x6d,0x20, - 0x62,0x20,0x7e,0x20,0x3c,0x20,0x67,0x58,0x67,0x58,0x67,0x58,0x67,0x58,0x4e,0x58, - 0x4b,0x58,0x2b,0x2e,0x20,0x20,0x20,0x20,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58, - 0x59,0x58,0x59,0x58,0x3a,0x2e,0x5b,0x2e,0x74,0x20,0x35,0x58,0x34,0x58,0x26,0x58, - 0x44,0x20,0x46,0x20,0x3d,0x58,0x7c,0x20,0x55,0x20,0x4a,0x20,0x47,0x20,0x56,0x20, - 0x5a,0x20,0x41,0x20,0x43,0x20,0x2f,0x20,0x3c,0x20,0x66,0x58,0x67,0x58,0x67,0x58, - 0x67,0x58,0x4d,0x58,0x48,0x58,0x2b,0x2e,0x20,0x20,0x20,0x20,0x59,0x58,0x22,0x2c, - 0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x3a,0x2e,0x5b,0x2e,0x6c,0x2e,0x68,0x20, - 0x33,0x58,0x58,0x2e,0x2e,0x2e,0x57,0x20,0x54,0x20,0x50,0x20,0x4c,0x20,0x48,0x20, - 0x4b,0x20,0x49,0x20,0x5b,0x20,0x53,0x20,0x60,0x20,0x7b,0x20,0x3c,0x20,0x66,0x58, - 0x66,0x58,0x66,0x58,0x66,0x58,0x4d,0x58,0x4b,0x58,0x2b,0x2e,0x20,0x20,0x20,0x20, - 0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x3a,0x2e,0x5b,0x2e, - 0x47,0x2e,0x65,0x2e,0x31,0x20,0x2a,0x58,0x4f,0x2e,0x2e,0x2e,0x45,0x20,0x52,0x20, - 0x59,0x20,0x59,0x20,0x7c,0x20,0x2d,0x58,0x64,0x20,0x5a,0x2e,0x6b,0x20,0x36,0x58, - 0x3e,0x20,0x66,0x58,0x66,0x58,0x66,0x58,0x66,0x58,0x42,0x58,0x4a,0x58,0x2b,0x2e, - 0x20,0x20,0x20,0x20,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58, - 0x3a,0x2e,0x5b,0x2e,0x47,0x2e,0x7b,0x2e,0x60,0x2e,0x75,0x2e,0x31,0x20,0x46,0x20, - 0x26,0x58,0x2a,0x58,0x25,0x58,0x7a,0x20,0x6c,0x20,0x61,0x2e,0x75,0x58,0x66,0x58, - 0x70,0x2e,0x3e,0x20,0x70,0x2e,0x73,0x58,0x73,0x58,0x73,0x58,0x66,0x58,0x42,0x58, - 0x4a,0x58,0x2b,0x2e,0x20,0x20,0x20,0x20,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58, - 0x59,0x58,0x59,0x58,0x3a,0x2e,0x7b,0x2e,0x47,0x2e,0x7c,0x2e,0x2b,0x58,0x2b,0x58, - 0x20,0x58,0x4e,0x2e,0x71,0x2e,0x35,0x2e,0x37,0x2e,0x71,0x20,0x63,0x58,0x76,0x58, - 0x73,0x58,0x73,0x58,0x73,0x58,0x73,0x58,0x73,0x58,0x73,0x58,0x73,0x58,0x73,0x58, - 0x73,0x58,0x42,0x58,0x4b,0x58,0x2b,0x2e,0x20,0x20,0x20,0x20,0x59,0x58,0x22,0x2c, - 0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x3a,0x2e,0x7c,0x2e,0x47,0x2e,0x5d,0x2e, - 0x7c,0x2e,0x4c,0x2e,0x48,0x2e,0x47,0x2e,0x47,0x2e,0x47,0x2e,0x41,0x2e,0x31,0x2e, - 0x4a,0x58,0x76,0x58,0x73,0x58,0x73,0x58,0x73,0x58,0x73,0x58,0x73,0x58,0x73,0x58, - 0x73,0x58,0x66,0x58,0x64,0x58,0x43,0x58,0x50,0x58,0x2b,0x2e,0x20,0x20,0x20,0x20, - 0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x3a,0x2e,0x7b,0x2e, - 0x47,0x2e,0x47,0x2e,0x47,0x2e,0x47,0x2e,0x47,0x2e,0x78,0x2e,0x77,0x2e,0x3b,0x2e, - 0x74,0x20,0x3a,0x2e,0x48,0x58,0x64,0x58,0x73,0x58,0x73,0x58,0x73,0x58,0x73,0x58, - 0x73,0x58,0x64,0x58,0x76,0x58,0x42,0x58,0x5a,0x58,0x4c,0x58,0x74,0x58,0x3d,0x20, - 0x20,0x20,0x20,0x20,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58, - 0x3a,0x2e,0x7b,0x2e,0x47,0x2e,0x4a,0x2e,0x78,0x2e,0x39,0x2e,0x3b,0x2e,0x72,0x20, - 0x39,0x20,0x71,0x20,0x30,0x20,0x23,0x2e,0x4b,0x58,0x76,0x58,0x73,0x58,0x61,0x58, - 0x73,0x58,0x76,0x58,0x42,0x58,0x43,0x58,0x48,0x58,0x69,0x58,0x67,0x2e,0x2a,0x2e, - 0x3d,0x20,0x4f,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58, - 0x59,0x58,0x59,0x58,0x3a,0x2e,0x4c,0x2e,0x39,0x2e,0x2d,0x2e,0x79,0x20,0x39,0x20, - 0x71,0x20,0x30,0x20,0x3d,0x20,0x2b,0x20,0x20,0x20,0x23,0x2e,0x48,0x58,0x62,0x58, - 0x64,0x58,0x62,0x58,0x56,0x58,0x5a,0x58,0x63,0x58,0x38,0x58,0x2c,0x2e,0x33,0x20, - 0x24,0x20,0x2e,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x22,0x2c, - 0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x25,0x2e,0x7a,0x2e,0x39,0x20,0x71,0x20, - 0x37,0x20,0x2a,0x20,0x6f,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x24,0x2e, - 0x50,0x58,0x5a,0x58,0x6d,0x58,0x6d,0x58,0x30,0x58,0x73,0x2e,0x30,0x20,0x24,0x20, - 0x58,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x38,0x20,0x30,0x20, - 0x3d,0x20,0x6f,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0x3a,0x2e,0x49,0x58,0x70,0x58,0x67,0x2e,0x2a,0x2e,0x3d,0x20,0x4f,0x20, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x59,0x58, - 0x59,0x58,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0x59,0x58,0x59,0x58,0x40,0x2e,0x23,0x2e,0x32,0x20,0x40,0x20,0x2e,0x20, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x59,0x58, - 0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x22,0x2c,0xa,0x22,0x59,0x58, - 0x59,0x58,0x59,0x58,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58, - 0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x22,0x2c, - 0xa,0x22,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58, - 0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x59,0x58,0x59,0x58,0x59,0x58, - 0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58,0x59,0x58, - 0x59,0x58,0x22,0xa,0x7d,0x3b,0xa, - # /home/rdale/src/kde/branches/KDE/3.5/tdevelop/languages/ruby/app_templates/qtruby4makeapp/editcut.xpm - 0x0,0x0,0x16,0x47, - 0x2f, - 0x2a,0x20,0x58,0x50,0x4d,0x20,0x2a,0x2f,0xa,0x73,0x74,0x61,0x74,0x69,0x63,0x20, - 0x63,0x68,0x61,0x72,0x20,0x2a,0x65,0x64,0x69,0x74,0x63,0x75,0x74,0x5b,0x5d,0x20, - 0x3d,0x20,0x7b,0xa,0x2f,0x2a,0x20,0x63,0x6f,0x6c,0x75,0x6d,0x6e,0x73,0x20,0x72, - 0x6f,0x77,0x73,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x73,0x20,0x63,0x68,0x61,0x72,0x73, - 0x2d,0x70,0x65,0x72,0x2d,0x70,0x69,0x78,0x65,0x6c,0x20,0x2a,0x2f,0xa,0x22,0x33, - 0x32,0x20,0x33,0x32,0x20,0x32,0x31,0x34,0x20,0x32,0x22,0x2c,0xa,0x22,0x20,0x20, - 0x20,0x63,0x20,0x23,0x30,0x30,0x30,0x30,0x30,0x30,0x22,0x2c,0xa,0x22,0x2e,0x20, - 0x20,0x63,0x20,0x23,0x30,0x42,0x30,0x42,0x30,0x42,0x22,0x2c,0xa,0x22,0x58,0x20, - 0x20,0x63,0x20,0x23,0x31,0x38,0x31,0x33,0x30,0x30,0x22,0x2c,0xa,0x22,0x6f,0x20, - 0x20,0x63,0x20,0x23,0x31,0x44,0x31,0x39,0x30,0x42,0x22,0x2c,0xa,0x22,0x4f,0x20, - 0x20,0x63,0x20,0x23,0x31,0x33,0x31,0x33,0x31,0x33,0x22,0x2c,0xa,0x22,0x2b,0x20, - 0x20,0x63,0x20,0x23,0x31,0x42,0x31,0x42,0x31,0x42,0x22,0x2c,0xa,0x22,0x40,0x20, - 0x20,0x63,0x20,0x23,0x32,0x31,0x31,0x45,0x31,0x31,0x22,0x2c,0xa,0x22,0x23,0x20, - 0x20,0x63,0x20,0x23,0x32,0x36,0x32,0x33,0x31,0x41,0x22,0x2c,0xa,0x22,0x24,0x20, - 0x20,0x63,0x20,0x23,0x32,0x41,0x32,0x35,0x31,0x33,0x22,0x2c,0xa,0x22,0x25,0x20, - 0x20,0x63,0x20,0x23,0x32,0x45,0x32,0x39,0x31,0x32,0x22,0x2c,0xa,0x22,0x26,0x20, - 0x20,0x63,0x20,0x23,0x32,0x45,0x32,0x41,0x31,0x39,0x22,0x2c,0xa,0x22,0x2a,0x20, - 0x20,0x63,0x20,0x23,0x33,0x37,0x32,0x45,0x30,0x42,0x22,0x2c,0xa,0x22,0x3d,0x20, - 0x20,0x63,0x20,0x23,0x33,0x30,0x32,0x41,0x31,0x32,0x22,0x2c,0xa,0x22,0x2d,0x20, - 0x20,0x63,0x20,0x23,0x33,0x31,0x32,0x43,0x31,0x42,0x22,0x2c,0xa,0x22,0x3b,0x20, - 0x20,0x63,0x20,0x23,0x33,0x41,0x33,0x32,0x30,0x46,0x22,0x2c,0xa,0x22,0x3a,0x20, - 0x20,0x63,0x20,0x23,0x33,0x43,0x33,0x34,0x31,0x35,0x22,0x2c,0xa,0x22,0x3e,0x20, - 0x20,0x63,0x20,0x23,0x33,0x43,0x33,0x35,0x31,0x42,0x22,0x2c,0xa,0x22,0x2c,0x20, - 0x20,0x63,0x20,0x23,0x32,0x33,0x32,0x33,0x32,0x33,0x22,0x2c,0xa,0x22,0x3c,0x20, - 0x20,0x63,0x20,0x23,0x32,0x42,0x32,0x39,0x32,0x32,0x22,0x2c,0xa,0x22,0x31,0x20, - 0x20,0x63,0x20,0x23,0x32,0x43,0x32,0x43,0x32,0x43,0x22,0x2c,0xa,0x22,0x32,0x20, - 0x20,0x63,0x20,0x23,0x33,0x30,0x32,0x45,0x32,0x36,0x22,0x2c,0xa,0x22,0x33,0x20, - 0x20,0x63,0x20,0x23,0x33,0x35,0x33,0x31,0x32,0x30,0x22,0x2c,0xa,0x22,0x34,0x20, - 0x20,0x63,0x20,0x23,0x33,0x46,0x33,0x42,0x32,0x44,0x22,0x2c,0xa,0x22,0x35,0x20, - 0x20,0x63,0x20,0x23,0x33,0x31,0x33,0x31,0x33,0x31,0x22,0x2c,0xa,0x22,0x36,0x20, - 0x20,0x63,0x20,0x23,0x33,0x41,0x33,0x41,0x33,0x41,0x22,0x2c,0xa,0x22,0x37,0x20, - 0x20,0x63,0x20,0x23,0x34,0x32,0x33,0x38,0x31,0x34,0x22,0x2c,0xa,0x22,0x38,0x20, - 0x20,0x63,0x20,0x23,0x34,0x39,0x33,0x45,0x31,0x37,0x22,0x2c,0xa,0x22,0x39,0x20, - 0x20,0x63,0x20,0x23,0x34,0x31,0x33,0x44,0x32,0x46,0x22,0x2c,0xa,0x22,0x30,0x20, - 0x20,0x63,0x20,0x23,0x34,0x32,0x33,0x46,0x33,0x32,0x22,0x2c,0xa,0x22,0x71,0x20, - 0x20,0x63,0x20,0x23,0x34,0x46,0x34,0x33,0x31,0x39,0x22,0x2c,0xa,0x22,0x77,0x20, - 0x20,0x63,0x20,0x23,0x35,0x43,0x34,0x41,0x30,0x30,0x22,0x2c,0xa,0x22,0x65,0x20, - 0x20,0x63,0x20,0x23,0x35,0x46,0x34,0x46,0x30,0x44,0x22,0x2c,0xa,0x22,0x72,0x20, - 0x20,0x63,0x20,0x23,0x35,0x31,0x34,0x34,0x31,0x30,0x22,0x2c,0xa,0x22,0x74,0x20, - 0x20,0x63,0x20,0x23,0x35,0x35,0x34,0x38,0x31,0x33,0x22,0x2c,0xa,0x22,0x79,0x20, - 0x20,0x63,0x20,0x23,0x34,0x45,0x34,0x37,0x32,0x43,0x22,0x2c,0xa,0x22,0x75,0x20, - 0x20,0x63,0x20,0x23,0x34,0x34,0x34,0x31,0x33,0x36,0x22,0x2c,0xa,0x22,0x69,0x20, - 0x20,0x63,0x20,0x23,0x34,0x41,0x34,0x38,0x33,0x46,0x22,0x2c,0xa,0x22,0x70,0x20, - 0x20,0x63,0x20,0x23,0x35,0x33,0x34,0x42,0x32,0x42,0x22,0x2c,0xa,0x22,0x61,0x20, - 0x20,0x63,0x20,0x23,0x35,0x30,0x34,0x42,0x33,0x37,0x22,0x2c,0xa,0x22,0x73,0x20, - 0x20,0x63,0x20,0x23,0x35,0x31,0x34,0x43,0x33,0x41,0x22,0x2c,0xa,0x22,0x64,0x20, - 0x20,0x63,0x20,0x23,0x36,0x35,0x34,0x46,0x30,0x34,0x22,0x2c,0xa,0x22,0x66,0x20, - 0x20,0x63,0x20,0x23,0x36,0x30,0x34,0x46,0x30,0x42,0x22,0x2c,0xa,0x22,0x67,0x20, - 0x20,0x63,0x20,0x23,0x36,0x36,0x35,0x32,0x30,0x30,0x22,0x2c,0xa,0x22,0x68,0x20, - 0x20,0x63,0x20,0x23,0x36,0x37,0x35,0x35,0x30,0x39,0x22,0x2c,0xa,0x22,0x6a,0x20, - 0x20,0x63,0x20,0x23,0x36,0x42,0x35,0x34,0x30,0x35,0x22,0x2c,0xa,0x22,0x6b,0x20, - 0x20,0x63,0x20,0x23,0x36,0x43,0x35,0x38,0x30,0x37,0x22,0x2c,0xa,0x22,0x6c,0x20, - 0x20,0x63,0x20,0x23,0x36,0x43,0x35,0x39,0x30,0x42,0x22,0x2c,0xa,0x22,0x7a,0x20, - 0x20,0x63,0x20,0x23,0x37,0x34,0x35,0x42,0x30,0x34,0x22,0x2c,0xa,0x22,0x78,0x20, - 0x20,0x63,0x20,0x23,0x37,0x31,0x35,0x44,0x30,0x41,0x22,0x2c,0xa,0x22,0x63,0x20, - 0x20,0x63,0x20,0x23,0x37,0x42,0x35,0x42,0x30,0x32,0x22,0x2c,0xa,0x22,0x76,0x20, - 0x20,0x63,0x20,0x23,0x36,0x32,0x35,0x42,0x33,0x42,0x22,0x2c,0xa,0x22,0x62,0x20, - 0x20,0x63,0x20,0x23,0x37,0x45,0x36,0x38,0x31,0x35,0x22,0x2c,0xa,0x22,0x6e,0x20, - 0x20,0x63,0x20,0x23,0x36,0x43,0x36,0x34,0x33,0x45,0x22,0x2c,0xa,0x22,0x6d,0x20, - 0x20,0x63,0x20,0x23,0x34,0x44,0x34,0x42,0x34,0x32,0x22,0x2c,0xa,0x22,0x4d,0x20, - 0x20,0x63,0x20,0x23,0x34,0x39,0x34,0x39,0x34,0x39,0x22,0x2c,0xa,0x22,0x4e,0x20, - 0x20,0x63,0x20,0x23,0x35,0x30,0x34,0x44,0x34,0x33,0x22,0x2c,0xa,0x22,0x42,0x20, - 0x20,0x63,0x20,0x23,0x35,0x34,0x35,0x33,0x34,0x43,0x22,0x2c,0xa,0x22,0x56,0x20, - 0x20,0x63,0x20,0x23,0x35,0x31,0x35,0x31,0x35,0x31,0x22,0x2c,0xa,0x22,0x43,0x20, - 0x20,0x63,0x20,0x23,0x35,0x44,0x35,0x42,0x35,0x34,0x22,0x2c,0xa,0x22,0x5a,0x20, - 0x20,0x63,0x20,0x23,0x36,0x35,0x36,0x30,0x34,0x38,0x22,0x2c,0xa,0x22,0x41,0x20, - 0x20,0x63,0x20,0x23,0x37,0x33,0x36,0x41,0x34,0x34,0x22,0x2c,0xa,0x22,0x53,0x20, - 0x20,0x63,0x20,0x23,0x37,0x32,0x36,0x43,0x35,0x34,0x22,0x2c,0xa,0x22,0x44,0x20, - 0x20,0x63,0x20,0x23,0x37,0x37,0x37,0x32,0x35,0x42,0x22,0x2c,0xa,0x22,0x46,0x20, - 0x20,0x63,0x20,0x23,0x36,0x39,0x36,0x39,0x36,0x38,0x22,0x2c,0xa,0x22,0x47,0x20, - 0x20,0x63,0x20,0x67,0x72,0x61,0x79,0x35,0x30,0x22,0x2c,0xa,0x22,0x48,0x20,0x20, - 0x63,0x20,0x23,0x38,0x32,0x36,0x32,0x30,0x33,0x22,0x2c,0xa,0x22,0x4a,0x20,0x20, - 0x63,0x20,0x23,0x38,0x30,0x36,0x36,0x30,0x39,0x22,0x2c,0xa,0x22,0x4b,0x20,0x20, - 0x63,0x20,0x23,0x38,0x33,0x36,0x39,0x30,0x37,0x22,0x2c,0xa,0x22,0x4c,0x20,0x20, - 0x63,0x20,0x23,0x38,0x44,0x36,0x41,0x30,0x33,0x22,0x2c,0xa,0x22,0x50,0x20,0x20, - 0x63,0x20,0x23,0x39,0x41,0x36,0x46,0x30,0x30,0x22,0x2c,0xa,0x22,0x49,0x20,0x20, - 0x63,0x20,0x23,0x39,0x42,0x37,0x30,0x30,0x35,0x22,0x2c,0xa,0x22,0x55,0x20,0x20, - 0x63,0x20,0x23,0x39,0x45,0x37,0x33,0x30,0x45,0x22,0x2c,0xa,0x22,0x59,0x20,0x20, - 0x63,0x20,0x23,0x39,0x43,0x37,0x35,0x31,0x31,0x22,0x2c,0xa,0x22,0x54,0x20,0x20, - 0x63,0x20,0x23,0x38,0x35,0x37,0x33,0x32,0x43,0x22,0x2c,0xa,0x22,0x52,0x20,0x20, - 0x63,0x20,0x23,0x38,0x38,0x37,0x38,0x33,0x42,0x22,0x2c,0xa,0x22,0x45,0x20,0x20, - 0x63,0x20,0x23,0x41,0x45,0x37,0x43,0x30,0x30,0x22,0x2c,0xa,0x22,0x57,0x20,0x20, - 0x63,0x20,0x23,0x41,0x38,0x37,0x42,0x31,0x33,0x22,0x2c,0xa,0x22,0x51,0x20,0x20, - 0x63,0x20,0x23,0x38,0x34,0x37,0x42,0x35,0x33,0x22,0x2c,0xa,0x22,0x21,0x20,0x20, - 0x63,0x20,0x23,0x38,0x32,0x37,0x44,0x36,0x34,0x22,0x2c,0xa,0x22,0x7e,0x20,0x20, - 0x63,0x20,0x23,0x39,0x43,0x38,0x36,0x32,0x45,0x22,0x2c,0xa,0x22,0x5e,0x20,0x20, - 0x63,0x20,0x23,0x41,0x39,0x38,0x41,0x31,0x46,0x22,0x2c,0xa,0x22,0x2f,0x20,0x20, - 0x63,0x20,0x23,0x42,0x32,0x38,0x44,0x30,0x41,0x22,0x2c,0xa,0x22,0x28,0x20,0x20, - 0x63,0x20,0x23,0x42,0x38,0x38,0x44,0x30,0x30,0x22,0x2c,0xa,0x22,0x29,0x20,0x20, - 0x63,0x20,0x23,0x42,0x32,0x38,0x32,0x31,0x41,0x22,0x2c,0xa,0x22,0x5f,0x20,0x20, - 0x63,0x20,0x23,0x42,0x31,0x38,0x45,0x31,0x42,0x22,0x2c,0xa,0x22,0x60,0x20,0x20, - 0x63,0x20,0x23,0x42,0x33,0x39,0x34,0x31,0x43,0x22,0x2c,0xa,0x22,0x27,0x20,0x20, - 0x63,0x20,0x23,0x41,0x38,0x38,0x45,0x32,0x43,0x22,0x2c,0xa,0x22,0x5d,0x20,0x20, - 0x63,0x20,0x23,0x41,0x32,0x38,0x43,0x33,0x36,0x22,0x2c,0xa,0x22,0x5b,0x20,0x20, - 0x63,0x20,0x23,0x41,0x45,0x39,0x32,0x32,0x34,0x22,0x2c,0xa,0x22,0x7b,0x20,0x20, - 0x63,0x20,0x23,0x38,0x39,0x38,0x31,0x35,0x45,0x22,0x2c,0xa,0x22,0x7d,0x20,0x20, - 0x63,0x20,0x23,0x38,0x37,0x38,0x32,0x36,0x44,0x22,0x2c,0xa,0x22,0x7c,0x20,0x20, - 0x63,0x20,0x23,0x38,0x35,0x38,0x31,0x37,0x34,0x22,0x2c,0xa,0x22,0x20,0x2e,0x20, - 0x63,0x20,0x23,0x38,0x38,0x38,0x33,0x37,0x30,0x22,0x2c,0xa,0x22,0x2e,0x2e,0x20, - 0x63,0x20,0x23,0x38,0x45,0x38,0x41,0x37,0x44,0x22,0x2c,0xa,0x22,0x58,0x2e,0x20, - 0x63,0x20,0x23,0x39,0x32,0x38,0x43,0x37,0x31,0x22,0x2c,0xa,0x22,0x6f,0x2e,0x20, - 0x63,0x20,0x23,0x41,0x32,0x38,0x45,0x34,0x34,0x22,0x2c,0xa,0x22,0x4f,0x2e,0x20, - 0x63,0x20,0x23,0x41,0x41,0x39,0x46,0x37,0x34,0x22,0x2c,0xa,0x22,0x2b,0x2e,0x20, - 0x63,0x20,0x23,0x42,0x39,0x41,0x34,0x35,0x36,0x22,0x2c,0xa,0x22,0x40,0x2e,0x20, - 0x63,0x20,0x23,0x42,0x44,0x41,0x38,0x35,0x42,0x22,0x2c,0xa,0x22,0x23,0x2e,0x20, - 0x63,0x20,0x23,0x42,0x32,0x41,0x30,0x36,0x38,0x22,0x2c,0xa,0x22,0x24,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x32,0x38,0x37,0x30,0x30,0x22,0x2c,0xa,0x22,0x25,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x43,0x38,0x45,0x30,0x30,0x22,0x2c,0xa,0x22,0x26,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x32,0x39,0x41,0x30,0x30,0x22,0x2c,0xa,0x22,0x2a,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x34,0x39,0x36,0x32,0x46,0x22,0x2c,0xa,0x22,0x3d,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x43,0x41,0x31,0x30,0x30,0x22,0x2c,0xa,0x22,0x2d,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x36,0x41,0x38,0x30,0x30,0x22,0x2c,0xa,0x22,0x3b,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x31,0x41,0x43,0x31,0x42,0x22,0x2c,0xa,0x22,0x3a,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x44,0x42,0x33,0x31,0x41,0x22,0x2c,0xa,0x22,0x3e,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x32,0x41,0x39,0x32,0x32,0x22,0x2c,0xa,0x22,0x2c,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x34,0x41,0x45,0x32,0x42,0x22,0x2c,0xa,0x22,0x3c,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x42,0x41,0x31,0x32,0x45,0x22,0x2c,0xa,0x22,0x31,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x42,0x41,0x34,0x33,0x33,0x22,0x2c,0xa,0x22,0x32,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x44,0x42,0x34,0x32,0x38,0x22,0x2c,0xa,0x22,0x33,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x32,0x42,0x32,0x33,0x42,0x22,0x2c,0xa,0x22,0x34,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x36,0x41,0x32,0x30,0x30,0x22,0x2c,0xa,0x22,0x35,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x38,0x41,0x35,0x30,0x39,0x22,0x2c,0xa,0x22,0x36,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x41,0x41,0x46,0x30,0x30,0x22,0x2c,0xa,0x22,0x37,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x46,0x41,0x43,0x31,0x45,0x22,0x2c,0xa,0x22,0x38,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x35,0x41,0x31,0x30,0x30,0x22,0x2c,0xa,0x22,0x39,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x41,0x44,0x30,0x32,0x22,0x2c,0xa,0x22,0x30,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x43,0x41,0x46,0x30,0x44,0x22,0x2c,0xa,0x22,0x71,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x43,0x42,0x30,0x30,0x35,0x22,0x2c,0xa,0x22,0x77,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x42,0x36,0x30,0x43,0x22,0x2c,0xa,0x22,0x65,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x42,0x44,0x30,0x30,0x22,0x2c,0xa,0x22,0x72,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x42,0x44,0x31,0x36,0x22,0x2c,0xa,0x22,0x74,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x33,0x42,0x34,0x33,0x32,0x22,0x2c,0xa,0x22,0x79,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x38,0x42,0x46,0x33,0x43,0x22,0x2c,0xa,0x22,0x75,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x36,0x42,0x45,0x32,0x46,0x22,0x2c,0xa,0x22,0x69,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x36,0x41,0x39,0x34,0x39,0x22,0x2c,0xa,0x22,0x70,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x39,0x41,0x39,0x34,0x38,0x22,0x2c,0xa,0x22,0x61,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x38,0x41,0x42,0x35,0x32,0x22,0x2c,0xa,0x22,0x73,0x2e,0x20, - 0x63,0x20,0x23,0x44,0x42,0x42,0x41,0x34,0x35,0x22,0x2c,0xa,0x22,0x64,0x2e,0x20, - 0x63,0x20,0x23,0x43,0x35,0x42,0x31,0x36,0x32,0x22,0x2c,0xa,0x22,0x66,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x43,0x42,0x37,0x34,0x44,0x22,0x2c,0xa,0x22,0x67,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x46,0x42,0x38,0x34,0x31,0x22,0x2c,0xa,0x22,0x68,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x46,0x42,0x45,0x34,0x41,0x22,0x2c,0xa,0x22,0x6a,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x41,0x42,0x41,0x35,0x35,0x22,0x2c,0xa,0x22,0x6b,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x44,0x43,0x30,0x30,0x36,0x22,0x2c,0xa,0x22,0x6c,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x43,0x31,0x30,0x42,0x22,0x2c,0xa,0x22,0x7a,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x43,0x38,0x30,0x30,0x22,0x2c,0xa,0x22,0x78,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x43,0x39,0x30,0x44,0x22,0x2c,0xa,0x22,0x63,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x41,0x43,0x31,0x31,0x33,0x22,0x2c,0xa,0x22,0x76,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x42,0x43,0x31,0x31,0x43,0x22,0x2c,0xa,0x22,0x62,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x44,0x43,0x39,0x31,0x30,0x22,0x2c,0xa,0x22,0x6e,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x44,0x43,0x32,0x33,0x33,0x22,0x2c,0xa,0x22,0x6d,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x35,0x43,0x33,0x32,0x44,0x22,0x2c,0xa,0x22,0x4d,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x43,0x37,0x32,0x38,0x22,0x2c,0xa,0x22,0x4e,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x34,0x43,0x35,0x33,0x37,0x22,0x2c,0xa,0x22,0x42,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x36,0x43,0x36,0x33,0x41,0x22,0x2c,0xa,0x22,0x56,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x35,0x43,0x42,0x33,0x36,0x22,0x2c,0xa,0x22,0x43,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x44,0x37,0x33,0x44,0x22,0x2c,0xa,0x22,0x5a,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x39,0x43,0x36,0x35,0x39,0x22,0x2c,0xa,0x22,0x41,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x41,0x43,0x38,0x35,0x41,0x22,0x2c,0xa,0x22,0x53,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x44,0x41,0x34,0x42,0x22,0x2c,0xa,0x22,0x44,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x44,0x44,0x35,0x44,0x22,0x2c,0xa,0x22,0x46,0x2e,0x20, - 0x63,0x20,0x23,0x45,0x39,0x43,0x44,0x36,0x42,0x22,0x2c,0xa,0x22,0x47,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x44,0x35,0x36,0x30,0x22,0x2c,0xa,0x22,0x48,0x2e,0x20, - 0x63,0x20,0x23,0x46,0x46,0x45,0x30,0x36,0x43,0x22,0x2c,0xa,0x22,0x4a,0x2e,0x20, - 0x63,0x20,0x67,0x72,0x61,0x79,0x35,0x36,0x22,0x2c,0xa,0x22,0x4b,0x2e,0x20,0x63, - 0x20,0x23,0x39,0x35,0x39,0x35,0x39,0x35,0x22,0x2c,0xa,0x22,0x4c,0x2e,0x20,0x63, - 0x20,0x67,0x72,0x61,0x79,0x36,0x32,0x22,0x2c,0xa,0x22,0x50,0x2e,0x20,0x63,0x20, - 0x23,0x41,0x36,0x41,0x31,0x38,0x41,0x22,0x2c,0xa,0x22,0x49,0x2e,0x20,0x63,0x20, - 0x23,0x41,0x38,0x41,0x36,0x39,0x45,0x22,0x2c,0xa,0x22,0x55,0x2e,0x20,0x63,0x20, - 0x23,0x41,0x45,0x41,0x38,0x39,0x35,0x22,0x2c,0xa,0x22,0x59,0x2e,0x20,0x63,0x20, - 0x23,0x42,0x33,0x41,0x43,0x38,0x46,0x22,0x2c,0xa,0x22,0x54,0x2e,0x20,0x63,0x20, - 0x23,0x42,0x38,0x41,0x46,0x38,0x42,0x22,0x2c,0xa,0x22,0x52,0x2e,0x20,0x63,0x20, - 0x23,0x42,0x34,0x41,0x44,0x39,0x36,0x22,0x2c,0xa,0x22,0x45,0x2e,0x20,0x63,0x20, - 0x23,0x42,0x38,0x42,0x31,0x39,0x39,0x22,0x2c,0xa,0x22,0x57,0x2e,0x20,0x63,0x20, - 0x23,0x41,0x34,0x41,0x34,0x41,0x34,0x22,0x2c,0xa,0x22,0x51,0x2e,0x20,0x63,0x20, - 0x23,0x41,0x41,0x41,0x41,0x41,0x41,0x22,0x2c,0xa,0x22,0x21,0x2e,0x20,0x63,0x20, - 0x23,0x42,0x30,0x41,0x44,0x41,0x33,0x22,0x2c,0xa,0x22,0x7e,0x2e,0x20,0x63,0x20, - 0x23,0x42,0x42,0x42,0x36,0x41,0x33,0x22,0x2c,0xa,0x22,0x5e,0x2e,0x20,0x63,0x20, - 0x23,0x42,0x31,0x42,0x31,0x42,0x31,0x22,0x2c,0xa,0x22,0x2f,0x2e,0x20,0x63,0x20, - 0x23,0x42,0x39,0x42,0x39,0x42,0x36,0x22,0x2c,0xa,0x22,0x28,0x2e,0x20,0x63,0x20, - 0x23,0x42,0x42,0x42,0x42,0x42,0x41,0x22,0x2c,0xa,0x22,0x29,0x2e,0x20,0x63,0x20, - 0x23,0x43,0x35,0x42,0x43,0x39,0x44,0x22,0x2c,0xa,0x22,0x5f,0x2e,0x20,0x63,0x20, - 0x23,0x43,0x32,0x42,0x43,0x41,0x32,0x22,0x2c,0xa,0x22,0x60,0x2e,0x20,0x63,0x20, - 0x23,0x43,0x31,0x42,0x45,0x42,0x35,0x22,0x2c,0xa,0x22,0x27,0x2e,0x20,0x63,0x20, - 0x23,0x44,0x32,0x43,0x33,0x38,0x45,0x22,0x2c,0xa,0x22,0x5d,0x2e,0x20,0x63,0x20, - 0x23,0x44,0x43,0x43,0x37,0x38,0x43,0x22,0x2c,0xa,0x22,0x5b,0x2e,0x20,0x63,0x20, - 0x23,0x43,0x37,0x43,0x30,0x41,0x37,0x22,0x2c,0xa,0x22,0x7b,0x2e,0x20,0x63,0x20, - 0x23,0x43,0x37,0x43,0x32,0x41,0x45,0x22,0x2c,0xa,0x22,0x7d,0x2e,0x20,0x63,0x20, - 0x23,0x43,0x37,0x43,0x33,0x42,0x32,0x22,0x2c,0xa,0x22,0x7c,0x2e,0x20,0x63,0x20, - 0x23,0x43,0x35,0x43,0x32,0x42,0x38,0x22,0x2c,0xa,0x22,0x20,0x58,0x20,0x63,0x20, - 0x23,0x43,0x41,0x43,0x36,0x42,0x36,0x22,0x2c,0xa,0x22,0x2e,0x58,0x20,0x63,0x20, - 0x23,0x43,0x42,0x43,0x39,0x42,0x45,0x22,0x2c,0xa,0x22,0x58,0x58,0x20,0x63,0x20, - 0x23,0x44,0x39,0x44,0x33,0x42,0x42,0x22,0x2c,0xa,0x22,0x6f,0x58,0x20,0x63,0x20, - 0x23,0x45,0x36,0x44,0x30,0x38,0x41,0x22,0x2c,0xa,0x22,0x4f,0x58,0x20,0x63,0x20, - 0x23,0x45,0x37,0x44,0x45,0x42,0x44,0x22,0x2c,0xa,0x22,0x2b,0x58,0x20,0x63,0x20, - 0x23,0x45,0x43,0x44,0x45,0x42,0x33,0x22,0x2c,0xa,0x22,0x40,0x58,0x20,0x63,0x20, - 0x23,0x46,0x46,0x46,0x30,0x42,0x39,0x22,0x2c,0xa,0x22,0x23,0x58,0x20,0x63,0x20, - 0x23,0x43,0x35,0x43,0x35,0x43,0x35,0x22,0x2c,0xa,0x22,0x24,0x58,0x20,0x63,0x20, - 0x23,0x43,0x45,0x43,0x43,0x43,0x37,0x22,0x2c,0xa,0x22,0x25,0x58,0x20,0x63,0x20, - 0x23,0x44,0x30,0x43,0x45,0x43,0x35,0x22,0x2c,0xa,0x22,0x26,0x58,0x20,0x63,0x20, - 0x23,0x44,0x30,0x43,0x46,0x43,0x38,0x22,0x2c,0xa,0x22,0x2a,0x58,0x20,0x63,0x20, - 0x23,0x44,0x32,0x44,0x31,0x43,0x42,0x22,0x2c,0xa,0x22,0x3d,0x58,0x20,0x63,0x20, - 0x23,0x44,0x42,0x44,0x36,0x43,0x35,0x22,0x2c,0xa,0x22,0x2d,0x58,0x20,0x63,0x20, - 0x23,0x44,0x42,0x44,0x37,0x43,0x39,0x22,0x2c,0xa,0x22,0x3b,0x58,0x20,0x63,0x20, - 0x23,0x44,0x33,0x44,0x33,0x44,0x31,0x22,0x2c,0xa,0x22,0x3a,0x58,0x20,0x63,0x20, - 0x23,0x44,0x42,0x44,0x42,0x44,0x42,0x22,0x2c,0xa,0x22,0x3e,0x58,0x20,0x63,0x20, - 0x23,0x45,0x35,0x45,0x31,0x44,0x36,0x22,0x2c,0xa,0x22,0x2c,0x58,0x20,0x63,0x20, - 0x23,0x45,0x35,0x45,0x33,0x44,0x41,0x22,0x2c,0xa,0x22,0x3c,0x58,0x20,0x63,0x20, - 0x23,0x45,0x38,0x45,0x35,0x44,0x39,0x22,0x2c,0xa,0x22,0x31,0x58,0x20,0x63,0x20, - 0x23,0x45,0x44,0x45,0x41,0x44,0x43,0x22,0x2c,0xa,0x22,0x32,0x58,0x20,0x63,0x20, - 0x23,0x46,0x45,0x46,0x36,0x44,0x45,0x22,0x2c,0xa,0x22,0x33,0x58,0x20,0x63,0x20, - 0x23,0x45,0x36,0x45,0x36,0x45,0x36,0x22,0x2c,0xa,0x22,0x34,0x58,0x20,0x63,0x20, - 0x23,0x45,0x39,0x45,0x37,0x45,0x32,0x22,0x2c,0xa,0x22,0x35,0x58,0x20,0x63,0x20, - 0x23,0x45,0x39,0x45,0x38,0x45,0x34,0x22,0x2c,0xa,0x22,0x36,0x58,0x20,0x63,0x20, - 0x23,0x45,0x44,0x45,0x43,0x45,0x41,0x22,0x2c,0xa,0x22,0x37,0x58,0x20,0x63,0x20, - 0x23,0x46,0x32,0x46,0x31,0x45,0x42,0x22,0x2c,0xa,0x22,0x38,0x58,0x20,0x63,0x20, - 0x23,0x46,0x31,0x46,0x31,0x46,0x31,0x22,0x2c,0xa,0x22,0x39,0x58,0x20,0x63,0x20, - 0x23,0x46,0x38,0x46,0x37,0x46,0x34,0x22,0x2c,0xa,0x22,0x30,0x58,0x20,0x63,0x20, - 0x23,0x46,0x39,0x46,0x38,0x46,0x38,0x22,0x2c,0xa,0x22,0x71,0x58,0x20,0x63,0x20, - 0x4e,0x6f,0x6e,0x65,0x22,0x2c,0xa,0x2f,0x2a,0x20,0x70,0x69,0x78,0x65,0x6c,0x73, - 0x20,0x2a,0x2f,0xa,0x22,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x22,0x2c,0xa,0x22,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x35,0x20,0x35,0x20,0x35, - 0x20,0x31,0x20,0x2c,0x20,0x20,0x20,0x20,0x20,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x22,0x2c,0xa,0x22,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x35,0x20,0x56, - 0x20,0x2f,0x2e,0x26,0x58,0x51,0x2e,0x46,0x20,0x31,0x20,0x2c,0x20,0x20,0x20,0x20, - 0x20,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x22,0x2c,0xa, - 0x22,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x35,0x20,0x5f,0x2e,0x44,0x2e,0x53,0x2e,0x48,0x2e,0x40,0x58,0x26,0x58,0x36, - 0x20,0x2e,0x20,0x20,0x20,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x22,0x2c,0xa,0x22,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x35,0x20,0x53,0x2e,0x3d,0x2e,0x77,0x20,0x67,0x20,0x26, - 0x2e,0x43,0x2e,0x2e,0x2e,0x2b,0x20,0x20,0x20,0x20,0x20,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x22,0x2c,0xa,0x22,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x35,0x20,0x2d,0x2e,0x27,0x20,0x2b, - 0x20,0x6f,0x20,0x74,0x20,0x7a,0x2e,0x64,0x2e,0x2c,0x20,0x20,0x20,0x20,0x20,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x22,0x2c,0xa,0x22,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x35,0x20,0x43,0x20,0x56, - 0x2e,0x40,0x2e,0x2b,0x20,0x20,0x20,0x33,0x20,0x3a,0x2e,0x33,0x2e,0x2c,0x20,0x20, - 0x20,0x20,0x20,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x22,0x2c,0xa, - 0x22,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x35, - 0x20,0x27,0x2e,0x62,0x2e,0x46,0x2e,0x36,0x20,0x2c,0x20,0x31,0x20,0x73,0x2e,0x2c, - 0x2e,0x2c,0x20,0x20,0x20,0x20,0x20,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x22,0x2c,0xa,0x22,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x31,0x20,0x62,0x20,0x28,0x20,0x6e,0x2e,0x4f,0x58,0x45,0x2e,0x45, - 0x2e,0x46,0x2e,0x5e,0x20,0x2b,0x20,0x20,0x20,0x20,0x20,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x35,0x20,0x35,0x20,0x31, - 0x20,0x2c,0x20,0x20,0x20,0x22,0x2c,0xa,0x22,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x20,0x20,0x6c,0x20,0x78,0x20,0x4b,0x20,0x41, - 0x2e,0x6f,0x58,0x6f,0x58,0x5a,0x2e,0x69,0x2e,0x2c,0x20,0x20,0x20,0x20,0x20,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x35,0x20,0x56,0x20,0x26, - 0x58,0x30,0x58,0x36,0x58,0x2c,0x20,0x20,0x20,0x22,0x2c,0xa,0x22,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x20,0x20,0x20,0x20,0x20, - 0x20,0x38,0x20,0x28,0x20,0x63,0x2e,0x76,0x2e,0x6b,0x2e,0x4e,0x2e,0x31,0x20,0x20, - 0x20,0x20,0x20,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x35,0x20,0x56,0x20,0x24, - 0x58,0x30,0x58,0x30,0x58,0x39,0x58,0x58,0x58,0x2c,0x20,0x20,0x20,0x22,0x2c,0xa, - 0x22,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x20,0x20,0x20,0x20,0x4f,0x20,0x74,0x20,0x36,0x2e,0x65,0x2e,0x65,0x2e,0x6b, - 0x2e,0x53,0x20,0x4f,0x20,0x20,0x20,0x20,0x20,0x35,0x20,0x35,0x20,0x56,0x20,0x24, - 0x58,0x38,0x58,0x38,0x58,0x38,0x58,0x31,0x58,0x44,0x20,0x3a,0x20,0x4f,0x20,0x20, - 0x20,0x22,0x2c,0xa,0x22,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x20,0x20,0x33,0x20,0x4a,0x20,0x65, - 0x2e,0x47,0x2e,0x37,0x58,0x23,0x2e,0x2b,0x20,0x2e,0x20,0x35,0x20,0x43,0x20,0x7c, - 0x2e,0x33,0x58,0x33,0x58,0x35,0x58,0x34,0x58,0x5f,0x2e,0x34,0x20,0x25,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0x22,0x2c,0xa,0x22,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x20,0x20,0x20, - 0x20,0x71,0x20,0x5d,0x2e,0x30,0x58,0x30,0x58,0x2b,0x58,0x2c,0x20,0x42,0x20,0x7d, - 0x2e,0x3a,0x58,0x3a,0x58,0x3a,0x58,0x3a,0x58,0x3d,0x58,0x53,0x20,0x26,0x20,0x6f, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x22,0x2c,0xa,0x22,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x20,0x20,0x2b,0x20,0x4d,0x20,0x38,0x58,0x38,0x58,0x37,0x58,0x55, - 0x2e,0x51,0x2e,0x23,0x58,0x2a,0x58,0x2a,0x58,0x2a,0x58,0x52,0x2e,0x3c,0x20,0x25, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x71,0x58,0x22,0x2c,0xa, - 0x22,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x2c,0x20,0x31,0x20,0x20,0x58,0x36, - 0x58,0x57,0x2e,0x47,0x20,0x51,0x2e,0x4c,0x2e,0x5e,0x2e,0x7b,0x2e,0x5a,0x20,0x40, - 0x20,0x2e,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x71,0x58,0x71, - 0x58,0x22,0x2c,0xa,0x22,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x35,0x20,0x35,0x20,0x6d,0x20,0x50, - 0x2e,0x57,0x2e,0x3a,0x58,0x36,0x20,0x2e,0x20,0x33,0x58,0x2f,0x2e,0x58,0x2e,0x2c, - 0x20,0x40,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x22,0x2c,0xa,0x22,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x35,0x20,0x35,0x20,0x35,0x20,0x6e,0x20,0x2b, - 0x2e,0x52,0x2e,0x57,0x2e,0x4a,0x2e,0x4b,0x2e,0x57,0x2e,0x5e,0x2e,0x3a,0x58,0x3a, - 0x58,0x31,0x58,0x6d,0x20,0x2b,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x22,0x2c,0xa,0x22,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x35,0x20,0x35,0x20,0x69,0x20,0x6f,0x2e,0x79, - 0x2e,0x76,0x2e,0x71,0x2e,0x2f,0x20,0x50,0x2e,0x49,0x2e,0x7d,0x20,0x7c,0x20,0x52, - 0x2e,0x26,0x58,0x2a,0x58,0x3b,0x58,0x38,0x58,0x20,0x2e,0x2c,0x20,0x20,0x20,0x20, - 0x20,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x22,0x2c,0xa, - 0x22,0x71,0x58,0x71,0x58,0x35,0x20,0x35,0x20,0x35,0x20,0x52,0x20,0x33,0x2e,0x4d, - 0x2e,0x35,0x2e,0x45,0x20,0x4c,0x20,0x37,0x2e,0x34,0x2e,0x5f,0x20,0x30,0x20,0x2b, - 0x20,0x4f,0x20,0x2b,0x20,0x69,0x20,0x29,0x2e,0x23,0x58,0x23,0x58,0x35,0x58,0x7e, - 0x2e,0x2c,0x20,0x4f,0x20,0x20,0x20,0x20,0x20,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x22,0x2c,0xa,0x22,0x71,0x58,0x35,0x20,0x75,0x20,0x5d,0x20,0x6d,0x2e,0x72, - 0x2e,0x25,0x2e,0x48,0x20,0x72,0x20,0x3a,0x20,0x2c,0x20,0x74,0x2e,0x30,0x2e,0x50, - 0x20,0x37,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x24,0x20,0x2c,0x20,0x7b,0x20,0x60, - 0x2e,0x28,0x2e,0x3b,0x58,0x2d,0x58,0x2c,0x20,0x2b,0x20,0x20,0x20,0x20,0x20,0x71, - 0x58,0x71,0x58,0x71,0x58,0x22,0x2c,0xa,0x22,0x35,0x20,0x75,0x20,0x32,0x2e,0x77, - 0x2e,0x24,0x2e,0x6b,0x20,0x74,0x20,0x6f,0x20,0x20,0x20,0x2c,0x20,0x7e,0x20,0x68, - 0x2e,0x50,0x20,0x6c,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x2c,0x20,0x75,0x20,0x54,0x2e,0x5e,0x2e,0x23,0x58,0x3c,0x58,0x4e,0x20,0x2c, - 0x20,0x20,0x20,0x20,0x20,0x71,0x58,0x71,0x58,0x22,0x2c,0xa,0x22,0x35,0x20,0x3e, - 0x2e,0x39,0x2e,0x55,0x20,0x72,0x20,0x2e,0x20,0x20,0x20,0x2e,0x20,0x2c,0x20,0x54, - 0x20,0x42,0x2e,0x2a,0x2e,0x78,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x71, - 0x58,0x20,0x20,0x20,0x20,0x20,0x20,0x2b,0x20,0x2c,0x20,0x51,0x20,0x21,0x2e,0x51, - 0x2e,0x3c,0x58,0x43,0x20,0x2c,0x20,0x20,0x20,0x20,0x20,0x71,0x58,0x22,0x2c,0xa, - 0x22,0x70,0x20,0x71,0x2e,0x31,0x2e,0x3e,0x20,0x2e,0x20,0x20,0x20,0x2b,0x20,0x31, - 0x20,0x5b,0x20,0x6d,0x2e,0x70,0x2e,0x6b,0x20,0x2e,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x20,0x20,0x20,0x20,0x20,0x20,0x2c, - 0x20,0x75,0x20,0x4f,0x2e,0x57,0x2e,0x3b,0x58,0x21,0x20,0x2b,0x20,0x20,0x20,0x20, - 0x20,0x22,0x2c,0xa,0x22,0x34,0x20,0x38,0x2e,0x6a,0x2e,0x60,0x20,0x70,0x20,0x35, - 0x20,0x79,0x20,0x3b,0x2e,0x75,0x2e,0x61,0x2e,0x64,0x20,0x25,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x20, - 0x20,0x20,0x20,0x20,0x20,0x4f,0x20,0x2c,0x20,0x41,0x20,0x50,0x2e,0x5f,0x2e,0x2c, - 0x20,0x20,0x20,0x20,0x20,0x22,0x2c,0xa,0x22,0x31,0x20,0x78,0x20,0x3c,0x2e,0x66, - 0x2e,0x6d,0x2e,0x78,0x2e,0x62,0x2e,0x79,0x2e,0x61,0x2e,0x67,0x20,0x3b,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x20,0x20,0x20,0x20,0x20,0x20,0x2b,0x20,0x30, - 0x20,0x76,0x20,0x4f,0x20,0x20,0x20,0x20,0x20,0x22,0x2c,0xa,0x22,0x20,0x20,0x2d, - 0x20,0x68,0x20,0x63,0x20,0x57,0x20,0x57,0x20,0x57,0x20,0x57,0x20,0x7a,0x20,0x3a, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x20,0x20,0x20, - 0x20,0x20,0x20,0x2e,0x20,0x2e,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x22,0x2c,0xa, - 0x22,0x20,0x20,0x20,0x20,0x20,0x20,0x2a,0x20,0x65,0x20,0x6c,0x20,0x6c,0x20,0x66, - 0x20,0x58,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x22,0x2c,0xa,0x22,0x71,0x58,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x20,0x20,0x20, - 0x20,0x20,0x20,0x71,0x58,0x22,0x2c,0xa,0x22,0x71,0x58,0x71,0x58,0x71,0x58,0x20, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x22,0x2c,0xa,0x22,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x22,0x2c,0xa, - 0x22,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71,0x58,0x71, - 0x58,0x22,0xa,0x7d,0x3b,0xa, - ] - -@@qt_resource_name = [ - # fileopen.xpm - 0x0,0xc, - 0xb,0x21,0x7,0xad, - 0x0,0x66, - 0x0,0x69,0x0,0x6c,0x0,0x65,0x0,0x6f,0x0,0x70,0x0,0x65,0x0,0x6e,0x0,0x2e,0x0,0x78,0x0,0x70,0x0,0x6d, - # filesave.xpm - 0x0,0xc, - 0x5,0x68,0x6,0x4d, - 0x0,0x66, - 0x0,0x69,0x0,0x6c,0x0,0x65,0x0,0x73,0x0,0x61,0x0,0x76,0x0,0x65,0x0,0x2e,0x0,0x78,0x0,0x70,0x0,0x6d, - # editcopy.xpm - 0x0,0xc, - 0xb,0xe,0x4a,0x2d, - 0x0,0x65, - 0x0,0x64,0x0,0x69,0x0,0x74,0x0,0x63,0x0,0x6f,0x0,0x70,0x0,0x79,0x0,0x2e,0x0,0x78,0x0,0x70,0x0,0x6d, - # filenew.xpm - 0x0,0xb, - 0x4,0x14,0x5a,0xed, - 0x0,0x66, - 0x0,0x69,0x0,0x6c,0x0,0x65,0x0,0x6e,0x0,0x65,0x0,0x77,0x0,0x2e,0x0,0x78,0x0,0x70,0x0,0x6d, - # editpaste.xpm - 0x0,0xd, - 0xd,0xc9,0x33,0xcd, - 0x0,0x65, - 0x0,0x64,0x0,0x69,0x0,0x74,0x0,0x70,0x0,0x61,0x0,0x73,0x0,0x74,0x0,0x65,0x0,0x2e,0x0,0x78,0x0,0x70,0x0,0x6d, - # editcut.xpm - 0x0,0xb, - 0xa,0x10,0x3e,0x2d, - 0x0,0x65, - 0x0,0x64,0x0,0x69,0x0,0x74,0x0,0x63,0x0,0x75,0x0,0x74,0x0,0x2e,0x0,0x78,0x0,0x70,0x0,0x6d, - ] - -@@qt_resource_struct = [ - # : - 0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x6,0x0,0x0,0x0,0x1, - # :/filenew.xpm - 0x0,0x0,0x0,0x5a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x44,0x97, - # :/filesave.xpm - 0x0,0x0,0x0,0x1e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x18,0xfd, - # :/editcut.xpm - 0x0,0x0,0x0,0x96,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x71,0xa0, - # :/editcopy.xpm - 0x0,0x0,0x0,0x3c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x31,0xfa, - # :/fileopen.xpm - 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0, - # :/editpaste.xpm - 0x0,0x0,0x0,0x76,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x58,0xa4, -] - - def self.qInitResources_application() - Qt.qRegisterResourceData(0x01, QCleanupResources__dest_class__.qt_resource_struct.pack("C*"), QCleanupResources__dest_class__.qt_resource_name.pack("C*"), QCleanupResources__dest_class__.qt_resource_data.pack("C*")) - return 1 - end - def self.qCleanupResources_application() - Qt.qUnregisterResourceData(0x01, QCleanupResources__dest_class__.qt_resource_struct.pack("C*"), QCleanupResources__dest_class__.qt_resource_name.pack("C*"), QCleanupResources__dest_class__.qt_resource_data.pack("C*")) - return 1 - end - -end - -QCleanupResources__dest_class__.qInitResources_application() diff --git a/languages/ruby/app_templates/qtruby4app/qtruby4app.kdevelop b/languages/ruby/app_templates/qtruby4app/qtruby4app.kdevelop deleted file mode 100644 index 4afe7bca..00000000 --- a/languages/ruby/app_templates/qtruby4app/qtruby4app.kdevelop +++ /dev/null @@ -1,83 +0,0 @@ -<?xml version="1.0"?> -<kdevelop> - <general> - <author>%{AUTHOR}</author> - <email>%{EMAIL}</email> - <version>%{VERSION}</version> - <projectmanagement>KDevCustomProject</projectmanagement> - <primarylanguage>Ruby</primarylanguage> - <keywords> - <keyword>Ruby</keyword> - <keyword>Qt</keyword> - </keywords> - </general> - <kdevcustomproject> - <general> - <activedir/> - </general> - </kdevcustomproject> - <kdevfileview> - <groups> - <group pattern="*.rb" name="Ruby files" /> - <group pattern="*.ui" name="QT Designer files" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*" name="Others" /> - </groups> - <tree> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidepatterns>CVS,.svn</hidepatterns> - </tree> - </kdevfileview> - <kdevdoctreeview> - <ignoretocs> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>kde2book</toc> - <toc>opengl</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>qt-kdev3</toc> - <toc>sdl</toc> - <toc>stl</toc> - <toc>sw</toc> - <toc>w3c-dom-level2-html</toc> - <toc>w3c-svg</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - </ignoretocs> - <ignoredoxygen> - <toc>KDE Libraries (Doxygen)</toc> - </ignoredoxygen> - </kdevdoctreeview> - <workspace> - <openfiles/> - </workspace> - <kdevfilecreate> - <useglobaltypes> - <type ext="ui" /> - <type ext="rb" /> - </useglobaltypes> - </kdevfilecreate> - <kdevrubysupport> - <run> - <interpreter>ruby</interpreter> - <terminal>false</terminal> - <mainprogram>./main.rb</mainprogram> - </run> - </kdevrubysupport> -</kdevelop> diff --git a/languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate b/languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate deleted file mode 100644 index fb9642c3..00000000 --- a/languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate +++ /dev/null @@ -1,88 +0,0 @@ -# TDE Config File -[General] -Name=QtRuby4 Application - -Comment=Generate a QtRuby4 based application (crossplatform compatible) - Needs QtRuby4 - -Category=Ruby/Qt - -Icon=qtruby4app.png -FileTemplates=rb,ShellStyle -ShowFilesAfterGeneration=%{dest}/%{APPNAMELC}.rb,%{dest}/ReadMe -Archive=qtruby4app.tar.gz - -[FILE1] -Type=install -Source=%{src}/qtruby4app.kdevelop -Dest=%{dest}/%{APPNAMELC}.kdevelop - -[FILE2] -Type=install -Source=%{src}/main.rb -Dest=%{dest}/main.rb - -[FILE3] -Type=install -Source=%{src}/qtruby4app.rb -Dest=%{dest}/%{APPNAMELC}.rb - -[FILE4] -Type=install -Source=%{src}/app-Makefile -Dest=%{dest}/Makefile - -[FILE5] -Type=install -Source=%{src}/fileopen.xpm -Dest=%{dest}/fileopen.xpm - -[FILE6] -Type=install -Source=%{src}/filesave.xpm -Dest=%{dest}/filesave.xpm - -[FILE7] -Type=install -Source=%{src}/filenew.xpm -Dest=%{dest}/filenew.xpm - -[FILE8] -Type=install -Source=%{src}/editcopy.xpm -Dest=%{dest}/editcopy.xpm - -[FILE9] -Type=install -Source=%{src}/editpaste.xpm -Dest=%{dest}/editpaste.xpm - -[FILE10] -Type=install -Source=%{src}/editcut.xpm -Dest=%{dest}/editcut.xpm - -[FILE11] -Type=install -Source=%{src}/application.qrc -Dest=%{dest}/application.qrc - -[FILE12] -Type=install -Source=%{src}/ReadMe -Dest=%{dest}/ReadMe - -[FILE13] -Type=install -Source=%{src}/app.filelist -Dest=%{dest}/%{APPNAMELC}.kdevelop.filelist - -[MSG] -Type=message -Comment=A QtRuby4 based application was created in %{dest} - -[DESIGNER] -Type=value -ValueType=QString -Value=DESIGNER -Comment=Absolute Path for Designer (Qt4). -Default= diff --git a/languages/ruby/app_templates/qtruby4app/qtruby4app.png b/languages/ruby/app_templates/qtruby4app/qtruby4app.png Binary files differdeleted file mode 100644 index d874d54e..00000000 --- a/languages/ruby/app_templates/qtruby4app/qtruby4app.png +++ /dev/null diff --git a/languages/ruby/app_templates/qtruby4app/qtruby4app.rb b/languages/ruby/app_templates/qtruby4app/qtruby4app.rb deleted file mode 100644 index c44e984a..00000000 --- a/languages/ruby/app_templates/qtruby4app/qtruby4app.rb +++ /dev/null @@ -1,263 +0,0 @@ - -class %{APPNAME} < Qt::MainWindow - - Q_SLOTS :newFile, - :open, - :save, - :saveAs, - :about, - :documentWasModified - - def initialize - super - @textEdit = Qt::TextEdit.new - setCentralWidget(@textEdit) - - createActions() - createMenus() - createToolBars() - createStatusBar() - - readSettings() - - connect(@textEdit.document, SIGNAL(:contentsChanged), - self, SLOT(:documentWasModified)) - - setCurrentFile("") - end - - def closeEvent(event) - if maybeSave - writeSettings - event.accept - else - event.ignore - end - end - - def newFile() - if maybeSave - @textEdit.clear - setCurrentFile("") - end - end - - def open() - if maybeSave - fileName = Qt::FileDialog.getOpenFileName(self) - if !fileName.nil? - loadFile(fileName) - end - end - end - - def save() - if @curFile.nil? - return saveAs() - else - return saveFile(@curFile); - end - end - - def saveAs() - fileName = Qt::FileDialog.getSaveFileName(self) - if fileName.nil? - return false - end - - return saveFile(fileName) - end - - def about() - Qt::MessageBox.about(self, tr("About Application"), - tr("The <b>Application</b> example demonstrates how to " \ - "write modern GUI applications using Qt, with a menu bar, " \ - "toolbars, and a status bar.")) - end - - def documentWasModified() - setWindowModified(true) - end - - def createActions() - @newAct = Qt::Action.new(Qt::Icon.new(":/filenew.xpm"), tr("&New"), self) - @newAct.shortcut = tr("Ctrl+N") - @newAct.statusTip = tr("Create a new file") - connect(@newAct, SIGNAL(:triggered), self, SLOT(:newFile)) - - @openAct = Qt::Action.new(Qt::Icon.new(":/fileopen.xpm"), tr("&Open..."), self) - @openAct.shortcut = tr("Ctrl+O") - @openAct.statusTip = tr("Open an existing file") - connect(@openAct, SIGNAL(:triggered), self, SLOT(:open)) - - @saveAct = Qt::Action.new(Qt::Icon.new(":/filesave.xpm"), tr("&Save"), self) - @saveAct.shortcut = tr("Ctrl+S") - @saveAct.statusTip = tr("Save the document to disk") - connect(@saveAct, SIGNAL(:triggered), self, SLOT(:save)) - - @saveAsAct = Qt::Action.new(tr("Save &As..."), self) - @saveAsAct.statusTip = tr("Save the document under a new name") - connect(@saveAsAct, SIGNAL(:triggered), self, SLOT(:saveAs)) - - @exitAct = Qt::Action.new(tr("E&xit"), self) - @exitAct.shortcut = tr("Ctrl+Q") - @exitAct.statusTip = tr("Exit the application") - connect(@exitAct, SIGNAL(:triggered), self, SLOT(:close)) - - @cutAct = Qt::Action.new(Qt::Icon.new(":/editcut.xpm"), tr("Cu&t"), self) - @cutAct.shortcut = tr("Ctrl+X") - @cutAct.statusTip = tr("Cut the current selection's contents to the " \ - "clipboard") - connect(@cutAct, SIGNAL(:triggered), @textEdit, SLOT(:cut)) - - @copyAct = Qt::Action.new(Qt::Icon.new(":/editcopy.xpm"), tr("&Copy"), self) - @copyAct.shortcut = tr("Ctrl+C") - @copyAct.statusTip = tr("Copy the current selection's contents to the " \ - "clipboard") - connect(@copyAct, SIGNAL(:triggered), @textEdit, SLOT(:copy)) - - @pasteAct = Qt::Action.new(Qt::Icon.new(":/editpaste.xpm"), tr("&Paste"), self) - @pasteAct.shortcut = tr("Ctrl+V") - @pasteAct.statusTip = tr("Paste the clipboard's contents into the current " \ - "selection") - connect(@pasteAct, SIGNAL(:triggered), @textEdit, SLOT(:paste)) - - @aboutAct = Qt::Action.new(tr("&About"), self) - @aboutAct.statusTip = tr("Show the application's About box") - connect(@aboutAct, SIGNAL(:triggered), self, SLOT(:about)) - - @aboutQtAct = Qt::Action.new(tr("About &Qt"), self) - @aboutQtAct.statusTip = tr("Show the Qt library's About box") - connect(@aboutQtAct, SIGNAL(:triggered), $tqApp, SLOT(:aboutQt)) - - @cutAct.setEnabled(false) - @copyAct.setEnabled(false) - connect(@textEdit, SIGNAL('copyAvailable(bool)'), - @cutAct, SLOT('setEnabled(bool)')) - connect(@textEdit, SIGNAL('copyAvailable(bool)'), - @copyAct, SLOT('setEnabled(bool)')) - end - - def createMenus() - @fileMenu = menuBar().addMenu(tr("&File")) - @fileMenu.addAction(@newAct) - @fileMenu.addAction(@openAct) - @fileMenu.addAction(@saveAct) - @fileMenu.addAction(@saveAsAct) - @fileMenu.addSeparator() - @fileMenu.addAction(@exitAct) - - @editMenu = menuBar.addMenu(tr("&Edit")) - @editMenu.addAction(@cutAct) - @editMenu.addAction(@copyAct) - @editMenu.addAction(@pasteAct) - - menuBar.addSeparator() - - @helpMenu = menuBar().addMenu(tr("&Help")) - @helpMenu.addAction(@aboutAct) - @helpMenu.addAction(@aboutQtAct) - end - - def createToolBars() - @fileToolBar = addToolBar(tr("File")) - @fileToolBar.addAction(@newAct) - @fileToolBar.addAction(@openAct) - @fileToolBar.addAction(@saveAct) - - @editToolBar = addToolBar(tr("Edit")) - @editToolBar.addAction(@cutAct) - @editToolBar.addAction(@copyAct) - @editToolBar.addAction(@pasteAct) - end - - def createStatusBar() - statusBar.showMessage(tr("Ready")) - end - - def readSettings() - settings = Qt::Settings.new("Trolltech", "Application Example") - pos = settings.value("pos", Qt::Variant.new(Qt::Point.new(200, 200))).toPoint() - size = settings.value("size", Qt::Variant.new(Qt::Size.new(400, 400))).toSize() - resize(size) - move(pos) - end - - def writeSettings() - settings = Qt::Settings.new("Trolltech", "Application Example") - settings.setValue("pos", Qt::Variant.new(pos())) - settings.setValue("size", Qt::Variant.new(size())) - end - - def maybeSave() - if @textEdit.document.modified? - ret = Qt::MessageBox.warning(self, tr("Application"), - tr("The document has been modified.\n" \ - "Do you want to save your changes?"), - Qt::MessageBox::Yes | Qt::MessageBox::Default, - Qt::MessageBox::No, - Qt::MessageBox::Cancel | Qt::MessageBox::Escape) - if ret == Qt::MessageBox::Yes - return save() - elsif ret == Qt::MessageBox::Cancel - return false - end - end - return true - end - - def loadFile(fileName) - file = Qt::File.new(fileName) - if !file.open(Qt::File::ReadOnly | Qt::File::Text) - Qt::MessageBox.warning( self, tr("Application"), - tr("Cannot read file %s\n%s." % [fileName, file.errorString]) ) - return - end - - inf = Qt::TextStream.new(file) - Qt::Application.overrideCursor = Qt::Cursor.new(Qt::WaitCursor) - @textEdit.setPlainText(inf.readAll) - Qt::Application.restoreOverrideCursor() - - setCurrentFile(fileName) - statusBar.showMessage(tr("File loaded"), 2000) - end - - def saveFile(fileName) - file = Qt::File.new(fileName) - if !file.open(Qt::File::WriteOnly | Qt::File::Text) - Qt::MessageBox.warning(self, tr("Application"), - tr("Cannot write file %s\n%s." % [fileName, file.errorString]) ) - return false - end - - outf = Qt::TextStream.new(file) - Qt::Application.overrideCursor = Qt::Cursor.new(Qt::WaitCursor) - outf << @textEdit.toPlainText() - Qt::Application.restoreOverrideCursor() - outf.flush - - setCurrentFile(fileName) - statusBar().showMessage(tr("File saved"), 2000) - return true - end - - def setCurrentFile(fileName) - @curFile = fileName; - @textEdit.document().modified = false - setWindowModified(false) - - shownName = "" - if @curFile.nil? - shownName = "untitled.txt" - else - shownName = strippedName(@curFile) - end - - setWindowTitle(tr("%s[*] - %s" % [shownName, tr("Application")])) - end - - def strippedName(fullFileName) - return Qt::FileInfo.new(fullFileName).fileName() - end -end
\ No newline at end of file diff --git a/languages/ruby/app_templates/qtrubyapp/main.rb b/languages/ruby/app_templates/qtrubyapp/main.rb index 6f4bceae..f76c9dac 100644 --- a/languages/ruby/app_templates/qtrubyapp/main.rb +++ b/languages/ruby/app_templates/qtrubyapp/main.rb @@ -1,10 +1,10 @@ require 'Qt' require '%{APPNAMELC}.rb' -a = Qt::Application.new( ARGV ) +a = TQt::Application.new( ARGV ) mw = %{APPNAMESC}.new mw.caption = "%{APPNAMESC}" mw.show -a.connect( a, SIGNAL('lastWindowClosed()'), a, SLOT('quit()') ) +a.connect( a, TQ_SIGNAL('lastWindowClosed()'), a, TQ_SLOT('quit()') ) a.exec diff --git a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb index 7d5f9ad3..ceae4ad1 100644 --- a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb +++ b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb @@ -1,8 +1,8 @@ -class %{APPNAMESC} < Qt::MainWindow +class %{APPNAMESC} < TQt::MainWindow - Q_SLOTS 'newDoc()', + slots 'newDoc()', 'choose()', - 'load( const QString& )', + 'load( const TQString& )', 'save()', 'saveAs()', 'print()', @@ -11,89 +11,89 @@ class %{APPNAMESC} < Qt::MainWindow def initialize() super( nil, "%{APPNAMESC}", WDestructiveClose ) - @printer = Qt::Printer.new + @printer = TQt::Printer.new - fileTools = Qt::ToolBar.new( self, "file operations" ) + fileTools = TQt::ToolBar.new( self, "file operations" ) fileTools.setLabel( tr("File Operations") ) - openIcon = Qt::Pixmap.new( "fileopen.xpm" ) - fileOpen = Qt::ToolButton.new( Qt::IconSet.new(openIcon), tr("Open File"), nil, - self, SLOT('choose()'), fileTools, "open file" ) + openIcon = TQt::Pixmap.new( "fileopen.xpm" ) + fileOpen = TQt::ToolButton.new( TQt::IconSet.new(openIcon), tr("Open File"), nil, + self, TQ_SLOT('choose()'), fileTools, "open file" ) - saveIcon = Qt::Pixmap.new( "filesave.xpm" ) - fileSave = Qt::ToolButton.new( Qt::IconSet.new(saveIcon), tr("Save File"), nil, - self, SLOT('save()'), fileTools, "save file" ) + saveIcon = TQt::Pixmap.new( "filesave.xpm" ) + fileSave = TQt::ToolButton.new( TQt::IconSet.new(saveIcon), tr("Save File"), nil, + self, TQ_SLOT('save()'), fileTools, "save file" ) - printIcon = Qt::Pixmap.new( "fileprint.xpm" ) - filePrint = Qt::ToolButton.new( Qt::IconSet.new(printIcon), tr("Print File"), nil, - self, SLOT('print()'), fileTools, "print file" ) + printIcon = TQt::Pixmap.new( "fileprint.xpm" ) + filePrint = TQt::ToolButton.new( TQt::IconSet.new(printIcon), tr("Print File"), nil, + self, TQ_SLOT('print()'), fileTools, "print file" ) - Qt::WhatsThis.whatsThisButton( fileTools ) + TQt::WhatsThis.whatsThisButton( fileTools ) fileOpenText = tr('<p><img source="fileopen"> ' + "Click this button to open a <em>new file</em>. <br>" + "You can also select the <b>Open</b> command " + "from the <b>File</b> menu.</p>") - Qt::WhatsThis.add( fileOpen, fileOpenText ) + TQt::WhatsThis.add( fileOpen, fileOpenText ) - Qt::MimeSourceFactory.defaultFactory().setPixmap( "fileopen", openIcon ) + TQt::MimeSourceFactory.defaultFactory().setPixmap( "fileopen", openIcon ) fileSaveText = tr("<p>Click this button to save the file you " + "are editing. You will be prompted for a file name.\n" + "You can also select the <b>Save</b> command " + "from the <b>File</b> menu.</p>") - Qt::WhatsThis.add( fileSave, fileSaveText ) + TQt::WhatsThis.add( fileSave, fileSaveText ) filePrintText = tr("Click this button to print the file you " + "are editing.\n You can also select the Print " + "command from the File menu.") - Qt::WhatsThis.add( filePrint, filePrintText ) + TQt::WhatsThis.add( filePrint, filePrintText ) - file = Qt::PopupMenu.new( self ) + file = TQt::PopupMenu.new( self ) menuBar().insertItem( tr("&File"), file ) - file.insertItem( tr("&New"), self, SLOT('newDoc()'), Qt::KeySequence.new(CTRL+Key_N) ) + file.insertItem( tr("&New"), self, TQ_SLOT('newDoc()'), TQt::KeySequence.new(CTRL+Key_N) ) - id = file.insertItem( Qt::IconSet.new(openIcon), tr("&Open..."), - self, SLOT('choose()'), Qt::KeySequence.new(CTRL+Key_O) ) + id = file.insertItem( TQt::IconSet.new(openIcon), tr("&Open..."), + self, TQ_SLOT('choose()'), TQt::KeySequence.new(CTRL+Key_O) ) file.setWhatsThis( id, fileOpenText ) - id = file.insertItem( Qt::IconSet.new(saveIcon), tr("&Save"), - self, SLOT('save()'), Qt::KeySequence.new(CTRL+Key_S) ) + id = file.insertItem( TQt::IconSet.new(saveIcon), tr("&Save"), + self, TQ_SLOT('save()'), TQt::KeySequence.new(CTRL+Key_S) ) file.setWhatsThis( id, fileSaveText ) - id = file.insertItem( tr("Save &As..."), self, SLOT('saveAs()') ) + id = file.insertItem( tr("Save &As..."), self, TQ_SLOT('saveAs()') ) file.setWhatsThis( id, fileSaveText ) file.insertSeparator() - id = file.insertItem( Qt::IconSet.new(printIcon), tr("&Print..."), - self, SLOT('print()'), Qt::KeySequence.new(CTRL+Key_P) ) + id = file.insertItem( TQt::IconSet.new(printIcon), tr("&Print..."), + self, TQ_SLOT('print()'), TQt::KeySequence.new(CTRL+Key_P) ) file.setWhatsThis( id, filePrintText ) file.insertSeparator() - file.insertItem( tr("&Close"), self, SLOT('close()'), Qt::KeySequence.new(CTRL+Key_W) ) + file.insertItem( tr("&Close"), self, TQ_SLOT('close()'), TQt::KeySequence.new(CTRL+Key_W) ) - file.insertItem( tr("&Quit"), $tqApp, SLOT( 'closeAllWindows()' ), Qt::KeySequence.new(CTRL+Key_Q) ) + file.insertItem( tr("&Quit"), $tqApp, TQ_SLOT( 'closeAllWindows()' ), TQt::KeySequence.new(CTRL+Key_Q) ) menuBar().insertSeparator() - help = Qt::PopupMenu.new( self ) + help = TQt::PopupMenu.new( self ) menuBar().insertItem( tr("&Help"), help ) - help.insertItem( tr("&About"), self, SLOT('about()'), Qt::KeySequence.new(Key_F1) ) - help.insertItem( tr("About &Qt"), self, SLOT('aboutQt()') ) + help.insertItem( tr("&About"), self, TQ_SLOT('about()'), TQt::KeySequence.new(Key_F1) ) + help.insertItem( tr("About &Qt"), self, TQ_SLOT('aboutQt()') ) help.insertSeparator() - help.insertItem( tr("What's &This"), self, SLOT('whatsThis()'), Qt::KeySequence.new(SHIFT+Key_F1) ) + help.insertItem( tr("What's &This"), self, TQ_SLOT('whatsThis()'), TQt::KeySequence.new(SHIFT+Key_F1) ) - @e = Qt::TextEdit.new( self, "editor" ) + @e = TQt::TextEdit.new( self, "editor" ) @e.setFocus() setCentralWidget( @e ) statusBar().message( tr("Ready"), 2000 ) @@ -110,7 +110,7 @@ class %{APPNAMESC} < Qt::MainWindow end def choose() - fn = Qt::FileDialog.getOpenFileName( nil, nil, + fn = TQt::FileDialog.getOpenFileName( nil, nil, self) if !fn.nil? load( fn ) @@ -121,12 +121,12 @@ class %{APPNAMESC} < Qt::MainWindow def load( filename ) - f = Qt::File.new( filename ) - if !f.open( Qt::IO_ReadOnly ) + f = TQt::File.new( filename ) + if !f.open( TQt::IO_ReadOnly ) return end - ts = Qt::TextStream.new( f ) + ts = TQt::TextStream.new( f ) @e.setText( ts.read() ) @e.setModified( false ) setCaption( filename ) @@ -141,14 +141,14 @@ class %{APPNAMESC} < Qt::MainWindow end text = @e.text() - f = Qt::File.new( @filename ) - if !f.open( Qt::IO_WriteOnly ) + f = TQt::File.new( @filename ) + if !f.open( TQt::IO_WriteOnly ) statusBar().message( tr("Could not write to %s" % @filename), 2000 ) return end - t = Qt::TextStream.new( f ) + t = TQt::TextStream.new( f ) t << text f.close() @@ -161,7 +161,7 @@ class %{APPNAMESC} < Qt::MainWindow def saveAs() - fn = Qt::FileDialog.getSaveFileName( nil, nil, + fn = TQt::FileDialog.getSaveFileName( nil, nil, self ) if !fn.nil? @filename = fn @@ -173,13 +173,13 @@ class %{APPNAMESC} < Qt::MainWindow def print() - # ###### Rewrite to use Qt::SimpleRichText to print here as well + # ###### Rewrite to use TQt::SimpleRichText to print here as well margin = 10 pageNo = 1 if @printer.setup(self) # @printer dialog statusBar().message( tr("Printing...") ) - p = Qt::Painter.new + p = TQt::Painter.new if !p.begin( @printer ) # paint on @printer return end @@ -187,7 +187,7 @@ class %{APPNAMESC} < Qt::MainWindow p.setFont( @e.font() ) yPos = 0 # y-position for each line fm = p.fontMetrics() - metrics = Qt::PaintDeviceMetrics.new( @printer ) # need width/height + metrics = TQt::PaintDeviceMetrics.new( @printer ) # need width/height # of @printer surface for i in 0...@e.lines() do if margin + yPos > metrics.height() - margin @@ -220,7 +220,7 @@ class %{APPNAMESC} < Qt::MainWindow return end - case Qt::MessageBox.information( self, tr("Qt Application Example"), + case TQt::MessageBox.information( self, tr("Qt Application Example"), tr("Do you want to save the changes" + " to the document?"), tr("Yes"), tr("No"), tr("Cancel"), @@ -240,14 +240,14 @@ class %{APPNAMESC} < Qt::MainWindow private def about() - Qt::MessageBox.about( self, tr("Qt Application Example"), + TQt::MessageBox.about( self, tr("Qt Application Example"), tr("This example demonstrates simple use of " + - "Qt::MainWindow,\nQt::MenuBar and Qt::ToolBar.")) + "TQt::MainWindow,\nTQt::MenuBar and TQt::ToolBar.")) end def aboutQt() - Qt::MessageBox.aboutQt( self, tr("Qt Application Example") ) + TQt::MessageBox.aboutQt( self, tr("Qt Application Example") ) end end diff --git a/languages/ruby/debugger/dbgcontroller.h b/languages/ruby/debugger/dbgcontroller.h index d49d30b8..e5a3f99a 100644 --- a/languages/ruby/debugger/dbgcontroller.h +++ b/languages/ruby/debugger/dbgcontroller.h @@ -79,7 +79,7 @@ enum RttiValues { /***************************************************************************/ class DbgController : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/ruby/debugger/dbgpsdlg.cpp b/languages/ruby/debugger/dbgpsdlg.cpp index 2aa67f51..f17c3ce0 100644 --- a/languages/ruby/debugger/dbgpsdlg.cpp +++ b/languages/ruby/debugger/dbgpsdlg.cpp @@ -71,15 +71,15 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) topLayout->addWidget(pids_, 5); pids_->setFont(TDEGlobalSettings::fixedFont()); - KButtonBox *buttonbox = new KButtonBox(this, Qt::Horizontal, 5); + KButtonBox *buttonbox = new KButtonBox(this, TQt::Horizontal, 5); TQPushButton *ok = buttonbox->addButton(KStdGuiItem::ok()); buttonbox->addStretch(); TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); buttonbox->layout(); topLayout->addWidget(buttonbox); - connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); - connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept())); + connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); psProc_ = new KShellProcess("/bin/sh"); #ifdef USE_SOLARIS @@ -106,8 +106,8 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) } #endif - connect( psProc_, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(slotProcessExited()) ); - connect( psProc_, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(slotReceivedOutput(TDEProcess *, char *, int)) ); + connect( psProc_, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(slotProcessExited()) ); + connect( psProc_, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQ_SLOT(slotReceivedOutput(TDEProcess *, char *, int)) ); psProc_->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); // Default display to 40 chars wide, default height is okay diff --git a/languages/ruby/debugger/dbgpsdlg.h b/languages/ruby/debugger/dbgpsdlg.h index 03e45ad9..f9e668b7 100644 --- a/languages/ruby/debugger/dbgpsdlg.h +++ b/languages/ruby/debugger/dbgpsdlg.h @@ -35,7 +35,7 @@ namespace RDBDebugger class Dbg_PS_Dialog : public KDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp index 7dabbd3b..83b12d8d 100644 --- a/languages/ruby/debugger/dbgtoolbar.cpp +++ b/languages/ruby/debugger/dbgtoolbar.cpp @@ -113,13 +113,13 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e) if (moving_) return; - if (e->button() == Qt::RightButton) { + if (e->button() == TQt::RightButton) { TDEPopupMenu *menu = new TDEPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); menu->insertItem(i18n("Dock to Panel"), - parent(), TQT_SLOT(slotDock())); + parent(), TQ_SLOT(slotDock())); menu->insertItem(i18n("Dock to Panel && Iconify TDevelop"), - parent(), TQT_SLOT(slotIconifyAndDock())); + parent(), TQ_SLOT(slotIconifyAndDock())); menu->popup(e->globalPos()); } else { moving_ = true; @@ -228,22 +228,22 @@ DbgDocker::DbgDocker(TQWidget* parent, DbgToolBar* toolBar, const TQPixmap& pixm void DbgDocker::mousePressEvent(TQMouseEvent *e) { - if (!TQT_TQRECT_OBJECT(rect()).contains( e->pos())) + if (!rect().contains( e->pos())) return; switch (e->button()) { - case Qt::LeftButton: + case TQt::LeftButton: { // Not really a click, but it'll hold for the time being !!! emit clicked(); break; } - case Qt::RightButton: + case TQt::RightButton: { TDEPopupMenu* menu = new TDEPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); - menu->insertItem(i18n("Activate"), toolBar_, TQT_SLOT(slotUndock())); - menu->insertItem(i18n("Activate (TDevelop gets focus)"), toolBar_, TQT_SLOT(slotActivateAndUndock())); + menu->insertItem(i18n("Activate"), toolBar_, TQ_SLOT(slotUndock())); + menu->insertItem(i18n("Activate (TDevelop gets focus)"), toolBar_, TQ_SLOT(slotActivateAndUndock())); menu->popup(e->globalPos()); break; } @@ -269,9 +269,9 @@ DbgToolBar::DbgToolBar(RubyDebuggerPart* part, docker_(0), dockWindow_(new KSystemTray(parent)) { - winModule_ = new KWinModule(TQT_TQOBJECT(this)); + winModule_ = new KWinModule(this); docker_ = new DbgDocker(parent, this, BarIcon("dbgnext")); - connect(docker_, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver())); + connect(docker_, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepOver())); // Must have noFocus set so that we can see what window was active. // see slotDbgKdevFocus() for more comments @@ -284,7 +284,7 @@ DbgToolBar::DbgToolBar(RubyDebuggerPart* part, // KWin::setType(winId(), NET::Override); // So it has no decoration KWin::setType(winId(), NET::Dock); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setFrameStyle( TQFrame::Box | TQFrame::Plain ); setLineWidth(4); setMidLineWidth(0); @@ -306,14 +306,14 @@ DbgToolBar::DbgToolBar(RubyDebuggerPart* part, bPrevFocus_ = new DbgButton(BarIcon("dbgmemview"), TQString(), this); bKDevFocus_ = new DbgButton(BarIcon("tdevelop"), TQString(), this); - connect(bRun, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotRun())); - connect(bInterrupt, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotPause())); - connect(bNext, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver())); - connect(bStep, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepInto())); - connect(bFinish, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOut())); - connect(bRunTo, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotRunToCursor())); - connect(bKDevFocus_, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotKdevFocus())); - connect(bPrevFocus_, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrevFocus())); + connect(bRun, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotRun())); + connect(bInterrupt, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotPause())); + connect(bNext, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepOver())); + connect(bStep, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepInto())); + connect(bFinish, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotStepOut())); + connect(bRunTo, TQ_SIGNAL(clicked()), part_, TQ_SLOT(slotRunToCursor())); + connect(bKDevFocus_, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotKdevFocus())); + connect(bPrevFocus_, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPrevFocus())); TQToolTip::add( bRun, i18n("Continue with application execution, may start the application") ); TQToolTip::add( bInterrupt, i18n("Interrupt the application execution") ); diff --git a/languages/ruby/debugger/dbgtoolbar.h b/languages/ruby/debugger/dbgtoolbar.h index 7a199391..a98dfc74 100644 --- a/languages/ruby/debugger/dbgtoolbar.h +++ b/languages/ruby/debugger/dbgtoolbar.h @@ -38,7 +38,7 @@ class RubyDebuggerPart; class DbgDocker : public KSystemTray { - Q_OBJECT + TQ_OBJECT public: @@ -56,7 +56,7 @@ private: class DbgToolBar : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/ruby/debugger/debuggee.rb b/languages/ruby/debugger/debuggee.rb index 38e2dea7..75491f7d 100644 --- a/languages/ruby/debugger/debuggee.rb +++ b/languages/ruby/debugger/debuggee.rb @@ -269,7 +269,7 @@ class Context for c in ary str = debug_inspect(obj.module_eval(c)) if c.to_s != str && - str !~ /^Qt::|^KDE::/ && c.to_s !~ /@@classes$|@@cpp_names$|@@idclass$|@@debug_level$/ && + str !~ /^TQt::|^KDE::/ && c.to_s !~ /@@classes$|@@cpp_names$|@@idclass$|@@debug_level$/ && c.to_s !~ /^DCOPMeta$|^Meta$|SCRIPT_LINES__|TRUE|FALSE|NIL|MatchingData/ && c.to_s !~ /^PLATFORM$|^RELEASE_DATE$|^VERSION$|SilentClient|SilentObject/ && c.to_s !~ /^Client$|^Context$|^DEBUG_LAST_CMD$|^MUTEX$|^Mutex$|^SimpleDelegater$|^Delegater$/ && diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp index bfa5de96..b5210bdb 100644 --- a/languages/ruby/debugger/debuggerpart.cpp +++ b/languages/ruby/debugger/debuggerpart.cpp @@ -148,19 +148,19 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ mainWindow()->setViewAvailable(rdbOutputWidget, false); // rdbBreakpointWidget -> this - connect( rdbBreakpointWidget, TQT_SIGNAL(refreshBPState(const Breakpoint&)), - this, TQT_SLOT(slotRefreshBPState(const Breakpoint&))); - connect( rdbBreakpointWidget, TQT_SIGNAL(publishBPState(const Breakpoint&)), - this, TQT_SLOT(slotRefreshBPState(const Breakpoint&))); - connect( rdbBreakpointWidget, TQT_SIGNAL(gotoSourcePosition(const TQString&, int)), - this, TQT_SLOT(slotGotoSource(const TQString&, int)) ); + connect( rdbBreakpointWidget, TQ_SIGNAL(refreshBPState(const Breakpoint&)), + this, TQ_SLOT(slotRefreshBPState(const Breakpoint&))); + connect( rdbBreakpointWidget, TQ_SIGNAL(publishBPState(const Breakpoint&)), + this, TQ_SLOT(slotRefreshBPState(const Breakpoint&))); + connect( rdbBreakpointWidget, TQ_SIGNAL(gotoSourcePosition(const TQString&, int)), + this, TQ_SLOT(slotGotoSource(const TQString&, int)) ); // Now setup the actions TDEAction *action; // action = new TDEAction(i18n("&Start"), "1rightarrow", CTRL+SHIFT+Key_F9, action = new TDEAction(i18n("&Start"), "dbgrun", CTRL+SHIFT+Key_F9, - this, TQT_SLOT(slotRun()), + this, TQ_SLOT(slotRun()), actionCollection(), "debug_run"); action->setToolTip( i18n("Start in debugger") ); action->setWhatsThis( i18n("<b>Start in debugger</b><p>" @@ -171,26 +171,26 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ "about variables, frame stack, and so on.") ); action = new TDEAction(i18n("Sto&p"), "process-stop", 0, - this, TQT_SLOT(slotStop()), + this, TQ_SLOT(slotStop()), actionCollection(), "debug_stop"); action->setToolTip( i18n("Stop debugger") ); action->setWhatsThis(i18n("<b>Stop debugger</b><p>Kills the executable and exits the debugger.")); action = new TDEAction(i18n("Interrupt"), "media-playback-pause", 0, - this, TQT_SLOT(slotPause()), + this, TQ_SLOT(slotPause()), actionCollection(), "debug_pause"); action->setToolTip( i18n("Interrupt application") ); action->setWhatsThis(i18n("<b>Interrupt application</b><p>Interrupts the debugged process or current RDB command.")); action = new TDEAction(i18n("Run to &Cursor"), "dbgrunto", 0, - this, TQT_SLOT(slotRunToCursor()), + this, TQ_SLOT(slotRunToCursor()), actionCollection(), "debug_runtocursor"); action->setToolTip( i18n("Run to cursor") ); action->setWhatsThis(i18n("<b>Run to cursor</b><p>Continues execution until the cursor position is reached.")); action = new TDEAction(i18n("Step &Over"), "dbgnext", 0, - this, TQT_SLOT(slotStepOver()), + this, TQ_SLOT(slotStepOver()), actionCollection(), "debug_stepover"); action->setToolTip( i18n("Step over the next line") ); action->setWhatsThis( i18n("<b>Step over</b><p>" @@ -201,7 +201,7 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ action = new TDEAction(i18n("Step &Into"), "dbgstep", 0, - this, TQT_SLOT(slotStepInto()), + this, TQ_SLOT(slotStepInto()), actionCollection(), "debug_stepinto"); action->setToolTip( i18n("Step into the next statement") ); action->setWhatsThis( i18n("<b>Step into</b><p>" @@ -212,7 +212,7 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ action = new TDEAction(i18n("Step O&ut"), "dbgstepout", 0, - this, TQT_SLOT(slotStepOut()), + this, TQ_SLOT(slotStepOut()), actionCollection(), "debug_stepout"); action->setToolTip( i18n("Steps out of the current method") ); action->setWhatsThis( i18n("<b>Step out</b><p>" @@ -224,48 +224,48 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ action = new TDEAction(i18n("Toggle Breakpoint"), 0, 0, - this, TQT_SLOT(toggleBreakpoint()), + this, TQ_SLOT(toggleBreakpoint()), actionCollection(), "debug_toggle_breakpoint"); action->setToolTip(i18n("Toggle breakpoint")); action->setWhatsThis(i18n("<b>Toggle breakpoint</b><p>Toggles the breakpoint at the current line in editor.")); - connect( mainWindow()->main()->guiFactory(), TQT_SIGNAL(clientAdded(KXMLGUIClient*)), - this, TQT_SLOT(guiClientAdded(KXMLGUIClient*)) ); + connect( mainWindow()->main()->guiFactory(), TQ_SIGNAL(clientAdded(KXMLGUIClient*)), + this, TQ_SLOT(guiClientAdded(KXMLGUIClient*)) ); - connect( partController(), TQT_SIGNAL(loadedFile(const KURL &)), - rdbBreakpointWidget, TQT_SLOT(slotRefreshBP(const KURL &)) ); - connect( debugger(), TQT_SIGNAL(toggledBreakpoint(const TQString &, int)), - rdbBreakpointWidget, TQT_SLOT(slotToggleBreakpoint(const TQString &, int)) ); - connect( debugger(), TQT_SIGNAL(editedBreakpoint(const TQString &, int)), - rdbBreakpointWidget, TQT_SLOT(slotEditBreakpoint(const TQString &, int)) ); - connect( debugger(), TQT_SIGNAL(toggledBreakpointEnabled(const TQString &, int)), - rdbBreakpointWidget, TQT_SLOT(slotToggleBreakpointEnabled(const TQString &, int)) ); + connect( partController(), TQ_SIGNAL(loadedFile(const KURL &)), + rdbBreakpointWidget, TQ_SLOT(slotRefreshBP(const KURL &)) ); + connect( debugger(), TQ_SIGNAL(toggledBreakpoint(const TQString &, int)), + rdbBreakpointWidget, TQ_SLOT(slotToggleBreakpoint(const TQString &, int)) ); + connect( debugger(), TQ_SIGNAL(editedBreakpoint(const TQString &, int)), + rdbBreakpointWidget, TQ_SLOT(slotEditBreakpoint(const TQString &, int)) ); + connect( debugger(), TQ_SIGNAL(toggledBreakpointEnabled(const TQString &, int)), + rdbBreakpointWidget, TQ_SLOT(slotToggleBreakpointEnabled(const TQString &, int)) ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(slotStop(KDevPlugin*)) ); - connect( core(), TQT_SIGNAL(projectClosed()), - this, TQT_SLOT(projectClosed()) ); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(slotStop(KDevPlugin*)) ); + connect( core(), TQ_SIGNAL(projectClosed()), + this, TQ_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) ); procLineMaker = new ProcessLineMaker(); - connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)), - appFrontend(), TQT_SLOT(insertStdoutLine(const TQCString&)) ); - connect( procLineMaker, TQT_SIGNAL(receivedStderrLine(const TQCString&)), - appFrontend(), TQT_SLOT(insertStderrLine(const TQCString&)) ); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStdoutLine(const TQCString&)), - appFrontend(), TQT_SLOT(addPartialStdoutLine(const TQCString&)) ); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)), - appFrontend(), TQT_SLOT(addPartialStderrLine(const TQCString&)) ); + connect( procLineMaker, TQ_SIGNAL(receivedStdoutLine(const TQCString&)), + appFrontend(), TQ_SLOT(insertStdoutLine(const TQCString&)) ); + connect( procLineMaker, TQ_SIGNAL(receivedStderrLine(const TQCString&)), + appFrontend(), TQ_SLOT(insertStderrLine(const TQCString&)) ); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStdoutLine(const TQCString&)), + appFrontend(), TQ_SLOT(addPartialStdoutLine(const TQCString&)) ); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStderrLine(const TQCString&)), + appFrontend(), TQ_SLOT(addPartialStderrLine(const TQCString&)) ); setupController(); - TQTimer::singleShot(0, this, TQT_SLOT(setupDcop())); + TQTimer::singleShot(0, this, TQ_SLOT(setupDcop())); } RubyDebuggerPart::~RubyDebuggerPart() @@ -311,16 +311,16 @@ void RubyDebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) popup->insertSeparator(); if (econtext->url().isLocalFile()) { - int id = popup->insertItem( i18n("Toggle Breakpoint"), this, TQT_SLOT(toggleBreakpoint()) ); + int id = popup->insertItem( i18n("Toggle Breakpoint"), this, TQ_SLOT(toggleBreakpoint()) ); popup->setWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line.")); } if (!m_contextIdent.isEmpty()) { TQString squeezed = KStringHandler::csqueeze(m_contextIdent, 30); - int id = popup->insertItem( i18n("Watch: %1").arg(squeezed), this, TQT_SLOT(contextWatch()) ); + int id = popup->insertItem( i18n("Watch: %1").arg(squeezed), this, TQ_SLOT(contextWatch()) ); popup->setWhatsThis(id, i18n("<b>Watch</b><p>Adds an expression under the cursor to the Variables/Watch list.")); - id = popup->insertItem( i18n("Inspect: %1").arg(squeezed), this, TQT_SLOT(contextRubyInspect()) ); + id = popup->insertItem( i18n("Inspect: %1").arg(squeezed), this, TQ_SLOT(contextRubyInspect()) ); popup->setWhatsThis(id, i18n("<b>Inspect</b><p>Evaluates an expression under the cursor.")); } } @@ -362,74 +362,74 @@ void RubyDebuggerPart::setupController() controller = new RDBController(variableTree, framestackWidget, *projectDom()); // this -> controller - connect( this, TQT_SIGNAL(rubyInspect(const TQString&)), - controller, TQT_SLOT(slotRubyInspect(const TQString&))); + connect( this, TQ_SIGNAL(rubyInspect(const TQString&)), + controller, TQ_SLOT(slotRubyInspect(const TQString&))); // variableTree -> framestackWidget - connect( variableTree, TQT_SIGNAL(selectFrame(int, int)), - framestackWidget, TQT_SLOT(slotSelectFrame(int, int))); + connect( variableTree, TQ_SIGNAL(selectFrame(int, int)), + framestackWidget, TQ_SLOT(slotSelectFrame(int, int))); // framestackWidget -> variableTree - connect( framestackWidget, TQT_SIGNAL(frameActive(int, int, const TQString&)), - variableTree, TQT_SLOT(slotFrameActive(int, int, const TQString&))); + connect( framestackWidget, TQ_SIGNAL(frameActive(int, int, const TQString&)), + variableTree, TQ_SLOT(slotFrameActive(int, int, const TQString&))); // variableTree -> controller - connect( variableTree, TQT_SIGNAL(expandItem(VarItem*, const TQCString&)), - controller, TQT_SLOT(slotExpandItem(VarItem*, const TQCString&))); - connect( variableTree, TQT_SIGNAL(fetchGlobals(bool)), - controller, TQT_SLOT(slotFetchGlobals(bool))); - connect( variableTree, TQT_SIGNAL(addWatchExpression(const TQString&, bool)), - controller, TQT_SLOT(slotAddWatchExpression(const TQString&, bool))); - connect( variableTree, TQT_SIGNAL(removeWatchExpression(int)), - controller, TQT_SLOT(slotRemoveWatchExpression(int))); + connect( variableTree, TQ_SIGNAL(expandItem(VarItem*, const TQCString&)), + controller, TQ_SLOT(slotExpandItem(VarItem*, const TQCString&))); + connect( variableTree, TQ_SIGNAL(fetchGlobals(bool)), + controller, TQ_SLOT(slotFetchGlobals(bool))); + connect( variableTree, TQ_SIGNAL(addWatchExpression(const TQString&, bool)), + controller, TQ_SLOT(slotAddWatchExpression(const TQString&, bool))); + connect( variableTree, TQ_SIGNAL(removeWatchExpression(int)), + controller, TQ_SLOT(slotRemoveWatchExpression(int))); // framestackWidget -> controller - connect( framestackWidget, TQT_SIGNAL(selectFrame(int,int,const TQString&)), - controller, TQT_SLOT(slotSelectFrame(int,int,const TQString&))); + connect( framestackWidget, TQ_SIGNAL(selectFrame(int,int,const TQString&)), + controller, TQ_SLOT(slotSelectFrame(int,int,const TQString&))); // rdbBreakpointWidget -> controller - connect( rdbBreakpointWidget, TQT_SIGNAL(clearAllBreakpoints()), - controller, TQT_SLOT(slotClearAllBreakpoints())); - connect( rdbBreakpointWidget, TQT_SIGNAL(publishBPState(const Breakpoint&)), - controller, TQT_SLOT(slotBPState(const Breakpoint &))); + connect( rdbBreakpointWidget, TQ_SIGNAL(clearAllBreakpoints()), + controller, TQ_SLOT(slotClearAllBreakpoints())); + connect( rdbBreakpointWidget, TQ_SIGNAL(publishBPState(const Breakpoint&)), + controller, TQ_SLOT(slotBPState(const Breakpoint &))); // rdbOutputWidget -> controller - connect( rdbOutputWidget, TQT_SIGNAL(userRDBCmd(const TQString &)), - controller, TQT_SLOT(slotUserRDBCmd(const TQString&))); - connect( rdbOutputWidget, TQT_SIGNAL(breakInto()), - controller, TQT_SLOT(slotBreakInto())); + connect( rdbOutputWidget, TQ_SIGNAL(userRDBCmd(const TQString &)), + controller, TQ_SLOT(slotUserRDBCmd(const TQString&))); + connect( rdbOutputWidget, TQ_SIGNAL(breakInto()), + controller, TQ_SLOT(slotBreakInto())); // controller -> rdbBreakpointWidget - connect( controller, TQT_SIGNAL(acceptPendingBPs()), - rdbBreakpointWidget, TQT_SLOT(slotSetPendingBPs())); - connect( controller, TQT_SIGNAL(unableToSetBPNow(int)), - rdbBreakpointWidget, TQT_SLOT(slotUnableToSetBPNow(int))); - connect( controller, TQT_SIGNAL(rawRDBBreakpointList (char*)), - rdbBreakpointWidget, TQT_SLOT(slotParseRDBBrkptList(char*))); - connect( controller, TQT_SIGNAL(rawRDBBreakpointSet(char*, int)), - rdbBreakpointWidget, TQT_SLOT(slotParseRDBBreakpointSet(char*, int))); + connect( controller, TQ_SIGNAL(acceptPendingBPs()), + rdbBreakpointWidget, TQ_SLOT(slotSetPendingBPs())); + connect( controller, TQ_SIGNAL(unableToSetBPNow(int)), + rdbBreakpointWidget, TQ_SLOT(slotUnableToSetBPNow(int))); + connect( controller, TQ_SIGNAL(rawRDBBreakpointList (char*)), + rdbBreakpointWidget, TQ_SLOT(slotParseRDBBrkptList(char*))); + connect( controller, TQ_SIGNAL(rawRDBBreakpointSet(char*, int)), + rdbBreakpointWidget, TQ_SLOT(slotParseRDBBreakpointSet(char*, int))); // controller -> this - connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), - this, TQT_SLOT(slotStatus(const TQString&, int))); - connect( controller, TQT_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), - this, TQT_SLOT(slotShowStep(const TQString&, int))); + connect( controller, TQ_SIGNAL(dbgStatus(const TQString&, int)), + this, TQ_SLOT(slotStatus(const TQString&, int))); + connect( controller, TQ_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), + this, TQ_SLOT(slotShowStep(const TQString&, int))); // controller -> procLineMaker - connect( controller, TQT_SIGNAL(ttyStdout(const char*)), - procLineMaker, TQT_SLOT(slotReceivedStdout(const char*))); - connect( controller, TQT_SIGNAL(ttyStderr(const char*)), - procLineMaker, TQT_SLOT(slotReceivedStderr(const char*))); + connect( controller, TQ_SIGNAL(ttyStdout(const char*)), + procLineMaker, TQ_SLOT(slotReceivedStdout(const char*))); + connect( controller, TQ_SIGNAL(ttyStderr(const char*)), + procLineMaker, TQ_SLOT(slotReceivedStderr(const char*))); // controller -> rdbOutputWidget - connect( controller, TQT_SIGNAL(rdbStdout(const char*)), - rdbOutputWidget, TQT_SLOT(slotReceivedStdout(const char*)) ); - connect( controller, TQT_SIGNAL(rdbStderr(const char*)), - rdbOutputWidget, TQT_SLOT(slotReceivedStderr(const char*)) ); - connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), - rdbOutputWidget, TQT_SLOT(slotDbgStatus(const TQString&, int))); + connect( controller, TQ_SIGNAL(rdbStdout(const char*)), + rdbOutputWidget, TQ_SLOT(slotReceivedStdout(const char*)) ); + connect( controller, TQ_SIGNAL(rdbStderr(const char*)), + rdbOutputWidget, TQ_SLOT(slotReceivedStderr(const char*)) ); + connect( controller, TQ_SIGNAL(dbgStatus(const TQString&, int)), + rdbOutputWidget, TQ_SLOT(slotDbgStatus(const TQString&, int))); } diff --git a/languages/ruby/debugger/debuggerpart.h b/languages/ruby/debugger/debuggerpart.h index 498a159e..4dfd1958 100644 --- a/languages/ruby/debugger/debuggerpart.h +++ b/languages/ruby/debugger/debuggerpart.h @@ -47,7 +47,7 @@ class RDBOutputWidget; class RubyDebuggerPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/ruby/debugger/framestackwidget.cpp b/languages/ruby/debugger/framestackwidget.cpp index 4d90092f..024cff2c 100644 --- a/languages/ruby/debugger/framestackwidget.cpp +++ b/languages/ruby/debugger/framestackwidget.cpp @@ -51,8 +51,8 @@ FramestackWidget::FramestackWidget(TQWidget *parent, const char *name, WFlags f) setSorting(0); header()->hide(); - connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); } diff --git a/languages/ruby/debugger/framestackwidget.h b/languages/ruby/debugger/framestackwidget.h index 7f970c31..ba3aacb7 100644 --- a/languages/ruby/debugger/framestackwidget.h +++ b/languages/ruby/debugger/framestackwidget.h @@ -81,7 +81,7 @@ private: */ class FramestackWidget : public TQListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/ruby/debugger/rdbbreakpointwidget.cpp b/languages/ruby/debugger/rdbbreakpointwidget.cpp index f8e86ad7..92170f52 100644 --- a/languages/ruby/debugger/rdbbreakpointwidget.cpp +++ b/languages/ruby/debugger/rdbbreakpointwidget.cpp @@ -239,34 +239,34 @@ RDBBreakpointWidget::RDBBreakpointWidget(TQWidget *parent, const char *name) : m_ctxMenu->insertItem( i18n( "Disable" ), BW_ITEM_Disable ); m_ctxMenu->insertItem( i18n( "Delete" ), BW_ITEM_Delete ); - connect( addMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotAddBlankBreakpoint(int)) ); - connect( m_delete, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveBreakpoint()) ); - connect( m_edit, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotEditBreakpoint()) ); - connect( m_removeAll, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveAllBreakpoints()) ); + connect( addMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotAddBlankBreakpoint(int)) ); + connect( m_delete, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveBreakpoint()) ); + connect( m_edit, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotEditBreakpoint()) ); + connect( m_removeAll, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveAllBreakpoints()) ); - connect( m_table, TQT_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), - this, TQT_SLOT(slotContextMenuShow(int, int, const TQPoint & )) ); - connect( m_ctxMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotContextMenuSelect(int)) ); + connect( m_table, TQ_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), + this, TQ_SLOT(slotContextMenuShow(int, int, const TQPoint & )) ); + connect( m_ctxMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotContextMenuSelect(int)) ); - connect( m_table, TQT_SIGNAL(doubleClicked(int, int, int, const TQPoint &)), - this, TQT_SLOT(slotRowDoubleClicked(int, int, int, const TQPoint &))); + connect( m_table, TQ_SIGNAL(doubleClicked(int, int, int, const TQPoint &)), + this, TQ_SLOT(slotRowDoubleClicked(int, int, int, const TQPoint &))); - connect( m_table, TQT_SIGNAL(valueChanged(int, int)), - this, TQT_SLOT(slotNewValue(int, int))); + connect( m_table, TQ_SIGNAL(valueChanged(int, int)), + this, TQ_SLOT(slotNewValue(int, int))); - connect( m_table, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(slotEditBreakpoint())); -// connect( m_table, TQT_SIGNAL(f2Pressed()), -// this, TQT_SLOT(slotEditBreakpoint())); - connect( m_table, TQT_SIGNAL(deletePressed()), - this, TQT_SLOT(slotRemoveBreakpoint())); - connect( m_table, TQT_SIGNAL(insertPressed()), - this, TQT_SLOT(slotAddBreakpoint())); + connect( m_table, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(slotEditBreakpoint())); +// connect( m_table, TQ_SIGNAL(f2Pressed()), +// this, TQ_SLOT(slotEditBreakpoint())); + connect( m_table, TQ_SIGNAL(deletePressed()), + this, TQ_SLOT(slotRemoveBreakpoint())); + connect( m_table, TQ_SIGNAL(insertPressed()), + this, TQ_SLOT(slotAddBreakpoint())); } /***************************************************************************/ @@ -634,7 +634,7 @@ void RDBBreakpointWidget::slotRemoveAllBreakpoints() void RDBBreakpointWidget::slotRowDoubleClicked(int row, int col, int btn, const TQPoint &) { - if ( btn == Qt::LeftButton ) + if ( btn == TQt::LeftButton ) { // kdDebug(9012) << "in slotRowSelected row=" << row << endl; BreakpointTableRow* btr = (BreakpointTableRow *) m_table->item(row, Control); diff --git a/languages/ruby/debugger/rdbbreakpointwidget.h b/languages/ruby/debugger/rdbbreakpointwidget.h index 2b8186a8..c11d2a22 100644 --- a/languages/ruby/debugger/rdbbreakpointwidget.h +++ b/languages/ruby/debugger/rdbbreakpointwidget.h @@ -41,7 +41,7 @@ class RDBTable; class RDBBreakpointWidget : public TQHBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/ruby/debugger/rdbcontroller.cpp b/languages/ruby/debugger/rdbcontroller.cpp index 16ce7179..94204089 100644 --- a/languages/ruby/debugger/rdbcontroller.cpp +++ b/languages/ruby/debugger/rdbcontroller.cpp @@ -130,8 +130,8 @@ RDBController::RDBController(VariableTree *varTree, FramestackWidget *frameStack bind(masterSocket_, (const struct sockaddr*) &sockaddr, sizeof(sockaddr)); listen(masterSocket_, 1); acceptNotifier_ = new TQSocketNotifier(masterSocket_, TQSocketNotifier::Read, this); - TQObject::connect( acceptNotifier_, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotAcceptConnection(int)) ); + TQObject::connect( acceptNotifier_, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotAcceptConnection(int)) ); configure(); cmdList_.setAutoDelete(true); @@ -696,8 +696,8 @@ void RDBController::slotStart(const TQString& ruby_interpreter, const TQString& tty_ = new STTY(config_dbgTerminal_, Settings::terminalEmulatorName( *kapp->config() )); if (!config_dbgTerminal_) { - connect( tty_, TQT_SIGNAL(OutOutput(const char*)), TQT_SIGNAL(ttyStdout(const char*)) ); - connect( tty_, TQT_SIGNAL(ErrOutput(const char*)), TQT_SIGNAL(ttyStderr(const char*)) ); + connect( tty_, TQ_SIGNAL(OutOutput(const char*)), TQ_SIGNAL(ttyStdout(const char*)) ); + connect( tty_, TQ_SIGNAL(ErrOutput(const char*)), TQ_SIGNAL(ttyStderr(const char*)) ); } TQString tty(tty_->getSlave()); @@ -716,17 +716,17 @@ void RDBController::slotStart(const TQString& ruby_interpreter, const TQString& dbgProcess_ = new TDEProcess; - connect( dbgProcess_, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotDbgStdout(TDEProcess *, char *, int)) ); + connect( dbgProcess_, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotDbgStdout(TDEProcess *, char *, int)) ); - connect( dbgProcess_, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(slotDbgStderr(TDEProcess *, char *, int)) ); + connect( dbgProcess_, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(slotDbgStderr(TDEProcess *, char *, int)) ); - connect( dbgProcess_, TQT_SIGNAL(wroteStdin(TDEProcess *)), - this, TQT_SLOT(slotDbgWroteStdin(TDEProcess *)) ); + connect( dbgProcess_, TQ_SIGNAL(wroteStdin(TDEProcess *)), + this, TQ_SLOT(slotDbgWroteStdin(TDEProcess *)) ); - connect( dbgProcess_, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotDbgProcessExited(TDEProcess*)) ); + connect( dbgProcess_, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotDbgProcessExited(TDEProcess*)) ); rubyInterpreter_ = ruby_interpreter; characterCoding_ = character_coding; @@ -1199,8 +1199,8 @@ void RDBController::slotAcceptConnection(int masterSocket) } socketNotifier_ = new TQSocketNotifier(socket_, TQSocketNotifier::Read, 0); - TQObject::connect( socketNotifier_, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotReadFromSocket(int)) ); + TQObject::connect( socketNotifier_, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotReadFromSocket(int)) ); setStateOff(s_dbgNotStarted); emit dbgStatus ("", state_); diff --git a/languages/ruby/debugger/rdbcontroller.h b/languages/ruby/debugger/rdbcontroller.h index ce2247e9..f28302db 100644 --- a/languages/ruby/debugger/rdbcontroller.h +++ b/languages/ruby/debugger/rdbcontroller.h @@ -55,7 +55,7 @@ class STTY; class RDBController : public DbgController { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/ruby/debugger/rdboutputwidget.cpp b/languages/ruby/debugger/rdboutputwidget.cpp index 575d60ad..52ba2c0f 100644 --- a/languages/ruby/debugger/rdboutputwidget.cpp +++ b/languages/ruby/debugger/rdboutputwidget.cpp @@ -81,8 +81,8 @@ RDBOutputWidget::RDBOutputWidget( TQWidget *parent, const char *name) : slotDbgStatus( "", s_dbgNotStarted); - connect( m_userRDBCmdEditor, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotRDBCmd()) ); - connect( m_Interrupt, TQT_SIGNAL(clicked()), TQT_SIGNAL(breakInto())); + connect( m_userRDBCmdEditor, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotRDBCmd()) ); + connect( m_Interrupt, TQ_SIGNAL(clicked()), TQ_SIGNAL(breakInto())); } /***************************************************************************/ diff --git a/languages/ruby/debugger/rdboutputwidget.h b/languages/ruby/debugger/rdboutputwidget.h index 50b1ea7f..3f96aeed 100644 --- a/languages/ruby/debugger/rdboutputwidget.h +++ b/languages/ruby/debugger/rdboutputwidget.h @@ -36,7 +36,7 @@ namespace RDBDebugger class RDBOutputWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/ruby/debugger/rdbtable.h b/languages/ruby/debugger/rdbtable.h index 35ee6f9f..1cf6bfe5 100644 --- a/languages/ruby/debugger/rdbtable.h +++ b/languages/ruby/debugger/rdbtable.h @@ -22,7 +22,7 @@ namespace RDBDebugger { class RDBTable : public TQTable { -Q_OBJECT +TQ_OBJECT public: RDBTable(TQWidget *parent = 0, const char *name = 0); diff --git a/languages/ruby/debugger/stty.cpp b/languages/ruby/debugger/stty.cpp index 73ea4784..bacb21d9 100644 --- a/languages/ruby/debugger/stty.cpp +++ b/languages/ruby/debugger/stty.cpp @@ -131,7 +131,7 @@ STTY::STTY(bool ext, const TQString &termAppName) if (fout >= 0) { ttySlave = TQString(tty_slave); out = new TQSocketNotifier(fout, TQSocketNotifier::Read, this); - connect( out, TQT_SIGNAL(activated(int)), this, TQT_SLOT(OutReceived(int)) ); + connect( out, TQ_SIGNAL(activated(int)), this, TQ_SLOT(OutReceived(int)) ); } } } diff --git a/languages/ruby/debugger/stty.h b/languages/ruby/debugger/stty.h index ead3dede..908872dd 100644 --- a/languages/ruby/debugger/stty.h +++ b/languages/ruby/debugger/stty.h @@ -35,7 +35,7 @@ namespace RDBDebugger class STTY : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp index 94fd4e88..c4173dfb 100644 --- a/languages/ruby/debugger/variablewidget.cpp +++ b/languages/ruby/debugger/variablewidget.cpp @@ -71,8 +71,8 @@ VariableWidget::VariableWidget(TQWidget *parent, const char *name) topLayout->addWidget(varTree_, 10); topLayout->addLayout( vbox ); - connect( addButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddWatchExpression()) ); - connect( watchVarEditor_, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotAddWatchExpression()) ); + connect( addButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddWatchExpression()) ); + connect( watchVarEditor_, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotAddWatchExpression()) ); } @@ -145,11 +145,11 @@ VariableTree::VariableTree(VariableWidget *parent, const char *name) addColumn(i18n("Variable"), 100 ); addColumn(i18n("Value"), 100 ); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*)) ); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*)) ); - connect( this, TQT_SIGNAL(pressed(TQListViewItem*)), - this, TQT_SLOT(slotPressed(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(pressed(TQListViewItem*)), + this, TQ_SLOT(slotPressed(TQListViewItem*)) ); watchRoot_ = new WatchRoot(this); } diff --git a/languages/ruby/debugger/variablewidget.h b/languages/ruby/debugger/variablewidget.h index 3fce8225..4667184b 100644 --- a/languages/ruby/debugger/variablewidget.h +++ b/languages/ruby/debugger/variablewidget.h @@ -62,7 +62,7 @@ enum DataType { class VariableWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -94,7 +94,7 @@ private: class VariableTree : public TDEListView, public TQToolTip { - Q_OBJECT + TQ_OBJECT //we need this to be able to emit expandItem() from within LazyFetchItem friend class LazyFetchItem; diff --git a/languages/ruby/rubyconfigwidget.h b/languages/ruby/rubyconfigwidget.h index 447ce938..10458e3c 100644 --- a/languages/ruby/rubyconfigwidget.h +++ b/languages/ruby/rubyconfigwidget.h @@ -8,7 +8,7 @@ class TQDomDocument; class RubyConfigWidget : public RubyConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: RubyConfigWidget(TQDomDocument &projectDom, TQWidget* parent = 0, const char* name = 0); diff --git a/languages/ruby/rubyimplementationwidget.h b/languages/ruby/rubyimplementationwidget.h index a5d8e491..a11f67b3 100644 --- a/languages/ruby/rubyimplementationwidget.h +++ b/languages/ruby/rubyimplementationwidget.h @@ -23,7 +23,7 @@ #include <implementationwidget.h> class RubyImplementationWidget : public ImplementationWidget { -Q_OBJECT +TQ_OBJECT public: RubyImplementationWidget(KDevLanguageSupport* part, TQWidget* parent = 0, diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp index db9576b3..79cbac07 100644 --- a/languages/ruby/rubysupport_part.cpp +++ b/languages/ruby/rubysupport_part.cpp @@ -49,26 +49,26 @@ RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStr TDEAction *action; action = new TDEAction( i18n("&Run"), "application-x-executable", SHIFT + Key_F9, - this, TQT_SLOT(slotRun()), + this, TQ_SLOT(slotRun()), actionCollection(), "build_execute" ); action->setToolTip(i18n("Run")); action->setWhatsThis(i18n("<b>Run</b><p>Starts an application.")); action->setIcon("ruby_run.png"); action = new TDEAction( i18n("Run Test Under Cursor"), "application-x-executable", ALT + Key_F9, - this, TQT_SLOT(slotRunTestUnderCursor()), + this, TQ_SLOT(slotRunTestUnderCursor()), actionCollection(), "build_execute_test_function" ); action->setToolTip(i18n("Run Test Under Cursor")); action->setWhatsThis(i18n("<b>Run Test Under Cursor</b><p>Runs the function under the cursor as test.")); - action = new TDEAction( i18n("Launch Browser"), "network", 0, this, TQT_SLOT(slotBrowse()), actionCollection(), "build_launch_browser" ); + action = new TDEAction( i18n("Launch Browser"), "network", 0, this, TQ_SLOT(slotBrowse()), actionCollection(), "build_launch_browser" ); action->setToolTip(i18n("Launch Browser")); action->setWhatsThis(i18n("<b>Launch Browser</b><p>Opens a web browser pointing to the Ruby Rails server") ); - action = new TDEAction( i18n("Switch To Controller"), 0, CTRL+ALT+Key_1, this, TQT_SLOT(slotSwitchToController()), actionCollection(), "switch_to_controller" ); - action = new TDEAction( i18n("Switch To Model"), 0, CTRL+ALT+Key_2, this, TQT_SLOT(slotSwitchToModel()), actionCollection(), "switch_to_model" ); - action = new TDEAction( i18n("Switch To View"), 0, CTRL+ALT+Key_3, this, TQT_SLOT(slotSwitchToView()), actionCollection(), "switch_to_view" ); - action = new TDEAction( i18n("Switch To Test"), 0, CTRL+ALT+Key_4, this, TQT_SLOT(slotSwitchToTest()), actionCollection(), "switch_to_test" ); + action = new TDEAction( i18n("Switch To Controller"), 0, CTRL+ALT+Key_1, this, TQ_SLOT(slotSwitchToController()), actionCollection(), "switch_to_controller" ); + action = new TDEAction( i18n("Switch To Model"), 0, CTRL+ALT+Key_2, this, TQ_SLOT(slotSwitchToModel()), actionCollection(), "switch_to_model" ); + action = new TDEAction( i18n("Switch To View"), 0, CTRL+ALT+Key_3, this, TQ_SLOT(slotSwitchToView()), actionCollection(), "switch_to_view" ); + action = new TDEAction( i18n("Switch To Test"), 0, CTRL+ALT+Key_4, this, TQ_SLOT(slotSwitchToTest()), actionCollection(), "switch_to_test" ); kdDebug() << "Creating RubySupportPart" << endl; @@ -78,14 +78,14 @@ RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStr mainWindow()->embedOutputView( m_shellWidget, i18n("Ruby Shell"), i18n("Ruby Shell")); mainWindow()->raiseView( m_shellWidget ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), - this, TQT_SLOT(savedFile(const KURL&)) ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), + this, TQ_SLOT(savedFile(const KURL&)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); } @@ -101,7 +101,7 @@ void RubySupportPart::projectConfigWidget(KDialogBase *dlg) { TQVBox *vbox = dlg->addVBoxPage(i18n("Ruby"), i18n("Ruby"), BarIcon("ruby_config.png", TDEIcon::SizeMedium, TDEIcon::DefaultState, RubySupportPart::instance())); RubyConfigWidget *w = new RubyConfigWidget(*projectDom(), (TQWidget *)vbox, "ruby config widget"); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } void RubySupportPart::projectOpened() @@ -114,10 +114,10 @@ void RubySupportPart::projectOpened() m_shellWidget->activate(); m_shellWidget->setAutoReactivateOnClose( true ); - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)), - this, TQT_SLOT(addedFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)), - this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)), + this, TQ_SLOT(addedFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)), + this, TQ_SLOT(removedFilesFromProject(const TQStringList &)) ); TQFileInfo program(mainProgram()); @@ -134,7 +134,7 @@ void RubySupportPart::projectOpened() // We want to parse only after all components have been // properly initialized - TQTimer::singleShot(0, this, TQT_SLOT(initialParse())); + TQTimer::singleShot(0, this, TQ_SLOT(initialParse())); } void RubySupportPart::maybeParse(const TQString fileName) @@ -668,7 +668,7 @@ void RubySupportPart::contextMenu( TQPopupMenu * popup, const Context * context if (url.fileName().endsWith(".ui")) { m_contextFileName = url.fileName(); - int id = popup->insertItem(i18n("Create or Select Implementation..."), this, TQT_SLOT(slotCreateSubclass())); + int id = popup->insertItem(i18n("Create or Select Implementation..."), this, TQ_SLOT(slotCreateSubclass())); popup->setWhatsThis(id, i18n("<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner.")); } } diff --git a/languages/ruby/rubysupport_part.h b/languages/ruby/rubysupport_part.h index 024eae60..4e8544bd 100644 --- a/languages/ruby/rubysupport_part.h +++ b/languages/ruby/rubysupport_part.h @@ -17,7 +17,7 @@ class KDevShellWidget; class RubySupportPart : public KDevLanguageSupport { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/ruby/tqtdesignerrubyintegration.h b/languages/ruby/tqtdesignerrubyintegration.h index be89e490..1ffe264c 100644 --- a/languages/ruby/tqtdesignerrubyintegration.h +++ b/languages/ruby/tqtdesignerrubyintegration.h @@ -24,7 +24,7 @@ class QtDesignerRubyIntegration : public QtDesignerIntegration { -Q_OBJECT +TQ_OBJECT public: QtDesignerRubyIntegration(KDevLanguageSupport *part, ImplementationWidget *impl); diff --git a/languages/sql/sqlactions.cpp b/languages/sql/sqlactions.cpp index 1d1a5b14..6ef46f2c 100644 --- a/languages/sql/sqlactions.cpp +++ b/languages/sql/sqlactions.cpp @@ -37,8 +37,8 @@ SqlListAction::SqlListAction(SQLSupportPart *part, const TQString &text, m_combo->setMinimumWidth( 200 ); m_combo->setMaximumWidth( 400 ); - connect( m_combo, TQT_SIGNAL(activated(const TQString&)), receiver, slot ); - connect( m_combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(activated(int)) ); + connect( m_combo, TQ_SIGNAL(activated(const TQString&)), receiver, slot ); + connect( m_combo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(activated(int)) ); setShortcutConfigurable( false ); setAutoSized( true ); diff --git a/languages/sql/sqlactions.h b/languages/sql/sqlactions.h index 04ad295b..9ed4453b 100644 --- a/languages/sql/sqlactions.h +++ b/languages/sql/sqlactions.h @@ -21,7 +21,7 @@ class KComboBox; class SqlListAction : public KWidgetAction { - Q_OBJECT + TQ_OBJECT public: SqlListAction( SQLSupportPart *part, const TQString &text, const TDEShortcut& cut, diff --git a/languages/sql/sqlconfigwidget.ui b/languages/sql/sqlconfigwidget.ui index cfa61833..81e20b78 100644 --- a/languages/sql/sqlconfigwidget.ui +++ b/languages/sql/sqlconfigwidget.ui @@ -164,10 +164,10 @@ <variable access="private">TQDomDocument* doc;</variable> <variable access="private">bool changed;</variable> </variables> -<Q_SIGNALS> +<signals> <signal>newConfigSaved()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>init()</slot> <slot>valueChanged( int, int )</slot> <slot>removeDb()</slot> @@ -176,7 +176,7 @@ <slot>accept()</slot> <slot>setProjectDom( TQDomDocument * doc )</slot> <slot>loadConfig()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/sql/sqlconfigwidget.ui.h b/languages/sql/sqlconfigwidget.ui.h index c06413e7..e1a4d975 100644 --- a/languages/sql/sqlconfigwidget.ui.h +++ b/languages/sql/sqlconfigwidget.ui.h @@ -38,7 +38,7 @@ public: virtual void setContentFromEditor( TQWidget* w ) { - if ( w->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQComboBox" ) ) setText( ( (TQComboBox*)w )->currentText() ); else TQTableItem::setContentFromEditor( w ); @@ -62,7 +62,7 @@ public: virtual void setContentFromEditor( TQWidget* w ) { - if ( w->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQSpinBox" ) ) setText( ( (TQSpinBox*)w )->text() ); else TQTableItem::setContentFromEditor( w ); diff --git a/languages/sql/sqloutputwidget.h b/languages/sql/sqloutputwidget.h index 4e5fa790..04eb89d2 100644 --- a/languages/sql/sqloutputwidget.h +++ b/languages/sql/sqloutputwidget.h @@ -21,7 +21,7 @@ class TQSqlError; class SqlOutputWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp index 96e8ed4f..096d49d9 100644 --- a/languages/sql/sqlsupport_part.cpp +++ b/languages/sql/sqlsupport_part.cpp @@ -40,20 +40,20 @@ SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStri setXMLFile( "kdevsqlsupport.rc" ); TDEAction *action; - action = new TDEAction( i18n( "&Run" ), "application-x-executable", Key_F9, this, TQT_SLOT( slotRun() ), actionCollection(), "build_execute" ); + action = new TDEAction( i18n( "&Run" ), "application-x-executable", Key_F9, this, TQ_SLOT( slotRun() ), actionCollection(), "build_execute" ); action->setToolTip(i18n("Run")); action->setWhatsThis(i18n("<b>Run</b><p>Executes a SQL script.")); - dbAction = new SqlListAction( this, i18n( "&Database Connections" ), 0, this, TQT_SLOT(activeConnectionChanged()), actionCollection(), "connection_combo" ); + dbAction = new SqlListAction( this, i18n( "&Database Connections" ), 0, this, TQ_SLOT(activeConnectionChanged()), actionCollection(), "connection_combo" ); kdDebug( 9000 ) << "Creating SQLSupportPart" << endl; - connect( core(), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), - this, TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( core(), TQT_SIGNAL(languageChanged()), this, TQT_SLOT(projectOpened()) ); - connect( partController(), TQT_SIGNAL( savedFile( const KURL& ) ), this, TQT_SLOT( savedFile( const KURL& ) ) ); + connect( core(), TQ_SIGNAL( projectConfigWidget( KDialogBase* ) ), + this, TQ_SLOT( projectConfigWidget( KDialogBase* ) ) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( core(), TQ_SIGNAL(languageChanged()), this, TQ_SLOT(projectOpened()) ); + connect( partController(), TQ_SIGNAL( savedFile( const KURL& ) ), this, TQ_SLOT( savedFile( const KURL& ) ) ); m_widget = new SqlOutputWidget(); mainWindow()->embedOutputView( m_widget, i18n( "SQL" ), i18n( "Output of SQL commands" ) ); @@ -136,22 +136,22 @@ void SQLSupportPart::projectConfigWidget( KDialogBase *dlg ) SqlConfigWidget *w = new SqlConfigWidget( (TQWidget*)vbox, "SQL config widget" ); w->setProjectDom( projectDom() ); w->loadConfig(); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); - connect( w, TQT_SIGNAL(newConfigSaved()), this, TQT_SLOT(loadConfig()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); + connect( w, TQ_SIGNAL(newConfigSaved()), this, TQ_SLOT(loadConfig()) ); } void SQLSupportPart::projectOpened() { - connect( project(), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ), - this, TQT_SLOT( addedFilesToProject( const TQStringList & ) ) ); - connect( project(), TQT_SIGNAL( removedFilesFromProject( const TQStringList & ) ), - this, TQT_SLOT( removedFilesFromProject( const TQStringList & ) ) ); + connect( project(), TQ_SIGNAL( addedFilesToProject( const TQStringList & ) ), + this, TQ_SLOT( addedFilesToProject( const TQStringList & ) ) ); + connect( project(), TQ_SIGNAL( removedFilesFromProject( const TQStringList & ) ), + this, TQ_SLOT( removedFilesFromProject( const TQStringList & ) ) ); loadConfig(); // We want to parse only after all components have been // properly initialized - TQTimer::singleShot( 0, this, TQT_SLOT( parse() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( parse() ) ); } diff --git a/languages/sql/sqlsupport_part.h b/languages/sql/sqlsupport_part.h index d5efca5b..921743e2 100644 --- a/languages/sql/sqlsupport_part.h +++ b/languages/sql/sqlsupport_part.h @@ -16,7 +16,7 @@ class CodeModel; class SQLSupportPart : public KDevLanguageSupport { - Q_OBJECT + TQ_OBJECT public: diff --git a/lib/antlr/antlr/CharScanner.h b/lib/antlr/antlr/CharScanner.h index 9ad6fc7b..2e2ffc7c 100644 --- a/lib/antlr/antlr/CharScanner.h +++ b/lib/antlr/antlr/CharScanner.h @@ -10,6 +10,7 @@ #include <antlr/config.h> +#include <functional> #include <map> #ifdef HAS_NOT_CCTYPE_H @@ -66,7 +67,7 @@ ANTLR_C_USING(strcasecmp) /** Functor for the literals map */ -class ANTLR_API CharScannerLiteralsLess : public ANTLR_USE_NAMESPACE(std)binary_function<ANTLR_USE_NAMESPACE(std)string,ANTLR_USE_NAMESPACE(std)string,bool> { +class ANTLR_API CharScannerLiteralsLess : public ANTLR_USE_NAMESPACE(std)function<bool(ANTLR_USE_NAMESPACE(std)string,ANTLR_USE_NAMESPACE(std)string)> { private: const CharScanner* scanner; public: diff --git a/lib/cppparser/ast.cpp b/lib/cppparser/ast.cpp index 20cf0fc8..21c7f375 100644 --- a/lib/cppparser/ast.cpp +++ b/lib/cppparser/ast.cpp @@ -83,7 +83,7 @@ TQString nodeTypeToString( int type ) return "DoStatement"; case NodeType_ForStatement: return "ForStatement"; - case NodeType_ForEachStatement: // qt4 [erbsland] + case NodeType_ForEachStatement: return "ForEachStatement"; case NodeType_SwitchStatement: return "SwitchStatement"; @@ -219,13 +219,13 @@ void NameAST::setGlobal( bool b ) void NameAST::setUnqualifiedName( ClassOrNamespaceNameAST::Node& unqualifiedName ) { - m_unqualifiedName = unqualifiedName; - if( m_unqualifiedName.get() ) m_unqualifiedName->setParent( this ); + m_unqualifiedName = std::move(unqualifiedName); + if( m_unqualifiedName ) m_unqualifiedName->setParent( this ); } void NameAST::addClassOrNamespaceName( ClassOrNamespaceNameAST::Node& classOrNamespaceName ) { - if( !classOrNamespaceName.get() ) + if( !classOrNamespaceName ) return; classOrNamespaceName->setParent( this ); @@ -234,7 +234,7 @@ void NameAST::addClassOrNamespaceName( ClassOrNamespaceNameAST::Node& classOrNam TQString NameAST::text() const { - if( !m_unqualifiedName.get() ) + if( !m_unqualifiedName ) return TQString(); TQString str; @@ -249,7 +249,7 @@ TQString NameAST::text() const ++it; } - if( m_unqualifiedName.get() ) + if( m_unqualifiedName ) str += m_unqualifiedName->text(); return str; @@ -268,7 +268,7 @@ LinkageBodyAST::LinkageBodyAST() void LinkageBodyAST::addDeclaration( DeclarationAST::Node& ast ) { - if( !ast.get() ) + if( !ast ) return; ast->setParent( this ); @@ -282,32 +282,32 @@ LinkageSpecificationAST::LinkageSpecificationAST() void LinkageSpecificationAST::setExternType( AST::Node& externType ) { - m_externType = externType; - if( m_externType.get() ) m_externType->setParent( this ); + m_externType = std::move(externType); + if( m_externType ) m_externType->setParent( this ); } void LinkageSpecificationAST::setLinkageBody( LinkageBodyAST::Node& linkageBody ) { - m_linkageBody = linkageBody; - if( m_linkageBody.get() ) m_linkageBody->setParent( this ); + m_linkageBody = std::move(linkageBody); + if( m_linkageBody ) m_linkageBody->setParent( this ); } void LinkageSpecificationAST::setDeclaration( DeclarationAST::Node& decl ) { - m_declaration = decl; - if( m_declaration.get() ) m_declaration->setParent( this ); + m_declaration = std::move(decl); + if( m_declaration ) m_declaration->setParent( this ); } // ------------------------------------------------------------------------ TranslationUnitAST::TranslationUnitAST() { - ////kdDebug(9007) << "++ TranslationUnitAST::TranslationUnitAST()" << endl; + //kdDebug(9007) << "++ TranslationUnitAST::TranslationUnitAST()" << endl; m_declarationList.setAutoDelete( true ); } void TranslationUnitAST::addDeclaration( DeclarationAST::Node& ast ) { - if( !ast.get() ) + if( !ast ) return; ast->setParent( this ); @@ -321,14 +321,14 @@ NamespaceAST::NamespaceAST() void NamespaceAST::setNamespaceName( AST::Node& namespaceName ) { - m_namespaceName = namespaceName; - if( m_namespaceName.get() ) m_namespaceName->setParent( this ); + m_namespaceName = std::move(namespaceName); + if( m_namespaceName ) m_namespaceName->setParent( this ); } void NamespaceAST::setLinkageBody( LinkageBodyAST::Node& linkageBody ) { - m_linkageBody = linkageBody; - if( m_linkageBody.get() ) m_linkageBody->setParent( this ); + m_linkageBody = std::move(linkageBody); + if( m_linkageBody ) m_linkageBody->setParent( this ); } @@ -339,14 +339,14 @@ NamespaceAliasAST::NamespaceAliasAST() void NamespaceAliasAST::setNamespaceName( AST::Node& namespaceName ) { - m_namespaceName = namespaceName; - if( m_namespaceName.get() ) m_namespaceName->setParent( this ); + m_namespaceName = std::move(namespaceName); + if( m_namespaceName ) m_namespaceName->setParent( this ); } void NamespaceAliasAST::setAliasName( NameAST::Node& name ) { - m_aliasName = name; - if( m_aliasName.get() ) m_aliasName->setParent( this ); + m_aliasName = std::move(name); + if( m_aliasName ) m_aliasName->setParent( this ); } // ------------------------------------------------------------------------ @@ -356,14 +356,14 @@ UsingAST::UsingAST() void UsingAST::setTypeName( AST::Node& typeName ) { - m_typeName = typeName; - if( m_typeName.get() ) m_typeName->setParent( this ); + m_typeName = std::move(typeName); + if( m_typeName ) m_typeName->setParent( this ); } void UsingAST::setName( NameAST::Node& name ) { - m_name = name; - if( m_name.get() ) m_name->setParent( this ); + m_name = std::move(name); + if( m_name ) m_name->setParent( this ); } // ------------------------------------------------------------------------ @@ -373,8 +373,8 @@ UsingDirectiveAST::UsingDirectiveAST() void UsingDirectiveAST::setName( NameAST::Node& name ) { - m_name = name; - if( m_name.get() ) m_name->setParent( this ); + m_name = std::move(name); + if( m_name ) m_name->setParent( this ); } TypedefAST::TypedefAST() @@ -383,20 +383,20 @@ TypedefAST::TypedefAST() void TypeSpecifierAST::setName( NameAST::Node& name ) { - m_name = name; - if( m_name.get() ) m_name->setParent( this ); + m_name = std::move(name); + if( m_name ) m_name->setParent( this ); } void TypedefAST::setTypeSpec( TypeSpecifierAST::Node& typeSpec ) { - m_typeSpec = typeSpec; - if( m_typeSpec.get() ) m_typeSpec->setParent( this ); + m_typeSpec = std::move(typeSpec); + if( m_typeSpec ) m_typeSpec->setParent( this ); } void TypedefAST::setInitDeclaratorList( InitDeclaratorListAST::Node& initDeclaratorList ) { - m_initDeclaratorList = initDeclaratorList; - if( m_initDeclaratorList.get() ) m_initDeclaratorList->setParent( this ); + m_initDeclaratorList = std::move(initDeclaratorList); + if( m_initDeclaratorList ) m_initDeclaratorList->setParent( this ); } // ------------------------------------------------------------------------ @@ -407,7 +407,7 @@ TemplateArgumentListAST::TemplateArgumentListAST() void TemplateArgumentListAST::addArgument( AST::Node& arg ) { - if( !arg.get() ) + if( !arg ) return; arg->setParent( this ); @@ -434,20 +434,20 @@ TemplateDeclarationAST::TemplateDeclarationAST() void TemplateDeclarationAST::setExported( AST::Node& exported ) { - m_exported = exported; - if( m_exported.get() ) m_exported->setParent( this ); + m_exported = std::move(exported); + if( m_exported ) m_exported->setParent( this ); } void TemplateDeclarationAST::setTemplateParameterList( TemplateParameterListAST::Node& templateParameterList ) { - m_templateParameterList = templateParameterList; - if( m_templateParameterList.get() ) m_templateParameterList->setParent( this ); + m_templateParameterList = std::move(templateParameterList); + if( m_templateParameterList ) m_templateParameterList->setParent( this ); } void TemplateDeclarationAST::setDeclaration( DeclarationAST::Node& declaration ) { - m_declaration = declaration; - if( m_declaration.get() ) m_declaration->setParent( this ); + m_declaration = std::move(declaration); + if( m_declaration ) m_declaration->setParent( this ); } // ------------------------------------------------------------------------ @@ -457,23 +457,23 @@ ClassOrNamespaceNameAST::ClassOrNamespaceNameAST() void ClassOrNamespaceNameAST::setName( AST::Node& name ) { - m_name = name; - if( m_name.get() ) m_name->setParent( this ); + m_name = std::move(name); + if( m_name ) m_name->setParent( this ); } void ClassOrNamespaceNameAST::setTemplateArgumentList( TemplateArgumentListAST::Node& templateArgumentList ) { - m_templateArgumentList = templateArgumentList; - if( m_templateArgumentList.get() ) m_templateArgumentList->setParent( this ); + m_templateArgumentList = std::move(templateArgumentList); + if( m_templateArgumentList ) m_templateArgumentList->setParent( this ); } TQString ClassOrNamespaceNameAST::text() const { - if( !m_name.get() ) + if( !m_name ) return TQString(); TQString str = m_name->text(); - if( m_templateArgumentList.get() ) + if( m_templateArgumentList ) str += TQString::fromLatin1("< ") + m_templateArgumentList->text() + TQString::fromLatin1(" >"); return str; @@ -486,27 +486,27 @@ TypeSpecifierAST::TypeSpecifierAST() void TypeSpecifierAST::setCvQualify( GroupAST::Node& cvQualify ) { - m_cvQualify = cvQualify; - if( m_cvQualify.get() ) m_cvQualify->setParent( this ); + m_cvQualify = std::move(cvQualify); + if( m_cvQualify ) m_cvQualify->setParent( this ); } void TypeSpecifierAST::setCv2Qualify( GroupAST::Node& cv2Qualify ) { - m_cv2Qualify = cv2Qualify; - if( m_cv2Qualify.get() ) m_cv2Qualify->setParent( this ); + m_cv2Qualify = std::move(cv2Qualify); + if( m_cv2Qualify ) m_cv2Qualify->setParent( this ); } TQString TypeSpecifierAST::text() const { TQString str; - if( m_cvQualify.get() ) + if( m_cvQualify ) str += m_cvQualify->text() + " "; - if( m_name.get() ) + if( m_name ) str += m_name->text(); - if( m_cv2Qualify.get() ) + if( m_cv2Qualify ) str += TQString(" ") + m_cv2Qualify->text(); return str; @@ -520,13 +520,13 @@ ClassSpecifierAST::ClassSpecifierAST() void ClassSpecifierAST::setClassKey( AST::Node& classKey ) { - m_classKey = classKey; - if( m_classKey.get() ) m_classKey->setParent( this ); + m_classKey = std::move(classKey); + if( m_classKey ) m_classKey->setParent( this ); } void ClassSpecifierAST::addDeclaration( DeclarationAST::Node& declaration ) { - if( !declaration.get() ) + if( !declaration ) return; declaration->setParent( this ); @@ -535,8 +535,8 @@ void ClassSpecifierAST::addDeclaration( DeclarationAST::Node& declaration ) void ClassSpecifierAST::setBaseClause( BaseClauseAST::Node& baseClause ) { - m_baseClause = baseClause; - if( m_baseClause.get() ) m_baseClause->setParent( this ); + m_baseClause = std::move(baseClause); + if( m_baseClause ) m_baseClause->setParent( this ); } // ------------------------------------------------------------------------ @@ -547,7 +547,7 @@ EnumSpecifierAST::EnumSpecifierAST() void EnumSpecifierAST::addEnumerator( EnumeratorAST::Node& enumerator ) { - if( !enumerator.get() ) + if( !enumerator ) return; enumerator->setParent( this ); @@ -562,13 +562,13 @@ ElaboratedTypeSpecifierAST::ElaboratedTypeSpecifierAST() void ElaboratedTypeSpecifierAST::setKind( AST::Node& kind ) { - m_kind = kind; - if( m_kind.get() ) m_kind->setParent( this ); + m_kind = std::move(kind); + if( m_kind ) m_kind->setParent( this ); } TQString ElaboratedTypeSpecifierAST::text() const { - if( m_kind.get() ) + if( m_kind ) return m_kind->text() + " " + TypeSpecifierAST::text(); return TypeSpecifierAST::text(); @@ -586,14 +586,14 @@ EnumeratorAST::EnumeratorAST() void EnumeratorAST::setId( AST::Node& id ) { - m_id = id; - if( m_id.get() ) m_id->setParent( this ); + m_id = std::move(id); + if( m_id ) m_id->setParent( this ); } void EnumeratorAST::setExpr( AST::Node& expr ) { - m_expr = expr; - if( m_expr.get() ) m_expr->setParent( this ); + m_expr = std::move(expr); + if( m_expr ) m_expr->setParent( this ); } // ------------------------------------------------------------------------ @@ -604,7 +604,7 @@ BaseClauseAST::BaseClauseAST() void BaseClauseAST::addBaseSpecifier( BaseSpecifierAST::Node& baseSpecifier ) { - if( !baseSpecifier.get() ) + if( !baseSpecifier ) return; baseSpecifier->setParent( this ); @@ -618,20 +618,20 @@ BaseSpecifierAST::BaseSpecifierAST() void BaseSpecifierAST::setIsVirtual( AST::Node& isVirtual ) { - m_isVirtual = isVirtual; - if( m_isVirtual.get() ) m_isVirtual->setParent( this ); + m_isVirtual = std::move(isVirtual); + if( m_isVirtual ) m_isVirtual->setParent( this ); } void BaseSpecifierAST::setAccess( AST::Node& access ) { - m_access = access; - if( m_access.get() ) m_access->setParent( this ); + m_access = std::move(access); + if( m_access ) m_access->setParent( this ); } void BaseSpecifierAST::setName( NameAST::Node& name ) { - m_name = name; - if( m_name.get() ) m_name->setParent( this ); + m_name = std::move(name); + if( m_name ) m_name->setParent( this ); } // ------------------------------------------------------------------------ @@ -641,32 +641,32 @@ SimpleDeclarationAST::SimpleDeclarationAST() void SimpleDeclarationAST::setFunctionSpecifier( GroupAST::Node& functionSpecifier ) { - m_functionSpecifier = functionSpecifier; - if( m_functionSpecifier.get() ) m_functionSpecifier->setParent( this ); + m_functionSpecifier = std::move(functionSpecifier); + if( m_functionSpecifier ) m_functionSpecifier->setParent( this ); } void SimpleDeclarationAST::setStorageSpecifier( GroupAST::Node& storageSpecifier ) { - m_storageSpecifier = storageSpecifier; - if( m_storageSpecifier.get() ) m_storageSpecifier->setParent( this ); + m_storageSpecifier = std::move(storageSpecifier); + if( m_storageSpecifier ) m_storageSpecifier->setParent( this ); } void SimpleDeclarationAST::setTypeSpec( TypeSpecifierAST::Node& typeSpec ) { - m_typeSpec = typeSpec; - if( m_typeSpec.get() ) m_typeSpec->setParent( this ); + m_typeSpec = std::move(typeSpec); + if( m_typeSpec ) m_typeSpec->setParent( this ); } void SimpleDeclarationAST::setInitDeclaratorList( InitDeclaratorListAST::Node& initDeclaratorList ) { - m_initDeclaratorList = initDeclaratorList; - if( m_initDeclaratorList.get() ) m_initDeclaratorList->setParent( this ); + m_initDeclaratorList = std::move(initDeclaratorList); + if( m_initDeclaratorList ) m_initDeclaratorList->setParent( this ); } void SimpleDeclarationAST::setWinDeclSpec( GroupAST::Node& winDeclSpec ) { - m_winDeclSpec = winDeclSpec; - if( m_winDeclSpec.get() ) m_winDeclSpec->setParent( this ); + m_winDeclSpec = std::move(winDeclSpec); + if( m_winDeclSpec ) m_winDeclSpec->setParent( this ); } @@ -678,7 +678,7 @@ InitDeclaratorListAST::InitDeclaratorListAST() void InitDeclaratorListAST::addInitDeclarator( InitDeclaratorAST::Node& decl ) { - if( !decl.get() ) + if( !decl ) return; decl->setParent( this ); @@ -694,52 +694,52 @@ DeclaratorAST::DeclaratorAST() void DeclaratorAST::setSubDeclarator( DeclaratorAST::Node& subDeclarator ) { - m_subDeclarator = subDeclarator; - if( m_subDeclarator.get() ) m_subDeclarator->setParent( this ); + m_subDeclarator = std::move(subDeclarator); + if( m_subDeclarator ) m_subDeclarator->setParent( this ); } void DeclaratorAST::setDeclaratorId( NameAST::Node& declaratorId ) { - m_declaratorId = declaratorId; - if( m_declaratorId.get() ) m_declaratorId->setParent( this ); + m_declaratorId = std::move(declaratorId); + if( m_declaratorId ) m_declaratorId->setParent( this ); } void DeclaratorAST::setBitfieldInitialization( AST::Node& bitfieldInitialization ) { - m_bitfieldInitialization = bitfieldInitialization; - if( m_bitfieldInitialization.get() ) m_bitfieldInitialization->setParent( this ); + m_bitfieldInitialization = std::move(bitfieldInitialization); + if( m_bitfieldInitialization ) m_bitfieldInitialization->setParent( this ); } void DeclaratorAST::addArrayDimension( AST::Node& arrayDimension ) { - if( !arrayDimension.get() ) + if( !arrayDimension ) return; arrayDimension->setParent( this ); m_arrayDimensionList.append( arrayDimension.release() ); } -void DeclaratorAST::setParameterDeclarationClause( ParameterDeclarationClauseAST::Node& parameterDeclarationClause ) +void DeclaratorAST::setParameterDeclarationClause( std::unique_ptr<class ParameterDeclarationClauseAST>& parameterDeclarationClause ) { - m_parameterDeclarationClause = parameterDeclarationClause; - if( m_parameterDeclarationClause.get() ) m_parameterDeclarationClause->setParent( this ); + m_parameterDeclarationClause = std::move(parameterDeclarationClause); + if( m_parameterDeclarationClause ) m_parameterDeclarationClause->setParent( this ); } void DeclaratorAST::setConstant( AST::Node& constant ) { - m_constant = constant; - if( m_constant.get() ) m_constant->setParent( this ); + m_constant = std::move(constant); + if( m_constant ) m_constant->setParent( this ); } void DeclaratorAST::setExceptionSpecification( GroupAST::Node& exceptionSpecification ) { - m_exceptionSpecification = exceptionSpecification; - if( m_exceptionSpecification.get() ) m_exceptionSpecification->setParent( this ); + m_exceptionSpecification = std::move(exceptionSpecification); + if( m_exceptionSpecification ) m_exceptionSpecification->setParent( this ); } void DeclaratorAST::addPtrOp( AST::Node& ptrOp ) { - if( !ptrOp.get() ) + if( !ptrOp ) return; ptrOp->setParent( this ); @@ -753,14 +753,14 @@ InitDeclaratorAST::InitDeclaratorAST() void InitDeclaratorAST::setDeclarator( DeclaratorAST::Node& declarator ) { - m_declarator = declarator; - if( m_declarator.get() ) m_declarator->setParent( this ); + m_declarator = std::move(declarator); + if( m_declarator ) m_declarator->setParent( this ); } void InitDeclaratorAST::setInitializer( AST::Node& initializer ) { - m_initializer = initializer; - if( m_initializer.get() ) m_initializer->setParent( this ); + m_initializer = std::move(initializer); + if( m_initializer ) m_initializer->setParent( this ); } // -------------------------------------------------------------------------- @@ -770,38 +770,38 @@ FunctionDefinitionAST::FunctionDefinitionAST() void FunctionDefinitionAST::setFunctionSpecifier( GroupAST::Node& functionSpecifier ) { - m_functionSpecifier = functionSpecifier; - if( m_functionSpecifier.get() ) m_functionSpecifier->setParent( this ); + m_functionSpecifier = std::move(functionSpecifier); + if( m_functionSpecifier ) m_functionSpecifier->setParent( this ); } void FunctionDefinitionAST::setStorageSpecifier( GroupAST::Node& storageSpecifier ) { - m_storageSpecifier = storageSpecifier; - if( m_storageSpecifier.get() ) m_storageSpecifier->setParent( this ); + m_storageSpecifier = std::move(storageSpecifier); + if( m_storageSpecifier ) m_storageSpecifier->setParent( this ); } void FunctionDefinitionAST::setTypeSpec( TypeSpecifierAST::Node& typeSpec ) { - m_typeSpec = typeSpec; - if( m_typeSpec.get() ) m_typeSpec->setParent( this ); + m_typeSpec = std::move(typeSpec); + if( m_typeSpec ) m_typeSpec->setParent( this ); } void FunctionDefinitionAST::setInitDeclarator( InitDeclaratorAST::Node& initDeclarator ) { - m_initDeclarator = initDeclarator; - if( m_initDeclarator.get() ) m_initDeclarator->setParent( this ); + m_initDeclarator = std::move(initDeclarator); + if( m_initDeclarator ) m_initDeclarator->setParent( this ); } void FunctionDefinitionAST::setFunctionBody( StatementListAST::Node& functionBody ) { - m_functionBody = functionBody; - if( m_functionBody.get() ) m_functionBody->setParent( this ); + m_functionBody = std::move(functionBody); + if( m_functionBody ) m_functionBody->setParent( this ); } void FunctionDefinitionAST::setWinDeclSpec( GroupAST::Node& winDeclSpec ) { - m_winDeclSpec = winDeclSpec; - if( m_winDeclSpec.get() ) m_winDeclSpec->setParent( this ); + m_winDeclSpec = std::move(winDeclSpec); + if( m_winDeclSpec ) m_winDeclSpec->setParent( this ); } // -------------------------------------------------------------------------- @@ -812,7 +812,7 @@ StatementListAST::StatementListAST() void StatementListAST::addStatement( StatementAST::Node& statement ) { - if( !statement.get() ) + if( !statement ) return; statement->setParent( this ); @@ -826,20 +826,20 @@ IfStatementAST::IfStatementAST() void IfStatementAST::setCondition( ConditionAST::Node& condition ) { - m_condition = condition; - if( m_condition.get() ) m_condition->setParent( this ); + m_condition = std::move(condition); + if( m_condition ) m_condition->setParent( this ); } void IfStatementAST::setStatement( StatementAST::Node& statement ) { - m_statement = statement; - if( m_statement.get() ) m_statement->setParent( this ); + m_statement = std::move(statement); + if( m_statement ) m_statement->setParent( this ); } void IfStatementAST::setElseStatement( StatementAST::Node& elseStatement ) { - m_elseStatement = elseStatement; - if( m_elseStatement.get() ) m_elseStatement->setParent( this ); + m_elseStatement = std::move(elseStatement); + if( m_elseStatement ) m_elseStatement->setParent( this ); } // -------------------------------------------------------------------------- @@ -849,14 +849,14 @@ WhileStatementAST::WhileStatementAST() void WhileStatementAST::setCondition( ConditionAST::Node& condition ) { - m_condition = condition; - if( m_condition.get() ) m_condition->setParent( this ); + m_condition = std::move(condition); + if( m_condition ) m_condition->setParent( this ); } void WhileStatementAST::setStatement( StatementAST::Node& statement ) { - m_statement = statement; - if( m_statement.get() ) m_statement->setParent( this ); + m_statement = std::move(statement); + if( m_statement ) m_statement->setParent( this ); } // -------------------------------------------------------------------------- @@ -866,14 +866,14 @@ DoStatementAST::DoStatementAST() void DoStatementAST::setCondition( ConditionAST::Node& condition ) { - m_condition = condition; - if( m_condition.get() ) m_condition->setParent( this ); + m_condition = std::move(condition); + if( m_condition ) m_condition->setParent( this ); } void DoStatementAST::setStatement( StatementAST::Node& statement ) { - m_statement = statement; - if( m_statement.get() ) m_statement->setParent( this ); + m_statement = std::move(statement); + if( m_statement ) m_statement->setParent( this ); } // -------------------------------------------------------------------------- @@ -883,26 +883,26 @@ ForStatementAST::ForStatementAST() void ForStatementAST::setCondition( ConditionAST::Node& condition ) { - m_condition = condition; - if( m_condition.get() ) m_condition->setParent( this ); + m_condition = std::move(condition); + if( m_condition ) m_condition->setParent( this ); } void ForStatementAST::setExpression( AST::Node& expression ) { - m_expression = expression; - if( m_expression.get() ) m_expression->setParent( this ); + m_expression = std::move(expression); + if( m_expression ) m_expression->setParent( this ); } void ForStatementAST::setStatement( StatementAST::Node& statement ) { - m_statement = statement; - if( m_statement.get() ) m_statement->setParent( this ); + m_statement = std::move(statement); + if( m_statement ) m_statement->setParent( this ); } void ForStatementAST::setInitStatement( StatementAST::Node& initStatement ) { - m_initStatement = initStatement; - if( m_initStatement.get() ) m_initStatement->setParent( this ); + m_initStatement = std::move(initStatement); + if( m_initStatement ) m_initStatement->setParent( this ); } // -------------------------------------------------------------------------- @@ -912,20 +912,20 @@ ForEachStatementAST::ForEachStatementAST() void ForEachStatementAST::setExpression( AST::Node& expression ) { - m_expression = expression; - if( m_expression.get() ) m_expression->setParent( this ); + m_expression = std::move(expression); + if( m_expression ) m_expression->setParent( this ); } void ForEachStatementAST::setStatement( StatementAST::Node& statement ) { - m_statement = statement; - if( m_statement.get() ) m_statement->setParent( this ); + m_statement = std::move(statement); + if( m_statement ) m_statement->setParent( this ); } void ForEachStatementAST::setInitStatement( StatementAST::Node& initStatement ) { - m_initStatement = initStatement; - if( m_initStatement.get() ) m_initStatement->setParent( this ); + m_initStatement = std::move(initStatement); + if( m_initStatement ) m_initStatement->setParent( this ); } // -------------------------------------------------------------------------- @@ -935,14 +935,14 @@ SwitchStatementAST::SwitchStatementAST() void SwitchStatementAST::setCondition( ConditionAST::Node& condition ) { - m_condition = condition; - if( m_condition.get() ) m_condition->setParent( this ); + m_condition = std::move(condition); + if( m_condition ) m_condition->setParent( this ); } void SwitchStatementAST::setStatement( StatementAST::Node& statement ) { - m_statement = statement; - if( m_statement.get() ) m_statement->setParent( this ); + m_statement = std::move(statement); + if( m_statement ) m_statement->setParent( this ); } // -------------------------------------------------------------------------- @@ -953,7 +953,7 @@ CatchStatementListAST::CatchStatementListAST() void CatchStatementListAST::addStatement( CatchStatementAST::Node& statement ) { - if( !statement.get() ) + if( !statement ) return; statement->setParent( this ); @@ -967,14 +967,14 @@ CatchStatementAST::CatchStatementAST() void CatchStatementAST::setCondition( ConditionAST::Node& condition ) { - m_condition = condition; - if( m_condition.get() ) m_condition->setParent( this ); + m_condition = std::move(condition); + if( m_condition ) m_condition->setParent( this ); } void CatchStatementAST::setStatement( StatementAST::Node& statement ) { - m_statement = statement; - if( m_statement.get() ) m_statement->setParent( this ); + m_statement = std::move(statement); + if( m_statement ) m_statement->setParent( this ); } // -------------------------------------------------------------------------- @@ -984,14 +984,14 @@ TryBlockStatementAST::TryBlockStatementAST() void TryBlockStatementAST::setStatement( StatementAST::Node& statement ) { - m_statement = statement; - if( m_statement.get() ) m_statement->setParent( this ); + m_statement = std::move(statement); + if( m_statement ) m_statement->setParent( this ); } void TryBlockStatementAST::setCatchStatementList( CatchStatementListAST::Node& statementList ) { - m_catchStatementList = statementList; - if( m_catchStatementList.get() ) m_catchStatementList->setParent( this ); + m_catchStatementList = std::move(statementList); + if( m_catchStatementList ) m_catchStatementList->setParent( this ); } // -------------------------------------------------------------------------- @@ -1001,8 +1001,8 @@ DeclarationStatementAST::DeclarationStatementAST() void DeclarationStatementAST::setDeclaration( DeclarationAST::Node& declaration ) { - m_declaration = declaration; - if( m_declaration.get() ) m_declaration->setParent( this ); + m_declaration = std::move(declaration); + if( m_declaration ) m_declaration->setParent( this ); } // -------------------------------------------------------------------------- @@ -1012,8 +1012,8 @@ ExpressionStatementAST::ExpressionStatementAST() void ExpressionStatementAST::setExpression( AST::Node& expression ) { - m_expression = expression; - if( m_expression.get() ) m_expression->setParent( this ); + m_expression = std::move(expression); + if( m_expression ) m_expression->setParent( this ); } @@ -1024,32 +1024,32 @@ ParameterDeclarationAST::ParameterDeclarationAST() void ParameterDeclarationAST::setTypeSpec( TypeSpecifierAST::Node& typeSpec ) { - m_typeSpec = typeSpec; - if( m_typeSpec.get() ) m_typeSpec->setParent( this ); + m_typeSpec = std::move(typeSpec); + if( m_typeSpec ) m_typeSpec->setParent( this ); } void ParameterDeclarationAST::setDeclarator( DeclaratorAST::Node& declarator ) { - m_declarator = declarator; - if( m_declarator.get() ) m_declarator->setParent( this ); + m_declarator = std::move(declarator); + if( m_declarator ) m_declarator->setParent( this ); } void ParameterDeclarationAST::setExpression( AST::Node& expression ) { - m_expression = expression; - if( m_expression.get() ) m_expression->setParent( this ); + m_expression = std::move(expression); + if( m_expression ) m_expression->setParent( this ); } TQString ParameterDeclarationAST::text() const { TQString str; - if( m_typeSpec.get() ) + if( m_typeSpec ) str += m_typeSpec->text() + " "; - if( m_declarator.get() ) + if( m_declarator ) str += m_declarator->text(); - if( m_expression.get() ) + if( m_expression ) str += TQString( " = " ) + m_expression->text(); return str; @@ -1063,7 +1063,7 @@ ParameterDeclarationListAST::ParameterDeclarationListAST() void ParameterDeclarationListAST::addParameter( ParameterDeclarationAST::Node& parameter ) { - if( !parameter.get() ) + if( !parameter ) return; parameter->setParent( this ); @@ -1091,24 +1091,24 @@ ParameterDeclarationClauseAST::ParameterDeclarationClauseAST() void ParameterDeclarationClauseAST::setParameterDeclarationList( ParameterDeclarationListAST::Node& parameterDeclarationList ) { - m_parameterDeclarationList = parameterDeclarationList; - if( m_parameterDeclarationList.get() ) m_parameterDeclarationList->setParent( this ); + m_parameterDeclarationList = std::move(parameterDeclarationList); + if( m_parameterDeclarationList ) m_parameterDeclarationList->setParent( this ); } void ParameterDeclarationClauseAST::setEllipsis( AST::Node& ellipsis ) { - m_ellipsis = ellipsis; - if( m_ellipsis.get() ) m_ellipsis->setParent( this ); + m_ellipsis = std::move(ellipsis); + if( m_ellipsis ) m_ellipsis->setParent( this ); } TQString ParameterDeclarationClauseAST::text() const { TQString str; - if( m_parameterDeclarationList.get() ) + if( m_parameterDeclarationList ) str += m_parameterDeclarationList->text(); - if( m_ellipsis.get() ) + if( m_ellipsis ) str += " ..."; return str; @@ -1123,7 +1123,7 @@ GroupAST::GroupAST() void GroupAST::addNode( AST::Node& node ) { - if( !node.get() ) + if( !node ) return; node->setParent( this ); @@ -1151,7 +1151,7 @@ AccessDeclarationAST::AccessDeclarationAST() void AccessDeclarationAST::addAccess( AST::Node& access ) { - if( !access.get() ) + if( !access ) return; access->setParent( this ); @@ -1178,26 +1178,26 @@ TypeParameterAST::TypeParameterAST() void TypeParameterAST::setKind( AST::Node& kind ) { - m_kind = kind; - if( m_kind.get() ) m_kind->setParent( this ); + m_kind = std::move(kind); + if( m_kind ) m_kind->setParent( this ); } -void TypeParameterAST::setTemplateParameterList( TemplateParameterListAST::Node& templateParameterList ) +void TypeParameterAST::setTemplateParameterList( std::unique_ptr<class TemplateParameterListAST>& templateParameterList ) { - m_templateParameterList = templateParameterList; - if( m_templateParameterList.get() ) m_templateParameterList->setParent( this ); + m_templateParameterList = std::move(templateParameterList); + if( m_templateParameterList ) m_templateParameterList->setParent( this ); } void TypeParameterAST::setName( NameAST::Node& name ) { - m_name = name; - if( m_name.get() ) m_name->setParent( this ); + m_name = std::move(name); + if( m_name ) m_name->setParent( this ); } void TypeParameterAST::setTypeId( AST::Node& typeId ) { - m_typeId = typeId; - if( m_typeId.get() ) m_typeId->setParent( this ); + m_typeId = std::move(typeId); + if( m_typeId ) m_typeId->setParent( this ); } // -------------------------------------------------------------------------- @@ -1207,14 +1207,14 @@ TemplateParameterAST::TemplateParameterAST() void TemplateParameterAST::setTypeParameter( TypeParameterAST::Node& typeParameter ) { - m_typeParameter = typeParameter; - if( m_typeParameter.get() ) m_typeParameter->setParent( this ); + m_typeParameter = std::move(typeParameter); + if( m_typeParameter ) m_typeParameter->setParent( this ); } void TemplateParameterAST::setTypeValueParameter( ParameterDeclarationAST::Node& typeValueParameter ) { - m_typeValueParameter = typeValueParameter; - if( m_typeValueParameter.get() ) m_typeValueParameter->setParent( this ); + m_typeValueParameter = std::move(typeValueParameter); + if( m_typeValueParameter ) m_typeValueParameter->setParent( this ); } // -------------------------------------------------------------------------- @@ -1225,7 +1225,7 @@ TemplateParameterListAST::TemplateParameterListAST() void TemplateParameterListAST::addTemplateParameter( TemplateParameterAST::Node& templateParameter ) { - if( !templateParameter.get() ) + if( !templateParameter ) return; templateParameter->setParent( this ); @@ -1239,24 +1239,24 @@ ConditionAST::ConditionAST() void ConditionAST::setTypeSpec( TypeSpecifierAST::Node& typeSpec ) { - m_typeSpec = typeSpec; - if( m_typeSpec.get() ) m_typeSpec->setParent( this ); + m_typeSpec = std::move(typeSpec); + if( m_typeSpec ) m_typeSpec->setParent( this ); } void ConditionAST::setDeclarator( DeclaratorAST::Node& declarator ) { - m_declarator = declarator; - if( m_declarator.get() ) m_declarator->setParent( this ); + m_declarator = std::move(declarator); + if( m_declarator ) m_declarator->setParent( this ); } void ConditionAST::setExpression( AST::Node& expression ) { - m_expression = expression; - if( m_expression.get() ) m_expression->setParent( this ); + m_expression = std::move(expression); + if( m_expression ) m_expression->setParent( this ); } void ClassSpecifierAST::setWinDeclSpec( GroupAST::Node & winDeclSpec ) { - m_winDeclSpec = winDeclSpec; - if( m_winDeclSpec.get() ) m_winDeclSpec->setParent( this ); + m_winDeclSpec = std::move(winDeclSpec); + if( m_winDeclSpec ) m_winDeclSpec->setParent( this ); } diff --git a/lib/cppparser/ast.h b/lib/cppparser/ast.h index a55325bd..b6c2d64b 100644 --- a/lib/cppparser/ast.h +++ b/lib/cppparser/ast.h @@ -72,7 +72,7 @@ enum NodeType NodeType_WhileStatement, NodeType_DoStatement, NodeType_ForStatement, - NodeType_ForEachStatement, // qt4 [erbsland] + NodeType_ForEachStatement, NodeType_SwitchStatement, NodeType_CatchStatement, NodeType_CatchStatementList, @@ -155,7 +155,7 @@ class CommentAST { class AST : public CommentAST { public: - typedef std::auto_ptr<AST> Node; + typedef std::unique_ptr<AST> Node; enum { Type=NodeType_Generic }; DECLARE_ALLOC( AST ) @@ -217,7 +217,7 @@ private: class GroupAST: public AST { public: - typedef std::auto_ptr<GroupAST> Node; + typedef std::unique_ptr<GroupAST> Node; enum { Type = NodeType_Group }; DECLARE_ALLOC( GroupAST ) @@ -242,7 +242,7 @@ private: class TemplateArgumentListAST: public AST { public: - typedef std::auto_ptr<TemplateArgumentListAST> Node; + typedef std::unique_ptr<TemplateArgumentListAST> Node; enum { Type = NodeType_TemplateArgumentList }; DECLARE_ALLOC( TemplateArgumentListAST ) @@ -266,7 +266,7 @@ private: class ClassOrNamespaceNameAST: public AST { public: - typedef std::auto_ptr<ClassOrNamespaceNameAST> Node; + typedef std::unique_ptr<ClassOrNamespaceNameAST> Node; enum { Type = NodeType_ClassOrNamespaceName }; DECLARE_ALLOC( ClassOrNamespaceNameAST ) @@ -294,7 +294,7 @@ private: class NameAST: public AST { public: - typedef std::auto_ptr<NameAST> Node; + typedef std::unique_ptr<NameAST> Node; enum { Type = NodeType_Name }; DECLARE_ALLOC( NameAST ) @@ -326,7 +326,7 @@ private: class TypeParameterAST: public AST { public: - typedef std::auto_ptr<TypeParameterAST> Node; + typedef std::unique_ptr<TypeParameterAST> Node; enum { Type = NodeType_TypeParameter }; DECLARE_ALLOC( TypeParameterAST ) @@ -338,7 +338,7 @@ public: void setKind( AST::Node& kind ); class TemplateParameterListAST* templateParameterList() { return m_templateParameterList.get(); } - void setTemplateParameterList( std::auto_ptr<class TemplateParameterListAST>& templateParameterList ); + void setTemplateParameterList( std::unique_ptr<class TemplateParameterListAST>& templateParameterList ); NameAST* name() { return m_name.get(); } void setName( NameAST::Node& name ); @@ -348,7 +348,7 @@ public: private: AST::Node m_kind; - std::auto_ptr<class TemplateParameterListAST> m_templateParameterList; + std::unique_ptr<class TemplateParameterListAST> m_templateParameterList; NameAST::Node m_name; AST::Node m_typeId; @@ -360,7 +360,7 @@ private: class DeclarationAST: public AST { public: - typedef std::auto_ptr<DeclarationAST> Node; + typedef std::unique_ptr<DeclarationAST> Node; enum { Type = NodeType_Declaration }; DECLARE_ALLOC( DeclarationAST ) @@ -376,7 +376,7 @@ private: class AccessDeclarationAST: public DeclarationAST { public: - typedef std::auto_ptr<AccessDeclarationAST> Node; + typedef std::unique_ptr<AccessDeclarationAST> Node; enum { Type = NodeType_AccessDeclaration }; DECLARE_ALLOC( AccessDeclarationAST ) @@ -400,7 +400,7 @@ private: class TypeSpecifierAST: public AST { public: - typedef std::auto_ptr<TypeSpecifierAST> Node; + typedef std::unique_ptr<TypeSpecifierAST> Node; enum { Type = NodeType_TypeSpecifier }; DECLARE_ALLOC( TypeSpecifierAST ) @@ -432,7 +432,7 @@ private: class BaseSpecifierAST: public AST { public: - typedef std::auto_ptr<BaseSpecifierAST> Node; + typedef std::unique_ptr<BaseSpecifierAST> Node; enum { Type = NodeType_BaseSpecifier }; DECLARE_ALLOC( BaseSpecifierAST ) @@ -462,7 +462,7 @@ private: class BaseClauseAST: public AST { public: - typedef std::auto_ptr<BaseClauseAST> Node; + typedef std::unique_ptr<BaseClauseAST> Node; enum { Type = NodeType_BaseClause }; DECLARE_ALLOC( BaseClauseAST ) @@ -484,7 +484,7 @@ private: class ClassSpecifierAST: public TypeSpecifierAST { public: - typedef std::auto_ptr<ClassSpecifierAST> Node; + typedef std::unique_ptr<ClassSpecifierAST> Node; enum { Type = NodeType_ClassSpecifier }; DECLARE_ALLOC( ClassSpecifierAST ) @@ -517,7 +517,7 @@ private: class EnumeratorAST: public AST { public: - typedef std::auto_ptr<EnumeratorAST> Node; + typedef std::unique_ptr<EnumeratorAST> Node; enum { Type = NodeType_Enumerator }; DECLARE_ALLOC( EnumeratorAST ) @@ -543,7 +543,7 @@ private: class EnumSpecifierAST: public TypeSpecifierAST { public: - typedef std::auto_ptr<EnumSpecifierAST> Node; + typedef std::unique_ptr<EnumSpecifierAST> Node; enum { Type = NodeType_EnumSpecifier }; DECLARE_ALLOC( EnumSpecifierAST ) @@ -565,7 +565,7 @@ private: class ElaboratedTypeSpecifierAST: public TypeSpecifierAST { public: - typedef std::auto_ptr<ElaboratedTypeSpecifierAST> Node; + typedef std::unique_ptr<ElaboratedTypeSpecifierAST> Node; enum { Type = NodeType_ElaboratedTypeSpecifier }; DECLARE_ALLOC( ElaboratedTypeSpecifierAST ) @@ -590,7 +590,7 @@ private: class LinkageBodyAST: public AST { public: - typedef std::auto_ptr<LinkageBodyAST> Node; + typedef std::unique_ptr<LinkageBodyAST> Node; enum { Type = NodeType_LinkageBody }; DECLARE_ALLOC( LinkageBodyAST ) @@ -612,7 +612,7 @@ private: class LinkageSpecificationAST: public DeclarationAST { public: - typedef std::auto_ptr<LinkageSpecificationAST> Node; + typedef std::unique_ptr<LinkageSpecificationAST> Node; enum { Type = NodeType_LinkageSpecification }; DECLARE_ALLOC( LinkageSpecificationAST ) @@ -642,7 +642,7 @@ private: class NamespaceAST: public DeclarationAST { public: - typedef std::auto_ptr<NamespaceAST> Node; + typedef std::unique_ptr<NamespaceAST> Node; enum { Type = NodeType_Namespace }; DECLARE_ALLOC( NamespaceAST ) @@ -668,7 +668,7 @@ private: class NamespaceAliasAST: public DeclarationAST { public: - typedef std::auto_ptr<NamespaceAliasAST> Node; + typedef std::unique_ptr<NamespaceAliasAST> Node; enum { Type = NodeType_NamespaceAlias }; DECLARE_ALLOC( NamespaceAliasAST ) @@ -694,7 +694,7 @@ private: class UsingAST: public DeclarationAST { public: - typedef std::auto_ptr<UsingAST> Node; + typedef std::unique_ptr<UsingAST> Node; enum { Type = NodeType_Using }; DECLARE_ALLOC( UsingAST ) @@ -720,7 +720,7 @@ private: class UsingDirectiveAST: public DeclarationAST { public: - typedef std::auto_ptr<UsingDirectiveAST> Node; + typedef std::unique_ptr<UsingDirectiveAST> Node; enum { Type = NodeType_UsingDirective }; DECLARE_ALLOC( UsingDirectiveAST ) @@ -742,7 +742,7 @@ private: class DeclaratorAST: public AST { public: - typedef std::auto_ptr<DeclaratorAST> Node; + typedef std::unique_ptr<DeclaratorAST> Node; enum { Type = NodeType_Declarator }; DECLARE_ALLOC( DeclaratorAST ) @@ -754,7 +754,7 @@ public: void addPtrOp( AST::Node& ptrOp ); DeclaratorAST* subDeclarator() { return m_subDeclarator.get(); } - void setSubDeclarator( std::auto_ptr<DeclaratorAST>& subDeclarator ); + void setSubDeclarator( Node& subDeclarator ); NameAST* declaratorId() { return m_declaratorId.get(); } void setDeclaratorId( NameAST::Node& declaratorId ); @@ -766,7 +766,7 @@ public: void addArrayDimension( AST::Node& arrayDimension ); class ParameterDeclarationClauseAST* parameterDeclarationClause() { return m_parameterDeclarationClause.get(); } - void setParameterDeclarationClause( std::auto_ptr<class ParameterDeclarationClauseAST>& parameterDeclarationClause ); + void setParameterDeclarationClause( std::unique_ptr<class ParameterDeclarationClauseAST>& parameterDeclarationClause ); // ### replace 'constant' with cvQualify AST* constant() { return m_constant.get(); } @@ -777,11 +777,11 @@ public: private: TQPtrList<AST> m_ptrOpList; - std::auto_ptr<DeclaratorAST> m_subDeclarator; + Node m_subDeclarator; NameAST::Node m_declaratorId; AST::Node m_bitfieldInitialization; TQPtrList<AST> m_arrayDimensionList; - std::auto_ptr<class ParameterDeclarationClauseAST> m_parameterDeclarationClause; + std::unique_ptr<class ParameterDeclarationClauseAST> m_parameterDeclarationClause; AST::Node m_constant; GroupAST::Node m_exceptionSpecification; @@ -793,7 +793,7 @@ private: class ParameterDeclarationAST: public AST { public: - typedef std::auto_ptr<ParameterDeclarationAST> Node; + typedef std::unique_ptr<ParameterDeclarationAST> Node; enum { Type = NodeType_ParameterDeclaration }; DECLARE_ALLOC( ParameterDeclarationAST ) @@ -825,7 +825,7 @@ private: class ParameterDeclarationListAST: public AST { public: - typedef std::auto_ptr<ParameterDeclarationListAST> Node; + typedef std::unique_ptr<ParameterDeclarationListAST> Node; enum { Type = NodeType_ParameterDeclarationList }; DECLARE_ALLOC( ParameterDeclarationListAST ) @@ -849,7 +849,7 @@ private: class ParameterDeclarationClauseAST: public AST { public: - typedef std::auto_ptr<ParameterDeclarationClauseAST> Node; + typedef std::unique_ptr<ParameterDeclarationClauseAST> Node; enum { Type = NodeType_ParameterDeclarationClause }; DECLARE_ALLOC( ParameterDeclarationClauseAST ) @@ -878,7 +878,7 @@ private: class InitDeclaratorAST: public AST { public: - typedef std::auto_ptr<InitDeclaratorAST> Node; + typedef std::unique_ptr<InitDeclaratorAST> Node; enum { Type = NodeType_InitDeclarator }; DECLARE_ALLOC( InitDeclaratorAST ) @@ -904,7 +904,7 @@ private: class InitDeclaratorListAST: public AST { public: - typedef std::auto_ptr<InitDeclaratorListAST> Node; + typedef std::unique_ptr<InitDeclaratorListAST> Node; enum { Type = NodeType_InitDeclaratorList }; DECLARE_ALLOC( InitDeclaratorListAST ) @@ -926,7 +926,7 @@ private: class TypedefAST: public DeclarationAST { public: - typedef std::auto_ptr<TypedefAST> Node; + typedef std::unique_ptr<TypedefAST> Node; enum { Type = NodeType_Typedef }; DECLARE_ALLOC( TypedefAST ) @@ -952,7 +952,7 @@ private: class TemplateParameterAST: public AST { public: - typedef std::auto_ptr<TemplateParameterAST> Node; + typedef std::unique_ptr<TemplateParameterAST> Node; enum { Type = NodeType_TemplateParameter }; DECLARE_ALLOC( TemplateParameterAST ) @@ -978,7 +978,7 @@ private: class TemplateParameterListAST: public AST { public: - typedef std::auto_ptr<TemplateParameterListAST> Node; + typedef std::unique_ptr<TemplateParameterListAST> Node; enum { Type = NodeType_TemplateParameterList }; DECLARE_ALLOC( TemplateParameterListAST ) @@ -1000,7 +1000,7 @@ private: class TemplateDeclarationAST: public DeclarationAST { public: - typedef std::auto_ptr<TemplateDeclarationAST> Node; + typedef std::unique_ptr<TemplateDeclarationAST> Node; enum { Type = NodeType_TemplateDeclaration }; DECLARE_ALLOC( TemplateDeclarationAST ) @@ -1030,7 +1030,7 @@ private: class SimpleDeclarationAST: public DeclarationAST { public: - typedef std::auto_ptr<SimpleDeclarationAST> Node; + typedef std::unique_ptr<SimpleDeclarationAST> Node; enum { Type = NodeType_SimpleDeclaration }; DECLARE_ALLOC( SimpleDeclarationAST ) @@ -1068,7 +1068,7 @@ private: class StatementAST: public AST { public: - typedef std::auto_ptr<StatementAST> Node; + typedef std::unique_ptr<StatementAST> Node; enum { Type = NodeType_Statement }; DECLARE_ALLOC( StatementAST ) @@ -1084,7 +1084,7 @@ private: class ExpressionStatementAST: public StatementAST { public: - typedef std::auto_ptr<ExpressionStatementAST> Node; + typedef std::unique_ptr<ExpressionStatementAST> Node; enum { Type = NodeType_ExpressionStatement }; DECLARE_ALLOC( ExpressionStatementAST ) @@ -1106,7 +1106,7 @@ private: class ConditionAST: public AST { public: - typedef std::auto_ptr<ConditionAST> Node; + typedef std::unique_ptr<ConditionAST> Node; enum { Type = NodeType_Condition }; DECLARE_ALLOC( ConditionAST ) @@ -1136,7 +1136,7 @@ private: class IfStatementAST: public StatementAST { public: - typedef std::auto_ptr<IfStatementAST> Node; + typedef std::unique_ptr<IfStatementAST> Node; enum { Type = NodeType_IfStatement }; DECLARE_ALLOC( IfStatementAST ) @@ -1166,7 +1166,7 @@ private: class WhileStatementAST: public StatementAST { public: - typedef std::auto_ptr<WhileStatementAST> Node; + typedef std::unique_ptr<WhileStatementAST> Node; enum { Type = NodeType_WhileStatement }; DECLARE_ALLOC( WhileStatementAST ) @@ -1192,7 +1192,7 @@ private: class DoStatementAST: public StatementAST { public: - typedef std::auto_ptr<DoStatementAST> Node; + typedef std::unique_ptr<DoStatementAST> Node; enum { Type = NodeType_DoStatement }; DECLARE_ALLOC( DoStatementAST ) @@ -1218,7 +1218,7 @@ private: class ForStatementAST: public StatementAST { public: - typedef std::auto_ptr<ForStatementAST> Node; + typedef std::unique_ptr<ForStatementAST> Node; enum { Type = NodeType_ForStatement }; DECLARE_ALLOC( ForStatementAST ) @@ -1249,11 +1249,10 @@ private: void operator = ( const ForStatementAST& source ); }; -// qt4 [erbsland] class ForEachStatementAST: public StatementAST { public: - typedef std::auto_ptr<ForEachStatementAST> Node; + typedef std::unique_ptr<ForEachStatementAST> Node; enum { Type = NodeType_ForEachStatement }; DECLARE_ALLOC( ForEachStatementAST ) @@ -1283,7 +1282,7 @@ private: class SwitchStatementAST: public StatementAST { public: - typedef std::auto_ptr<SwitchStatementAST> Node; + typedef std::unique_ptr<SwitchStatementAST> Node; enum { Type = NodeType_SwitchStatement }; DECLARE_ALLOC( SwitchStatementAST ) @@ -1309,7 +1308,7 @@ private: class StatementListAST: public StatementAST { public: - typedef std::auto_ptr<StatementListAST> Node; + typedef std::unique_ptr<StatementListAST> Node; enum { Type = NodeType_StatementList }; DECLARE_ALLOC( StatementListAST ) @@ -1331,7 +1330,7 @@ private: class CatchStatementAST: public StatementAST { public: - typedef std::auto_ptr<CatchStatementAST> Node; + typedef std::unique_ptr<CatchStatementAST> Node; enum { Type = NodeType_CatchStatement }; DECLARE_ALLOC( CatchStatementAST ) @@ -1357,7 +1356,7 @@ private: class CatchStatementListAST: public StatementAST { public: - typedef std::auto_ptr<CatchStatementListAST> Node; + typedef std::unique_ptr<CatchStatementListAST> Node; enum { Type = NodeType_CatchStatementList }; DECLARE_ALLOC( CatchStatementListAST ) @@ -1379,7 +1378,7 @@ private: class TryBlockStatementAST: public StatementAST { public: - typedef std::auto_ptr<TryBlockStatementAST> Node; + typedef std::unique_ptr<TryBlockStatementAST> Node; enum { Type = NodeType_TryBlockStatement }; DECLARE_ALLOC( TryBlockStatementAST ) @@ -1405,7 +1404,7 @@ private: class DeclarationStatementAST: public StatementAST { public: - typedef std::auto_ptr<DeclarationStatementAST> Node; + typedef std::unique_ptr<DeclarationStatementAST> Node; enum { Type = NodeType_DeclarationStatement }; DECLARE_ALLOC( DeclarationStatementAST ) @@ -1427,7 +1426,7 @@ private: class FunctionDefinitionAST: public DeclarationAST { public: - typedef std::auto_ptr<FunctionDefinitionAST> Node; + typedef std::unique_ptr<FunctionDefinitionAST> Node; enum { Type = NodeType_FunctionDefinition }; DECLARE_ALLOC( FunctionDefinitionAST ) diff --git a/lib/cppparser/driver.cpp b/lib/cppparser/driver.cpp index c1a6f55a..dc3689db 100644 --- a/lib/cppparser/driver.cpp +++ b/lib/cppparser/driver.cpp @@ -597,7 +597,7 @@ void Driver::setupLexer( Lexer * lexer ) { lexer->addSkipWord( "KDE_DEPRECATED" ); // qt - lexer->addSkipWord( "Q_OBJECT" ); + lexer->addSkipWord( "TQ_OBJECT" ); lexer->addSkipWord( "" ); lexer->addSkipWord( "TQ_OVERRIDE", SkipWordAndArguments ); lexer->addSkipWord( "TQ_ENUMS", SkipWordAndArguments ); @@ -614,14 +614,11 @@ void Driver::setupLexer( Lexer * lexer ) { lexer->addSkipWord( "TQ_REFCOUNT" ); lexer->addSkipWord( "TQ_EXPLICIT" ); lexer->addSkipWord( "QMAC_PASCAL" ); - lexer->addSkipWord( "QT_STATIC_CONST" ); - lexer->addSkipWord( "QT_STATIC_CONST_IMPL" ); lexer->addSkipWord( "TQT_WIN_PAINTER_MEMBERS" ); lexer->addSkipWord( "TQT_NC_MSGBOX" ); lexer->addSkipWord( "TQ_VARIANT_AS", SkipWordAndArguments ); lexer->addSkipWord( "CALLBACK_CALL_TYPE" ); - // qt4 [erbsland] lexer->addSkipWord( "TQ_DECLARE_FLAGS", SkipWordAndArguments ); lexer->addSkipWord( "TQ_DECLARE_OPERATORS_FOR_FLAGS", SkipWordAndArguments ); diff --git a/lib/cppparser/errors.cpp b/lib/cppparser/errors.cpp index 5ce5058d..2622e7de 100644 --- a/lib/cppparser/errors.cpp +++ b/lib/cppparser/errors.cpp @@ -20,6 +20,6 @@ #include "errors.h" #include <tdelocale.h> -QT_STATIC_CONST_IMPL Error& Errors::InternalError = Error( 1, -1, i18n("Internal Error") ); -QT_STATIC_CONST_IMPL Error& Errors::SyntaxError = Error( 2, -1, i18n("Syntax Error before '%1'") ); -QT_STATIC_CONST_IMPL Error& Errors::ParseError = Error( 3, -1, i18n("Parse Error before '%1'") ); +const Error& Errors::InternalError = Error( 1, -1, i18n("Internal Error") ); +const Error& Errors::SyntaxError = Error( 2, -1, i18n("Syntax Error before '%1'") ); +const Error& Errors::ParseError = Error( 3, -1, i18n("Parse Error before '%1'") ); diff --git a/lib/cppparser/errors.h b/lib/cppparser/errors.h index 26b63f2c..d4e65e0b 100644 --- a/lib/cppparser/errors.h +++ b/lib/cppparser/errors.h @@ -35,9 +35,9 @@ struct Error{ class Errors{ public: - QT_STATIC_CONST Error& InternalError; - QT_STATIC_CONST Error& SyntaxError; - QT_STATIC_CONST Error& ParseError; + static const Error& InternalError; + static const Error& SyntaxError; + static const Error& ParseError; }; diff --git a/lib/cppparser/keywords.h b/lib/cppparser/keywords.h index 5c48324d..385342fe 100644 --- a/lib/cppparser/keywords.h +++ b/lib/cppparser/keywords.h @@ -9,7 +9,7 @@ INSERT( "k_dcop", Token_k_dcop ); INSERT( "k_dcop_signals", Token_k_dcop_signals ); // TQt Keywords -INSERT( "Q_OBJECT", Token_Q_OBJECT ); +INSERT( "TQ_OBJECT", Token_TQ_OBJECT ); INSERT( "", Token_ ); INSERT( "signals", Token_signals ); INSERT( "slots", Token_slots ); diff --git a/lib/cppparser/lexer.cpp b/lib/cppparser/lexer.cpp index 5325c80f..f5ec0015 100644 --- a/lib/cppparser/lexer.cpp +++ b/lib/cppparser/lexer.cpp @@ -514,7 +514,7 @@ void Lexer::resetSkipWords() void Lexer::addSkipWord( const TQString& word, SkipType skipType, const TQString& str ) { - m_words[ word ] = tqMakePair( skipType, str ); + m_words[ word ] = qMakePair( skipType, str ); } void Lexer::skip( int l, int r ) diff --git a/lib/cppparser/lexer.h b/lib/cppparser/lexer.h index dd3e5824..b496afda 100644 --- a/lib/cppparser/lexer.h +++ b/lib/cppparser/lexer.h @@ -60,12 +60,12 @@ enum Type { Token_k_dcop, Token_k_dcop_signals, - Token_Q_OBJECT, + Token_TQ_OBJECT, Token_, Token_signals, Token_slots, Token_emit, - Token_foreach, // qt4 [erbsland] + Token_foreach, Token_and, Token_and_eq, diff --git a/lib/cppparser/parser.cpp b/lib/cppparser/parser.cpp index 5e394b27..9701b944 100644 --- a/lib/cppparser/parser.cpp +++ b/lib/cppparser/parser.cpp @@ -325,7 +325,7 @@ bool Parser::skipCommaExpression( AST::Node& node ) AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -377,7 +377,7 @@ bool Parser::skipExpression( AST::Node& node ) { AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); } return true; @@ -428,7 +428,7 @@ bool Parser::parseName( NameAST::Node& node ) return false; UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -441,7 +441,7 @@ bool Parser::parseTranslationUnit( TranslationUnitAST::Node& node ) m_problems = 0; TranslationUnitAST::Node tun = CreateNode<TranslationUnitAST>(); - node = tun; + node = std::move(tun); if( lex->lookAhead(0) == Token_comment ) { node->setComment( lex->lookAhead(0).text() ); nextToken(); @@ -539,7 +539,7 @@ bool Parser::parseDeclaration( DeclarationAST::Node& node ) ast->setTypeSpec( spec ); ast->setInitDeclaratorList( declarators ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -587,7 +587,7 @@ bool Parser::parseLinkageSpecification( DeclarationAST::Node& node ) UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -604,7 +604,7 @@ bool Parser::parseLinkageBody( LinkageBodyAST::Node& node ) nextToken(); LinkageBodyAST::Node lba = CreateNode<LinkageBodyAST>(); - node = lba; + node = std::move(lba); while( !lex->lookAhead(0).isNull() ){ int tk = lex->lookAhead( 0 ); @@ -665,7 +665,7 @@ bool Parser::parseNamespace( DeclarationAST::Node& node ) ast->setNamespaceName( namespaceName ); ast->setAliasName( name ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } else { reportError( i18n("namespace expected") ); @@ -684,7 +684,7 @@ bool Parser::parseNamespace( DeclarationAST::Node& node ) ast->setLinkageBody( linkageBody ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -727,7 +727,7 @@ bool Parser::parseUsing( DeclarationAST::Node& node ) ADVANCE( ';', ";" ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -754,7 +754,7 @@ bool Parser::parseUsingDirective( DeclarationAST::Node& node ) UsingDirectiveAST::Node ast = CreateNode<UsingDirectiveAST>(); ast->setName( name ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -774,7 +774,7 @@ bool Parser::parseOperatorFunctionId( AST::Node& node ) AST::Node op; if( parseOperator(op) ){ AST::Node asn = CreateNode<AST>(); - node = asn; + node = std::move(asn); UPDATE_POS( node, start, lex->index() ); return true; } else { @@ -798,7 +798,7 @@ bool Parser::parseOperatorFunctionId( AST::Node& node ) ; AST::Node asn = CreateNode<AST>(); - node = asn; + node = std::move(asn); UPDATE_POS( node, start, lex->index() ); return true; } @@ -831,7 +831,7 @@ bool Parser::parseTemplateArgumentList( TemplateArgumentListAST::Node& node, boo } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -879,7 +879,7 @@ bool Parser::parseTypedef( DeclarationAST::Node& node ) ast->setTypeSpec( spec ); ast->setInitDeclaratorList( declarators ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -913,7 +913,7 @@ bool Parser::parseTemplateDeclaration( DeclarationAST::Node& node ) nextToken(); AST::Node n = CreateNode<AST>(); UPDATE_POS( n, startExport, lex->index() ); - exp = n; + exp = std::move(n); } if( lex->lookAhead(0) != Token_template ){ @@ -939,7 +939,7 @@ bool Parser::parseTemplateDeclaration( DeclarationAST::Node& node ) ast->setTemplateParameterList( params ); ast->setDeclaration( def ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1033,7 +1033,7 @@ bool Parser::parseCvQualify( GroupAST::Node& node ) ////kdDebug(9007)<< "-----------------> token = " << lex->lookAhead(0).text() << endl; UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1090,7 +1090,7 @@ bool Parser::parseSimpleTypeSpecifier( TypeSpecifierAST::Node& node ) } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1118,7 +1118,7 @@ bool Parser::parsePtrOperator( AST::Node& node ) AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1283,7 +1283,7 @@ bool Parser::parseDeclarator( DeclaratorAST::Node& node ) update_pos: UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1380,7 +1380,7 @@ bool Parser::parseAbstractDeclarator( DeclaratorAST::Node& node ) UPDATE_POS: UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1439,7 +1439,7 @@ bool Parser::parseEnumSpecifier( TypeSpecifierAST::Node& node ) UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1470,7 +1470,7 @@ bool Parser::parseTemplateParameterList( TemplateParameterListAST::Node& node ) } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1498,7 +1498,7 @@ bool Parser::parseTemplateParameter( TemplateParameterAST::Node& node ) ok: UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1586,7 +1586,7 @@ bool Parser::parseTypeParameter( TypeParameterAST::Node& node ) UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1615,7 +1615,7 @@ bool Parser::parseStorageClassSpecifier( GroupAST::Node& node ) return false; UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1644,7 +1644,7 @@ bool Parser::parseFunctionSpecifier( GroupAST::Node& node ) return false; UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1665,7 +1665,7 @@ bool Parser::parseTypeId( AST::Node& node ) parseAbstractDeclarator( decl ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1696,7 +1696,7 @@ bool Parser::parseInitDeclaratorList( InitDeclaratorListAST::Node& node ) ////kdDebug(9007)<< "--- tok = " << lex->lookAhead(0).text() << " -- " << "Parser::parseInitDeclaratorList() -- end" << endl; UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1735,7 +1735,7 @@ good: /// @todo add ellipsis UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1844,7 +1844,7 @@ bool Parser::parseParameterDeclarationList( ParameterDeclarationListAST::Node& n } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1887,7 +1887,7 @@ bool Parser::parseParameterDeclaration( ParameterDeclarationAST::Node& node ) ast->setExpression( expr ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1905,7 +1905,7 @@ bool Parser::parseClassSpecifier( TypeSpecifierAST::Node& node ) int kind = lex->lookAhead( 0 ); if( kind == Token_class || kind == Token_struct || kind == Token_union ){ AST::Node asn = CreateNode<AST>(); - classKey = asn; + classKey = std::move(asn); nextToken(); UPDATE_POS( classKey, classKeyStart, lex->index() ); } else { @@ -1968,7 +1968,7 @@ bool Parser::parseClassSpecifier( TypeSpecifierAST::Node& node ) nextToken(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1984,7 +1984,7 @@ bool Parser::parseAccessSpecifier( AST::Node& node ) case Token_protected: case Token_private: { AST::Node asn = CreateNode<AST>(); - node = asn; + node = std::move(asn); nextToken(); UPDATE_POS( node, start, lex->index() ); return true; @@ -2005,7 +2005,7 @@ bool Parser::parseMemberSpecification( DeclarationAST::Node& node ) if( lex->lookAhead(0) == ';' ){ nextToken(); return true; - } else if( lex->lookAhead(0) == Token_Q_OBJECT || lex->lookAhead(0) == Token_ || lex->lookAhead(0) == Token_K_DCOP ){ + } else if( lex->lookAhead(0) == Token_TQ_OBJECT || lex->lookAhead(0) == Token_ || lex->lookAhead(0) == Token_K_DCOP ){ nextToken(); return true; } else if( lex->lookAhead(0) == Token_signals || lex->lookAhead(0) == Token_k_dcop || lex->lookAhead(0) == Token_k_dcop_signals ){ @@ -2016,7 +2016,7 @@ bool Parser::parseMemberSpecification( DeclarationAST::Node& node ) ast->addAccess( n ); ADVANCE( ':', ":" ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } else if( parseTypedef(node) ){ return true; @@ -2037,7 +2037,7 @@ bool Parser::parseMemberSpecification( DeclarationAST::Node& node ) } ADVANCE( ':', ":" ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2065,7 +2065,7 @@ bool Parser::parseMemberSpecification( DeclarationAST::Node& node ) ast->setTypeSpec( spec ); ast->setInitDeclaratorList( declarators ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2115,7 +2115,7 @@ bool Parser::parseElaboratedTypeSpecifier( TypeSpecifierAST::Node& node ) ast->setKind( kind ); ast->setName( name ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2149,7 +2149,7 @@ bool Parser::parseExceptionSpecification( GroupAST::Node& node ) ast->addNode( ellipsis ); nextToken(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); } else if( lex->lookAhead(0) == ')' ) { node = CreateNode<GroupAST>(); } else { @@ -2174,7 +2174,7 @@ bool Parser::parseEnumerator( EnumeratorAST::Node& node ) EnumeratorAST::Node ena = CreateNode<EnumeratorAST>(); - node = ena; + node = std::move(ena); AST::Node id = CreateNode<AST>(); UPDATE_POS( id, start, lex->index() ); @@ -2219,7 +2219,7 @@ bool Parser::parseInitDeclarator( InitDeclaratorAST::Node& node ) ast->setDeclarator( decl ); ast->setInitializer( init ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2255,7 +2255,7 @@ bool Parser::parseBaseClause( BaseClauseAST::Node& node ) return false; UPDATE_POS( bca, start, lex->index() ); - node = bca; + node = std::move(bca); return true; } @@ -2346,7 +2346,7 @@ bool Parser::parseTypeIdList( GroupAST::Node& node ) } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2383,7 +2383,7 @@ bool Parser::parseBaseSpecifier( BaseSpecifierAST::Node& node ) ast->setAccess( access ); ast->setName( name ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2491,7 +2491,7 @@ bool Parser::parseUnqualifiedName( ClassOrNamespaceNameAST::Node& node ) } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2526,7 +2526,7 @@ bool Parser::skipExpressionStatement( StatementAST::Node& node ) ExpressionStatementAST::Node ast = CreateNode<ExpressionStatementAST>(); ast->setExpression( expr ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2620,7 +2620,7 @@ bool Parser::parseCondition( ConditionAST::Node& node ) ast->setExpression( expr ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2629,7 +2629,7 @@ bool Parser::parseCondition( ConditionAST::Node& node ) ast->setDeclarator( decl ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2644,7 +2644,7 @@ bool Parser::parseCondition( ConditionAST::Node& node ) ast->setExpression( expr ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2673,7 +2673,7 @@ bool Parser::parseWhileStatement( StatementAST::Node& node ) ast->setCondition( cond ); ast->setStatement( body ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2707,7 +2707,7 @@ bool Parser::parseDoStatement( StatementAST::Node& node ) ast->setStatement( body ); //ast->setCondition( condition ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2743,12 +2743,11 @@ bool Parser::parseForStatement( StatementAST::Node& node ) // ast->setExpression( expression ); ast->setStatement( body ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } -// qt4 [erbsland] ///@todo add the right parsing for the foreach statement bool Parser::parseForEachStatement( StatementAST::Node& node ) { @@ -2769,7 +2768,7 @@ bool Parser::parseForEachStatement( StatementAST::Node& node ) // add here the parser results ast->setStatement( body ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2820,7 +2819,7 @@ bool Parser::parseCompoundStatement( StatementAST::Node& node ) } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2862,7 +2861,7 @@ bool Parser::parseIfStatement( StatementAST::Node& node ) } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2892,7 +2891,7 @@ bool Parser::parseSwitchStatement( StatementAST::Node& node ) ast->setCondition( cond ); ast->setStatement( stmt ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2909,7 +2908,7 @@ bool Parser::parseLabeledStatement( StatementAST::Node& node ) StatementAST::Node stmt; if( parseStatement(stmt) ){ - node = stmt; + node = std::move(stmt); return true; } } @@ -2933,7 +2932,7 @@ bool Parser::parseLabeledStatement( StatementAST::Node& node ) StatementAST::Node stmt; if( parseStatement(stmt) ){ - node = stmt; + node = std::move(stmt); return true; } } @@ -2990,7 +2989,7 @@ bool Parser::parseBlockDeclaration( DeclarationAST::Node& node ) ast->setTypeSpec( spec ); ast->setInitDeclaratorList( declarators ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -3030,7 +3029,7 @@ bool Parser::parseDeclarationStatement( StatementAST::Node& node ) DeclarationStatementAST::Node ast = CreateNode<DeclarationStatementAST>(); ast->setDeclaration( decl ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); ////kdDebug(9007)<< "---------------------> found a block declaration" << endl; return true; @@ -3094,7 +3093,7 @@ bool Parser::parseDeclarationInternal( DeclarationAST::Node& node ) SimpleDeclarationAST::Node ast = CreateNode<SimpleDeclarationAST>(); ast->setInitDeclaratorList( declarators ); ast->setText( toString(start, endSignature) ); - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); return true; @@ -3112,7 +3111,7 @@ bool Parser::parseDeclarationInternal( DeclarationAST::Node& node ) ast->setInitDeclarator( declarator ); ast->setFunctionBody( funBody ); ast->setText( toString(start, endSignature) ); - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); return true; } @@ -3129,7 +3128,7 @@ bool Parser::parseDeclarationInternal( DeclarationAST::Node& node ) ast->setInitDeclarator( declarator ); ast->setText( toString(start, endSignature) ); ast->setFunctionBody( funBody ); - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); return true; } @@ -3159,7 +3158,7 @@ start_decl: if( parseInitDeclaratorList(declarators) ){ ADVANCE( ';', ";" ); DeclarationAST::Node ast = CreateNode<DeclarationAST>(); - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); return true; } @@ -3220,7 +3219,7 @@ start_decl: ast->setWinDeclSpec( winDeclSpec ); ast->setInitDeclaratorList( declarators ); - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); } return true; @@ -3244,7 +3243,7 @@ start_decl: ast->setTypeSpec( spec ); ast->setFunctionBody( funBody ); ast->setInitDeclarator( decl ); - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); return true; } @@ -3292,7 +3291,7 @@ bool Parser::parseFunctionBody( StatementListAST::Node& node ) nextToken(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -3380,7 +3379,7 @@ bool Parser::parseTryBlockStatement( StatementAST::Node& node ) ast->setStatement( stmt ); ast->setCatchStatementList( list ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -3906,7 +3905,7 @@ bool Parser::parseLogicalOrExpression( AST::Node& node, bool templArgs ) AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -3951,7 +3950,7 @@ bool Parser::parseAssignmentExpression( AST::Node& node ) AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -3962,7 +3961,7 @@ bool Parser::parseConstantExpression( AST::Node& node ) if( parseConditionalExpression(node) ){ AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } return false; @@ -3979,7 +3978,7 @@ bool Parser::parseExpression( AST::Node& node ) AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -4001,7 +4000,7 @@ bool Parser::parseCommaExpression( AST::Node& node ) AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -4204,7 +4203,7 @@ bool Parser::parseIdentifierList( GroupAST::Node & node ) ADVANCE( Token_identifier, "identifier" ); } - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); return true; } diff --git a/lib/cppparser/parser.h b/lib/cppparser/parser.h index fbefd8c5..40173c86 100644 --- a/lib/cppparser/parser.h +++ b/lib/cppparser/parser.h @@ -368,7 +368,7 @@ public /*rules*/ : bool parseWhileStatement( StatementAST::Node& node ); bool parseDoStatement( StatementAST::Node& node ); bool parseForStatement( StatementAST::Node& node ); - bool parseForEachStatement( StatementAST::Node& node ); // qt4 [erbsland] + bool parseForEachStatement( StatementAST::Node& node ); bool parseCompoundStatement( StatementAST::Node& node ); bool parseForInitStatement( StatementAST::Node& node ); bool parseIfStatement( StatementAST::Node& node ); diff --git a/lib/interfaces/KDevCoreIface.cpp b/lib/interfaces/KDevCoreIface.cpp index aa70e01b..c86e3562 100644 --- a/lib/interfaces/KDevCoreIface.cpp +++ b/lib/interfaces/KDevCoreIface.cpp @@ -29,8 +29,8 @@ KDevCoreIface::KDevCoreIface(KDevCore *core) : TQObject(core), DCOPObject("KDevCore"), m_core(core) { - connect( m_core, TQT_SIGNAL(projectOpened()), this, TQT_SLOT(forwardProjectOpened()) ); - connect( m_core, TQT_SIGNAL(projectClosed()), this, TQT_SLOT(forwardProjectClosed()) ); + connect( m_core, TQ_SIGNAL(projectOpened()), this, TQ_SLOT(forwardProjectOpened()) ); + connect( m_core, TQ_SIGNAL(projectClosed()), this, TQ_SLOT(forwardProjectClosed()) ); } diff --git a/lib/interfaces/KDevCoreIface.h b/lib/interfaces/KDevCoreIface.h index 612c8457..7a985931 100644 --- a/lib/interfaces/KDevCoreIface.h +++ b/lib/interfaces/KDevCoreIface.h @@ -29,7 +29,7 @@ class KDevCore; class KDevCoreIface : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP diff --git a/lib/interfaces/KDevPartControllerIface.cpp b/lib/interfaces/KDevPartControllerIface.cpp index 1b184453..60c9ef97 100644 --- a/lib/interfaces/KDevPartControllerIface.cpp +++ b/lib/interfaces/KDevPartControllerIface.cpp @@ -28,9 +28,9 @@ KDevPartControllerIface::KDevPartControllerIface(KDevPartController *pc) : TQObject(pc), DCOPObject("KDevPartController"), m_controller(pc) { - connect(pc, TQT_SIGNAL(loadedFile(const KURL &)), this, TQT_SLOT(forwardLoadedFile(const KURL &))); - connect(pc, TQT_SIGNAL(savedFile(const KURL &)), this, TQT_SLOT(forwardSavedFile(const KURL &))); - connect(pc, TQT_SIGNAL(closedFile(const KURL &)), this, TQT_SLOT(forwardClosedFile(const KURL &))); + connect(pc, TQ_SIGNAL(loadedFile(const KURL &)), this, TQ_SLOT(forwardLoadedFile(const KURL &))); + connect(pc, TQ_SIGNAL(savedFile(const KURL &)), this, TQ_SLOT(forwardSavedFile(const KURL &))); + connect(pc, TQ_SIGNAL(closedFile(const KURL &)), this, TQ_SLOT(forwardClosedFile(const KURL &))); } diff --git a/lib/interfaces/KDevPartControllerIface.h b/lib/interfaces/KDevPartControllerIface.h index 8c3647ea..b37bf1df 100644 --- a/lib/interfaces/KDevPartControllerIface.h +++ b/lib/interfaces/KDevPartControllerIface.h @@ -27,7 +27,7 @@ class KDevPartController; class KDevPartControllerIface : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP diff --git a/lib/interfaces/extensions/Mainpage.dox b/lib/interfaces/extensions/Mainpage.dox index 3b493fde..175909c3 100644 --- a/lib/interfaces/extensions/Mainpage.dox +++ b/lib/interfaces/extensions/Mainpage.dox @@ -38,7 +38,7 @@ those should be loaded at a time. This can be accomplished by: @code class KDevMyExtension: public KDevPlugin { public: - KDevMyExtension(const KDevPluginInfo *info, QObject* parent, const char* name) + KDevMyExtension(const KDevPluginInfo *info, TQObject* parent, const char* name) :KDevPlugin(info, parent, name) {} virtual void doSomething() = 0; diff --git a/lib/interfaces/extensions/codebrowserfrontend.h b/lib/interfaces/extensions/codebrowserfrontend.h index 49dd95a8..eddad758 100644 --- a/lib/interfaces/extensions/codebrowserfrontend.h +++ b/lib/interfaces/extensions/codebrowserfrontend.h @@ -26,7 +26,7 @@ namespace Extensions { class KDevCodeBrowserFrontend : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/lib/interfaces/extensions/kdevappfrontend.h b/lib/interfaces/extensions/kdevappfrontend.h index 76952f35..f175ee92 100644 --- a/lib/interfaces/extensions/kdevappfrontend.h +++ b/lib/interfaces/extensions/kdevappfrontend.h @@ -56,7 +56,7 @@ if (apf) { */ class KDevAppFrontend : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/lib/interfaces/extensions/kdevmakefrontend.h b/lib/interfaces/extensions/kdevmakefrontend.h index 52afa3d3..ea869e30 100644 --- a/lib/interfaces/extensions/kdevmakefrontend.h +++ b/lib/interfaces/extensions/kdevmakefrontend.h @@ -52,7 +52,7 @@ if (mf) { */ class KDevMakeFrontend : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/lib/interfaces/extensions/kdevversioncontrol.h b/lib/interfaces/extensions/kdevversioncontrol.h index a19c6275..ede2cf91 100644 --- a/lib/interfaces/extensions/kdevversioncontrol.h +++ b/lib/interfaces/extensions/kdevversioncontrol.h @@ -134,7 +134,7 @@ if (vcs) { */ class KDevVersionControl: public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: @@ -184,7 +184,7 @@ Basic interface for providing info on file registered in a version control repos */ class KDevVCSFileInfoProvider: public TQObject { - Q_OBJECT + TQ_OBJECT public: /**Constructor. diff --git a/lib/interfaces/external/Mainpage.dox b/lib/interfaces/external/Mainpage.dox index 8c22ba73..7c97cf16 100644 --- a/lib/interfaces/external/Mainpage.dox +++ b/lib/interfaces/external/Mainpage.dox @@ -10,23 +10,23 @@ GUI Designer integration framework. \section designerintegration Overview of GUI designer integration process Each KPart that wants to act as a GUI Designer must implement @ref KInterfaceDesigner::Designer -interface. It defines necessary Q_SIGNALS to communicate with an IDE and abstract virtual +interface. It defines necessary signals to communicate with an IDE and abstract virtual functions to determine designer type. If a part which can "design" user interface files of a certain mimetype implements this interface and sets itself as a default handler for that mimetype then it becomes automatically integrated into TDevelop IDE. -When a part is embedded into TDevelop shell, its Q_SIGNALS (defined in @ref +When a part is embedded into TDevelop shell, its signals (defined in @ref KInterfaceDesigner::Designer interface): @code - void addedFunction(DesignerType type, const QString &formName, Function function) - void removedFunction(DesignerType type, const QString &formName, Function function) - void editedFunction(DesignerType type, const QString &formName, Function oldFunction, Function function) - void editFunction(DesignerType type, const QString &formName, const QString &functionName) - void editSource(DesignerType type, const QString &formName); + void addedFunction(DesignerType type, const TQString &formName, Function function) + void removedFunction(DesignerType type, const TQString &formName, Function function) + void editedFunction(DesignerType type, const TQString &formName, Function oldFunction, Function function) + void editFunction(DesignerType type, const TQString &formName, const TQString &functionName) + void editSource(DesignerType type, const TQString &formName); @endcode -are connected to corresponding Q_SLOTS of TDevelop designer integration engine which can be implemented in TDevelop language support plugin. +are connected to corresponding slots of TDevelop designer integration engine which can be implemented in TDevelop language support plugin. Each language support which wants to use integrated designer, must reimplement @code diff --git a/lib/interfaces/external/designer.h b/lib/interfaces/external/designer.h index b84e2268..73420496 100644 --- a/lib/interfaces/external/designer.h +++ b/lib/interfaces/external/designer.h @@ -64,7 +64,7 @@ implements this interface and sets itself as a default handler for that mimetype then it becomes automatically integrated into TDevelop IDE. */ class Designer: public KParts::ReadWritePart{ - Q_OBJECT + TQ_OBJECT public: Designer(TQObject *parent, const char *name); diff --git a/lib/interfaces/extras/kdevcompileroptions.h b/lib/interfaces/extras/kdevcompileroptions.h index 6544c5d0..c6719e27 100644 --- a/lib/interfaces/extras/kdevcompileroptions.h +++ b/lib/interfaces/extras/kdevcompileroptions.h @@ -71,7 +71,7 @@ if ( plugin ) */ class KDevCompilerOptions : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/lib/interfaces/extras/kdevvcsintegrator.h b/lib/interfaces/extras/kdevvcsintegrator.h index 793070b3..41faf993 100644 --- a/lib/interfaces/extras/kdevvcsintegrator.h +++ b/lib/interfaces/extras/kdevvcsintegrator.h @@ -63,7 +63,7 @@ VCS integrator takes care about setting up VCS for new and existing projects. It can, for example, perform checkout or import operations. */ class KDevVCSIntegrator: public TQObject { - Q_OBJECT + TQ_OBJECT public: KDevVCSIntegrator(TQObject *parent = 0, const char *name = 0); diff --git a/lib/interfaces/katedocumentmanagerinterface.h b/lib/interfaces/katedocumentmanagerinterface.h index 8bdbdf8f..edc6d0af 100644 --- a/lib/interfaces/katedocumentmanagerinterface.h +++ b/lib/interfaces/katedocumentmanagerinterface.h @@ -32,7 +32,7 @@ This is an emulated interface to provide compatibility with Kate scripts. */ class KateDocumentManagerInterface : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP public: diff --git a/lib/interfaces/kdevapi.h b/lib/interfaces/kdevapi.h index d1f4f5cc..ef756b69 100644 --- a/lib/interfaces/kdevapi.h +++ b/lib/interfaces/kdevapi.h @@ -46,7 +46,7 @@ class because @ref KDevPlugin already provides API convenience methods. */ class KDevApi: public TQObject { - Q_OBJECT + TQ_OBJECT public: /**Constructor.*/ diff --git a/lib/interfaces/kdevcoderepository.h b/lib/interfaces/kdevcoderepository.h index 4e1dd765..fca20f32 100644 --- a/lib/interfaces/kdevcoderepository.h +++ b/lib/interfaces/kdevcoderepository.h @@ -47,7 +47,7 @@ symbol store like @ref CodeModel. */ class KDevCodeRepository : public TQObject { - Q_OBJECT + TQ_OBJECT public: /**Constructor.*/ diff --git a/lib/interfaces/kdevcore.h b/lib/interfaces/kdevcore.h index fad2891a..e496576f 100644 --- a/lib/interfaces/kdevcore.h +++ b/lib/interfaces/kdevcore.h @@ -78,15 +78,15 @@ to if you reimplement TQWidget::contextMenuEvent method. -# Connect KDevCore::contextMenu(TQPopupMenu *, const Context *) signal to that slot in the constructor of your plugin:\n @code -connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); +connect(core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); @endcode -# Fill the menu in the slot you created, for example:\n @code if (context->hasType(Context::EditorContext)) { const EditorContext *econtext = static_cast<const EditorContext*>(context); - int id = popup->insertItem(i18n("My Menu Item 1"), this, TQT_SLOT(myMenuAction1())); + int id = popup->insertItem(i18n("My Menu Item 1"), this, TQ_SLOT(myMenuAction1())); popup->setWhatsThis(id, i18n("What's this for my menu item 1")); } else if context->hasType(MyContext)) @@ -299,7 +299,7 @@ It defines: */ class KDevCore: public TQObject { - Q_OBJECT + TQ_OBJECT public: /**Constructor diff --git a/lib/interfaces/kdevdesignerintegration.h b/lib/interfaces/kdevdesignerintegration.h index 528926cb..d8658b48 100644 --- a/lib/interfaces/kdevdesignerintegration.h +++ b/lib/interfaces/kdevdesignerintegration.h @@ -50,7 +50,7 @@ and reimplement slots defined in the form. */ class KDevDesignerIntegration : public TQObject { -Q_OBJECT +TQ_OBJECT public: /**Constructor. diff --git a/lib/interfaces/kdevlanguagesupport.cpp b/lib/interfaces/kdevlanguagesupport.cpp index aa5b560c..a5609cf9 100644 --- a/lib/interfaces/kdevlanguagesupport.cpp +++ b/lib/interfaces/kdevlanguagesupport.cpp @@ -68,9 +68,9 @@ bool KDevLanguageSupport::shouldSplitDocument(const KURL &url) return false; } -Qt::Orientation KDevLanguageSupport::splitOrientation() const +TQt::Orientation KDevLanguageSupport::splitOrientation() const { - return Qt::Vertical; + return TQt::Vertical; } void KDevLanguageSupport::addClass() diff --git a/lib/interfaces/kdevlanguagesupport.h b/lib/interfaces/kdevlanguagesupport.h index 42221868..59b160b2 100644 --- a/lib/interfaces/kdevlanguagesupport.h +++ b/lib/interfaces/kdevlanguagesupport.h @@ -60,7 +60,7 @@ formatted name). */ class KDevLanguageSupport: public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: @@ -135,8 +135,8 @@ public: virtual bool shouldSplitDocument( const KURL &url ); /**Returns the language parts Split View orientation. - By default Qt::Vertical.*/ - virtual Qt::Orientation splitOrientation() const; + By default TQt::Vertical.*/ + virtual TQt::Orientation splitOrientation() const; /**Opens a "New class" dialog and adds the configured class to the sources. Define NewClass feature if you reimplement this method.*/ @@ -255,7 +255,7 @@ signals: void addedSourceInfo( const TQString& fileName ); /**Emitted when the language part changes the Split View orientation.*/ - void splitOrientationChanged( Qt::Orientation orientation ); + void splitOrientationChanged( TQt::Orientation orientation ); }; #endif diff --git a/lib/interfaces/kdevpartcontroller.h b/lib/interfaces/kdevpartcontroller.h index fd8e6830..0229c7e7 100644 --- a/lib/interfaces/kdevpartcontroller.h +++ b/lib/interfaces/kdevpartcontroller.h @@ -55,7 +55,7 @@ GUI designers, etc. */ class KDevPartController: public KParts::PartManager { - Q_OBJECT + TQ_OBJECT public: diff --git a/lib/interfaces/kdevplugin.h b/lib/interfaces/kdevplugin.h index 5bdcaaf6..e2058fa8 100644 --- a/lib/interfaces/kdevplugin.h +++ b/lib/interfaces/kdevplugin.h @@ -106,7 +106,7 @@ from shell applications. */ class KDevPlugin: public TQObject, public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: diff --git a/lib/interfaces/kdevplugincontroller.cpp b/lib/interfaces/kdevplugincontroller.cpp index 1cc6caa3..2a1b0770 100644 --- a/lib/interfaces/kdevplugincontroller.cpp +++ b/lib/interfaces/kdevplugincontroller.cpp @@ -27,8 +27,17 @@ KDevPluginController::KDevPluginController() TDETrader::OfferList KDevPluginController::query(const TQString &serviceType, const TQString &constraint) { - return TDETrader::self()->query(serviceType, - TQString("%1 and [X-TDevelop-Version] == %2").arg(constraint).arg(TDEVELOP_PLUGIN_VERSION)); + TQString versionConstraint = + TQString::fromLatin1("[X-TDevelop-Version] == %1").arg(TDEVELOP_PLUGIN_VERSION); + + TQString newConstraint; + if (!constraint.isEmpty()) { + newConstraint = TQString("( %1 ) and %2").arg(constraint).arg(versionConstraint); + } else { + newConstraint = versionConstraint; + } + + return TDETrader::self()->query(serviceType, newConstraint); } TDETrader::OfferList KDevPluginController::queryPlugins(const TQString &constraint) diff --git a/lib/interfaces/kdevplugincontroller.h b/lib/interfaces/kdevplugincontroller.h index d72563d5..c21cf58a 100644 --- a/lib/interfaces/kdevplugincontroller.h +++ b/lib/interfaces/kdevplugincontroller.h @@ -38,7 +38,7 @@ Plugin controller is responsible for quering, loading and unloading available pl */ class KDevPluginController: public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/lib/interfaces/kdevproject.cpp b/lib/interfaces/kdevproject.cpp index e8616df1..3a49a8c6 100644 --- a/lib/interfaces/kdevproject.cpp +++ b/lib/interfaces/kdevproject.cpp @@ -40,14 +40,14 @@ struct KDevProject::Private { KDevProject::KDevProject(const KDevPluginInfo *info, TQObject *parent, const char *name) : KDevPlugin(info, parent, name), d(new KDevProject::Private()) { - connect( this, TQT_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) ); - connect( this, TQT_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) ); + connect( this, TQ_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQ_SLOT(buildFileMap()) ); + connect( this, TQ_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQ_SLOT(buildFileMap()) ); - connect( this, TQT_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQT_SLOT(slotAddFilesToFileMap(const TQStringList& )) ); - connect( this, TQT_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQT_SLOT(slotRemoveFilesFromFileMap(const TQStringList& )) ); + connect( this, TQ_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQ_SLOT(slotAddFilesToFileMap(const TQStringList& )) ); + connect( this, TQ_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQ_SLOT(slotRemoveFilesFromFileMap(const TQStringList& )) ); d->m_timer = new TQTimer(this); - connect(d->m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotBuildFileMap())); + connect(d->m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotBuildFileMap())); d->m_iface = new KDevProjectIface(this); } diff --git a/lib/interfaces/kdevproject.h b/lib/interfaces/kdevproject.h index 256b0c0c..3fc6cf87 100644 --- a/lib/interfaces/kdevproject.h +++ b/lib/interfaces/kdevproject.h @@ -47,7 +47,7 @@ as a way of providing support for a build system (like it is done in TDevelop ID */ class KDevProject: public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: /**Constructs a project plugin. diff --git a/lib/interfaces/kdevprojectiface.h b/lib/interfaces/kdevprojectiface.h index e30cd6cc..4908f9f2 100644 --- a/lib/interfaces/kdevprojectiface.h +++ b/lib/interfaces/kdevprojectiface.h @@ -33,7 +33,7 @@ DCOP Interface for the @ref KDevProject object. */ class KDevProjectIface : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP public: diff --git a/lib/util/blockingkprocess.cpp b/lib/util/blockingkprocess.cpp index b88b0cad..0c2b0650 100644 --- a/lib/util/blockingkprocess.cpp +++ b/lib/util/blockingkprocess.cpp @@ -22,12 +22,12 @@ BlockingTDEProcess::BlockingTDEProcess(TQObject *parent, const char *name) m_timeoutValue = 60; m_timer = 0L; - connect(this, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotReceivedStdOut(TDEProcess *, char *, int))); - connect(this, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(slotReceivedStdErr(TDEProcess *, char *, int))); - connect(this, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotProcessExited(TDEProcess *))); + connect(this, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotReceivedStdOut(TDEProcess *, char *, int))); + connect(this, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(slotReceivedStdErr(TDEProcess *, char *, int))); + connect(this, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotProcessExited(TDEProcess *))); } BlockingTDEProcess::BlockingTDEProcess() @@ -37,12 +37,12 @@ BlockingTDEProcess::BlockingTDEProcess() m_stdErr = ""; m_timeoutValue = 60; m_timer = 0L; - connect(this, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotReceivedStdOut(TDEProcess *, char *, int))); - connect(this, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(slotReceivedStdErr(TDEProcess *, char *, int))); - connect(this, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotProcessExited(TDEProcess *))); + connect(this, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotReceivedStdOut(TDEProcess *, char *, int))); + connect(this, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(slotReceivedStdErr(TDEProcess *, char *, int))); + connect(this, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotProcessExited(TDEProcess *))); } @@ -55,7 +55,7 @@ bool BlockingTDEProcess::start(RunMode runmode, Communication comm) { m_timeout = false; m_timer = new TQTimer(); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeOut())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeOut())); m_timer->start(m_timeoutValue*1000, true); enter_loop(); delete m_timer; @@ -95,7 +95,7 @@ void tqt_leave_modal( TQWidget *widget ); void BlockingTDEProcess::enter_loop() { TQWidget dummy(0,0,WType_Dialog | WShowModal); - dummy.setFocusPolicy( TQ_NoFocus ); + dummy.setFocusPolicy( TQWidget::NoFocus ); tqt_enter_modal(&dummy); tqApp->enter_loop(); tqt_leave_modal(&dummy); diff --git a/lib/util/blockingkprocess.h b/lib/util/blockingkprocess.h index 8d164bef..b5a7e71e 100644 --- a/lib/util/blockingkprocess.h +++ b/lib/util/blockingkprocess.h @@ -30,7 +30,7 @@ class TQTimer; class BlockingTDEProcess : public TDEProcess { - Q_OBJECT + TQ_OBJECT public: diff --git a/lib/util/configwidgetproxy.cpp b/lib/util/configwidgetproxy.cpp index 0047a3db..16f578f0 100644 --- a/lib/util/configwidgetproxy.cpp +++ b/lib/util/configwidgetproxy.cpp @@ -34,8 +34,8 @@ ConfigWidgetProxy::ConfigWidgetProxy( KDevCore * core ) { - connect( core, TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(slotConfigWidget( KDialogBase*)) ); - connect( core, TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(slotProjectConfigWidget( KDialogBase*)) ); + connect( core, TQ_SIGNAL(configWidget(KDialogBase*)), this, TQ_SLOT(slotConfigWidget( KDialogBase*)) ); + connect( core, TQ_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQ_SLOT(slotProjectConfigWidget( KDialogBase*)) ); } ConfigWidgetProxy::~ConfigWidgetProxy() @@ -43,12 +43,12 @@ ConfigWidgetProxy::~ConfigWidgetProxy() void ConfigWidgetProxy::createGlobalConfigPage( TQString const & title, unsigned int pagenumber, TQString const & icon ) { - _globalTitleMap.insert( pagenumber, tqMakePair( title, icon ) ); + _globalTitleMap.insert( pagenumber, qMakePair( title, icon ) ); } void ConfigWidgetProxy::createProjectConfigPage( TQString const & title, unsigned int pagenumber, TQString const & icon ) { - _projectTitleMap.insert( pagenumber, tqMakePair( title, icon ) ); + _projectTitleMap.insert( pagenumber, qMakePair( title, icon ) ); } void ConfigWidgetProxy::removeConfigPage( int pagenumber ) @@ -66,8 +66,8 @@ void ConfigWidgetProxy::slotConfigWidget( KDialogBase * dlg ) ++it; } - connect( dlg, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT( slotAboutToShowPage(TQWidget*)) ); - connect( dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotConfigWidgetDestroyed()) ); + connect( dlg, TQ_SIGNAL(aboutToShowPage(TQWidget*)), this, TQ_SLOT( slotAboutToShowPage(TQWidget*)) ); + connect( dlg, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotConfigWidgetDestroyed()) ); } void ConfigWidgetProxy::slotProjectConfigWidget( KDialogBase * dlg ) @@ -79,8 +79,8 @@ void ConfigWidgetProxy::slotProjectConfigWidget( KDialogBase * dlg ) ++it; } - connect( dlg, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT( slotAboutToShowPage(TQWidget*)) ); - connect( dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotConfigWidgetDestroyed()) ); + connect( dlg, TQ_SIGNAL(aboutToShowPage(TQWidget*)), this, TQ_SLOT( slotAboutToShowPage(TQWidget*)) ); + connect( dlg, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotConfigWidgetDestroyed()) ); } void ConfigWidgetProxy::slotConfigWidgetDestroyed( ) @@ -95,7 +95,7 @@ void ConfigWidgetProxy::slotAboutToShowPage( TQWidget * page ) PageMap::Iterator it = _pageMap.find( page ); if ( it != _pageMap.end() ) { - emit insertConfigWidget( static_cast<KDialogBase*>(TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))), page, it.data() ); + emit insertConfigWidget( static_cast<KDialogBase*>(const_cast<TQObject*>(sender())), page, it.data() ); _pageMap.remove( it ); } } diff --git a/lib/util/configwidgetproxy.h b/lib/util/configwidgetproxy.h index ffbbca15..ee9a3fb0 100644 --- a/lib/util/configwidgetproxy.h +++ b/lib/util/configwidgetproxy.h @@ -47,8 +47,8 @@ A typical case looks like this: _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createGlobalConfigPage( i18n("My Part"), GLOBALDOC_OPTIONS, info()->icon() ); _configProxy->createProjectConfigPage( i18n("My Part"), PROJECTDOC_OPTIONS, info()->icon() ); -connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const TQObject*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const TQObject*, TQWidget*, unsigned int )) ); +connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const TQObject*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const TQObject*, TQWidget*, unsigned int )) ); ... ... @@ -57,10 +57,10 @@ void MyPart::insertConfigWidget( TQObject const * dlg, TQWidget * page, unsigned { if ( pagenumber == PROJECTDOC_OPTIONS ) { MyPartGlobalSettings * w = new MyPartGlobalSettings( this, page ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(slotAccept()) ); } else if ( pagenumber == PROJECTDOC_OPTIONS ) { MyPartProjectSettings * w = new MyPartProjectSettings( this, page ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(slotAccept()) ); } } @endcode @@ -70,7 +70,7 @@ KDevCore::projectConfigWidget() slots. */ class ConfigWidgetProxy : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/lib/util/domutil.h b/lib/util/domutil.h index e5614d49..9a0c24ad 100644 --- a/lib/util/domutil.h +++ b/lib/util/domutil.h @@ -174,7 +174,7 @@ public: or "widget/property||2/string" . \verbatim - <widget class=TQDIALOG_OBJECT_NAME_STRING> + <widget class="TQDialog"> <property name="name"> <cstring>KdevFormName</cstring> </property> diff --git a/lib/util/execcommand.cpp b/lib/util/execcommand.cpp index 0e617762..6fb0f40c 100644 --- a/lib/util/execcommand.cpp +++ b/lib/util/execcommand.cpp @@ -39,12 +39,12 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, *proc << executable; *proc << args; - connect( proc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(processExited()) ); - connect( proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - this, TQT_SLOT(receivedStdout(TDEProcess*,char*,int)) ); - connect( proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - this, TQT_SLOT(receivedStderr(TDEProcess*,char*,int)) ); + connect( proc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(processExited()) ); + connect( proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQ_SLOT(receivedStdout(TDEProcess*,char*,int)) ); + connect( proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQ_SLOT(receivedStderr(TDEProcess*,char*,int)) ); bool ok = proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ); @@ -58,8 +58,8 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, } else { progressDlg = new KProgressDialog( 0, 0, i18n("Command running..."), i18n("Please wait until the \"%1\" command finishes.").arg( executable ), false ); - connect( progressDlg, TQT_SIGNAL(cancelClicked()), - this, TQT_SLOT(cancelClicked()) ); + connect( progressDlg, TQ_SIGNAL(cancelClicked()), + this, TQ_SLOT(cancelClicked()) ); } } diff --git a/lib/util/execcommand.h b/lib/util/execcommand.h index 7ea1ef5c..cc546e11 100644 --- a/lib/util/execcommand.h +++ b/lib/util/execcommand.h @@ -44,7 +44,7 @@ Command execution facilities. */ class ExecCommand : public TQObject { - Q_OBJECT + TQ_OBJECT public: ExecCommand( const TQString& executable, const TQStringList& args, diff --git a/lib/util/kdevjobtimer.cpp b/lib/util/kdevjobtimer.cpp index b0b78250..db095e55 100644 --- a/lib/util/kdevjobtimer.cpp +++ b/lib/util/kdevjobtimer.cpp @@ -15,7 +15,7 @@ KDevJobTimer::KDevJobTimer( void * payload, TQObject *parent, const char *name) : TQTimer(parent, name) { m_payload = payload; - connect( this, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()) ); + connect( this, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout()) ); } KDevJobTimer::~KDevJobTimer() @@ -26,7 +26,7 @@ void KDevJobTimer::singleShot(int msec, TQObject * receiver, const char * member { KDevJobTimer * p = new KDevJobTimer( payload ); p->start( msec, true ); - connect( p, TQT_SIGNAL(timeout(void*)), receiver, member ); + connect( p, TQ_SIGNAL(timeout(void*)), receiver, member ); } void KDevJobTimer::slotTimeout() diff --git a/lib/util/kdevjobtimer.h b/lib/util/kdevjobtimer.h index b0fa829e..ed50e08d 100644 --- a/lib/util/kdevjobtimer.h +++ b/lib/util/kdevjobtimer.h @@ -16,7 +16,7 @@ class KDevJobTimer : public TQTimer { -Q_OBJECT +TQ_OBJECT public: static void singleShot( int msec, TQObject * receiver, const char * member, void * payload ); diff --git a/lib/util/kdevshellwidget.cpp b/lib/util/kdevshellwidget.cpp index 51d310bf..1db1b7e1 100644 --- a/lib/util/kdevshellwidget.cpp +++ b/lib/util/kdevshellwidget.cpp @@ -41,18 +41,18 @@ void KDevShellWidget::activate( ) KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart"); if ( !factory ) return; - m_konsolePart = (KParts::ReadOnlyPart *) factory->create( TQT_TQOBJECT(this), "libkonsolepart", "KParts::ReadOnlyPart" ); + m_konsolePart = (KParts::ReadOnlyPart *) factory->create( this, "libkonsolepart", "KParts::ReadOnlyPart" ); if ( !m_konsolePart ) return; - connect( m_konsolePart, TQT_SIGNAL( processExited(TDEProcess *) ), this, TQT_SLOT( processExited(TDEProcess *) ) ); - connect( m_konsolePart, TQT_SIGNAL( receivedData( const TQString& ) ), this, TQT_SIGNAL( receivedData( const TQString& ) ) ); - connect( m_konsolePart, TQT_SIGNAL(destroyed()), this, TQT_SLOT(partDestroyed()) ); + connect( m_konsolePart, TQ_SIGNAL( processExited(TDEProcess *) ), this, TQ_SLOT( processExited(TDEProcess *) ) ); + connect( m_konsolePart, TQ_SIGNAL( receivedData( const TQString& ) ), this, TQ_SIGNAL( receivedData( const TQString& ) ) ); + connect( m_konsolePart, TQ_SIGNAL(destroyed()), this, TQ_SLOT(partDestroyed()) ); - m_konsolePart->widget()->setFocusPolicy( TQ_WheelFocus ); + m_konsolePart->widget()->setFocusPolicy( TQWidget::WheelFocus ); setFocusProxy( m_konsolePart->widget() ); m_konsolePart->widget()->setFocus(); - if ( m_konsolePart->widget()->inherits(TQFRAME_OBJECT_NAME_STRING) ) + if ( m_konsolePart->widget()->inherits("TQFrame") ) ((TQFrame*)m_konsolePart->widget())->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); m_konsolePart->widget()->show(); @@ -109,7 +109,7 @@ void KDevShellWidget::setAutoReactivateOnClose( bool doAutoActivate ) // reactivating with a non-working setting (the partDestroyed() // slot will have ran before m_doAutoActivate is set) if ( doAutoActivate ) - TQTimer::singleShot( 3000, this, TQT_SLOT(setAutoReactivateOnCloseDelayed()) ); + TQTimer::singleShot( 3000, this, TQ_SLOT(setAutoReactivateOnCloseDelayed()) ); else m_doAutoActivate = false; } diff --git a/lib/util/kdevshellwidget.h b/lib/util/kdevshellwidget.h index 9ba21e2e..88a6c563 100644 --- a/lib/util/kdevshellwidget.h +++ b/lib/util/kdevshellwidget.h @@ -26,7 +26,7 @@ namespace KParts class KDevShellWidget : public TQVBox { -Q_OBJECT +TQ_OBJECT public: diff --git a/lib/util/tdescriptactionmanager.cpp b/lib/util/tdescriptactionmanager.cpp index c4b44894..de10a9e0 100644 --- a/lib/util/tdescriptactionmanager.cpp +++ b/lib/util/tdescriptactionmanager.cpp @@ -52,7 +52,7 @@ KScriptAction::KScriptAction( const TQString &scriptDesktopFile, TQObject *inter TDETrader::OfferList offers = TDETrader::self()->query( "KScriptRunner/KScriptRunner", scriptTypeQuery ); if ( !offers.isEmpty() ) { - m_action = new TDEAction(m_scriptName, TDEShortcut(), this, TQT_SLOT(activate()), ac, "script"); + m_action = new TDEAction(m_scriptName, TDEShortcut(), this, TQ_SLOT(activate()), ac, "script"); m_isValid = true; m_timeout = new TQTimer(this); TQString icon = desktop.readIcon(); @@ -60,7 +60,7 @@ KScriptAction::KScriptAction( const TQString &scriptDesktopFile, TQObject *inter if( !icon.isEmpty() ) m_action->setIcon(icon); m_action->setShortcutConfigurable(true); - connect( m_timeout, TQT_SIGNAL(timeout()), TQT_SLOT(cleanup()) ); + connect( m_timeout, TQ_SIGNAL(timeout()), TQ_SLOT(cleanup()) ); } } } @@ -91,7 +91,7 @@ void KScriptAction::activate( ) m_interface->setScript(m_scriptFile); else m_interface->setScript(m_scriptFile, m_scriptMethod); - connect(this, TQT_SIGNAL(done(KScriptClientInterface::Result, const TQVariant &)), this, TQT_SLOT(scriptFinished())); + connect(this, TQ_SIGNAL(done(KScriptClientInterface::Result, const TQVariant &)), this, TQ_SLOT(scriptFinished())); } else { @@ -152,16 +152,16 @@ TQPtrList< TDEAction > KScriptActionManager::scripts( TQObject * interface , con { actions.append(script->action()); m_actions.append(script); - connect(script, TQT_SIGNAL(error( const TQString&)), this, - TQT_SIGNAL(scriptError( const TQString&))); - connect(script, TQT_SIGNAL(warning( const TQString&)), this, - TQT_SIGNAL(scriptWarning( const TQString&))); - connect(script, TQT_SIGNAL(output( const TQString&)), this, - TQT_SIGNAL(scriptOutput( const TQString&))); - connect(script, TQT_SIGNAL(progress( int )), this, - TQT_SIGNAL(scriptProgress(int))); - connect(script, TQT_SIGNAL(done( KScriptClientInterface::Result, const TQVariant &)),this, - TQT_SIGNAL(scriptDone( KScriptClientInterface::Result, const TQVariant &))); + connect(script, TQ_SIGNAL(error( const TQString&)), this, + TQ_SIGNAL(scriptError( const TQString&))); + connect(script, TQ_SIGNAL(warning( const TQString&)), this, + TQ_SIGNAL(scriptWarning( const TQString&))); + connect(script, TQ_SIGNAL(output( const TQString&)), this, + TQ_SIGNAL(scriptOutput( const TQString&))); + connect(script, TQ_SIGNAL(progress( int )), this, + TQ_SIGNAL(scriptProgress(int))); + connect(script, TQ_SIGNAL(done( KScriptClientInterface::Result, const TQVariant &)),this, + TQ_SIGNAL(scriptDone( KScriptClientInterface::Result, const TQVariant &))); } else delete script; diff --git a/lib/util/tdescriptactionmanager.h b/lib/util/tdescriptactionmanager.h index 20133310..9a610845 100644 --- a/lib/util/tdescriptactionmanager.h +++ b/lib/util/tdescriptactionmanager.h @@ -36,7 +36,7 @@ class TQTimer; * @author ian geiser geiseri@sourcextreme.com */ class KScriptAction : public TQObject, public KScriptClientInterface { - Q_OBJECT + TQ_OBJECT public: @@ -92,7 +92,7 @@ private: * @author ian geiser <geiseri@sourcextreme.com> */ class KScriptActionManager : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/lib/widgets/flagboxes.cpp b/lib/widgets/flagboxes.cpp index 7e643d66..87db2425 100644 --- a/lib/widgets/flagboxes.cpp +++ b/lib/widgets/flagboxes.cpp @@ -320,7 +320,7 @@ FlagPathEdit::FlagPathEdit( TQWidget * parent, TQString pathDelimiter, layout->addWidget(edit); details = new TQPushButton("...", this); details->setMaximumWidth(30); - connect(details, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPathDetails())); + connect(details, TQ_SIGNAL(clicked()), this, TQ_SLOT(showPathDetails())); layout->addWidget(details); } @@ -540,7 +540,7 @@ FlagListEdit::FlagListEdit( TQWidget * parent, TQString listDelimiter, FlagEditC { details = new TQPushButton("...", this); details->setMaximumWidth(30); - connect(details, TQT_SIGNAL(clicked()), this, TQT_SLOT(showListDetails())); + connect(details, TQ_SIGNAL(clicked()), this, TQ_SLOT(showListDetails())); layout->addWidget(details); } diff --git a/lib/widgets/flagboxes.h b/lib/widgets/flagboxes.h index 79c77fa7..89de805a 100644 --- a/lib/widgets/flagboxes.h +++ b/lib/widgets/flagboxes.h @@ -67,7 +67,7 @@ private: /**List box item holding a compiler flag.*/ class FlagListBox : public TQListView { - Q_OBJECT + TQ_OBJECT public: FlagListBox( TQWidget *parent=0, const char *name=0 ); @@ -82,7 +82,7 @@ public: /**Check box item holding a compiler flag.*/ class FlagCheckBox : public TQCheckBox { - Q_OBJECT + TQ_OBJECT public: FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, @@ -109,7 +109,7 @@ private: /**Radiobutton item holding an option of a compiler flag.*/ class FlagRadioButton : public TQRadioButton { - Q_OBJECT + TQ_OBJECT public: FlagRadioButton(TQWidget *parent, FlagRadioButtonController *controller, @@ -125,7 +125,7 @@ private: /**Path editor if path is a compiler flag.*/ class FlagPathEdit: public TQWidget { - Q_OBJECT + TQ_OBJECT public: /**If the pathDelimiter is not empty then path edit can contain a list of paths*/ @@ -155,7 +155,7 @@ private: /**List editor if list is a compiler flag.*/ class FlagListEdit: public TQWidget { - Q_OBJECT + TQ_OBJECT public: /**If the listDelimiter is not empty then list edit can contain a list of entries*/ diff --git a/lib/widgets/kcomboview.h b/lib/widgets/kcomboview.h index f808c29c..2e52a216 100644 --- a/lib/widgets/kcomboview.h +++ b/lib/widgets/kcomboview.h @@ -54,7 +54,7 @@ class CustomCompleter : public TDECompletion { class KComboView: public QComboView { - Q_OBJECT + TQ_OBJECT public: ///The combo-view takes the ownership of the completer and deletes it on destruction diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp index a8520e30..8fdec94e 100644 --- a/lib/widgets/kdevhtmlpart.cpp +++ b/lib/widgets/kdevhtmlpart.cpp @@ -24,54 +24,54 @@ KDevHTMLPart::KDevHTMLPart() { setXMLFile(locate("data", "tdevelop/kdevhtml_partui.rc"), true); - connect(browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &,const KParts::URLArgs &)), - this, TQT_SLOT(openURLRequest(const KURL &)) ); + connect(browserExtension(), TQ_SIGNAL(openURLRequestDelayed(const KURL &,const KParts::URLArgs &)), + this, TQ_SLOT(openURLRequest(const KURL &)) ); - connect(this, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(slotStarted(TDEIO::Job* ))); - connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted())); - connect(this, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCancelled(const TQString &))); + connect(this, TQ_SIGNAL(started(TDEIO::Job *)), this, TQ_SLOT(slotStarted(TDEIO::Job* ))); + connect(this, TQ_SIGNAL(completed()), this, TQ_SLOT(slotCompleted())); + connect(this, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(slotCancelled(const TQString &))); TDEActionCollection * actions = actionCollection();// new TDEActionCollection( this ); reloadAction = new TDEAction( i18n( "Reload" ), "reload", 0, - this, TQT_SLOT( slotReload() ), actions, "doc_reload" ); + this, TQ_SLOT( slotReload() ), actions, "doc_reload" ); reloadAction->setWhatsThis(i18n("<b>Reload</b><p>Reloads the current document.")); stopAction = new TDEAction( i18n( "Stop" ), "process-stop", 0, - this, TQT_SLOT( slotStop() ), actions, "doc_stop" ); + this, TQ_SLOT( slotStop() ), actions, "doc_stop" ); stopAction->setWhatsThis(i18n("<b>Stop</b><p>Stops the loading of current document.")); duplicateAction = new TDEAction( i18n( "Duplicate Tab" ), "window-new", 0, - this, TQT_SLOT( slotDuplicate() ), actions, "doc_dup" ); + this, TQ_SLOT( slotDuplicate() ), actions, "doc_dup" ); duplicateAction->setWhatsThis(i18n("<b>Duplicate window</b><p>Opens current document in a new window.")); - printAction = KStdAction::print(this, TQT_SLOT(slotPrint()), actions, "print_doc"); - copyAction = KStdAction::copy(this, TQT_SLOT(slotCopy()), actions, "copy_doc_selection"); + printAction = KStdAction::print(this, TQ_SLOT(slotPrint()), actions, "print_doc"); + copyAction = KStdAction::copy(this, TQ_SLOT(slotCopy()), actions, "copy_doc_selection"); - connect( this, TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQT_SLOT(popup(const TQString &, const TQPoint &))); - connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); + connect( this, TQ_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQ_SLOT(popup(const TQString &, const TQPoint &))); + connect(this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); //BEGIN documentation history stuff m_backAction = new TDEToolBarPopupAction(i18n("Back"), "back", 0, - this, TQT_SLOT(slotBack()), + this, TQ_SLOT(slotBack()), actions, "browser_back"); m_backAction->setEnabled( false ); m_backAction->setToolTip(i18n("Back")); m_backAction->setWhatsThis(i18n("<b>Back</b><p>Moves backwards one step in the <b>documentation</b> browsing history.")); - connect(m_backAction->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotBackAboutToShow())); - connect(m_backAction->popupMenu(), TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotPopupActivated(int))); + connect(m_backAction->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotBackAboutToShow())); + connect(m_backAction->popupMenu(), TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPopupActivated(int))); m_forwardAction = new TDEToolBarPopupAction(i18n("Forward"), "forward", 0, - this, TQT_SLOT(slotForward()), + this, TQ_SLOT(slotForward()), actions, "browser_forward"); m_forwardAction->setEnabled( false ); m_forwardAction->setToolTip(i18n("Forward")); m_forwardAction->setWhatsThis(i18n("<b>Forward</b><p>Moves forward one step in the <b>documentation</b> browsing history.")); - connect(m_forwardAction->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotForwardAboutToShow())); - connect(m_forwardAction->popupMenu(), TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotPopupActivated(int))); + connect(m_forwardAction->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotForwardAboutToShow())); + connect(m_forwardAction->popupMenu(), TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPopupActivated(int))); m_restoring = false; m_Current = m_history.end(); @@ -479,9 +479,9 @@ void KDevHTMLPart::slotCopy( ) TQString text = selectedText(); text.replace( TQChar( 0xa0 ), ' ' ); TQClipboard *cb = TQApplication::clipboard(); - disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); + disconnect( cb, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotClearSelection() ) ); cb->setText(text); - connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); + connect( cb, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotClearSelection() ) ); } void KDevHTMLPart::slotSelectionChanged( ) diff --git a/lib/widgets/kdevhtmlpart.h b/lib/widgets/kdevhtmlpart.h index 6c8f7dc3..080c66ca 100644 --- a/lib/widgets/kdevhtmlpart.h +++ b/lib/widgets/kdevhtmlpart.h @@ -43,7 +43,7 @@ It has it's own popup menu and font/zoom settings. */ class KDevHTMLPart : public TDEHTMLPart { - Q_OBJECT + TQ_OBJECT public: diff --git a/lib/widgets/kdevtabwidget.cpp b/lib/widgets/kdevtabwidget.cpp index cadff807..7a9ed47b 100644 --- a/lib/widgets/kdevtabwidget.cpp +++ b/lib/widgets/kdevtabwidget.cpp @@ -22,8 +22,8 @@ KDevTabWidget::KDevTabWidget(TQWidget *parent, const char *name) : TQTabWidget(p { m_pTabBar = new KTabBar(this, "tabbar"); setTabBar(m_pTabBar); - connect(m_pTabBar, TQT_SIGNAL(closeWindow(const TQWidget*)), this, TQT_SIGNAL(closeWindow(const TQWidget*))); - connect(m_pTabBar, TQT_SIGNAL(closeOthers(TQWidget*)), this, TQT_SIGNAL(closeOthers(TQWidget*))); + connect(m_pTabBar, TQ_SIGNAL(closeWindow(const TQWidget*)), this, TQ_SIGNAL(closeWindow(const TQWidget*))); + connect(m_pTabBar, TQ_SIGNAL(closeOthers(TQWidget*)), this, TQ_SIGNAL(closeOthers(TQWidget*))); } KTabBar::KTabBar(TQWidget *parent, const char *name) : TQTabBar(parent,name) @@ -34,8 +34,8 @@ KTabBar::KTabBar(TQWidget *parent, const char *name) : TQTabBar(parent,name) if (closePixmap.isNull()) closePixmap = SmallIcon("window-close"); - m_pPopupMenu->insertItem(closePixmap, i18n("&Close"), this, TQT_SLOT(closeWindowSlot())); - m_pPopupMenu->insertItem(i18n("Close &Others"), this, TQT_SLOT(closeOthersSlot())); + m_pPopupMenu->insertItem(closePixmap, i18n("&Close"), this, TQ_SLOT(closeWindowSlot())); + m_pPopupMenu->insertItem(i18n("Close &Others"), this, TQ_SLOT(closeOthersSlot())); } void KTabBar::closeWindowSlot() @@ -50,7 +50,7 @@ void KTabBar::closeOthersSlot() void KTabBar::mousePressEvent(TQMouseEvent *e) { - if(e->button() == Qt::RightButton) { + if(e->button() == TQt::RightButton) { TQTab *tab = selectTab(e->pos() ); if( tab == 0L ) return; diff --git a/lib/widgets/ksavealldialog.cpp b/lib/widgets/ksavealldialog.cpp index 9690e8a4..a98ce92a 100644 --- a/lib/widgets/ksavealldialog.cpp +++ b/lib/widgets/ksavealldialog.cpp @@ -79,9 +79,9 @@ KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List co ++it; } - connect( this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(cancel()) ); - connect( this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(save()) ); - connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(saveNone()) ); + connect( this, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(cancel()) ); + connect( this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(save()) ); + connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(saveNone()) ); } KSaveSelectDialog::~KSaveSelectDialog() {} @@ -159,9 +159,9 @@ KSaveAllDialog::KSaveAllDialog( const TQStringList& filenames, TQWidget* parent setButtonTip( User1, i18n("Lose all modifications") ); setButtonTip( Close, i18n("Cancels the action") ); - connect( this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(cancel()) ); - connect( this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(saveAll()) ); - connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(revert()) ); + connect( this, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(cancel()) ); + connect( this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(saveAll()) ); + connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(revert()) ); } KSaveAllDialog::~KSaveAllDialog() diff --git a/lib/widgets/ksavealldialog.h b/lib/widgets/ksavealldialog.h index fcd63fc0..59a16f87 100644 --- a/lib/widgets/ksavealldialog.h +++ b/lib/widgets/ksavealldialog.h @@ -35,7 +35,7 @@ Dialog to save selected files. */ class KSaveSelectDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -61,7 +61,7 @@ Dialog to save all files. */ class KSaveAllDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/lib/widgets/processlinemaker.cpp b/lib/widgets/processlinemaker.cpp index 113b206b..be881aa3 100644 --- a/lib/widgets/processlinemaker.cpp +++ b/lib/widgets/processlinemaker.cpp @@ -28,11 +28,11 @@ ProcessLineMaker::ProcessLineMaker() ProcessLineMaker::ProcessLineMaker( const TDEProcess* proc ) { - connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) ); + connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) ); - connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - this, TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) ); + connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) ); } void ProcessLineMaker::slotReceivedStdout( const char *buffer ) diff --git a/lib/widgets/processlinemaker.h b/lib/widgets/processlinemaker.h index 7126b322..c438e84e 100644 --- a/lib/widgets/processlinemaker.h +++ b/lib/widgets/processlinemaker.h @@ -34,7 +34,7 @@ Convenience class to catch output of TDEProcess. */ class ProcessLineMaker : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/lib/widgets/processwidget.cpp b/lib/widgets/processwidget.cpp index a4188643..7d8a4d3b 100644 --- a/lib/widgets/processwidget.cpp +++ b/lib/widgets/processwidget.cpp @@ -106,7 +106,7 @@ void ProcessListBoxItem::paint(TQPainter *p) ProcessWidget::ProcessWidget(TQWidget *parent, const char *name) : TDEListBox(parent, name) { - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); // Don't override the palette, as that can mess up styles. Instead, draw // the background ourselves (see ProcessListBoxItem::paint). @@ -117,17 +117,17 @@ ProcessWidget::ProcessWidget(TQWidget *parent, const char *name) procLineMaker = new ProcessLineMaker( childproc ); - connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)), - this, TQT_SLOT(insertStdoutLine(const TQCString&) )); - connect( procLineMaker, TQT_SIGNAL(receivedStderrLine(const TQCString&)), - this, TQT_SLOT(insertStderrLine(const TQCString&) )); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStdoutLine(const TQCString&)), - this, TQT_SLOT(addPartialStdoutLine(const TQCString&) )); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)), - this, TQT_SLOT(addPartialStderrLine(const TQCString&) )); - - connect(childproc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*) )) ; + connect( procLineMaker, TQ_SIGNAL(receivedStdoutLine(const TQCString&)), + this, TQ_SLOT(insertStdoutLine(const TQCString&) )); + connect( procLineMaker, TQ_SIGNAL(receivedStderrLine(const TQCString&)), + this, TQ_SLOT(insertStderrLine(const TQCString&) )); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStdoutLine(const TQCString&)), + this, TQ_SLOT(addPartialStdoutLine(const TQCString&) )); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStderrLine(const TQCString&)), + this, TQ_SLOT(addPartialStderrLine(const TQCString&) )); + + connect(childproc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*) )) ; } diff --git a/lib/widgets/processwidget.h b/lib/widgets/processwidget.h index a8279477..a80f3deb 100644 --- a/lib/widgets/processwidget.h +++ b/lib/widgets/processwidget.h @@ -57,7 +57,7 @@ private: */ class ProcessWidget : public TDEListBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/lib/widgets/propeditor/Mainpage.dox b/lib/widgets/propeditor/Mainpage.dox index d77010d0..411a2ffe 100644 --- a/lib/widgets/propeditor/Mainpage.dox +++ b/lib/widgets/propeditor/Mainpage.dox @@ -76,7 +76,7 @@ A simple example on how to create a property editor and use it with one property list->addProperty("My Group", new Property(Property::String, "Second Property", "This is my second property", "Hello")); list->addProperty(new Property(Property::Color, "Third Property", - "This is my third property", QColor("green"))); + "This is my third property", TQColor("green"))); m_editor->populateProperties(*list); \endcode @@ -94,7 +94,7 @@ More advanced example with property buffers and list intersection: list->addProperty("My Group", new Property(Property::String, "Second Property", "This is my second property", "Hello")); list->addProperty(new Property(Property::Color, "Third Property", - "This is my third property", QColor("green"))); + "This is my third property", TQColor("green"))); PropertyList *list2 = new PropertyList; list2->addProperty("My Group", new Property(Property::Integer, "First Property", diff --git a/lib/widgets/propeditor/pcheckbox.cpp b/lib/widgets/propeditor/pcheckbox.cpp index 6e9c06b7..951fad34 100644 --- a/lib/widgets/propeditor/pcheckbox.cpp +++ b/lib/widgets/propeditor/pcheckbox.cpp @@ -39,7 +39,7 @@ PCheckBox::PCheckBox(MultiProperty *property, TQWidget *parent, const char *name m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); + connect(m_edit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateProperty(bool))); } TQVariant PCheckBox::value() const @@ -49,9 +49,9 @@ TQVariant PCheckBox::value() const void PCheckBox::setValue(const TQVariant &value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); + disconnect(m_edit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateProperty(bool))); m_edit->setChecked(value.toBool()); - connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); + connect(m_edit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateProperty(bool))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/pcheckbox.h b/lib/widgets/propeditor/pcheckbox.h index ed2aea39..0131cf82 100644 --- a/lib/widgets/propeditor/pcheckbox.h +++ b/lib/widgets/propeditor/pcheckbox.h @@ -30,7 +30,7 @@ namespace PropertyLib{ @short %Property editor with checkbox. */ class PCheckBox: public PropertyWidget{ - Q_OBJECT + TQ_OBJECT public: PCheckBox(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/pcolorbutton.cpp b/lib/widgets/propeditor/pcolorbutton.cpp index 4b6ae5c4..9c42f4a6 100644 --- a/lib/widgets/propeditor/pcolorbutton.cpp +++ b/lib/widgets/propeditor/pcolorbutton.cpp @@ -39,10 +39,10 @@ PColorButton::PColorButton(MultiProperty* property, TQWidget* parent, const char TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); #ifndef PURE_QT m_edit = new KColorButton(this); - connect(m_edit, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(updateProperty(const TQColor&))); + connect(m_edit, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(updateProperty(const TQColor&))); #else m_edit = new TQPushButton(this); - connect(m_edit, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeColor())); + connect(m_edit, TQ_SIGNAL(clicked()), this, TQ_SLOT(changeColor())); #endif m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); @@ -78,9 +78,9 @@ void PColorButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect void PColorButton::setValue(const TQVariant& value, bool emitChange) { #ifndef PURE_QT - disconnect(m_edit, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(updateProperty(const TQColor&))); + disconnect(m_edit, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(updateProperty(const TQColor&))); m_edit->setColor(value.toColor()); - connect(m_edit, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(updateProperty(const TQColor&))); + connect(m_edit, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(updateProperty(const TQColor&))); #else m_color = value.toColor(); m_edit->setText(m_color.name()); diff --git a/lib/widgets/propeditor/pcolorbutton.h b/lib/widgets/propeditor/pcolorbutton.h index ab17b449..61f96fc4 100644 --- a/lib/widgets/propeditor/pcolorbutton.h +++ b/lib/widgets/propeditor/pcolorbutton.h @@ -35,7 +35,7 @@ namespace PropertyLib{ */ class PColorButton: public PropertyWidget { - Q_OBJECT + TQ_OBJECT public: PColorButton(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/pcolorcombo.cpp b/lib/widgets/propeditor/pcolorcombo.cpp index 23c61f46..78fd9dc3 100644 --- a/lib/widgets/propeditor/pcolorcombo.cpp +++ b/lib/widgets/propeditor/pcolorcombo.cpp @@ -34,7 +34,7 @@ PColorCombo::PColorCombo(MultiProperty *property, TQWidget *parent, const char * m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); } TQVariant PColorCombo::value() const @@ -44,9 +44,9 @@ TQVariant PColorCombo::value() const void PColorCombo::setValue(const TQVariant &value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + disconnect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); m_edit->setColor(value.toColor()); - connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/pcolorcombo.h b/lib/widgets/propeditor/pcolorcombo.h index 052c287d..31588b7d 100644 --- a/lib/widgets/propeditor/pcolorcombo.h +++ b/lib/widgets/propeditor/pcolorcombo.h @@ -30,7 +30,7 @@ namespace PropertyLib{ @short %Property editor with color combobox. */ class PColorCombo: public PropertyWidget{ - Q_OBJECT + TQ_OBJECT public: PColorCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/pcombobox.cpp b/lib/widgets/propeditor/pcombobox.cpp index a0749744..ca42cda6 100644 --- a/lib/widgets/propeditor/pcombobox.cpp +++ b/lib/widgets/propeditor/pcombobox.cpp @@ -45,7 +45,7 @@ void PComboBox::init(bool rw) fillBox(); - connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); } void PComboBox::fillBox() @@ -68,9 +68,9 @@ void PComboBox::setValue(const TQVariant &value, bool emitChange) { if (!value.isNull()) { - disconnect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + disconnect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); m_edit->setCurrentText(findDescription(value)); - connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/pcombobox.h b/lib/widgets/propeditor/pcombobox.h index c9da1ad9..fc246ea5 100644 --- a/lib/widgets/propeditor/pcombobox.h +++ b/lib/widgets/propeditor/pcombobox.h @@ -34,7 +34,7 @@ namespace PropertyLib{ @short %Property editor with combobox. */ class PComboBox: public PropertyWidget{ - Q_OBJECT + TQ_OBJECT public: /**This constructor is used for read-only selection combo. It provides a value from valueList*/ diff --git a/lib/widgets/propeditor/pcursoredit.h b/lib/widgets/propeditor/pcursoredit.h index 5ff9fbf3..9ff8320f 100644 --- a/lib/widgets/propeditor/pcursoredit.h +++ b/lib/widgets/propeditor/pcursoredit.h @@ -29,7 +29,7 @@ namespace PropertyLib{ */ class PCursorEdit: public PComboBox { - Q_OBJECT + TQ_OBJECT public: PCursorEdit(MultiProperty* property, const TQStringVariantMap &spValues, diff --git a/lib/widgets/propeditor/pdateedit.cpp b/lib/widgets/propeditor/pdateedit.cpp index ed83dbb2..563552c3 100644 --- a/lib/widgets/propeditor/pdateedit.cpp +++ b/lib/widgets/propeditor/pdateedit.cpp @@ -33,7 +33,7 @@ PDateEdit::PDateEdit(MultiProperty* property, TQWidget* parent, const char* name m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(updateProperty(const TQDate&))); + connect(m_edit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SLOT(updateProperty(const TQDate&))); } TQVariant PDateEdit::value() const @@ -46,14 +46,14 @@ void PDateEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, value.toDate().toString(Qt::LocalDate)); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, value.toDate().toString(TQt::LocalDate)); } void PDateEdit::setValue(const TQVariant& value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(updateProperty(const TQDate&))); + disconnect(m_edit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SLOT(updateProperty(const TQDate&))); m_edit->setDate(value.toDate()); - connect(m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(updateProperty(const TQDate&))); + connect(m_edit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SLOT(updateProperty(const TQDate&))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/pdateedit.h b/lib/widgets/propeditor/pdateedit.h index 126a4023..edfe69ff 100644 --- a/lib/widgets/propeditor/pdateedit.h +++ b/lib/widgets/propeditor/pdateedit.h @@ -31,7 +31,7 @@ namespace PropertyLib{ */ class PDateEdit : public PropertyWidget { -Q_OBJECT +TQ_OBJECT public: PDateEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); diff --git a/lib/widgets/propeditor/pdatetimeedit.cpp b/lib/widgets/propeditor/pdatetimeedit.cpp index 3b8993d3..8f4c03d3 100644 --- a/lib/widgets/propeditor/pdatetimeedit.cpp +++ b/lib/widgets/propeditor/pdatetimeedit.cpp @@ -32,7 +32,7 @@ PDateTimeEdit::PDateTimeEdit(MultiProperty* property, TQWidget* parent, const ch m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(updateProperty(const TQDateTime&))); + connect(m_edit, TQ_SIGNAL(valueChanged(const TQDateTime&)), this, TQ_SLOT(updateProperty(const TQDateTime&))); } TQVariant PDateTimeEdit::value() const @@ -45,14 +45,14 @@ void PDateTimeEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRec p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, value.toDateTime().toString(Qt::LocalDate)); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, value.toDateTime().toString(TQt::LocalDate)); } void PDateTimeEdit::setValue(const TQVariant& value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(updateProperty(const TQDateTime&))); + disconnect(m_edit, TQ_SIGNAL(valueChanged(const TQDateTime&)), this, TQ_SLOT(updateProperty(const TQDateTime&))); m_edit->setDateTime(value.toDateTime()); - connect(m_edit, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(updateProperty(const TQDateTime&))); + connect(m_edit, TQ_SIGNAL(valueChanged(const TQDateTime&)), this, TQ_SLOT(updateProperty(const TQDateTime&))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/pdatetimeedit.h b/lib/widgets/propeditor/pdatetimeedit.h index 4b54714b..86affb59 100644 --- a/lib/widgets/propeditor/pdatetimeedit.h +++ b/lib/widgets/propeditor/pdatetimeedit.h @@ -31,7 +31,7 @@ namespace PropertyLib{ */ class PDateTimeEdit : public PropertyWidget { -Q_OBJECT +TQ_OBJECT public: PDateTimeEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); diff --git a/lib/widgets/propeditor/pdoublenuminput.cpp b/lib/widgets/propeditor/pdoublenuminput.cpp index 99b0151e..b244935f 100644 --- a/lib/widgets/propeditor/pdoublenuminput.cpp +++ b/lib/widgets/propeditor/pdoublenuminput.cpp @@ -38,10 +38,10 @@ PDoubleNumInput::PDoubleNumInput(MultiProperty *property, TQWidget *parent, cons #ifndef PURE_QT m_edit = new KDoubleNumInput(-999999.0, 999999.0, 0.0, 0.01, 2, this); m_edit->setLabel(TQString()); - connect(m_edit, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(updateProperty(double))); + connect(m_edit, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(updateProperty(double))); #else m_edit = new TQFloatInput(-999999, 999999, 0.01, 2, this ); - connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int))); #endif m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); /* m_edit->setMinValue(-999999999); @@ -59,13 +59,13 @@ TQVariant PDoubleNumInput::value() const void PDoubleNumInput::setValue(const TQVariant &value, bool emitChange) { #ifndef PURE_QT - disconnect(m_edit, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(updateProperty(double))); + disconnect(m_edit, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(updateProperty(double))); m_edit->setValue(value.toDouble()); - connect(m_edit, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(updateProperty(double))); + connect(m_edit, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(updateProperty(double))); #else - disconnect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); + disconnect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int))); m_edit->setValue(int(value.toDouble()*pow(m_edit->digits(),10))); - connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int))); #endif if (emitChange) emit propertyChanged(m_property, value); diff --git a/lib/widgets/propeditor/pdoublenuminput.h b/lib/widgets/propeditor/pdoublenuminput.h index a398c498..65665ddc 100644 --- a/lib/widgets/propeditor/pdoublenuminput.h +++ b/lib/widgets/propeditor/pdoublenuminput.h @@ -35,7 +35,7 @@ namespace PropertyLib{ */ class PDoubleNumInput: public PropertyWidget { -Q_OBJECT +TQ_OBJECT public: PDoubleNumInput(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/pdummywidget.h b/lib/widgets/propeditor/pdummywidget.h index dad94591..514af868 100644 --- a/lib/widgets/propeditor/pdummywidget.h +++ b/lib/widgets/propeditor/pdummywidget.h @@ -39,7 +39,7 @@ like TQValueList's or TQMap's stored in a variant. */ class PDummyWidget: public PropertyWidget { - Q_OBJECT + TQ_OBJECT public: PDummyWidget(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/pfontbutton.cpp b/lib/widgets/propeditor/pfontbutton.cpp index 8932c4ae..7044e6c1 100644 --- a/lib/widgets/propeditor/pfontbutton.cpp +++ b/lib/widgets/propeditor/pfontbutton.cpp @@ -44,7 +44,7 @@ PFontButton::PFontButton(MultiProperty* property, TQWidget* parent, const char* #endif l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(fontSelected(const TQFont& )), this, TQT_SLOT(updateProperty(const TQFont& ))); + connect(m_edit, TQ_SIGNAL(fontSelected(const TQFont& )), this, TQ_SLOT(updateProperty(const TQFont& ))); } TQVariant PFontButton::value() const @@ -66,9 +66,9 @@ void PFontButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& void PFontButton::setValue(const TQVariant& value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(fontSelected(const TQFont&)), this, TQT_SLOT(updateProperty(const TQFont&))); + disconnect(m_edit, TQ_SIGNAL(fontSelected(const TQFont&)), this, TQ_SLOT(updateProperty(const TQFont&))); m_edit->setFont(value.toFont()); - connect(m_edit, TQT_SIGNAL(fontSelected(const TQFont& )), this, TQT_SLOT(updateProperty(const TQFont& ))); + connect(m_edit, TQ_SIGNAL(fontSelected(const TQFont& )), this, TQ_SLOT(updateProperty(const TQFont& ))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/pfontbutton.h b/lib/widgets/propeditor/pfontbutton.h index 3f7d54c6..818b5779 100644 --- a/lib/widgets/propeditor/pfontbutton.h +++ b/lib/widgets/propeditor/pfontbutton.h @@ -31,7 +31,7 @@ namespace PropertyLib{ */ class PFontButton : public PropertyWidget { -Q_OBJECT +TQ_OBJECT public: PFontButton(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); diff --git a/lib/widgets/propeditor/pfontcombo.cpp b/lib/widgets/propeditor/pfontcombo.cpp index cb8a80b2..224e4bd0 100644 --- a/lib/widgets/propeditor/pfontcombo.cpp +++ b/lib/widgets/propeditor/pfontcombo.cpp @@ -46,9 +46,9 @@ PFontCombo::PFontCombo(MultiProperty *property, TQWidget *parent, const char *na #ifdef PURE_QT TQFontDatabase fonts; m_edit->insertStringList(fonts.families()); - connect(m_edit, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_edit, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(updateProperty(const TQString&))); #else - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); #endif } @@ -63,13 +63,13 @@ TQVariant PFontCombo::value() const void PFontCombo::setValue(const TQVariant &value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + disconnect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); #ifndef PURE_QT m_edit->setCurrentFont(value.toString()); #else m_edit->setCurrentText(value.toString()); #endif - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/pfontcombo.h b/lib/widgets/propeditor/pfontcombo.h index e1a90b69..f208e18a 100644 --- a/lib/widgets/propeditor/pfontcombo.h +++ b/lib/widgets/propeditor/pfontcombo.h @@ -34,7 +34,7 @@ namespace PropertyLib{ @short %Property editor with font combo box. */ class PFontCombo: public PropertyWidget{ - Q_OBJECT + TQ_OBJECT public: PFontCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/plineedit.cpp b/lib/widgets/propeditor/plineedit.cpp index f5e1ecb0..c27a6b74 100644 --- a/lib/widgets/propeditor/plineedit.cpp +++ b/lib/widgets/propeditor/plineedit.cpp @@ -32,7 +32,7 @@ PLineEdit::PLineEdit(MultiProperty *property, TQWidget *parent, const char *name m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); } TQVariant PLineEdit::value() const @@ -42,9 +42,9 @@ TQVariant PLineEdit::value() const void PLineEdit::setValue(const TQVariant &value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + disconnect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); m_edit->setText(value.toString()); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/plineedit.h b/lib/widgets/propeditor/plineedit.h index 4730a5c7..a5d57b98 100644 --- a/lib/widgets/propeditor/plineedit.h +++ b/lib/widgets/propeditor/plineedit.h @@ -30,7 +30,7 @@ namespace PropertyLib{ @short %Property editor with line edit. */ class PLineEdit: public PropertyWidget{ - Q_OBJECT + TQ_OBJECT public: PLineEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/plinestyleedit.cpp b/lib/widgets/propeditor/plinestyleedit.cpp index 996b1d0e..baa6224b 100644 --- a/lib/widgets/propeditor/plinestyleedit.cpp +++ b/lib/widgets/propeditor/plinestyleedit.cpp @@ -140,7 +140,7 @@ PLineStyleEdit::PLineStyleEdit(MultiProperty* property, TQWidget* parent, const m_edit->insertItem(TQPixmap(dashdot)); m_edit->insertItem(TQPixmap(dashdotdot)); - connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); } TQVariant PLineStyleEdit::value() const @@ -186,9 +186,9 @@ void PLineStyleEdit::setValue(const TQVariant& value, bool emitChange) return; if ((value.toInt() > 5) || (value.toInt() < 0)) return; - disconnect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + disconnect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); m_edit->setCurrentItem(value.toInt()); - connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/plinestyleedit.h b/lib/widgets/propeditor/plinestyleedit.h index 2df5f3be..2c91e04a 100644 --- a/lib/widgets/propeditor/plinestyleedit.h +++ b/lib/widgets/propeditor/plinestyleedit.h @@ -30,7 +30,7 @@ namespace PropertyLib { @short Line style editor */ class PLineStyleEdit : public PropertyWidget { - Q_OBJECT + TQ_OBJECT public: PLineStyleEdit(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); diff --git a/lib/widgets/propeditor/ppixmapedit.cpp b/lib/widgets/propeditor/ppixmapedit.cpp index 452b9637..0026ec31 100644 --- a/lib/widgets/propeditor/ppixmapedit.cpp +++ b/lib/widgets/propeditor/ppixmapedit.cpp @@ -61,7 +61,7 @@ PPixmapEdit::PPixmapEdit(MultiProperty* property, TQWidget* parent, const char* m_popup->hide(); - connect(m_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateProperty())); + connect(m_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateProperty())); } TQVariant PPixmapEdit::value() const @@ -112,7 +112,7 @@ void PPixmapEdit::resizeEvent(TQResizeEvent *ev) bool PPixmapEdit::eventFilter(TQObject *o, TQEvent *ev) { - if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_edit)) + if(o == m_edit) { if(ev->type() == TQEvent::MouseButtonPress) { @@ -131,7 +131,7 @@ bool PPixmapEdit::eventFilter(TQObject *o, TQEvent *ev) } if(ev->type() == TQEvent::KeyPress) { - TQKeyEvent* e = TQT_TQKEYEVENT(ev); + TQKeyEvent* e = static_cast<TQKeyEvent*>(ev); if((e->key() == Key_Enter) || (e->key()== Key_Space) || (e->key() == Key_Return)) { m_button->animateClick(); diff --git a/lib/widgets/propeditor/ppixmapedit.h b/lib/widgets/propeditor/ppixmapedit.h index 1d95b6b5..5fdfebed 100644 --- a/lib/widgets/propeditor/ppixmapedit.h +++ b/lib/widgets/propeditor/ppixmapedit.h @@ -32,7 +32,7 @@ namespace PropertyLib{ */ class PPixmapEdit : public PropertyWidget { - Q_OBJECT + TQ_OBJECT public: PPixmapEdit(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); diff --git a/lib/widgets/propeditor/ppointedit.h b/lib/widgets/propeditor/ppointedit.h index b6f9f9ad..8ed1e7ae 100644 --- a/lib/widgets/propeditor/ppointedit.h +++ b/lib/widgets/propeditor/ppointedit.h @@ -31,7 +31,7 @@ namespace PropertyLib{ */ class PPointEdit : public PropertyWidget { -Q_OBJECT +TQ_OBJECT public: PPointEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); diff --git a/lib/widgets/propeditor/prectedit.h b/lib/widgets/propeditor/prectedit.h index 82abcda1..cd360ad0 100644 --- a/lib/widgets/propeditor/prectedit.h +++ b/lib/widgets/propeditor/prectedit.h @@ -31,7 +31,7 @@ namespace PropertyLib{ */ class PRectEdit : public PropertyWidget { - Q_OBJECT + TQ_OBJECT public: PRectEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); diff --git a/lib/widgets/propeditor/propertyeditor.cpp b/lib/widgets/propeditor/propertyeditor.cpp index 987bb31b..0185b2e4 100644 --- a/lib/widgets/propeditor/propertyeditor.cpp +++ b/lib/widgets/propeditor/propertyeditor.cpp @@ -177,10 +177,10 @@ PropertyEditor::PropertyEditor(TQWidget *parent, const char *name) header()->setClickEnabled(false); - connect(header(), TQT_SIGNAL(sizeChange(int, int, int)), - this, TQT_SLOT(updateEditorSize())); - connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(slotClicked(TQListViewItem*))); + connect(header(), TQ_SIGNAL(sizeChange(int, int, int)), + this, TQ_SLOT(updateEditorSize())); + connect(this, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(slotClicked(TQListViewItem*))); m_currentEditItem = 0; m_doubleClickForEdit = true; @@ -199,7 +199,7 @@ PropertyEditor::PropertyEditor(TQWidget *parent, const char *name) m_undoButton->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); m_undoButton->resize(m_undoButton->height(), m_undoButton->height()); m_undoButton->hide(); - connect(m_undoButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(undo())); + connect(m_undoButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(undo())); m_currentEditLayout = new TQGridLayout(m_currentEditArea, 1, 2, 0, 0); // m_currentEditLayout->addWidget(m_undoButton, 0, 1); } @@ -214,7 +214,7 @@ void PropertyEditor::populateProperties(PropertyList *list) if (list == 0) return; m_list = list; - connect(m_list, TQT_SIGNAL(propertyValueChanged(Property*)), this, TQT_SLOT(propertyValueChanged(Property*))); + connect(m_list, TQ_SIGNAL(propertyValueChanged(Property*)), this, TQ_SLOT(propertyValueChanged(Property*))); const TQValueList<TQPair<TQString, TQValueList<TQString> > >& groups = m_list->propertiesOfGroup(); for (TQValueList<TQPair<TQString, TQValueList<TQString> > >::const_iterator it = groups.begin(); it != groups.end(); ++it) @@ -288,7 +288,7 @@ void PropertyEditor::clearProperties() hideEditor(); - disconnect(m_list, TQT_SIGNAL(propertyValueChanged(Property*)), this, TQT_SLOT(propertyValueChanged(Property*))); + disconnect(m_list, TQ_SIGNAL(propertyValueChanged(Property*)), this, TQ_SLOT(propertyValueChanged(Property*))); clear(); delete m_list; m_list = 0; @@ -445,8 +445,8 @@ Machine *PropertyEditor::machine(MultiProperty *property) if (m_registeredForType[name] == 0) { m_registeredForType[name] = PropertyMachineFactory::getInstance()->machineForProperty(property); - connect(m_registeredForType[name]->propertyEditor, TQT_SIGNAL(propertyChanged(MultiProperty*, const TQVariant&)), - this, TQT_SLOT(propertyChanged(MultiProperty*, const TQVariant&))); + connect(m_registeredForType[name]->propertyEditor, TQ_SIGNAL(propertyChanged(MultiProperty*, const TQVariant&)), + this, TQ_SLOT(propertyChanged(MultiProperty*, const TQVariant&))); m_registeredForType[name]->propertyEditor->reparent(m_currentEditArea, 0, m_currentEditArea->childrenRect().topLeft()); m_registeredForType[name]->propertyEditor->hide(); } diff --git a/lib/widgets/propeditor/propertyeditor.h b/lib/widgets/propeditor/propertyeditor.h index 852d795a..ad5d722c 100644 --- a/lib/widgets/propeditor/propertyeditor.h +++ b/lib/widgets/propeditor/propertyeditor.h @@ -56,7 +56,7 @@ creation of property widgets from the machine factory. @see PropertyMachineFactory */ class PropertyEditor: public TDEListView{ - Q_OBJECT + TQ_OBJECT public: /**Constructs the property editor.*/ diff --git a/lib/widgets/propeditor/propertylist.cpp b/lib/widgets/propeditor/propertylist.cpp index a5b43a3f..6ef367c2 100644 --- a/lib/widgets/propeditor/propertylist.cpp +++ b/lib/widgets/propeditor/propertylist.cpp @@ -327,7 +327,7 @@ void PropertyBuffer::intersect(const PropertyList *list) // tqWarning("intersect:: removing %s from intersection", it.key().ascii()); removeProperty(it.key()); } - connect(list, TQT_SIGNAL(propertyValueChanged(Property*)), this, TQT_SLOT(intersectedValueChanged(Property*))); + connect(list, TQ_SIGNAL(propertyValueChanged(Property*)), this, TQ_SLOT(intersectedValueChanged(Property*))); } void PropertyBuffer::intersectedValueChanged(Property *property) @@ -359,7 +359,7 @@ PropertyBuffer::PropertyBuffer(PropertyList *list) addToGroup(list->m_groupOfProperty[it.data()], mp); m_list[it.key()] = mp; } - connect(list, TQT_SIGNAL(propertyValueChanged(Property*)), this, TQT_SLOT(intersectedValueChanged(Property*))); + connect(list, TQ_SIGNAL(propertyValueChanged(Property*)), this, TQ_SLOT(intersectedValueChanged(Property*))); } } diff --git a/lib/widgets/propeditor/propertylist.h b/lib/widgets/propeditor/propertylist.h index 9cee76f8..1561b04d 100644 --- a/lib/widgets/propeditor/propertylist.h +++ b/lib/widgets/propeditor/propertylist.h @@ -54,7 +54,7 @@ alphabetically sorted list of properties or both at the same time. */ class PropertyList: public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -181,7 +181,7 @@ buf->intersect(list3); /endcode */ class PropertyBuffer: public PropertyList{ - Q_OBJECT + TQ_OBJECT public: /**Constructs a buffer from given property list.*/ diff --git a/lib/widgets/propeditor/propertywidget.h b/lib/widgets/propeditor/propertywidget.h index 5071190b..857805da 100644 --- a/lib/widgets/propeditor/propertywidget.h +++ b/lib/widgets/propeditor/propertywidget.h @@ -47,7 +47,7 @@ A set of predefined widgets for predefined property types are available in the library. */ class PropertyWidget: public TQWidget{ - Q_OBJECT + TQ_OBJECT public: /**Constructs widget for property with name "propertyName".*/ diff --git a/lib/widgets/propeditor/propertywidgetproxy.h b/lib/widgets/propeditor/propertywidgetproxy.h index 37bbadb8..fdbcfffb 100644 --- a/lib/widgets/propeditor/propertywidgetproxy.h +++ b/lib/widgets/propeditor/propertywidgetproxy.h @@ -41,7 +41,7 @@ depending on the property type. */ class PropertyWidgetProxy: public TQWidget { -Q_OBJECT +TQ_OBJECT TQ_PROPERTY( int propertyType READ propertyType WRITE setPropertyType DESIGNABLE true ) TQ_PROPERTY( PropertyType propertyType2 READ propertyType2 WRITE setPropertyType2 DESIGNABLE false ) diff --git a/lib/widgets/propeditor/psizeedit.h b/lib/widgets/propeditor/psizeedit.h index 34acbb41..c4dba926 100644 --- a/lib/widgets/propeditor/psizeedit.h +++ b/lib/widgets/propeditor/psizeedit.h @@ -33,7 +33,7 @@ namespace PropertyLib{ */ class PSizeEdit: public PropertyWidget { - Q_OBJECT + TQ_OBJECT public: PSizeEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/psizepolicyedit.h b/lib/widgets/propeditor/psizepolicyedit.h index 45ad5414..eb30bd64 100644 --- a/lib/widgets/propeditor/psizepolicyedit.h +++ b/lib/widgets/propeditor/psizepolicyedit.h @@ -33,7 +33,7 @@ namespace PropertyLib{ */ class PSizePolicyEdit : public PropertyWidget { -Q_OBJECT +TQ_OBJECT public: PSizePolicyEdit(MultiProperty* property, const TQStringVariantMap &spValues, TQWidget* parent=0, const char* name=0); diff --git a/lib/widgets/propeditor/pspinbox.cpp b/lib/widgets/propeditor/pspinbox.cpp index 755041c1..cb15bebb 100644 --- a/lib/widgets/propeditor/pspinbox.cpp +++ b/lib/widgets/propeditor/pspinbox.cpp @@ -34,7 +34,7 @@ PSpinBox::PSpinBox(MultiProperty *property, TQWidget *parent, const char *name) m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int))); } PSpinBox::PSpinBox(MultiProperty *property, int minValue, int maxValue, int step, TQWidget *parent, const char *name) @@ -44,7 +44,7 @@ PSpinBox::PSpinBox(MultiProperty *property, int minValue, int maxValue, int step m_edit = new TQSpinBox(minValue, maxValue, step, this); l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int))); } TQVariant PSpinBox::value() const @@ -54,9 +54,9 @@ TQVariant PSpinBox::value() const void PSpinBox::setValue(const TQVariant &value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); + disconnect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int))); m_edit->setValue(value.toInt()); - connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); + connect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/pspinbox.h b/lib/widgets/propeditor/pspinbox.h index ecb73907..11e184ff 100644 --- a/lib/widgets/propeditor/pspinbox.h +++ b/lib/widgets/propeditor/pspinbox.h @@ -30,7 +30,7 @@ namespace PropertyLib{ @short %Property editor with integer num input box. */ class PSpinBox: public PropertyWidget{ - Q_OBJECT + TQ_OBJECT public: PSpinBox(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/pstringlistedit.cpp b/lib/widgets/propeditor/pstringlistedit.cpp index b6f4b74e..9f2e1364 100644 --- a/lib/widgets/propeditor/pstringlistedit.cpp +++ b/lib/widgets/propeditor/pstringlistedit.cpp @@ -49,7 +49,7 @@ PStringListEdit::PStringListEdit(MultiProperty *property, TQWidget *parent, cons pbSelect->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); l->addWidget(pbSelect); - connect(pbSelect, TQT_SIGNAL(clicked()), this, TQT_SLOT(showEditor())); + connect(pbSelect, TQ_SIGNAL(clicked()), this, TQ_SLOT(showEditor())); } TQVariant PStringListEdit::value() const @@ -87,8 +87,8 @@ void PStringListEdit::showEditor() #endif TQSpacerItem *si = new TQSpacerItem(30, 0, TQSizePolicy::Expanding, TQSizePolicy::Expanding); - connect(pbOk, TQT_SIGNAL(clicked()), dia, TQT_SLOT(accept())); - connect(pbCancel, TQT_SIGNAL(clicked()), dia, TQT_SLOT(reject())); + connect(pbOk, TQ_SIGNAL(clicked()), dia, TQ_SLOT(accept())); + connect(pbCancel, TQ_SIGNAL(clicked()), dia, TQ_SLOT(reject())); dh->addItem(si); dh->addWidget(pbOk); diff --git a/lib/widgets/propeditor/pstringlistedit.h b/lib/widgets/propeditor/pstringlistedit.h index 85b2ecc7..9986010d 100644 --- a/lib/widgets/propeditor/pstringlistedit.h +++ b/lib/widgets/propeditor/pstringlistedit.h @@ -34,7 +34,7 @@ namespace PropertyLib{ */ class PStringListEdit: public PropertyWidget { - Q_OBJECT + TQ_OBJECT public: PStringListEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/psymbolcombo.cpp b/lib/widgets/propeditor/psymbolcombo.cpp index ee91ea48..7b7afec1 100644 --- a/lib/widgets/propeditor/psymbolcombo.cpp +++ b/lib/widgets/propeditor/psymbolcombo.cpp @@ -51,8 +51,8 @@ PSymbolCombo::PSymbolCombo(MultiProperty *property, TQWidget *parent, const char m_select->hide(); #endif - connect(m_select, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectChar())); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_select, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectChar())); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); } TQVariant PSymbolCombo::value() const @@ -67,9 +67,9 @@ void PSymbolCombo::setValue(const TQVariant &value, bool emitChange) { if (!(value.isNull())) { - disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + disconnect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); m_edit->setText(TQChar(value.toInt())); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); if (emitChange) emit propertyChanged(m_property, value); } @@ -89,8 +89,8 @@ void PSymbolCombo::selectChar() KPushButton *pbCancel = new KPushButton(KStdGuiItem::cancel(), dia); TQSpacerItem *si = new TQSpacerItem(30, 0, TQSizePolicy::Expanding, TQSizePolicy::Expanding); - connect(pbOk, TQT_SIGNAL(clicked()), dia, TQT_SLOT(accept())); - connect(pbCancel, TQT_SIGNAL(clicked()), dia, TQT_SLOT(reject())); + connect(pbOk, TQ_SIGNAL(clicked()), dia, TQ_SLOT(accept())); + connect(pbCancel, TQ_SIGNAL(clicked()), dia, TQ_SLOT(reject())); dh->addItem(si); dh->addWidget(pbOk); diff --git a/lib/widgets/propeditor/psymbolcombo.h b/lib/widgets/propeditor/psymbolcombo.h index 52750fa1..c55eba58 100644 --- a/lib/widgets/propeditor/psymbolcombo.h +++ b/lib/widgets/propeditor/psymbolcombo.h @@ -33,7 +33,7 @@ namespace PropertyLib{ @short %Property editor with char selector. */ class PSymbolCombo: public PropertyWidget{ - Q_OBJECT + TQ_OBJECT public: PSymbolCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/purledit.cpp b/lib/widgets/propeditor/purledit.cpp index 047c9997..d2df31e0 100644 --- a/lib/widgets/propeditor/purledit.cpp +++ b/lib/widgets/propeditor/purledit.cpp @@ -38,14 +38,14 @@ PUrlEdit::PUrlEdit(Mode mode, MultiProperty* property, TQWidget* parent, const c m_edit = new KURLRequester(this); l->addWidget(m_edit); m_edit->setMode((KFile::Mode)mode); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); #else m_edit = new KLineEdit(this); m_select = new TQPushButton("...",this); l->addWidget(m_edit); l->addWidget(m_select); m_mode = mode; - connect( m_select, TQT_SIGNAL(clicked()),this,TQT_SLOT(select())); + connect( m_select, TQ_SIGNAL(clicked()),this,TQ_SLOT(select())); #endif m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); } @@ -62,9 +62,9 @@ TQVariant PUrlEdit::value() const void PUrlEdit::setValue(const TQVariant& value, bool emitChange) { #ifndef PURE_QT - disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + disconnect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); m_edit->setURL(value.toString()); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&))); #else m_edit->setText(value.toString()); #endif diff --git a/lib/widgets/propeditor/purledit.h b/lib/widgets/propeditor/purledit.h index bed86853..027f3b7d 100644 --- a/lib/widgets/propeditor/purledit.h +++ b/lib/widgets/propeditor/purledit.h @@ -38,7 +38,7 @@ namespace PropertyLib{ */ class PUrlEdit : public PropertyWidget { -Q_OBJECT +TQ_OBJECT public: #ifndef PURE_QT diff --git a/lib/widgets/propeditor/pyesnobutton.cpp b/lib/widgets/propeditor/pyesnobutton.cpp index dae82868..2d4bfb57 100644 --- a/lib/widgets/propeditor/pyesnobutton.cpp +++ b/lib/widgets/propeditor/pyesnobutton.cpp @@ -40,7 +40,7 @@ PYesNoButton::PYesNoButton(MultiProperty* property, TQWidget* parent, const char m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); + connect(m_edit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateProperty(bool))); } TQVariant PYesNoButton::value() const @@ -55,10 +55,10 @@ void PYesNoButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect void PYesNoButton::setValue(const TQVariant& value, bool emitChange) { - disconnect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); + disconnect(m_edit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateProperty(bool))); m_edit->setDown(value.toBool()); value.toBool() ? m_edit->setText(i18n("Yes")) : m_edit->setText(i18n("No")); - connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); + connect(m_edit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateProperty(bool))); if (emitChange) emit propertyChanged(m_property, value); } diff --git a/lib/widgets/propeditor/pyesnobutton.h b/lib/widgets/propeditor/pyesnobutton.h index bb899186..4e41da47 100644 --- a/lib/widgets/propeditor/pyesnobutton.h +++ b/lib/widgets/propeditor/pyesnobutton.h @@ -31,7 +31,7 @@ namespace PropertyLib{ */ class PYesNoButton : public PropertyWidget { - Q_OBJECT + TQ_OBJECT public: PYesNoButton(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); diff --git a/lib/widgets/propeditor/qeditlistbox.cpp b/lib/widgets/propeditor/qeditlistbox.cpp index 683a0931..862de024 100644 --- a/lib/widgets/propeditor/qeditlistbox.cpp +++ b/lib/widgets/propeditor/qeditlistbox.cpp @@ -120,7 +120,7 @@ void QEditListBox::init( bool checkAtEntering, int buttons, if ( buttons & Add ) { servNewButton = new TQPushButton(i18n("&Add"), gb); servNewButton->setEnabled(false); - connect(servNewButton, TQT_SIGNAL(clicked()), TQT_SLOT(addItem())); + connect(servNewButton, TQ_SIGNAL(clicked()), TQ_SLOT(addItem())); grid->addWidget(servNewButton, row++, 1); } @@ -128,7 +128,7 @@ void QEditListBox::init( bool checkAtEntering, int buttons, if ( buttons & Remove ) { servRemoveButton = new TQPushButton(i18n("&Remove"), gb); servRemoveButton->setEnabled(false); - connect(servRemoveButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem())); + connect(servRemoveButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeItem())); grid->addWidget(servRemoveButton, row++, 1); } @@ -136,20 +136,20 @@ void QEditListBox::init( bool checkAtEntering, int buttons, if ( buttons & UpDown ) { servUpButton = new TQPushButton(i18n("Move &Up"), gb); servUpButton->setEnabled(false); - connect(servUpButton, TQT_SIGNAL(clicked()), TQT_SLOT(moveItemUp())); + connect(servUpButton, TQ_SIGNAL(clicked()), TQ_SLOT(moveItemUp())); servDownButton = new TQPushButton(i18n("Move &Down"), gb); servDownButton->setEnabled(false); - connect(servDownButton, TQT_SIGNAL(clicked()), TQT_SLOT(moveItemDown())); + connect(servDownButton, TQ_SIGNAL(clicked()), TQ_SLOT(moveItemDown())); grid->addWidget(servUpButton, row++, 1); grid->addWidget(servDownButton, row++, 1); } - connect(m_lineEdit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(typedSomething(const TQString&))); + connect(m_lineEdit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(typedSomething(const TQString&))); - connect(m_lineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(addItem())); - connect(m_listBox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(enableMoveButtons(int))); + connect(m_lineEdit,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(addItem())); + connect(m_listBox, TQ_SIGNAL(highlighted(int)), TQ_SLOT(enableMoveButtons(int))); // maybe supplied lineedit has some text already typedSomething( m_lineEdit->text() ); diff --git a/lib/widgets/propeditor/qeditlistbox.h b/lib/widgets/propeditor/qeditlistbox.h index b57c454e..91ef4c3c 100644 --- a/lib/widgets/propeditor/qeditlistbox.h +++ b/lib/widgets/propeditor/qeditlistbox.h @@ -44,7 +44,7 @@ class QEditListBoxPrivate; class QEditListBox : public TQGroupBox { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQStringList items READ items WRITE setItems ) diff --git a/lib/widgets/qcomboview.cpp b/lib/widgets/qcomboview.cpp index cb44f32c..625e4d25 100644 --- a/lib/widgets/qcomboview.cpp +++ b/lib/widgets/qcomboview.cpp @@ -158,7 +158,7 @@ QComboView::QComboView( bool rw, TQWidget *parent, const char *name ) d->completeNow = FALSE; d->completionTimer = new TQTimer( this ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); d->ed = 0; if ( rw ) @@ -290,7 +290,7 @@ TQSize QComboView::sizeHint() const maxW = w; } */ - d->sizeHint = (style().tqsizeFromContents(TQStyle::CT_ComboBox, this, + d->sizeHint = (style().sizeFromContents(TQStyle::CT_ComboBox, this, TQSize(maxW, maxH)).expandedTo(TQApplication::globalStrut())); return d->sizeHint; @@ -466,7 +466,7 @@ void QComboView::paintEvent( TQPaintEvent * ) void QComboView::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() != Qt::LeftButton ) + if ( e->button() != TQt::LeftButton ) return; if ( d->discardNextMousePress ) { d->discardNextMousePress = FALSE; @@ -491,7 +491,7 @@ void QComboView::mousePressEvent( TQMouseEvent *e ) d->arrowDown = TRUE; repaint( FALSE ); } - TQTimer::singleShot( 200, this, TQT_SLOT(internalClickTimeout())); + TQTimer::singleShot( 200, this, TQ_SLOT(internalClickTimeout())); d->shortClick = TRUE; } } @@ -850,7 +850,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) { if ( !event ) return TRUE; - else if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(d->ed) ) { + else if ( object == d->ed ) { if ( event->type() == TQEvent::KeyPress ) { bool isAccepted = ( (TQKeyEvent*)event )->isAccepted(); keyPressEvent( (TQKeyEvent *)event ); @@ -887,15 +887,15 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) } } } - } else if ( ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(d->listView()) || - TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(d->listView()->viewport()) )) { + } else if ( ( object == d->listView() || + object == d->listView()->viewport() )) { TQMouseEvent *e = (TQMouseEvent*)event; switch( event->type() ) { case TQEvent::MouseMove: if ( !d->mouseWasInsidePopup ) { // tqWarning("!d->mouseWasInsidePopup"); TQPoint pos = e->pos(); - if ( TQT_TQRECT_OBJECT(d->listView()->rect()).contains( pos ) ) + if ( d->listView()->rect().contains( pos ) ) d->mouseWasInsidePopup = TRUE; // Check if arrow button should toggle if ( d->arrowPressed ) { @@ -917,7 +917,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) } } } - } else if ((e->state() & ( Qt::RightButton | Qt::LeftButton | Qt::MidButton ) ) == 0 && + } else if ((e->state() & ( TQt::RightButton | TQt::LeftButton | TQt::MidButton ) ) == 0 && style().styleHint(TQStyle::SH_ComboBox_ListMouseTracking, this)) { // tqWarning("event filter:: emu"); TQWidget *mouseW = TQApplication::widgetAt( e->globalPos(), TRUE ); @@ -935,7 +935,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) break; case TQEvent::MouseButtonRelease: - if ( TQT_TQRECT_OBJECT(d->listView()->rect()).contains( e->pos() ) ) { + if ( d->listView()->rect().contains( e->pos() ) ) { TQMouseEvent tmp( TQEvent::MouseButtonDblClick, e->pos(), e->button(), e->state() ) ; // will hide popup @@ -955,7 +955,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) break; case TQEvent::MouseButtonDblClick: case TQEvent::MouseButtonPress: - if ( !TQT_TQRECT_OBJECT(d->listView()->rect()).contains( e->pos() ) ) { + if ( !d->listView()->rect().contains( e->pos() ) ) { TQPoint globalPos = d->listView()->mapToGlobal(e->pos()); if ( TQApplication::widgetAt( globalPos, TRUE ) == this ) { d->discardNextMousePress = TRUE; @@ -1241,16 +1241,16 @@ void QComboView::setListView( TQListView * newListView ) d->listView()->resize( 100, 10 ); */ - connect( d->listView(), TQT_SIGNAL(returnPressed(TQListViewItem*)), - TQT_SLOT(internalActivate(TQListViewItem*))); - connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(internalActivate(TQListViewItem*))); - connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(checkState(TQListViewItem*))); - connect( d->listView(), TQT_SIGNAL(currentChanged(TQListViewItem*)), - TQT_SLOT(internalHighlight(TQListViewItem*))); - connect( d->listView(), TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(internalHighlight(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(returnPressed(TQListViewItem*)), + TQ_SLOT(internalActivate(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(internalActivate(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(checkState(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(currentChanged(TQListViewItem*)), + TQ_SLOT(internalHighlight(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(internalHighlight(TQListViewItem*))); } @@ -1359,7 +1359,7 @@ void QComboView::setEditable( bool y ) d->ed = 0; } - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); updateGeometry(); update(); } @@ -1386,16 +1386,16 @@ void QComboView::setUpListView() d->listView()->header()->hide(); - connect( d->listView(), TQT_SIGNAL(returnPressed(TQListViewItem*)), - TQT_SLOT(internalActivate(TQListViewItem*))); - connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(internalActivate(TQListViewItem*))); - connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(checkState(TQListViewItem*))); - connect( d->listView(), TQT_SIGNAL(currentChanged(TQListViewItem*)), - TQT_SLOT(internalHighlight(TQListViewItem*))); - connect( d->listView(), TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(internalHighlight(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(returnPressed(TQListViewItem*)), + TQ_SLOT(internalActivate(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(internalActivate(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(checkState(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(currentChanged(TQListViewItem*)), + TQ_SLOT(internalHighlight(TQListViewItem*))); + connect( d->listView(), TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(internalHighlight(TQListViewItem*))); } @@ -1430,20 +1430,20 @@ void QComboView::setLineEdit( TQLineEdit *edit ) d->ed = edit; - if ( TQT_BASE_OBJECT(edit->parent()) != TQT_BASE_OBJECT(this) ) { + if ( edit->parent() != this ) { edit->reparent( this, TQPoint(0,0), FALSE ); edit->setFont( font() ); } - connect (edit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SIGNAL( textChanged( const TQString& ) ) ); - connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressed()) ); + connect (edit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SIGNAL( textChanged( const TQString& ) ) ); + connect( edit, TQ_SIGNAL(returnPressed()), TQ_SLOT(returnPressed()) ); edit->setFrame( FALSE ); d->updateLinedGeometry(); edit->installEventFilter( this ); setFocusProxy( edit ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setUpListView(); diff --git a/lib/widgets/qcomboview.h b/lib/widgets/qcomboview.h index 51d57eec..cff2ce68 100644 --- a/lib/widgets/qcomboview.h +++ b/lib/widgets/qcomboview.h @@ -40,7 +40,7 @@ in the same way as TQComboBox and have similar API. */ class TQ_EXPORT QComboView : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_ENUMS( Policy ) TQ_PROPERTY( bool editable READ editable WRITE setEditable ) diff --git a/lib/widgets/resizablecombo.cpp b/lib/widgets/resizablecombo.cpp index ef96e724..c1dd08a3 100644 --- a/lib/widgets/resizablecombo.cpp +++ b/lib/widgets/resizablecombo.cpp @@ -89,7 +89,7 @@ void MyPushButton::mouseMoveEvent( TQMouseEvent * e ) MyPushButton::MyPushButton( ResizableCombo * parent, const char * name ) :TQPushButton(parent, name), m_resizing(false), m_combo(parent) { - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setFlat(true); m_width = m_combo->m_combo->width(); } diff --git a/lib/widgets/resizablecombo.h b/lib/widgets/resizablecombo.h index 4852f3dc..1bb629a3 100644 --- a/lib/widgets/resizablecombo.h +++ b/lib/widgets/resizablecombo.h @@ -36,7 +36,7 @@ Resizable combo box. Used to place resizable KComboBox onto toolbars. */ class ResizableCombo: public TQWidget{ - Q_OBJECT + TQ_OBJECT public: ResizableCombo(KComboView *view, TQWidget *parent = 0, const char *name = 0); diff --git a/parts/abbrev/abbrevconfigwidget.h b/parts/abbrev/abbrevconfigwidget.h index 4fdeb8a9..156c85ff 100644 --- a/parts/abbrev/abbrevconfigwidget.h +++ b/parts/abbrev/abbrevconfigwidget.h @@ -22,7 +22,7 @@ class AbbrevConfigWidget : public AbbrevConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/abbrev/abbrevconfigwidgetbase.ui b/parts/abbrev/abbrevconfigwidgetbase.ui index fd04ec23..0597bd4c 100644 --- a/parts/abbrev/abbrevconfigwidgetbase.ui +++ b/parts/abbrev/abbrevconfigwidgetbase.ui @@ -179,12 +179,12 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">addTemplate()</slot> <slot access="protected">codeChanged()</slot> <slot access="protected">removeTemplate()</slot> <slot access="protected">selectionChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp index 80d26599..4e695114 100644 --- a/parts/abbrev/abbrevpart.cpp +++ b/parts/abbrev/abbrevpart.cpp @@ -71,20 +71,20 @@ AbbrevPart::AbbrevPart(TQObject *parent, const char *name, const TQStringList &) setInstance(AbbrevFactory::instance()); setXMLFile("kdevabbrev.rc"); - connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect(partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) ); - connect(core(), TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(configWidget(KDialogBase*))); + connect(core(), TQ_SIGNAL(configWidget(KDialogBase*)), this, TQ_SLOT(configWidget(KDialogBase*))); TDEAction *action; action = new TDEAction( i18n("Expand Text"), CTRL + Key_J, - this, TQT_SLOT(slotExpandText()), + this, TQ_SLOT(slotExpandText()), actionCollection(), "edit_expandtext" ); action->setToolTip( i18n("Expand current word") ); action->setWhatsThis( i18n("<b>Expand current word</b><p>Current word can be completed using the list of similar words in source files.") ); action = new TDEAction( i18n("Expand Abbreviation"), CTRL + Key_L, - this, TQT_SLOT(slotExpandAbbrev()), + this, TQ_SLOT(slotExpandAbbrev()), actionCollection(), "edit_expandabbrev" ); action->setToolTip( i18n("Expand abbreviation") ); action->setWhatsThis( i18n("<b>Expand abbreviation</b><p>Enable and configure abbreviations in <b>TDevelop Settings</b>, <b>Abbreviations</b> tab.") ); @@ -140,14 +140,14 @@ void AbbrevPart::setAutoWordCompletionEnabled( bool enabled ) disconnect( docIface->widget(), 0, this, 0 ); if( m_autoWordCompletionEnabled ){ - connect( docIface->widget(), TQT_SIGNAL(completionAborted()), - this, TQT_SLOT(slotCompletionAborted()) ); - connect( docIface->widget(), TQT_SIGNAL(completionDone()), - this, TQT_SLOT(slotCompletionDone()) ); - connect( docIface->widget(), TQT_SIGNAL(aboutToShowCompletionBox()), - this, TQT_SLOT(slotAboutToShowCompletionBox()) ); - - connect( docIface, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); + connect( docIface->widget(), TQ_SIGNAL(completionAborted()), + this, TQ_SLOT(slotCompletionAborted()) ); + connect( docIface->widget(), TQ_SIGNAL(completionDone()), + this, TQ_SLOT(slotCompletionDone()) ); + connect( docIface->widget(), TQ_SIGNAL(aboutToShowCompletionBox()), + this, TQ_SLOT(slotAboutToShowCompletionBox()) ); + + connect( docIface, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()) ); } } void AbbrevPart::load() @@ -243,7 +243,7 @@ void AbbrevPart::configWidget(KDialogBase *dlg) { TQVBox *vbox = dlg->addVBoxPage(i18n("Abbreviations"), i18n("Abbreviations"), BarIcon( info()->icon(), TDEIcon::SizeMedium) ); AbbrevConfigWidget *w = new AbbrevConfigWidget(this, vbox, "abbrev config widget"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); } @@ -502,14 +502,14 @@ void AbbrevPart::slotActivePartChanged( KParts::Part* part ) disconnect( part->widget(), 0, this, 0 ); disconnect( doc, 0, this, 0 ); - connect( part->widget(), TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*, TQString*)), - this, TQT_SLOT(slotFilterInsertString(KTextEditor::CompletionEntry*, TQString*)) ); + connect( part->widget(), TQ_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*, TQString*)), + this, TQ_SLOT(slotFilterInsertString(KTextEditor::CompletionEntry*, TQString*)) ); if( autoWordCompletionEnabled() ){ - connect( part->widget(), TQT_SIGNAL(completionAborted()), this, TQT_SLOT(slotCompletionAborted()) ); - connect( part->widget(), TQT_SIGNAL(completionDone()), this, TQT_SLOT(slotCompletionDone()) ); - connect( part->widget(), TQT_SIGNAL(aboutToShowCompletionBox()), this, TQT_SLOT(slotAboutToShowCompletionBox()) ); - connect( doc, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); + connect( part->widget(), TQ_SIGNAL(completionAborted()), this, TQ_SLOT(slotCompletionAborted()) ); + connect( part->widget(), TQ_SIGNAL(completionDone()), this, TQ_SLOT(slotCompletionDone()) ); + connect( part->widget(), TQ_SIGNAL(aboutToShowCompletionBox()), this, TQ_SLOT(slotAboutToShowCompletionBox()) ); + connect( doc, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()) ); } m_prevLine = -1; diff --git a/parts/abbrev/abbrevpart.h b/parts/abbrev/abbrevpart.h index 2b602088..afc252a4 100644 --- a/parts/abbrev/abbrevpart.h +++ b/parts/abbrev/abbrevpart.h @@ -62,7 +62,7 @@ private: class AbbrevPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/abbrev/addtemplatedlg.cpp b/parts/abbrev/addtemplatedlg.cpp index a837c08a..b2c9a090 100644 --- a/parts/abbrev/addtemplatedlg.cpp +++ b/parts/abbrev/addtemplatedlg.cpp @@ -27,8 +27,8 @@ AddTemplateDialog::AddTemplateDialog( TQStringList suffixesList, TQWidget *paren { setFocusProxy( editTemplate ); comboSuffixes->insertStringList(suffixesList); - connect( editTemplate, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT( textChanged())); - connect( editDescription, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT( textChanged())); + connect( editTemplate, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT( textChanged())); + connect( editDescription, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT( textChanged())); buttonOk->setEnabled(false); } diff --git a/parts/abbrev/addtemplatedlg.h b/parts/abbrev/addtemplatedlg.h index c8912c18..71e72ac5 100644 --- a/parts/abbrev/addtemplatedlg.h +++ b/parts/abbrev/addtemplatedlg.h @@ -25,7 +25,7 @@ class AddTemplateDialog: public AddTemplateDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/abbrev/cpp_keywords b/parts/abbrev/cpp_keywords index e84d0cf1..19bd1a82 100644 --- a/parts/abbrev/cpp_keywords +++ b/parts/abbrev/cpp_keywords @@ -1,9 +1,9 @@ K_DCOP k_dcop -k_dcop_Q_SIGNALS -Q_OBJECT -Q_SIGNALS -Q_SLOTS +k_dcop_signals +TQ_OBJECT +signals +slots emit __int64 __asm__ diff --git a/parts/abbrev/qt_classes b/parts/abbrev/qt_classes index 266307bc..b6269002 100644 --- a/parts/abbrev/qt_classes +++ b/parts/abbrev/qt_classes @@ -38,14 +38,14 @@ QCanvasText QCanvasTextExtra QCanvasView QCanvasViewData -QChar +TQChar QCharRef QCharRef QCheckBox QCheckListItem QCleanupHandler QClipboard -QColor +TQColor QColorGroup QComboBox QComboBoxData @@ -137,7 +137,7 @@ QHeaderData QHostAddress QHttpHeader QHttpRequest -QIODevice +TQIODevice QIconDragItem QIconFactory QIconSet @@ -146,7 +146,7 @@ QIconViewItem QIconViewItemLineEdit QIconViewPrivate QIconViewToolTip -QImage +TQImage QImageConsumer QImageDataMisc QImageDecoder @@ -215,7 +215,7 @@ QNPlugin QNetworkOperation QNetworkProtocol QNetworkProtocolFactoryBase -QObject +TQObject QObjectList QObjectListIt QObjectUserData @@ -308,7 +308,7 @@ QSqlResult QStatusBar QStoredDragData QStrList -QString +TQString QStringList QStyle QStyleFactory @@ -380,7 +380,7 @@ QWSManager QWSRegionManager QWaitCondition QWheelEvent -QWidget +TQWidget QWidgetFactory QWidgetList QWidgetListIt diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp index 86373504..76e33693 100644 --- a/parts/appwizard/appwizarddlg.cpp +++ b/parts/appwizard/appwizarddlg.cpp @@ -98,17 +98,17 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch m_customOptions = 0L; loadLicenses(); - connect( this, TQT_SIGNAL( selected( const TQString & ) ), this, TQT_SLOT( pageChanged() ) ); + connect( this, TQ_SIGNAL( selected( const TQString & ) ), this, TQ_SLOT( pageChanged() ) ); helpButton()->hide(); templates_listview->header()->hide(); templates_listview->setColumnWidthMode(0, TQListView::Maximum); //to provide horiz scrollbar. m_templatesMenu = new TDEPopupMenu(templates_listview); - m_templatesMenu->insertItem(i18n("&Add to Favorites"), this, TQT_SLOT(addTemplateToFavourites())); + m_templatesMenu->insertItem(i18n("&Add to Favorites"), this, TQ_SLOT(addTemplateToFavourites())); m_favouritesMenu = new TDEPopupMenu(favourites_iconview); - m_favouritesMenu->insertItem(i18n("&Remove Favorite"), this, TQT_SLOT(removeFavourite())); + m_favouritesMenu->insertItem(i18n("&Remove Favorite"), this, TQ_SLOT(removeFavourite())); m_pathIsValid=false; m_part = part; @@ -304,7 +304,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch // How about names like "__" or "123" for project name? Are they legal? TQRegExpValidator *appname_edit_validator; appname_edit_validator = new TQRegExpValidator (appname_regexp, - TQT_TQOBJECT(appname_edit), + appname_edit, "AppNameValidator"); appname_edit->setValidator(appname_edit_validator); @@ -319,7 +319,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch license_combo->setCurrentItem( idx - 1 ); } - connect( license_combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(licenseChanged()) ); + connect( license_combo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(licenseChanged()) ); m_custom_options_layout = new TQHBoxLayout( custom_options ); m_custom_options_layout->setAutoAdd(true); diff --git a/parts/appwizard/appwizarddlg.h b/parts/appwizard/appwizarddlg.h index bae75531..06fc723c 100644 --- a/parts/appwizard/appwizarddlg.h +++ b/parts/appwizard/appwizarddlg.h @@ -120,7 +120,7 @@ struct AppWizardFileTemplate class AppWizardDialog : public AppWizardDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/appwizard/appwizarddlgbase.ui b/parts/appwizard/appwizarddlgbase.ui index f9c22c2f..af51e997 100644 --- a/parts/appwizard/appwizarddlgbase.ui +++ b/parts/appwizard/appwizarddlgbase.ui @@ -634,7 +634,7 @@ <forward>class TQListViewItem;</forward> <forward>class TQIconViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot access="protected">licenseChanged()</slot> <slot access="protected">destButtonClicked( const TQString & )</slot> <slot access="protected">projectLocationChanged()</slot> @@ -645,7 +645,7 @@ <slot access="protected">templatesContextMenu( TQListViewItem *, const TQPoint &, int )</slot> <slot access="protected">favouritesContextMenu( TQIconViewItem *, const TQPoint & )</slot> <slot>showTemplates(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/parts/appwizard/appwizardpart.cpp b/parts/appwizard/appwizardpart.cpp index e1a9dbad..dfdfc14a 100644 --- a/parts/appwizard/appwizardpart.cpp +++ b/parts/appwizard/appwizardpart.cpp @@ -43,7 +43,7 @@ AppWizardPart::AppWizardPart(TQObject *parent, const char *name, const TQStringL TDEAction *action; action = new TDEAction( i18n("&New Project..."), "window-new", 0, - this, TQT_SLOT(slotNewProject()), + this, TQ_SLOT(slotNewProject()), actionCollection(), "project_new" ); action->setToolTip( i18n("Generate a new project from a template") ); action->setWhatsThis( i18n("<b>New project</b><p>" @@ -52,7 +52,7 @@ AppWizardPart::AppWizardPart(TQObject *parent, const char *name, const TQStringL "application from a set of templates.") ); action = new TDEAction( i18n("&Import Existing Project..."),"wizard", 0, - this, TQT_SLOT(slotImportProject()), + this, TQ_SLOT(slotImportProject()), actionCollection(), "project_import" ); action->setToolTip( i18n("Import existing project") ); action->setWhatsThis( i18n("<b>Import existing project</b><p>Creates a project file for a given directory.") ); @@ -82,7 +82,7 @@ void AppWizardPart::slotImportProject() void AppWizardPart::openFilesAfterGeneration(const KURL::List urlsToOpen) { m_urlsToOpen = urlsToOpen; - connect( core(), TQT_SIGNAL( projectOpened() ), this, TQT_SLOT( openFilesAfterGeneration() ) ); + connect( core(), TQ_SIGNAL( projectOpened() ), this, TQ_SLOT( openFilesAfterGeneration() ) ); } void AppWizardPart::openFilesAfterGeneration() @@ -90,7 +90,7 @@ void AppWizardPart::openFilesAfterGeneration() for (KURL::List::const_iterator it = m_urlsToOpen.begin(); it != m_urlsToOpen.end(); ++it) partController()->editDocument(*it); m_urlsToOpen.clear(); - disconnect( core(), TQT_SIGNAL( projectOpened() ), this, TQT_SLOT( openFilesAfterGeneration() ) ); + disconnect( core(), TQ_SIGNAL( projectOpened() ), this, TQ_SLOT( openFilesAfterGeneration() ) ); } #include "appwizardpart.moc" diff --git a/parts/appwizard/appwizardpart.h b/parts/appwizard/appwizardpart.h index 59280631..a68a2cab 100644 --- a/parts/appwizard/appwizardpart.h +++ b/parts/appwizard/appwizardpart.h @@ -23,7 +23,7 @@ class AppWizardDialog; class AppWizardPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/appwizard/common/admin b/parts/appwizard/common/admin -Subproject 8c7e0d40de084fe5d54e173918756639e0d4d63 +Subproject 59a8bf7c09f87fbccd6dc2987145c7216e043e7 diff --git a/parts/appwizard/common/scons/admin/generic.py b/parts/appwizard/common/scons/admin/generic.py index 55c37c90..52c4e3bc 100644 --- a/parts/appwizard/common/scons/admin/generic.py +++ b/parts/appwizard/common/scons/admin/generic.py @@ -31,18 +31,18 @@ def generate(env): env['HELP']=1 if env['HELP']: - print """ + print(""" """+BOLD+"""*** Generic options *** -----------------------"""+NORMAL+""" """+BOLD+"""* debug """+NORMAL+""": debug=1 (-g) or debug=full (-g3, slower) else use environment CXXFLAGS, or -O2 by default """+BOLD+"""* prefix """+NORMAL+""": the installation path """+BOLD+"""* extraincludes """+NORMAL+""": a list of paths separated by ':' ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/include:/usr/local -"""+NORMAL +"""+NORMAL) ## Global cache directory ## Put all project files in it so a rm -rf cache will clean up the config - if not env.has_key('CACHEDIR'): + if 'CACHEDIR' not in env: env['CACHEDIR'] = os.getcwd()+'/cache/' if not os.path.isdir(env['CACHEDIR']): os.mkdir(env['CACHEDIR']) @@ -56,9 +56,9 @@ ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/ # Special trick for installing rpms ... env['DESTDIR']='' - if 'install' in sys.argv and os.environ.has_key('DESTDIR'): + if 'install' in sys.argv and 'DESTDIR' in os.environ: env['DESTDIR']=os.environ['DESTDIR']+'/' - print CYAN+'** Enabling DESTDIR for the project ** ' + NORMAL + env['DESTDIR'] + print(CYAN+'** Enabling DESTDIR for the project ** ' + NORMAL + env['DESTDIR']) # load the options from SCons.Options import Options, PathOption @@ -89,7 +89,7 @@ ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/ env['_CONFIGURE']=0 # configure the environment if needed - if not env['HELP'] and (env['_CONFIGURE'] or not env.has_key('ISCONFIGURED')): + if not env['HELP'] and (env['_CONFIGURE'] or 'ISCONFIGURED' not in env): import re def makeHashTable(args): @@ -108,40 +108,40 @@ ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/ env['ARGS']=makeHashTable(sys.argv) # be paranoid, unset existing variables - if env.has_key('KDECXXFLAGS'): + if 'KDECXXFLAGS' in env: env.__delitem__('KDECXXFLAGS') - if env.has_key('KDECCFLAGS'): + if 'KDECCFLAGS' in env: env.__delitem__('KDECCFLAGS') - if env.has_key('KDELINKFLAGS'): + if 'KDELINKFLAGS' in env: env.__delitem__('KDELINKFLAGS') - if env.has_key('PREFIX'): + if 'PREFIX' in env: env.__delitem__('PREFIX') - if env.has_key('EXTRAINCLUDES'): + if 'EXTRAINCLUDES' in env: env.__delitem__('EXTRAINCLUDES') - if env.has_key('ISCONFIGURED'): + if 'ISCONFIGURED' in env: env.__delitem__('ISCONFIGURED') if env['ARGS'].get('debug', None): debuglevel = env['ARGS'].get('debug', None) - print CYAN+'** Enabling debug for the project **' + NORMAL + print(CYAN+'** Enabling debug for the project **' + NORMAL) if (debuglevel == "full"): env['KDECXXFLAGS'] = ['-DDEBUG', '-g3'] else: env['KDECXXFLAGS'] = ['-DDEBUG', '-g'] else: - if os.environ.has_key('CXXFLAGS'): + if 'CXXFLAGS' in os.environ: # user-defined flags (gentooers will be elighted) env['KDECXXFLAGS'] = SCons.Util.CLVar( os.environ['CXXFLAGS'] ) env.Append( KDECXXFLAGS = ['-DNDEBUG', '-DNO_DEBUG'] ) else: env.Append(KDECXXFLAGS = ['-O2', '-DNDEBUG', '-DNO_DEBUG']) - if os.environ.has_key('CFLAGS'): + if 'CFLAGS' in os.environ: env['KDECCFLAGS'] = SCons.Util.CLVar( os.environ['CFLAGS'] ) ## FreeBSD settings (contributed by will at freebsd dot org) if os.uname()[0] == "FreeBSD": - if os.environ.has_key('PTHREAD_LIBS'): + if 'PTHREAD_LIBS' in os.environ: env.AppendUnique( KDELINKFLAGS = SCons.Util.CLVar( os.environ['PTHREAD_LIBS'] ) ) else: syspf = os.popen('/sbin/sysctl kern.osreldate') @@ -159,15 +159,15 @@ ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/ # User-specified prefix if env['ARGS'].get('prefix', None): env['PREFIX'] = env['ARGS'].get('prefix', None) - print CYAN+'** set the installation prefix for the project : ' + env['PREFIX'] +' **'+ NORMAL - elif env.has_key('PREFIX'): + print(CYAN+'** set the installation prefix for the project : ' + env['PREFIX'] +' **'+ NORMAL) + elif 'PREFIX' in env: env.__delitem__('PREFIX') # User-specified include paths env['EXTRAINCLUDES'] = env['ARGS'].get('extraincludes', None) if env['ARGS'].get('extraincludes', None): - print CYAN+'** set extra include paths for the project : ' + env['EXTRAINCLUDES'] +' **'+ NORMAL - elif env.has_key('EXTRAINCLUDES'): + print(CYAN+'** set extra include paths for the project : ' + env['EXTRAINCLUDES'] +' **'+ NORMAL) + elif 'EXTRAINCLUDES' in env: env.__delitem__('EXTRAINCLUDES') env['ISCONFIGURED']=1 @@ -175,16 +175,16 @@ ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/ # And finally save the options in the cache opts.Save(cachefile, env) - if env.has_key('KDECXXFLAGS'): + if 'KDECXXFLAGS' in env: env.AppendUnique( CPPFLAGS = env['KDECXXFLAGS'] ) - if env.has_key('KDECCFLAGS'): + if 'KDECCFLAGS' in env: env.AppendUnique( CCFLAGS = env['KDECCFLAGS'] ) - if env.has_key('KDELINKFLAGS'): + if 'KDELINKFLAGS' in env: env.AppendUnique( LINKFLAGS = env['KDELINKFLAGS'] ) - if env.has_key('EXTRAINCLUDES'): + if 'EXTRAINCLUDES' in env: incpaths = [] for dir in str(env['EXTRAINCLUDES']).split(':'): incpaths.append( dir ) diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py index 84b2c812..3d54ce93 100644 --- a/parts/appwizard/common/scons/admin/kde.py +++ b/parts/appwizard/common/scons/admin/kde.py @@ -43,109 +43,109 @@ def detect_kde(env): libdir = libdir+libsuffix ## Detect the kde libraries - print "Checking for tde-config : ", + print("Checking for tde-config : ", end=' ') kde_config = os.popen("which tde-config 2>/dev/null").read().strip() if len(kde_config): - print GREEN+"tde-config was found"+NORMAL + print(GREEN+"tde-config was found"+NORMAL) else: - print RED+"tde-config was NOT found in your PATH"+NORMAL - print "Make sure kde is installed properly" - print "(missing package tdebase-devel?)" + print(RED+"tde-config was NOT found in your PATH"+NORMAL) + print("Make sure kde is installed properly") + print("(missing package tdebase-devel?)") env.Exit(1) env['TDEDIR'] = os.popen('tde-config -prefix').read().strip() - print "Checking for kde version : ", + print("Checking for kde version : ", end=' ') kde_version = os.popen("tde-config --version|grep KDE").read().strip().split()[1] if int(kde_version[0]) != 3 or int(kde_version[2]) < 2: - print RED+kde_version - print RED+"Your kde version can be too old"+NORMAL - print RED+"Please make sure kde is at least 3.2"+NORMAL + print(RED+kde_version) + print(RED+"Your kde version can be too old"+NORMAL) + print(RED+"Please make sure kde is at least 3.2"+NORMAL) else: - print GREEN+kde_version+NORMAL + print(GREEN+kde_version+NORMAL) ## Detect the qt library - print "Checking for the qt library : ", + print("Checking for the qt library : ", end=' ') qtdir = os.getenv("TQTDIR") if qtdir: - print GREEN+"qt is in "+qtdir+NORMAL + print(GREEN+"qt is in "+qtdir+NORMAL) else: libdir = os.popen('tde-config --expandvars --install lib').read().strip() libtdeuiSO = libdir+'/'+getSOfromLA(libdir+'/libtdeui.la') m = re.search('(.*)/lib/libtqt.*', os.popen('ldd ' + libtdeuiSO + ' | grep libtqt').read().strip().split()[2]) if m: qtdir = m.group(1) - print YELLOW+"qt was found as "+m.group(1)+NORMAL + print(YELLOW+"qt was found as "+m.group(1)+NORMAL) else: - print RED+"qt was not found"+NORMAL - print RED+"Please set TQTDIR first (/usr/lib/qt3?)"+NORMAL + print(RED+"qt was not found"+NORMAL) + print(RED+"Please set TQTDIR first (/usr/lib/qt3?)"+NORMAL) env.Exit(1) env['TQTDIR'] = qtdir.strip() ## Find the necessary programs uic and moc - print "Checking for uic : ", + print("Checking for uic : ", end=' ') uic = qtdir + "/bin/uic" if os.path.isfile(uic): - print GREEN+"uic was found as "+uic+NORMAL + print(GREEN+"uic was found as "+uic+NORMAL) else: uic = os.popen("which uic 2>/dev/null").read().strip() if len(uic): - print YELLOW+"uic was found as "+uic+NORMAL + print(YELLOW+"uic was found as "+uic+NORMAL) else: uic = os.popen("which uic 2>/dev/null").read().strip() if len(uic): - print YELLOW+"uic was found as "+uic+NORMAL + print(YELLOW+"uic was found as "+uic+NORMAL) else: - print RED+"uic was not found - set TQTDIR put it in your PATH ?"+NORMAL + print(RED+"uic was not found - set TQTDIR put it in your PATH ?"+NORMAL) env.Exit(1) env['QT_UIC'] = uic - print "Checking for moc : ", + print("Checking for moc : ", end=' ') moc = qtdir + "/bin/moc" if os.path.isfile(moc): - print GREEN + "moc was found as " + moc + NORMAL + print(GREEN + "moc was found as " + moc + NORMAL) else: moc = os.popen("which moc 2>/dev/null").read().strip() if len(moc): - print YELLOW + "moc was found as " + moc + NORMAL + print(YELLOW + "moc was found as " + moc + NORMAL) elif os.path.isfile("/usr/share/qt3/bin/moc"): moc = "/usr/share/qt3/bin/moc" - print YELLOW + "moc was found as " + moc + NORMAL + print(YELLOW + "moc was found as " + moc + NORMAL) else: - print RED + "moc was not found - set TQTDIR or put it in your PATH ?" + NORMAL + print(RED + "moc was not found - set TQTDIR or put it in your PATH ?" + NORMAL) env.Exit(1) env['QT_MOC'] = moc ## check for the qt and kde includes - print "Checking for the qt includes : ", + print("Checking for the qt includes : ", end=' ') if qtincludes and os.path.isfile(qtincludes + "/qtqlayout.h"): # The user told where to look for and it looks valid - print GREEN + "ok " + qtincludes + NORMAL + print(GREEN + "ok " + qtincludes + NORMAL) else: if os.path.isfile(qtdir + "/include/qtqlayout.h"): # Automatic detection - print GREEN + "ok " + qtdir + "/include/ " + NORMAL + print(GREEN + "ok " + qtdir + "/include/ " + NORMAL) qtincludes = qtdir + "/include/" elif os.path.isfile("/usr/include/qt3/qtqlayout.h"): # Debian probably - print YELLOW + "the qt headers were found in /usr/include/qt3/ " + NORMAL + print(YELLOW + "the qt headers were found in /usr/include/qt3/ " + NORMAL) qtincludes = "/usr/include/qt3" else: - print RED + "the qt headers were not found" + NORMAL + print(RED + "the qt headers were not found" + NORMAL) env.Exit(1) - print "Checking for the kde includes : ", + print("Checking for the kde includes : ", end=' ') kdeprefix = os.popen("tde-config --prefix").read().strip() if not kdeincludes: kdeincludes = kdeprefix+"/include/" if os.path.isfile(kdeincludes + "/klineedit.h"): - print GREEN + "ok " + kdeincludes + NORMAL + print(GREEN + "ok " + kdeincludes + NORMAL) else: if os.path.isfile(kdeprefix+"/include/tde/klineedit.h"): # Debian, Fedora probably - print YELLOW + "the kde headers were found in " + kdeprefix + "/include/tde/" + NORMAL + print(YELLOW + "the kde headers were found in " + kdeprefix + "/include/tde/" + NORMAL) kdeincludes = kdeprefix + "/include/tde/" else: - print RED + "The kde includes were NOT found" + NORMAL + print(RED + "The kde includes were NOT found" + NORMAL) env.Exit(1) if prefix: @@ -206,7 +206,7 @@ def detect_kde(env): def generate(env): """"Set up the qt and kde environment and builders - the moc part is difficult to understand """ if env['HELP']: - print """ + print(""" """+BOLD+"""*** KDE options *** -------------------"""+NORMAL+""" """+BOLD+"""* prefix """+NORMAL+""": base install path, ie: /usr/local @@ -219,7 +219,7 @@ def generate(env): """+BOLD+"""* tdelibs """+NORMAL+""": path to the kde libs, for linking the programs """+BOLD+"""* tqtlibs """+NORMAL+""": same punishment, for qt libraries ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt -"""+NORMAL +"""+NORMAL) import SCons.Defaults import SCons.Tool @@ -264,8 +264,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt objBuilder = getattr(env, self.objBuilderName) # some regular expressions: - # Q_OBJECT detection - q_object_search = re.compile(r'[^A-Za-z0-9]Q_OBJECT[^A-Za-z0-9]') + # TQ_OBJECT detection + q_object_search = re.compile(r'[^A-Za-z0-9]TQ_OBJECT[^A-Za-z0-9]') # The following is kind of hacky to get builders working properly (FIXME) ?? objBuilderEnv = objBuilder.env @@ -280,12 +280,12 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt if not obj.has_builder(): # binary obj file provided if qtdebug: - print "scons: qt: '%s' seems to be a binary. Discarded." % str(obj) + print("scons: qt: '%s' seems to be a binary. Discarded." % str(obj)) continue cpp = obj.sources[0] if not splitext(str(cpp))[1] in source_extensions: if qtdebug: - print "scons: qt: '%s' is no cxx file. Discarded." % str(cpp) + print("scons: qt: '%s' is no cxx file. Discarded." % str(cpp)) # c or fortran source continue #cpp_contents = comment.sub('', cpp.get_contents()) @@ -300,7 +300,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt ui = find_file(uiname, (cpp.get_dir(),), FS.File) if ui: if qtdebug: - print "scons: qt: found .ui file of header" #% (str(h), str(cpp)) + print("scons: qt: found .ui file of header") #% (str(h), str(cpp)) #h_contents = comment.sub('', h.get_contents()) break @@ -315,18 +315,18 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt h = find_file(hname, (cpp.get_dir(),), FS.File) if h: if qtdebug: - print "scons: qt: Scanning '%s' (header of '%s')" % (str(h), str(cpp)) + print("scons: qt: Scanning '%s' (header of '%s')" % (str(h), str(cpp))) #h_contents = comment.sub('', h.get_contents()) h_contents = h.get_contents() break if not h and qtdebug: - print "scons: qt: no header for '%s'." % (str(cpp)) + print("scons: qt: no header for '%s'." % (str(cpp))) if h and q_object_search.search(h_contents): - # h file with the Q_OBJECT macro found -> add .moc or _moc.cpp file + # h file with the TQ_OBJECT macro found -> add .moc or _moc.cpp file moc_cpp = None - if env.has_key('NOMOCSCAN'): + if 'NOMOCSCAN' in env: moc_cpp = env.Moc(h) else: reg = '\n\s*#include\s*("|<)'+splitext(cpp.name)[0]+'.moc("|>)' @@ -338,12 +338,12 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt moc_o = objBuilder(moc_cpp) out_sources.append(moc_o) if qtdebug: - print "scons: qt: found Q_OBJECT macro in '%s', moc'ing to '%s'" % (str(h), str(moc_cpp[0])) + print("scons: qt: found TQ_OBJECT macro in '%s', moc'ing to '%s'" % (str(h), str(moc_cpp[0]))) if cpp and q_object_search.search(cpp_contents): - print "error, bksys cannot handle cpp files with Q_OBJECT classes" - print "if you are sure this is a feature worth the effort, " - print "report this to the authors tnagyemail-mail yahoo.fr" + print("error, bksys cannot handle cpp files with TQ_OBJECT classes") + print("if you are sure this is a feature worth the effort, ") + print("report this to the authors tnagyemail-mail yahoo.fr") # restore the original env attributes (FIXME) objBuilder.env = objBuilderEnv @@ -392,7 +392,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt opts.Update(env) # reconfigure when things are missing - if not env['HELP'] and (env['_CONFIGURE'] or not env.has_key('TQTDIR') or not env.has_key('TDEDIR')): + if not env['HELP'] and (env['_CONFIGURE'] or 'TQTDIR' not in env or 'TDEDIR' not in env): detect_kde(env) # finally save the configuration to the cache file @@ -501,7 +501,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt if len(source) <2: if not os.path.isfile(str(source[0])): - print RED+'kcfg file given'+str(source[0])+' does not exist !'+NORMAL + print(RED+'kcfg file given'+str(source[0])+' does not exist !'+NORMAL) return target, source kfcgfilename="" kcfgFileDeclRx = re.compile("^[fF]ile\s*=\s*(.+)\s*$") @@ -523,7 +523,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt def dcopGenerator(target, source, env, for_signature): act=[] act.append('dcopidl '+source[0].path+' > '+target[1].path+'|| ( rm -f '+target[1].path+' ; false)') - act.append('dcopidl2cpp --c++-suffix cpp --no-Q_SIGNALS --no-stub '+target[1].path) + act.append('dcopidl2cpp --c++-suffix cpp --no-signals --no-stub '+target[1].path) return act def dcopEmitter(target, source, env): @@ -604,7 +604,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt ## return a list of things def make_list(e): - if type(e) is types.ListType: + if type(e) is list: return e else: return e.split() @@ -650,13 +650,13 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt for file in ui_files: for ofile in other_files: if ofile == file: - print RED+"WARNING: You have included "+file+".ui and another file of the same prefix"+NORMAL - print "Files generated by uic (file.h, file.cpp must not be included" + print(RED+"WARNING: You have included "+file+".ui and another file of the same prefix"+NORMAL) + print("Files generated by uic (file.h, file.cpp must not be included") for file in kcfg_files: for ofile in other_files: if ofile == file: - print RED+"WARNING: You have included "+file+".kcfg and another file of the same prefix"+NORMAL - print "Files generated by tdeconfig_compiler (settings.h, settings.cpp) must not be included" + print(RED+"WARNING: You have included "+file+".kcfg and another file of the same prefix"+NORMAL) + print("Files generated by tdeconfig_compiler (settings.h, settings.cpp) must not be included") return src @@ -670,8 +670,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt return basedir=env['DESTDIR'] if len(restype)>0: - if not lenv.has_key(restype): - print RED+"unknown resource type "+restype+NORMAL + if restype not in lenv: + print(RED+"unknown resource type "+restype+NORMAL) else: basedir += lenv[restype]+'/' #print file # <- useful to trace stuff :) @@ -684,8 +684,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt return basedir=env['DESTDIR'] if len(restype)>0: - if not lenv.has_key(restype): - print RED+"unknown resource type "+restype+NORMAL + if restype not in lenv: + print(RED+"unknown resource type "+restype+NORMAL) else: basedir += lenv[restype]+'/' install_list = env.InstallAs(basedir+destfile, file) @@ -697,7 +697,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt The program is installed except if one sets env['NOAUTOINSTALL'] """ src = KDEfiles(lenv, target, source) program_list = lenv.Program(target, src) - if not lenv.has_key('NOAUTOINSTALL'): + if 'NOAUTOINSTALL' not in lenv: KDEinstall(lenv, 'KDEBIN', '', target) return program_list @@ -708,7 +708,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt lenv['LIBPREFIX']=libprefix library_list = lenv.SharedLibrary(target, src) lafile_list = lenv.LaFile(target, library_list) - if not lenv.has_key('NOAUTOINSTALL'): + if 'NOAUTOINSTALL' not in lenv: install_dir = 'KDEMODULE' if kdelib==1: install_dir = 'KDELIBPATH' @@ -800,13 +800,13 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt filename = lst[ len(lst) - 1 ] tmp = filename.split('-') if len(tmp)!=3: - print RED+'WARNING: icon filename has unknown format: '+iconfile+NORMAL + print(RED+'WARNING: icon filename has unknown format: '+iconfile+NORMAL) continue [icon_dir, icon_type, icon_filename]=tmp try: destfile = '%s/%s/%s/%s' % (lenv['KDEICONS'], dir_dic[icon_dir], type_dic[icon_type], icon_filename) except KeyError: - print RED+'WARNING: unknown icon type: '+iconfile+NORMAL + print(RED+'WARNING: unknown icon type: '+iconfile+NORMAL) continue ## Do not use KDEinstallas here, as parsing from an ide will be necessary if env['_INSTALL']: diff --git a/parts/appwizard/filepropspage.h b/parts/appwizard/filepropspage.h index 2539fd79..c75aa1b1 100644 --- a/parts/appwizard/filepropspage.h +++ b/parts/appwizard/filepropspage.h @@ -19,7 +19,7 @@ class ClassFileProp { class FilePropsPage : public FilePropsPageBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/appwizard/filepropspagebase.ui b/parts/appwizard/filepropspagebase.ui index 00d7f677..11c20e9e 100644 --- a/parts/appwizard/filepropspagebase.ui +++ b/parts/appwizard/filepropspagebase.ui @@ -150,10 +150,10 @@ <tabstop>baseclass_edit</tabstop> <tabstop>implfile_edit</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotSelectionChanged()</slot> <slot>slotClassnameChanged(const TQString&)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp index cbe5bec2..3a2c7c11 100644 --- a/parts/appwizard/importdlg.cpp +++ b/parts/appwizard/importdlg.cpp @@ -86,12 +86,12 @@ ImportDialog::ImportDialog(AppWizardPart *part, TQWidget *parent, const char *na infrastructureBox->setEnabled(false); setProjectType("c"); - connect( name_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotProjectNameChanged( const TQString & ) ) ); + connect( name_edit, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotProjectNameChanged( const TQString & ) ) ); // scanAvailableVCS(); - connect( fetchModuleButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotFetchModulesFromRepository()) ); - connect(urlinput_edit, TQT_SIGNAL(urlSelected(const TQString& )), this, TQT_SLOT(dirChanged())); - connect(urlinput_edit, TQT_SIGNAL(returnPressed(const TQString& )), this, TQT_SLOT(dirChanged())); + connect( fetchModuleButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotFetchModulesFromRepository()) ); + connect(urlinput_edit, TQ_SIGNAL(urlSelected(const TQString& )), this, TQ_SLOT(dirChanged())); + connect(urlinput_edit, TQ_SIGNAL(returnPressed(const TQString& )), this, TQ_SLOT(dirChanged())); slotProjectNameChanged( name_edit->text() ); } @@ -417,7 +417,7 @@ void ImportDialog::scanAutomakeProject(const TQString &dirName) TQFile configIn(dirName+"/configure.in"); TQFile configAc(dirName+"/configure.ac"); if (configInIn.open(IO_ReadOnly)){ - cstream.setDevice(TQT_TQIODEVICE(&configInIn)); + cstream.setDevice(&configInIn); while (!cstream.atEnd()) { TQString line = cstream.readLine(); if ( ac_init.search(line) >= 0){ @@ -437,11 +437,11 @@ void ImportDialog::scanAutomakeProject(const TQString &dirName) } if (configIn.open(IO_ReadOnly)){ - cstream.setDevice(TQT_TQIODEVICE(&configIn)); + cstream.setDevice(&configIn); } else{ if (configAc.open(IO_ReadOnly)){ - cstream.setDevice(TQT_TQIODEVICE(&configAc)); + cstream.setDevice(&configAc); } else{ return; @@ -531,8 +531,8 @@ void ImportDialog::slotFetchModulesFromRepository() setCursor( KCursor::waitCursor() ); // setEnabled( false ); - connect( vcs, TQT_SIGNAL(finishedFetching(TQString)), - this, TQT_SLOT(slotFinishedCheckout(TQString)) ); + connect( vcs, TQ_SIGNAL(finishedFetching(TQString)), + this, TQ_SLOT(slotFinishedCheckout(TQString)) ); //restore cursor if we can't fetch repository if ( !vcs->fetchFromRepository() ) diff --git a/parts/appwizard/importdlg.h b/parts/appwizard/importdlg.h index 5b334668..3ab2e71a 100644 --- a/parts/appwizard/importdlg.h +++ b/parts/appwizard/importdlg.h @@ -27,7 +27,7 @@ struct InfrastructureCmd{ class ImportDialog : public ImportDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/appwizard/importdlgbase.ui b/parts/appwizard/importdlgbase.ui index aa778f00..c18beff7 100644 --- a/parts/appwizard/importdlgbase.ui +++ b/parts/appwizard/importdlgbase.ui @@ -346,12 +346,12 @@ will be the author, everything between <tabstop>ok_button</tabstop> <tabstop>cancel_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">dirButtonClicked()</slot> <slot>dirChanged()</slot> <slot access="protected">projectTypeChanged(const TQString &)</slot> <slot access="protected">projectTypeChanged(int)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/parts/appwizard/imports/CMakeLists.txt b/parts/appwizard/imports/CMakeLists.txt index b9abbf17..76d6e153 100644 --- a/parts/appwizard/imports/CMakeLists.txt +++ b/parts/appwizard/imports/CMakeLists.txt @@ -13,7 +13,7 @@ tde_create_translated_desktop( SOURCE c-auto cpp-auto fortran-auto java-auto kde gnome c cpp fortran python php perl java java-ant qttmake qtqmake - qt4qmake ruby pascal ada + ruby pascal ada DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/imports PO_DIR tdevelop-desktops ) @@ -23,6 +23,6 @@ install( FILES java-auto.kdevelop kde.kdevelop gnome.kdevelop c.kdevelop cpp.kdevelop fortran.kdevelop python.kdevelop php.kdevelop perl.kdevelop java.kdevelop java-ant.kdevelop - qttmake.kdevelop qtqmake.kdevelop qt4qmake.kdevelop + qttmake.kdevelop qtqmake.kdevelop ruby.kdevelop pascal.kdevelop ada.kdevelop DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/importfiles ) diff --git a/parts/appwizard/imports/Makefile.am b/parts/appwizard/imports/Makefile.am index 5047de18..309293d4 100644 --- a/parts/appwizard/imports/Makefile.am +++ b/parts/appwizard/imports/Makefile.am @@ -2,6 +2,6 @@ appwizarddatadir = ${kde_datadir}/kdevappwizard importsdir = ${appwizarddatadir}/imports importfilesdir = ${appwizarddatadir}/importfiles -imports_DATA = c-auto cpp-auto fortran-auto java-auto kde gnome c cpp fortran python php perl java java-ant qttmake qtqmake qt4qmake ruby pascal ada -importfiles_DATA = c-auto.kdevelop cpp-auto.kdevelop fortran-auto.kdevelop java-auto.kdevelop kde.kdevelop gnome.kdevelop c.kdevelop cpp.kdevelop fortran.kdevelop python.kdevelop php.kdevelop perl.kdevelop java.kdevelop java-ant.kdevelop qttmake.kdevelop qtqmake.kdevelop qt4qmake.kdevelop ruby.kdevelop pascal.kdevelop ada.kdevelop +imports_DATA = c-auto cpp-auto fortran-auto java-auto kde gnome c cpp fortran python php perl java java-ant qttmake qtqmake ruby pascal ada +importfiles_DATA = c-auto.kdevelop cpp-auto.kdevelop fortran-auto.kdevelop java-auto.kdevelop kde.kdevelop gnome.kdevelop c.kdevelop cpp.kdevelop fortran.kdevelop python.kdevelop php.kdevelop perl.kdevelop java.kdevelop java-ant.kdevelop qttmake.kdevelop qtqmake.kdevelop ruby.kdevelop pascal.kdevelop ada.kdevelop diff --git a/parts/appwizard/imports/qt4qmake b/parts/appwizard/imports/qt4qmake deleted file mode 100644 index 56f22885..00000000 --- a/parts/appwizard/imports/qt4qmake +++ /dev/null @@ -1,3 +0,0 @@ -# TDE Config File -[General] -Comment=Qt4 C++ Application (QMake4 based) diff --git a/parts/appwizard/imports/qt4qmake.kdevelop b/parts/appwizard/imports/qt4qmake.kdevelop deleted file mode 100644 index dedc866b..00000000 --- a/parts/appwizard/imports/qt4qmake.kdevelop +++ /dev/null @@ -1,80 +0,0 @@ -<?xml version="1.0"?> -<kdevelop> - <general> - <author>%{AUTHOR}</author> - <email>%{EMAIL}</email> - <version>%{VERSION}</version> - <projectmanagement>KDevTrollProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>Qt</keyword> - </keywords> - </general> - <kdevfileview> - <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*" name="Others" /> - </groups> - </kdevfileview> - <kdevdoctreeview> - <ignoretocs> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>w3c-dom-level2-html</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>kde2book</toc> - <toc>opengl</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>qt-kdev3</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>stl</toc> - <toc>w3c-svg</toc> - <toc>sw</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - </ignoretocs> - <ignoredoxygen> - <toc>KDE Libraries (Doxygen)</toc> - </ignoredoxygen> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell/> - </general> - </kdevdebugger> - <kdevcppsupport> - <qt> - <version>4</version> - <used>true</used> - <includestyle>4</includestyle> - <designerintegration>ExternalDesigner</designerintegration> - </qt> - </kdevcppsupport> - <kdevfilecreate> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - <type ext="qrc" /> - </useglobaltypes> - </kdevfilecreate> -</kdevelop> diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp index 6f9198b0..af16f84f 100644 --- a/parts/astyle/astyle_part.cpp +++ b/parts/astyle/astyle_part.cpp @@ -50,13 +50,13 @@ AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &) setXMLFile("kdevpart_astyle.rc"); - formatTextAction = new TDEAction(i18n("&Reformat Source"), 0, this, TQT_SLOT(beautifySource()), actionCollection(), "edit_astyle"); + formatTextAction = new TDEAction(i18n("&Reformat Source"), 0, this, TQ_SLOT(beautifySource()), actionCollection(), "edit_astyle"); formatTextAction->setEnabled(false); formatTextAction->setToolTip(i18n("Reformat source")); formatTextAction->setWhatsThis(i18n("<b>Reformat source</b><p>Source reformatting functionality using <b>astyle</b> library. " "Also available in <b>New Class</b> and <b>Subclassing</b> wizards.")); - formatFileAction = new TDEAction(i18n("Format files"), 0, this, TQT_SLOT(formatFilesSelect()), actionCollection(), "tools_astyle"); + formatFileAction = new TDEAction(i18n("Format files"), 0, this, TQ_SLOT(formatFilesSelect()), actionCollection(), "tools_astyle"); formatFileAction->setEnabled(false); formatFileAction->setToolTip(i18n("Format files")); formatFileAction->setWhatsThis(i18n("<b>Fomat files</b><p>Formatting functionality using <b>astyle</b> library. " @@ -68,11 +68,11 @@ AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &) m_configProxy->createProjectConfigPage(i18n("Formatting"), PROJECTDOC_OPTIONS, info()->icon()); - connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase* ,TQWidget*,unsigned int)), this, TQT_SLOT(insertConfigWidget(const KDialogBase*,TQWidget*,unsigned int))); + connect(m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase* ,TQWidget*,unsigned int)), this, TQ_SLOT(insertConfigWidget(const KDialogBase*,TQWidget*,unsigned int))); - connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(activePartChanged(KParts::Part*))); + connect(partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SLOT(activePartChanged(KParts::Part*))); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); loadGlobal(); //use the globals first, project level will override later.. @@ -249,13 +249,13 @@ void AStylePart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsi case GLOBALDOC_OPTIONS: { AStyleWidget *w = new AStyleWidget(this, true, page, "astyle config widget"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } case PROJECTDOC_OPTIONS: { AStyleWidget *w = new AStyleWidget(this, false, page, "astyle config widget"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } } @@ -399,7 +399,7 @@ void AStylePart::contextMenu(TQPopupMenu *popup, const Context *context) if (context->hasType( Context::EditorContext )) { popup->insertSeparator(); - int id = popup->insertItem( i18n("Format selection"), this, TQT_SLOT(beautifySource()) ); + int id = popup->insertItem( i18n("Format selection"), this, TQ_SLOT(beautifySource()) ); popup->TQMenuData::setWhatsThis(id, i18n("<b>Format</b><p>Formats the current selection, if possible")); } else if ( context->hasType( Context::FileContext )){ @@ -407,7 +407,7 @@ void AStylePart::contextMenu(TQPopupMenu *popup, const Context *context) m_urls = ctx->urls(); popup->insertSeparator(); - int id = popup->insertItem( i18n("Format files"), this, TQT_SLOT(formatFiles()) ); + int id = popup->insertItem( i18n("Format files"), this, TQ_SLOT(formatFiles()) ); popup->TQMenuData::setWhatsThis(id, i18n("<b>Format files</b><p>Formats selected files if possible")); } diff --git a/parts/astyle/astyle_part.h b/parts/astyle/astyle_part.h index f5a79485..05f94bb7 100644 --- a/parts/astyle/astyle_part.h +++ b/parts/astyle/astyle_part.h @@ -22,7 +22,7 @@ class ConfigWidgetProxy; class AStylePart : public KDevSourceFormatter { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/astyle/astyle_widget.cpp b/parts/astyle/astyle_widget.cpp index 6959fe7b..67cf8d5c 100644 --- a/parts/astyle/astyle_widget.cpp +++ b/parts/astyle/astyle_widget.cpp @@ -17,40 +17,40 @@ AStyleWidget::AStyleWidget(AStylePart * part, bool global, TQWidget *parent, con : AStyleConfig(parent, name), m_part(part), isGlobalWidget(global) { // which style changed - disable the other pages. - connect(StyleGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(styleChanged())); - connect(ConfigTabs, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(styleChanged()) ); - - connect(FillingGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(styleChanged())); - connect(Fill_ForceTabs, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Fill_TabCount, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged())); - connect(Fill_SpaceCount, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged())); - - connect(BracketGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(styleChanged())); - connect(Brackets_CloseHeaders, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - - connect(Indent_Switches, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Cases, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Classes, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Brackets, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Namespaces, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Labels, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Blocks, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Indent_Preprocessors, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - - connect(Continue_MaxStatement, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged())); - connect(Continue_MinConditional, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged())); - - connect(Block_Break, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Block_BreakAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Block_IfElse, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - - connect(Pad_ParenthesesIn, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Pad_ParenthesesOut, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Pad_ParenthesesUn, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Pad_Operators, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - - connect(Keep_Statements, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - connect(Keep_Blocks, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); + connect(StyleGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(styleChanged())); + connect(ConfigTabs, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(styleChanged()) ); + + connect(FillingGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(styleChanged())); + connect(Fill_ForceTabs, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Fill_TabCount, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(styleChanged())); + connect(Fill_SpaceCount, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(styleChanged())); + + connect(BracketGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(styleChanged())); + connect(Brackets_CloseHeaders, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + + connect(Indent_Switches, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Cases, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Classes, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Brackets, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Namespaces, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Labels, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Blocks, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Indent_Preprocessors, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + + connect(Continue_MaxStatement, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(styleChanged())); + connect(Continue_MinConditional, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(styleChanged())); + + connect(Block_Break, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Block_BreakAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Block_IfElse, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + + connect(Pad_ParenthesesIn, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Pad_ParenthesesOut, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Pad_ParenthesesUn, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Pad_Operators, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + + connect(Keep_Statements, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); + connect(Keep_Blocks, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged())); TQStringVariantMap option; diff --git a/parts/astyle/astyle_widget.h b/parts/astyle/astyle_widget.h index 91963e54..5ebb70b0 100644 --- a/parts/astyle/astyle_widget.h +++ b/parts/astyle/astyle_widget.h @@ -9,7 +9,7 @@ class KDevPart; class AStyleWidget : public AStyleConfig { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/astyle/astyleconfig.ui b/parts/astyle/astyleconfig.ui index 73cf691a..28a3432e 100644 --- a/parts/astyle/astyleconfig.ui +++ b/parts/astyle/astyleconfig.ui @@ -1324,9 +1324,9 @@ multiple single-statement lines.</string> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot>allFiles()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp index 04fee8d7..a22756df 100644 --- a/parts/bookmarks/bookmarks_part.cpp +++ b/parts/bookmarks/bookmarks_part.cpp @@ -64,19 +64,19 @@ BookmarksPart::BookmarksPart(TQObject *parent, const char *name, const TQStringL _editorMap.setAutoDelete( true ); _settingMarks = false; - connect( partController(), TQT_SIGNAL( partAdded( KParts::Part * ) ), this, TQT_SLOT( partAdded( KParts::Part * ) ) ); + connect( partController(), TQ_SIGNAL( partAdded( KParts::Part * ) ), this, TQ_SLOT( partAdded( KParts::Part * ) ) ); _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("Bookmarks"), BOOKMARKSETTINGSPAGE, info()->icon() ); - connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - connect( _widget, TQT_SIGNAL( removeAllBookmarksForURL( const KURL & ) ), - this, TQT_SLOT( removeAllBookmarksForURL( const KURL & ) ) ); - connect( _widget, TQT_SIGNAL( removeBookmarkForURL( const KURL &, int ) ), - this, TQT_SLOT( removeBookmarkForURL( const KURL &, int ) ) ); + connect( _widget, TQ_SIGNAL( removeAllBookmarksForURL( const KURL & ) ), + this, TQ_SLOT( removeAllBookmarksForURL( const KURL & ) ) ); + connect( _widget, TQ_SIGNAL( removeBookmarkForURL( const KURL &, int ) ), + this, TQ_SLOT( removeBookmarkForURL( const KURL &, int ) ) ); - connect( _marksChangeTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( marksChanged() ) ); + connect( _marksChangeTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( marksChanged() ) ); _config = new BookmarksConfig; _config->readConfig(); @@ -112,10 +112,10 @@ void BookmarksPart::partAdded( KParts::Part * part ) // connect to this editor KTextEditor::Document * doc = static_cast<KTextEditor::Document*>( ro_part ); - connect( doc, TQT_SIGNAL( marksChanged() ), this, TQT_SLOT( marksEvent() ) ); + connect( doc, TQ_SIGNAL( marksChanged() ), this, TQ_SLOT( marksEvent() ) ); // workaround for a katepart oddity where it drops all bookmarks on 'reload' - connect( doc, TQT_SIGNAL( completed() ), this, TQT_SLOT( reload() ) ); + connect( doc, TQ_SIGNAL( completed() ), this, TQ_SLOT( reload() ) ); } } } @@ -124,7 +124,7 @@ void BookmarksPart::reload() { //kdDebug(0) << "BookmarksPart::reload()" << endl; - TQObject * senderobj = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() )); + TQObject * senderobj = const_cast<TQObject*>(sender()); if ( KParts::ReadOnlyPart * ro_part = dynamic_cast<KParts::ReadOnlyPart *>( senderobj ) ) { if ( partIsSane( ro_part ) ) @@ -140,7 +140,7 @@ void BookmarksPart::marksEvent() if ( ! _settingMarks ) { - TQObject * senderobj = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() )); + TQObject * senderobj = const_cast<TQObject*>(sender()); KParts::ReadOnlyPart * ro_part = dynamic_cast<KParts::ReadOnlyPart *>( senderobj ); if ( partIsSane( ro_part ) && !_dirtyParts.contains( ro_part ) ) @@ -203,7 +203,7 @@ void BookmarksPart::restorePartialProjectSession( const TQDomElement * el ) TQString line = mark.attribute( "line" ); if ( line != TQString() ) { - data->marks.append( tqMakePair( line.toInt(), TQString() ) ); + data->marks.append( qMakePair( line.toInt(), TQString() ) ); } mark = mark.nextSibling().toElement(); } @@ -409,7 +409,7 @@ EditorData * BookmarksPart::storeBookmarksForURL( KParts::ReadOnlyPart * ro_part if ( it.current()->type & KTextEditor::MarkInterface::markType01 ) { int line = it.current()->line; - data->marks.append( tqMakePair( line, TQString() ) ); + data->marks.append( qMakePair( line, TQString() ) ); } ++it; } @@ -490,7 +490,7 @@ void BookmarksPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page if ( pagenumber == BOOKMARKSETTINGSPAGE ) { BookmarkSettings * w = new BookmarkSettings( this, page ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(slotAccept()) ); } } diff --git a/parts/bookmarks/bookmarks_part.h b/parts/bookmarks/bookmarks_part.h index ae74bf63..b0b58b6b 100644 --- a/parts/bookmarks/bookmarks_part.h +++ b/parts/bookmarks/bookmarks_part.h @@ -40,7 +40,7 @@ class TQDomElement; class BookmarksPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/bookmarks/bookmarks_settings.h b/parts/bookmarks/bookmarks_settings.h index a28f424e..278fa637 100644 --- a/parts/bookmarks/bookmarks_settings.h +++ b/parts/bookmarks/bookmarks_settings.h @@ -18,7 +18,7 @@ class BookmarksPart; class BookmarkSettings : public BookmarkSettingsBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp index ac14328b..33354269 100644 --- a/parts/bookmarks/bookmarks_widget.cpp +++ b/parts/bookmarks/bookmarks_widget.cpp @@ -150,10 +150,10 @@ BookmarksWidget::BookmarksWidget(BookmarksPart *part) setAllColumnsShowFocus( true ); // setSortColumn( -1 ); - connect( this, TQT_SIGNAL( executed( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), - this, TQT_SLOT( popupMenu(TQListViewItem *, const TQPoint & , int ) ) ); + connect( this, TQ_SIGNAL( executed( TQListViewItem * ) ), this, TQ_SLOT( itemClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), this, TQ_SLOT( itemClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), + this, TQ_SLOT( popupMenu(TQListViewItem *, const TQPoint & , int ) ) ); } @@ -270,18 +270,18 @@ void BookmarksWidget::popupMenu( TQListViewItem * item, const TQPoint & p, int ) popup.insertTitle( _selectedItem->url().fileName() + i18n(", line ") + TQString::number( _selectedItem->line() +1 ) ); - popup.insertItem( i18n("Remove This Bookmark"), this, TQT_SLOT( doEmitRemoveBookMark() ) ); + popup.insertItem( i18n("Remove This Bookmark"), this, TQ_SLOT( doEmitRemoveBookMark() ) ); } else { popup.insertTitle( _selectedItem->url().fileName() + i18n( ", All" ) ); - popup.insertItem( i18n("Remove These Bookmarks"), this, TQT_SLOT( doEmitRemoveBookMark() ) ); + popup.insertItem( i18n("Remove These Bookmarks"), this, TQ_SLOT( doEmitRemoveBookMark() ) ); } popup.insertSeparator(); - popup.insertItem( i18n( "Collapse All" ), this, TQT_SLOT(collapseAll()) ); - popup.insertItem( i18n( "Expand All" ), this, TQT_SLOT(expandAll()) ); + popup.insertItem( i18n( "Collapse All" ), this, TQ_SLOT(collapseAll()) ); + popup.insertItem( i18n( "Expand All" ), this, TQ_SLOT(expandAll()) ); popup.exec(p); } diff --git a/parts/bookmarks/bookmarks_widget.h b/parts/bookmarks/bookmarks_widget.h index 79df9593..3246cec0 100644 --- a/parts/bookmarks/bookmarks_widget.h +++ b/parts/bookmarks/bookmarks_widget.h @@ -28,7 +28,7 @@ class BookmarksConfig; class BookmarksWidget : public TDEListView, public TQToolTip { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/classview/classtooldlg.cpp b/parts/classview/classtooldlg.cpp index c0cc21a2..853eb417 100644 --- a/parts/classview/classtooldlg.cpp +++ b/parts/classview/classtooldlg.cpp @@ -106,21 +106,21 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part ) layout->addWidget(class_tree, 10); - connect( class_combo, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotClassComboChoice(const TQString&)) ); - connect( close_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClose()) ); - connect( access_combo, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotAccessComboChoice(const TQString&)) ); - connect( parents_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewParents())); - connect( children_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewChildren())); - connect( clients_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewClients())); - connect( suppliers_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewSuppliers())); - connect( methods_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewMethods())); - connect( attributes_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewAttributes())); - - connect( part, TQT_SIGNAL(setLanguageSupport(KDevLanguageSupport*)), - this, TQT_SLOT(setLanguageSupport(KDevLanguageSupport*)) ); + connect( class_combo, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotClassComboChoice(const TQString&)) ); + connect( close_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClose()) ); + connect( access_combo, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotAccessComboChoice(const TQString&)) ); + connect( parents_button, TQ_SIGNAL(clicked()), TQ_SLOT(viewParents())); + connect( children_button, TQ_SIGNAL(clicked()), TQ_SLOT(viewChildren())); + connect( clients_button, TQ_SIGNAL(clicked()), TQ_SLOT(viewClients())); + connect( suppliers_button, TQ_SIGNAL(clicked()), TQ_SLOT(viewSuppliers())); + connect( methods_button, TQ_SIGNAL(clicked()), TQ_SLOT(viewMethods())); + connect( attributes_button, TQ_SIGNAL(clicked()), TQ_SLOT(viewAttributes())); + + connect( part, TQ_SIGNAL(setLanguageSupport(KDevLanguageSupport*)), + this, TQ_SLOT(setLanguageSupport(KDevLanguageSupport*)) ); m_part->registerClassToolDialog(this); } @@ -136,7 +136,7 @@ void ClassToolDialog::setLanguageSupport(KDevLanguageSupport *ls) { if (ls) { disconnect(ls, 0, this, 0); - connect(ls, TQT_SIGNAL(updatedSourceInfo()), this, TQT_SLOT(refresh())); + connect(ls, TQ_SIGNAL(updatedSourceInfo()), this, TQ_SLOT(refresh())); } else refresh(); @@ -240,7 +240,7 @@ void ClassToolDialog::slotAccessComboChoice(const TQString &str) void ClassToolDialog::slotClose() { delete this; - // TQTimer::singleShot(0, this, TQT_SLOT(delayedClose())); + // TQTimer::singleShot(0, this, TQ_SLOT(delayedClose())); } diff --git a/parts/classview/classtooldlg.h b/parts/classview/classtooldlg.h index d143e66e..958cb9b5 100644 --- a/parts/classview/classtooldlg.h +++ b/parts/classview/classtooldlg.h @@ -29,7 +29,7 @@ class ParsedClass; class ClassToolDialog : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/classview/classtoolwidget.h b/parts/classview/classtoolwidget.h index 8fd6b974..cfe2d603 100644 --- a/parts/classview/classtoolwidget.h +++ b/parts/classview/classtoolwidget.h @@ -19,7 +19,7 @@ class ClassToolWidget : public ClassTreeBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp index 9e052418..aeb7f11a 100644 --- a/parts/classview/classtreebase.cpp +++ b/parts/classview/classtreebase.cpp @@ -40,9 +40,9 @@ TDEPopupMenu *ClassTreeItem::createPopup() TDEPopupMenu *popup = new TDEPopupMenu(); if (features & KDevLanguageSupport::Declarations) - popup->insertItem( i18n("Go to Declaration"), classTree(), TQT_SLOT(slotGotoDeclaration()) ); + popup->insertItem( i18n("Go to Declaration"), classTree(), TQ_SLOT(slotGotoDeclaration()) ); if (m_item->itemType() == PIT_METHOD) - popup->insertItem( i18n("Go to Definition"), classTree(), TQT_SLOT(slotGotoImplementation()) ); + popup->insertItem( i18n("Go to Definition"), classTree(), TQ_SLOT(slotGotoImplementation()) ); TQString title; switch(m_item->itemType()) { @@ -52,13 +52,13 @@ TDEPopupMenu *ClassTreeItem::createPopup() bool hasAddMethod = features & KDevLanguageSupport::AddMethod; bool hasAddAttribute = features & KDevLanguageSupport::AddAttribute; if (hasAddMethod) - popup->insertItem( i18n("Add Method..."), classTree(), TQT_SLOT(slotAddMethod())); + popup->insertItem( i18n("Add Method..."), classTree(), TQ_SLOT(slotAddMethod())); if (hasAddAttribute) - popup->insertItem( i18n("Add Attribute..."), classTree(), TQT_SLOT(slotAddAttribute())); + popup->insertItem( i18n("Add Attribute..."), classTree(), TQ_SLOT(slotAddAttribute())); popup->insertSeparator(); - popup->insertItem( i18n("Parent Classes..."), classTree(), TQT_SLOT(slotClassBaseClasses())); - popup->insertItem( i18n("Child Classes..."), classTree(), TQT_SLOT(slotClassDerivedClasses())); - popup->insertItem( i18n("Class Tool..."), classTree(), TQT_SLOT(slotClassTool())); + popup->insertItem( i18n("Parent Classes..."), classTree(), TQ_SLOT(slotClassBaseClasses())); + popup->insertItem( i18n("Child Classes..."), classTree(), TQ_SLOT(slotClassDerivedClasses())); + popup->insertItem( i18n("Class Tool..."), classTree(), TQ_SLOT(slotClassTool())); } break; case PIT_STRUCT: @@ -459,14 +459,14 @@ ClassTreeBase::ClassTreeBase(ClassViewPart *part, TQWidget *parent, const char * (void) new ClassToolTip(this); - connect( this, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotItemPressed(int, TQListViewItem*)) ); - connect( this, TQT_SIGNAL(returnPressed( TQListViewItem*)), - TQT_SLOT( slotItemExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotItemExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotItemPressed(int, TQListViewItem*)) ); + connect( this, TQ_SIGNAL(returnPressed( TQListViewItem*)), + TQ_SLOT( slotItemExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&)) ); m_part = part; } diff --git a/parts/classview/classtreebase.h b/parts/classview/classtreebase.h index 413f288b..a73aede7 100644 --- a/parts/classview/classtreebase.h +++ b/parts/classview/classtreebase.h @@ -29,7 +29,7 @@ class TDEPopupMenu; class ClassTreeBase : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp index d068adaa..93110a54 100644 --- a/parts/classview/classviewpart.cpp +++ b/parts/classview/classviewpart.cpp @@ -161,11 +161,11 @@ ClassViewPart::ClassViewPart(TQObject *parent, const char *name, const TQStringL TQWhatsThis::add(m_widget, i18n("<b>Class browser</b><p>" "The class browser shows all namespaces, classes and namespace and class members in a project.")); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); - connect( core(), TQT_SIGNAL(languageChanged()), this, TQT_SLOT(slotProjectOpened()) ); - connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(activePartChanged(KParts::Part*))); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotProjectClosed()) ); + connect( core(), TQ_SIGNAL(languageChanged()), this, TQ_SLOT(slotProjectOpened()) ); + connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(activePartChanged(KParts::Part*))); } bool ClassViewPart::jumpedToItem( ItemDom item ) { @@ -182,34 +182,34 @@ ClassViewPart::~ClassViewPart() void ClassViewPart::slotProjectOpened( ) { - connect( languageSupport(), TQT_SIGNAL(updatedSourceInfo()), navigator, TQT_SLOT(refresh()) ); - connect( languageSupport(), TQT_SIGNAL(addedSourceInfo(const TQString& )), navigator, TQT_SLOT(addFile(const TQString& ))); + connect( languageSupport(), TQ_SIGNAL(updatedSourceInfo()), navigator, TQ_SLOT(refresh()) ); + connect( languageSupport(), TQ_SIGNAL(addedSourceInfo(const TQString& )), navigator, TQ_SLOT(addFile(const TQString& ))); navigator->refresh(); } void ClassViewPart::slotProjectClosed( ) { // navigator->refresh(); -// disconnect( languageSupport(), TQT_SIGNAL(updatedSourceInfo()), navigator, TQT_SLOT(refresh()) ); +// disconnect( languageSupport(), TQ_SIGNAL(updatedSourceInfo()), navigator, TQ_SLOT(refresh()) ); } void ClassViewPart::setupActions( ) { m_functionsnav = new TDEListViewAction( new KComboView(true, 150, 0, "m_functionsnav_combo", new FunctionCompletion() ), i18n("Functions Navigation"), 0, 0, 0, actionCollection(), "functionsnav_combo", true ); - connect(m_functionsnav->view(), TQT_SIGNAL(activated(TQListViewItem*)), navigator, TQT_SLOT(selectFunctionNav(TQListViewItem*))); + connect(m_functionsnav->view(), TQ_SIGNAL(activated(TQListViewItem*)), navigator, TQ_SLOT(selectFunctionNav(TQListViewItem*))); // m_functionsnav->view()->setEditable(false); - connect(m_functionsnav->view(), TQT_SIGNAL(focusGranted()), navigator, TQT_SLOT(functionNavFocused())); - connect(m_functionsnav->view(), TQT_SIGNAL(focusLost()), navigator, TQT_SLOT(functionNavUnFocused())); + connect(m_functionsnav->view(), TQ_SIGNAL(focusGranted()), navigator, TQ_SLOT(functionNavFocused())); + connect(m_functionsnav->view(), TQ_SIGNAL(focusLost()), navigator, TQ_SLOT(functionNavUnFocused())); m_functionsnav->setToolTip(i18n("Functions in file")); m_functionsnav->setWhatsThis(i18n("<b>Function navigator</b><p>Navigates over functions contained in the file.")); // m_functionsnav->view()->setCurrentText(NAV_NODEFINITION); m_functionsnav->view()->setDefaultText(NAV_NODEFINITION); - new TDEAction( i18n("Focus Navigator"), 0, this, TQT_SLOT(slotFocusNavbar()), actionCollection(), "focus_navigator" ); + new TDEAction( i18n("Focus Navigator"), 0, this, TQ_SLOT(slotFocusNavbar()), actionCollection(), "focus_navigator" ); if (langHasFeature(KDevLanguageSupport::Classes)) { - TDEAction *ac = new TDEAction(i18n("Class Inheritance Diagram"), "view_tree", 0, this, TQT_SLOT(graphicalClassView()), actionCollection(), "inheritance_dia"); + TDEAction *ac = new TDEAction(i18n("Class Inheritance Diagram"), "view_tree", 0, this, TQ_SLOT(graphicalClassView()), actionCollection(), "inheritance_dia"); ac->setToolTip(i18n("Class inheritance diagram")); ac->setWhatsThis(i18n("<b>Class inheritance diagram</b><p>Displays inheritance relationship between classes in project. " "Note, it does not display classes outside inheritance hierarchy.")); @@ -242,8 +242,8 @@ void ClassViewPart::activePartChanged( KParts::Part * part) navigator->stopTimer(); if (m_activeView) { - disconnect(m_activeView, TQT_SIGNAL(cursorPositionChanged()), - navigator, TQT_SLOT(slotCursorPositionChanged())); + disconnect(m_activeView, TQ_SIGNAL(cursorPositionChanged()), + navigator, TQ_SLOT(slotCursorPositionChanged())); } kdDebug() << "ClassViewPart::activePartChanged()" << endl; @@ -267,8 +267,8 @@ void ClassViewPart::activePartChanged( KParts::Part * part) } if( m_activeViewCursor ) { - connect(m_activeView, TQT_SIGNAL(cursorPositionChanged()), - navigator, TQT_SLOT(slotCursorPositionChanged()) ); + connect(m_activeView, TQ_SIGNAL(cursorPositionChanged()), + navigator, TQ_SLOT(slotCursorPositionChanged()) ); } } void ClassViewPart::slotFocusNavbar() diff --git a/parts/classview/classviewpart.h b/parts/classview/classviewpart.h index 16e18def..19342916 100644 --- a/parts/classview/classviewpart.h +++ b/parts/classview/classviewpart.h @@ -54,7 +54,7 @@ class Navigator; class HierarchyDialog; class ClassViewPart : public Extensions::KDevCodeBrowserFrontend { - Q_OBJECT + TQ_OBJECT public: ClassViewPart(TQObject *parent, const char *name, const TQStringList &); diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp index 22b865ef..18a5d686 100644 --- a/parts/classview/classviewwidget.cpp +++ b/parts/classview/classviewwidget.cpp @@ -59,11 +59,11 @@ ClassViewWidget::ClassViewWidget( ClassViewPart * part ) m_projectItem = 0; - connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(slotExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotExecuted(TQListViewItem*)) ); - connect( m_part->core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); - connect( m_part->core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); - connect( m_part->core(), TQT_SIGNAL(languageChanged()), this, TQT_SLOT(slotProjectOpened()) ); + connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, TQ_SLOT(slotExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotExecuted(TQListViewItem*)) ); + connect( m_part->core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); + connect( m_part->core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotProjectClosed()) ); + connect( m_part->core(), TQ_SIGNAL(languageChanged()), this, TQ_SLOT(slotProjectOpened()) ); TQStringList lst; lst << i18n( "Group by Directories" ) << i18n( "Plain List" ) << i18n( "Java Like Mode" ); @@ -71,28 +71,28 @@ ClassViewWidget::ClassViewWidget( ClassViewPart * part ) m_actionViewMode->setItems( lst ); m_actionViewMode->setWhatsThis(i18n("<b>View mode</b><p>Class browser items can be grouped by directories, listed in a plain or java like view.")); - m_actionNewClass = new TDEAction( i18n("New Class..."), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotNewClass()), + m_actionNewClass = new TDEAction( i18n("New Class..."), TDEShortcut(), this, TQ_SLOT(slotNewClass()), m_part->actionCollection(), "classview_new_class" ); m_actionNewClass->setWhatsThis(i18n("<b>New class</b><p>Calls the <b>New Class</b> wizard.")); - m_actionCreateAccessMethods = new TDEAction( i18n("Create get/set Methods"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotCreateAccessMethods()), m_part->actionCollection(), "classview_create_access_methods" ); + m_actionCreateAccessMethods = new TDEAction( i18n("Create get/set Methods"), TDEShortcut(), this, TQ_SLOT(slotCreateAccessMethods()), m_part->actionCollection(), "classview_create_access_methods" ); - m_actionAddMethod = new TDEAction( i18n("Add Method..."), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddMethod()), + m_actionAddMethod = new TDEAction( i18n("Add Method..."), TDEShortcut(), this, TQ_SLOT(slotAddMethod()), m_part->actionCollection(), "classview_add_method" ); m_actionAddMethod->setWhatsThis(i18n("<b>Add method</b><p>Calls the <b>New Method</b> wizard.")); - m_actionAddAttribute = new TDEAction( i18n("Add Attribute..."), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddAttribute()), + m_actionAddAttribute = new TDEAction( i18n("Add Attribute..."), TDEShortcut(), this, TQ_SLOT(slotAddAttribute()), m_part->actionCollection(), "classview_add_attribute" ); m_actionAddAttribute->setWhatsThis(i18n("<b>Add attribute</b><p>Calls the <b>New Attribute</b> wizard.")); - m_actionOpenDeclaration = new TDEAction( i18n("Open Declaration"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotOpenDeclaration()), + m_actionOpenDeclaration = new TDEAction( i18n("Open Declaration"), TDEShortcut(), this, TQ_SLOT(slotOpenDeclaration()), m_part->actionCollection(), "classview_open_declaration" ); m_actionOpenDeclaration->setWhatsThis(i18n("<b>Open declaration</b><p>Opens a file where the selected item is declared and jumps to the declaration line.")); - m_actionOpenImplementation = new TDEAction( i18n("Open Implementation"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotOpenImplementation()), + m_actionOpenImplementation = new TDEAction( i18n("Open Implementation"), TDEShortcut(), this, TQ_SLOT(slotOpenImplementation()), m_part->actionCollection(), "classview_open_implementation" ); m_actionOpenImplementation->setWhatsThis(i18n("<b>Open implementation</b><p>Opens a file where the selected item is defined (implemented) and jumps to the definition line.")); - m_actionFollowEditor = new TDEToggleAction( i18n("Follow Editor"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" ); + m_actionFollowEditor = new TDEToggleAction( i18n("Follow Editor"), TDEShortcut(), this, TQ_SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" ); TDEConfig* config = m_part->instance()->config(); config->setGroup( "General" ); @@ -218,12 +218,12 @@ void ClassViewWidget::slotProjectOpened( ) m_projectDirectoryLength = m_projectDirectory.length() + 1; - connect( m_part->languageSupport(), TQT_SIGNAL(updatedSourceInfo()), - this, TQT_SLOT(refresh()) ); - connect( m_part->languageSupport(), TQT_SIGNAL(aboutToRemoveSourceInfo(const TQString&)), - this, TQT_SLOT(removeFile(const TQString&)) ); - connect( m_part->languageSupport(), TQT_SIGNAL(addedSourceInfo(const TQString&)), - this, TQT_SLOT(insertFile(const TQString&)) ); + connect( m_part->languageSupport(), TQ_SIGNAL(updatedSourceInfo()), + this, TQ_SLOT(refresh()) ); + connect( m_part->languageSupport(), TQ_SIGNAL(aboutToRemoveSourceInfo(const TQString&)), + this, TQ_SLOT(removeFile(const TQString&)) ); + connect( m_part->languageSupport(), TQ_SIGNAL(addedSourceInfo(const TQString&)), + this, TQ_SLOT(insertFile(const TQString&)) ); } void ClassViewWidget::slotProjectClosed( ) diff --git a/parts/classview/classviewwidget.h b/parts/classview/classviewwidget.h index d74448f5..bdbd69f4 100644 --- a/parts/classview/classviewwidget.h +++ b/parts/classview/classviewwidget.h @@ -45,7 +45,7 @@ class TDEToggleAction; class ClassViewWidget : public TDEListView, public TQToolTip { - Q_OBJECT + TQ_OBJECT public: enum ViewMode diff --git a/parts/classview/digraphview.h b/parts/classview/digraphview.h index a72aa941..ed7fcc2e 100644 --- a/parts/classview/digraphview.h +++ b/parts/classview/digraphview.h @@ -23,7 +23,7 @@ class DigraphEdge; class DigraphView : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp index c8761861..3059f00e 100644 --- a/parts/classview/hierarchydlg.cpp +++ b/parts/classview/hierarchydlg.cpp @@ -51,7 +51,7 @@ HierarchyDialog::HierarchyDialog( ClassViewPart *part ) TQPushButton *save_button = new KPushButton(KStdGuiItem::save(), this); TQPushButton *refresh_button = new KPushButton(i18n("Refresh"), this); - TQSplitter *splitter = new TQSplitter(Qt::Vertical, this); + TQSplitter *splitter = new TQSplitter(TQt::Vertical, this); digraph = new DigraphView(splitter, "digraph view"); // member_tree = new ClassToolWidget(part, splitter); @@ -66,22 +66,22 @@ HierarchyDialog::HierarchyDialog( ClassViewPart *part ) combo_layout->addWidget(close_button); layout->addWidget(splitter); - connect( namespace_combo, TQT_SIGNAL(activated(TQListViewItem*)), - this, TQT_SLOT(slotNamespaceComboChoice(TQListViewItem*)) ); - connect( class_combo, TQT_SIGNAL(activated(TQListViewItem*)), - this, TQT_SLOT(slotClassComboChoice(TQListViewItem*)) ); - connect( namespace_combo, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotNamespaceComboChoice(const TQString&)) ); - connect( class_combo, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotClassComboChoice(const TQString&)) ); - connect( close_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(hide()) ); - connect( save_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(save()) ); - connect( refresh_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(refresh()) ); - connect( digraph, TQT_SIGNAL(selected(const TQString&)), - this, TQT_SLOT(classSelected(const TQString&)) ); + connect( namespace_combo, TQ_SIGNAL(activated(TQListViewItem*)), + this, TQ_SLOT(slotNamespaceComboChoice(TQListViewItem*)) ); + connect( class_combo, TQ_SIGNAL(activated(TQListViewItem*)), + this, TQ_SLOT(slotClassComboChoice(TQListViewItem*)) ); + connect( namespace_combo, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotNamespaceComboChoice(const TQString&)) ); + connect( class_combo, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotClassComboChoice(const TQString&)) ); + connect( close_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(hide()) ); + connect( save_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(save()) ); + connect( refresh_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(refresh()) ); + connect( digraph, TQ_SIGNAL(selected(const TQString&)), + this, TQ_SLOT(classSelected(const TQString&)) ); m_part = part; // m_part->registerHierarchyDialog(this); @@ -157,7 +157,7 @@ void HierarchyDialog::refresh() void HierarchyDialog::setLanguageSupport(KDevLanguageSupport *ls) { if (ls) - connect(ls, TQT_SIGNAL(updatedSourceInfo()), this, TQT_SLOT(refresh())); + connect(ls, TQ_SIGNAL(updatedSourceInfo()), this, TQ_SLOT(refresh())); else refresh(); } diff --git a/parts/classview/hierarchydlg.h b/parts/classview/hierarchydlg.h index 1c41a8f0..486b9bcb 100644 --- a/parts/classview/hierarchydlg.h +++ b/parts/classview/hierarchydlg.h @@ -25,7 +25,7 @@ class TQListViewItem; class HierarchyDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp index 694aa0d4..f42bd8db 100644 --- a/parts/classview/navigator.cpp +++ b/parts/classview/navigator.cpp @@ -111,18 +111,18 @@ Navigator::Navigator(ClassViewPart *parent, const char *name) m_navNoDefinition = true; m_actionSyncWithEditor = new TDEAction( i18n("Sync ClassView"), "view_tree", TDEShortcut(), this, - TQT_SLOT(slotSyncWithEditor()), m_part->actionCollection(), "classview_sync_with_editor" ); + TQ_SLOT(slotSyncWithEditor()), m_part->actionCollection(), "classview_sync_with_editor" ); TDEAction * action = new TDEAction( i18n("Jump to next function"), CTRL+ALT+Key_PageDown, this, - TQT_SLOT(slotJumpToNextFunction()), m_part->actionCollection(), "navigator_jump_to_next_function" ); + TQ_SLOT(slotJumpToNextFunction()), m_part->actionCollection(), "navigator_jump_to_next_function" ); action->plug( &m_dummyActionWidget ); action = new TDEAction( i18n("Jump to previous function"), CTRL+ALT+Key_PageUp, this, - TQT_SLOT(slotJumpToPreviousFunction()), m_part->actionCollection(), "navigator_jump_to_previous_function" ); + TQ_SLOT(slotJumpToPreviousFunction()), m_part->actionCollection(), "navigator_jump_to_previous_function" ); action->plug( &m_dummyActionWidget ); m_syncTimer = new TQTimer(this); - connect(m_syncTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(syncFunctionNav())); + connect(m_syncTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(syncFunctionNav())); } Navigator::~Navigator() diff --git a/parts/classview/navigator.h b/parts/classview/navigator.h index ed0c3ffb..66442ea5 100644 --- a/parts/classview/navigator.h +++ b/parts/classview/navigator.h @@ -38,7 +38,7 @@ TextPaintItem highlightFunctionName( TQString function, int type, TextPaintStyle class Navigator : public TQObject { -Q_OBJECT +TQ_OBJECT public: enum NavigationState { GoToDefinitions, GoToDeclarations }; diff --git a/parts/ctags2/ctags2_createtagfile.h b/parts/ctags2/ctags2_createtagfile.h index f0138bbe..886332e7 100644 --- a/parts/ctags2/ctags2_createtagfile.h +++ b/parts/ctags2/ctags2_createtagfile.h @@ -18,7 +18,7 @@ class CreateTagFile : public CTags2CreateTagFileBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/parts/ctags2/ctags2_createtagfilebase.ui b/parts/ctags2/ctags2_createtagfilebase.ui index 111fbf94..797414c5 100644 --- a/parts/ctags2/ctags2_createtagfilebase.ui +++ b/parts/ctags2/ctags2_createtagfilebase.ui @@ -135,10 +135,10 @@ <slot>validate()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>createTagFile()</slot> <slot>validate()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp index 1333ac54..3e53b66c 100644 --- a/parts/ctags2/ctags2_part.cpp +++ b/parts/ctags2/ctags2_part.cpp @@ -81,18 +81,18 @@ CTags2Part::CTags2Part(TQObject *parent, const char *name, const TQStringList& ) m_widget->setCaption(i18n("CTags Lookup")); mainWindow()->embedOutputView( m_widget, i18n( "CTags" ), i18n( "CTags lookup results" ) ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("CTags"), CTAGSSETTINGSPAGE, info()->icon() ); - connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - - new TDEAction( i18n("Lookup Current Text"), 0, CTRL+Key_Underscore, this, TQT_SLOT(slotLookup()), actionCollection(), "ctags_lookup_shortcut"); - new TDEAction( i18n("Lookup Current Text as Declaration"), 0, CTRL+Key_Semicolon, this, TQT_SLOT(slotLookupDeclaration()), actionCollection(), "ctags_declaration_shortcut"); - new TDEAction( i18n("Lookup Current Text as Definition"), 0, CTRL+Key_Colon, this, TQT_SLOT(slotLookupDefinition()), actionCollection(), "ctags_definition_shortcut"); - new TDEAction( i18n("Jump to Next Match"), 0, 0, this, TQT_SLOT(slotGoToNext()), actionCollection(), "ctags_jump_to_next"); - new TDEAction( i18n("Open Lookup Dialog"), 0, 0, this, TQT_SLOT(slotOpenLookup()), actionCollection(), "ctags_input_shortcut"); + connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + + new TDEAction( i18n("Lookup Current Text"), 0, CTRL+Key_Underscore, this, TQ_SLOT(slotLookup()), actionCollection(), "ctags_lookup_shortcut"); + new TDEAction( i18n("Lookup Current Text as Declaration"), 0, CTRL+Key_Semicolon, this, TQ_SLOT(slotLookupDeclaration()), actionCollection(), "ctags_declaration_shortcut"); + new TDEAction( i18n("Lookup Current Text as Definition"), 0, CTRL+Key_Colon, this, TQ_SLOT(slotLookupDefinition()), actionCollection(), "ctags_definition_shortcut"); + new TDEAction( i18n("Jump to Next Match"), 0, 0, this, TQ_SLOT(slotGoToNext()), actionCollection(), "ctags_jump_to_next"); + new TDEAction( i18n("Open Lookup Dialog"), 0, 0, this, TQ_SLOT(slotOpenLookup()), actionCollection(), "ctags_input_shortcut"); } @@ -111,8 +111,8 @@ void CTags2Part::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, u if ( pagenumber == CTAGSSETTINGSPAGE ) { CTags2SettingsWidget * w = new CTags2SettingsWidget( this, page ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) ); - connect( w, TQT_SIGNAL(newTagsfileName(const TQString& )), this, TQT_SLOT(updateTagsfileName(const TQString& )) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(slotAccept()) ); + connect( w, TQ_SIGNAL(newTagsfileName(const TQString& )), this, TQ_SLOT(updateTagsfileName(const TQString& )) ); } } @@ -194,13 +194,13 @@ void CTags2Part::contextMenu(TQPopupMenu *popup, const Context *context) popup->insertSeparator(); if ( showDeclaration ) - popup->insertItem( i18n("CTags - Go to Declaration: %1").arg(squeezed), this, TQT_SLOT(slotGotoDeclaration()) ); + popup->insertItem( i18n("CTags - Go to Declaration: %1").arg(squeezed), this, TQ_SLOT(slotGotoDeclaration()) ); if ( showDefinition ) - popup->insertItem( i18n("CTags - Go to Definition: %1").arg(squeezed), this, TQT_SLOT(slotGotoDefinition()) ); + popup->insertItem( i18n("CTags - Go to Definition: %1").arg(squeezed), this, TQ_SLOT(slotGotoDefinition()) ); if ( showLookup ) - popup->insertItem( i18n("CTags - Lookup: %1").arg(squeezed), this, TQT_SLOT(slotGotoTag()) ); + popup->insertItem( i18n("CTags - Lookup: %1").arg(squeezed), this, TQ_SLOT(slotGotoTag()) ); } } diff --git a/parts/ctags2/ctags2_part.h b/parts/ctags2/ctags2_part.h index 5de52c37..2a60def7 100644 --- a/parts/ctags2/ctags2_part.h +++ b/parts/ctags2/ctags2_part.h @@ -28,7 +28,7 @@ class KDialogBase; class CTags2Part : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/ctags2/ctags2_selecttagfile.h b/parts/ctags2/ctags2_selecttagfile.h index 046e72c3..4593ca90 100644 --- a/parts/ctags2/ctags2_selecttagfile.h +++ b/parts/ctags2/ctags2_selecttagfile.h @@ -15,7 +15,7 @@ #include "ctags2_selecttagfilebase.h" class SelectTagFile : public SelectTagFileBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/ctags2/ctags2_selecttagfilebase.ui b/parts/ctags2/ctags2_selecttagfilebase.ui index 5a048cab..e25f4cd9 100644 --- a/parts/ctags2/ctags2_selecttagfilebase.ui +++ b/parts/ctags2/ctags2_selecttagfilebase.ui @@ -116,9 +116,9 @@ <slot>validate()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>validate()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/ctags2/ctags2_settingswidget.h b/parts/ctags2/ctags2_settingswidget.h index 6eba2b44..90c7a095 100644 --- a/parts/ctags2/ctags2_settingswidget.h +++ b/parts/ctags2/ctags2_settingswidget.h @@ -39,7 +39,7 @@ private: class CTags2SettingsWidget : public CTags2SettingsWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/ctags2/ctags2_settingswidgetbase.ui b/parts/ctags2/ctags2_settingswidgetbase.ui index a4bd5378..98273191 100644 --- a/parts/ctags2/ctags2_settingswidgetbase.ui +++ b/parts/ctags2/ctags2_settingswidgetbase.ui @@ -361,13 +361,13 @@ <slot>clear()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>createNewTagSlot()</slot> <slot>addNewTagFile()</slot> <slot>removeTagFile()</slot> <slot>moveUpTagFile()</slot> <slot>moveDownTagFile()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/ctags2/ctags2_widget.cpp b/parts/ctags2/ctags2_widget.cpp index b9b54d97..7db053d0 100644 --- a/parts/ctags2/ctags2_widget.cpp +++ b/parts/ctags2/ctags2_widget.cpp @@ -52,10 +52,10 @@ CTags2Widget::CTags2Widget( CTags2Part * part, const char* name, WFlags fl) output_view->setColumnWidthMode(2,TQListView::Maximum); _typeTimeout = new TQTimer( this ); - connect( _typeTimeout, TQT_SIGNAL(timeout()), this, TQT_SLOT(line_edit_changed()) ); + connect( _typeTimeout, TQ_SIGNAL(timeout()), this, TQ_SLOT(line_edit_changed()) ); - connect( output_view, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(itemExecuted(TQListViewItem*)) ); - connect( output_view, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(itemExecuted(TQListViewItem*)) ); + connect( output_view, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(itemExecuted(TQListViewItem*)) ); + connect( output_view, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, TQ_SLOT(itemExecuted(TQListViewItem*)) ); updateDBDateLabel(); } @@ -148,7 +148,7 @@ void CTags2Widget::updateDBDateLabel( ) TQFileInfo tagsdb(tagFiles[0]); if ( tagsdb.exists() ) { - datetime_label->setText( tagsdb.created().date().toString( Qt::ISODate ) ); + datetime_label->setText( tagsdb.created().date().toString( TQt::ISODate ) ); } else { diff --git a/parts/ctags2/ctags2_widget.h b/parts/ctags2/ctags2_widget.h index d67ec415..7f1d1bd5 100644 --- a/parts/ctags2/ctags2_widget.h +++ b/parts/ctags2/ctags2_widget.h @@ -21,7 +21,7 @@ class TQListViewItem; class CTags2Widget : public CTags2WidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/ctags2/ctags2_widgetbase.ui b/parts/ctags2/ctags2_widgetbase.ui index 0379142f..919ca946 100644 --- a/parts/ctags2/ctags2_widgetbase.ui +++ b/parts/ctags2/ctags2_widgetbase.ui @@ -168,11 +168,11 @@ <tabstop>input_edit</tabstop> <tabstop>output_view</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="private">line_edit_changed_delayed()</slot> <slot access="private">line_edit_changed()</slot> <slot access="private">regeneratebutton_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/diff/diffdlg.h b/parts/diff/diffdlg.h index ee15011a..87c37211 100644 --- a/parts/diff/diffdlg.h +++ b/parts/diff/diffdlg.h @@ -19,7 +19,7 @@ class DiffWidget; class DiffDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp index eb2063c4..62fd20b2 100644 --- a/parts/diff/diffpart.cpp +++ b/parts/diff/diffpart.cpp @@ -58,13 +58,13 @@ DiffPart::DiffPart(TQObject *parent, const char *name, const TQStringList &) mainWindow()->setViewAvailable( diffWidget, false ); TDEAction *action = new TDEAction( i18n("Difference Viewer..."), 0, - this, TQT_SLOT(slotExecDiff()), + this, TQ_SLOT(slotExecDiff()), actionCollection(), "tools_diff" ); action->setToolTip(i18n("Difference viewer")); action->setWhatsThis(i18n("<b>Difference viewer</b><p>Shows the contents of a patch file.")); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); } static bool urlIsEqual(const KURL &a, const KURL &b) @@ -121,7 +121,7 @@ void DiffPart::contextMenu( TQPopupMenu* popup, const Context* context ) if ( partController()->documentState( rw_part->url() ) != Clean ) { int id = popup->insertItem( i18n( "Difference to Disk File" ), - this, TQT_SLOT(localDiff()) ); + this, TQ_SLOT(localDiff()) ); popup->TQMenuData::setWhatsThis(id, i18n("<b>Difference to disk file</b><p>Shows the difference between " "the file contents in this editor and the file contents on disk.")); } @@ -155,14 +155,14 @@ void DiffPart::localDiff() *proc << "-u" << popupFile.path() << "-"; proc->setWorkingDirectory( popupFile.directory() ); - connect( proc, TQT_SIGNAL(processExited( TDEProcess* )), - this, TQT_SLOT(processExited( TDEProcess* )) ); - connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int )), - this, TQT_SLOT(receivedStdout( TDEProcess*, char*, int )) ); - connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*, char*, int )), - this, TQT_SLOT(receivedStderr( TDEProcess*, char*, int )) ); - connect( proc, TQT_SIGNAL(wroteStdin( TDEProcess* )), - this, TQT_SLOT(wroteStdin( TDEProcess* )) ); + connect( proc, TQ_SIGNAL(processExited( TDEProcess* )), + this, TQ_SLOT(processExited( TDEProcess* )) ); + connect( proc, TQ_SIGNAL(receivedStdout( TDEProcess*, char*, int )), + this, TQ_SLOT(receivedStdout( TDEProcess*, char*, int )) ); + connect( proc, TQ_SIGNAL(receivedStderr( TDEProcess*, char*, int )), + this, TQ_SLOT(receivedStderr( TDEProcess*, char*, int )) ); + connect( proc, TQ_SIGNAL(wroteStdin( TDEProcess* )), + this, TQ_SLOT(wroteStdin( TDEProcess* )) ); if ( !proc->start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) { KMessageBox::error( 0, i18n( "Could not invoke the \"diff\" command." ) ); diff --git a/parts/diff/diffpart.h b/parts/diff/diffpart.h index 6fe89efe..3bccf1a1 100644 --- a/parts/diff/diffpart.h +++ b/parts/diff/diffpart.h @@ -26,7 +26,7 @@ class TQCString; class DiffPart : public KDevDiffFrontend { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp index b52b8b25..59dcf3de 100644 --- a/parts/diff/diffwidget.cpp +++ b/parts/diff/diffwidget.cpp @@ -78,19 +78,19 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p ) } if ( !extPartsTranslated.isEmpty() ) popup->insertSeparator( i ); - connect( popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupActivated(int)) ); + connect( popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(popupActivated(int)) ); - popup->insertItem( SmallIconSet( "document-save-as" ), i18n( "&Save As..." ), this, TQT_SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 ); + popup->insertItem( SmallIconSet( "document-save-as" ), i18n( "&Save As..." ), this, TQ_SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 ); popup->setItemEnabled( POPUP_BASE - 2, length() > 0 ); popup->insertSeparator( 1 ); - popup->insertItem( i18n( "Highlight Syntax" ), this, TQT_SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 ); + popup->insertItem( i18n( "Highlight Syntax" ), this, TQ_SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 ); popup->setItemChecked( POPUP_BASE - 1, _highlight ); popup->insertSeparator( 3 ); popup->insertSeparator(); - popup->insertItem( i18n("Hide view"), parent(), TQT_SLOT(hideView()) ); + popup->insertItem( i18n("Hide view"), parent(), TQ_SLOT(hideView()) ); return popup; } @@ -190,7 +190,7 @@ DiffWidget::DiffWidget( DiffPart * part, TQWidget *parent, const char *name, WFl te->setReadOnly( true ); te->setTextFormat( TQTextEdit::PlainText ); // te->setMinimumSize( 300, 200 ); - connect( te, TQT_SIGNAL(externalPartRequested(const TQString&)), this, TQT_SLOT(loadExtPart(const TQString&)) ); + connect( te, TQ_SIGNAL(externalPartRequested(const TQString&)), this, TQ_SLOT(loadExtPart(const TQString&)) ); TQVBoxLayout* layout = new TQVBoxLayout( this ); layout->addWidget( te ); @@ -229,7 +229,7 @@ void DiffWidget::loadExtPart( const TQString& partName ) if ( !extService ) return; - extPart = KParts::ComponentFactory::createPartInstanceFromService<KParts::ReadOnlyPart>( extService, this, 0, TQT_TQOBJECT(this), 0 ); + extPart = KParts::ComponentFactory::createPartInstanceFromService<KParts::ReadOnlyPart>( extService, this, 0, this, 0 ); if ( !extPart || !extPart->widget() ) return; @@ -309,10 +309,10 @@ void DiffWidget::openURL( const KURL& url ) if ( !job ) return; - connect( job, TQT_SIGNAL(data( TDEIO::Job *, const TQByteArray & )), - this, TQT_SLOT(slotAppend( TDEIO::Job*, const TQByteArray& )) ); - connect( job, TQT_SIGNAL(result( TDEIO::Job * )), - this, TQT_SLOT(slotFinished()) ); + connect( job, TQ_SIGNAL(data( TDEIO::Job *, const TQByteArray & )), + this, TQ_SLOT(slotAppend( TDEIO::Job*, const TQByteArray& )) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job * )), + this, TQ_SLOT(slotFinished()) ); } void DiffWidget::contextMenuEvent( TQContextMenuEvent* /* e */ ) @@ -321,9 +321,9 @@ void DiffWidget::contextMenuEvent( TQContextMenuEvent* /* e */ ) if ( !te->isVisible() ) { - popup->insertItem( i18n("Display &Raw Output"), this, TQT_SLOT(showTextEdit()) ); + popup->insertItem( i18n("Display &Raw Output"), this, TQ_SLOT(showTextEdit()) ); popup->insertSeparator(); - popup->insertItem( i18n("Hide view"), this, TQT_SLOT(hideView()) ); + popup->insertItem( i18n("Hide view"), this, TQ_SLOT(hideView()) ); } popup->exec( TQCursor::pos() ); diff --git a/parts/diff/diffwidget.h b/parts/diff/diffwidget.h index b021e516..43b9f90f 100644 --- a/parts/diff/diffwidget.h +++ b/parts/diff/diffwidget.h @@ -32,7 +32,7 @@ namespace KParts { // Helper class that displays a modified RMB popup menu class KDiffTextEdit: public TQTextEdit { - Q_OBJECT + TQ_OBJECT public: KDiffTextEdit( TQWidget* parent = 0, const char* name = 0 ); @@ -61,7 +61,7 @@ private: class DiffWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/distpart/distpart_part.cpp b/parts/distpart/distpart_part.cpp index fd235a0a..e0f3cccf 100644 --- a/parts/distpart/distpart_part.cpp +++ b/parts/distpart/distpart_part.cpp @@ -46,7 +46,7 @@ DistpartPart::DistpartPart(TQObject *parent, const char *name, const TQStringLis setXMLFile("kdevpart_distpart.rc"); m_action = new TDEAction( i18n("Distribution && Publishing"), "package", 0, - this, TQT_SLOT(show()), + this, TQ_SLOT(show()), actionCollection(), "make_dist" ); m_action->setToolTip(i18n("Make source and binary distribution")); @@ -58,8 +58,8 @@ DistpartPart::DistpartPart(TQObject *parent, const char *name, const TQStringLis m_dialog = new DistpartDialog(this, m_dlg ); m_dlg->setMainWidget(m_dialog); - connect( m_dlg, TQT_SIGNAL(okClicked()), m_dialog, TQT_SLOT(slotokayPushButtonPressed())); - connect( m_dlg, TQT_SIGNAL(cancelClicked()), m_dialog, TQT_SLOT(slotcancelPushButtonPressed())); + connect( m_dlg, TQ_SIGNAL(okClicked()), m_dialog, TQ_SLOT(slotokayPushButtonPressed())); + connect( m_dlg, TQ_SIGNAL(cancelClicked()), m_dialog, TQ_SLOT(slotcancelPushButtonPressed())); // Package types //RpmPackage = new SpecSupport(this); //LsmPackage = new LsmSupport(this); diff --git a/parts/distpart/distpart_part.h b/parts/distpart/distpart_part.h index aa019c4d..fb71202f 100644 --- a/parts/distpart/distpart_part.h +++ b/parts/distpart/distpart_part.h @@ -33,7 +33,7 @@ class DistpartDialog; class KDialogBase; class DistpartPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/distpart/distpart_ui.ui b/parts/distpart/distpart_ui.ui index 63cad280..1d287ca8 100644 --- a/parts/distpart/distpart_ui.ui +++ b/parts/distpart/distpart_ui.ui @@ -1193,14 +1193,14 @@ Build Files</string> <tabstop>uploadRemoveToolButton</tabstop> <tabstop>uploadFileListBox</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotbuildAllPushButtonPressed()</slot> <slot>slotexportSPECPushButtonPressed()</slot> <slot>slotimportSPECPushButtonPressed()</slot> <slot>slotSrcPackagePushButtonPressed()</slot> <slot>slotAddFileButtonPressed()</slot> <slot>slotRemoveFile(TQListBoxItem *item)</slot> -</Q_SLOTS> +</slots> <pixmapfunction>DesktopIcon</pixmapfunction> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp index c628fe26..48f90f31 100644 --- a/parts/distpart/distpart_widget.cpp +++ b/parts/distpart/distpart_widget.cpp @@ -55,39 +55,39 @@ DistpartDialog::DistpartDialog(DistpartPart *part, TQWidget *parent) :distpart_ui(parent, "dist_widget"), m_part(part) { m_spec = new SpecSupport(m_part); - connect( customProjectCheckBox, TQT_SIGNAL(toggled(bool) ), - this, TQT_SLOT(slotcustomProjectCheckBoxChanged())); - connect( uploadCustomCheckBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotuploadCustomCheckBoxChanged())); - -// connect( okayPushButton, TQT_SIGNAL(clicked()), -// this, TQT_SLOT(slotokayPushButtonPressed())); -// connect( cancelPushButton, TQT_SIGNAL(clicked()), -// this, TQT_SLOT(slotcancelPushButtonPressed())); -/* connect(help_PushButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slothelp_PushButtonPressed()));*/ - connect( createSrcArchPushButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotcreateSrcArchPushButtonPressed())); - connect( resetSrcPushButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotresetSrcPushButtonPressed())); - - connect( genHTMLPushButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotgenHTMLPushButtonPressed())); - connect( resetHTMLPushButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotresetHTMLPushButtonPressed())); - connect( uploadSubmitPushButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotuploadSubmitPushButtonPressed())); - connect( uploadResetPushButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotuploadResetPushButtonPressed())); - connect( uploadAddFileToolButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotuploadAddFileToolButtonPressed())); - connect( uploadRemoveToolButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotuploadRemoveToolButtonPressed())); - connect ( srcDistFileListBox, TQT_SIGNAL(clicked(TQListBoxItem*)), this, TQT_SLOT(slotRemoveFile(TQListBoxItem*))); -// connect( buildAllPushButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotbuildAllPushButtonPressed() )); -// connect( exportSPECPushButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotexportSPECPushButtonPressed( ) ) ); -// connect( srcPackagePushButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotsrcPackagePushButtonPressed() ) ); -// connect( importSPECPushButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotimportSPECPushButtonPressed() ) ); + connect( customProjectCheckBox, TQ_SIGNAL(toggled(bool) ), + this, TQ_SLOT(slotcustomProjectCheckBoxChanged())); + connect( uploadCustomCheckBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotuploadCustomCheckBoxChanged())); + +// connect( okayPushButton, TQ_SIGNAL(clicked()), +// this, TQ_SLOT(slotokayPushButtonPressed())); +// connect( cancelPushButton, TQ_SIGNAL(clicked()), +// this, TQ_SLOT(slotcancelPushButtonPressed())); +/* connect(help_PushButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slothelp_PushButtonPressed()));*/ + connect( createSrcArchPushButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotcreateSrcArchPushButtonPressed())); + connect( resetSrcPushButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotresetSrcPushButtonPressed())); + + connect( genHTMLPushButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotgenHTMLPushButtonPressed())); + connect( resetHTMLPushButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotresetHTMLPushButtonPressed())); + connect( uploadSubmitPushButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotuploadSubmitPushButtonPressed())); + connect( uploadResetPushButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotuploadResetPushButtonPressed())); + connect( uploadAddFileToolButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotuploadAddFileToolButtonPressed())); + connect( uploadRemoveToolButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotuploadRemoveToolButtonPressed())); + connect ( srcDistFileListBox, TQ_SIGNAL(clicked(TQListBoxItem*)), this, TQ_SLOT(slotRemoveFile(TQListBoxItem*))); +// connect( buildAllPushButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotbuildAllPushButtonPressed() )); +// connect( exportSPECPushButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotexportSPECPushButtonPressed( ) ) ); +// connect( srcPackagePushButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotsrcPackagePushButtonPressed() ) ); +// connect( importSPECPushButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotimportSPECPushButtonPressed() ) ); loadSettings(); diff --git a/parts/distpart/distpart_widget.h b/parts/distpart/distpart_widget.h index 7a684a5a..27877167 100644 --- a/parts/distpart/distpart_widget.h +++ b/parts/distpart/distpart_widget.h @@ -45,7 +45,7 @@ class ReadOnlyPart; class DistpartDialog : public distpart_ui { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/distpart/specsupport.cpp b/parts/distpart/specsupport.cpp index 06a0bb67..1698b68b 100644 --- a/parts/distpart/specsupport.cpp +++ b/parts/distpart/specsupport.cpp @@ -53,14 +53,14 @@ SpecSupport::SpecSupport(DistpartPart *part) : packageBase(), m_part(part) { // // // -// connect(buildAllPushButton, TQT_SIGNAL(clicked()), -// this, TQT_SLOT(slotbuildAllPushButtonPressed())); -// connect(exportSPECPushButton, TQT_SIGNAL(clicked()), -// this, TQT_SLOT(slotexportSPECPushButtonPressed())); -// connect(importSPECPushButton, TQT_SIGNAL(clicked()), -// this, TQT_SLOT(slotimportSPECPushButtonPressed())); -// connect(srcPackagePushButton, TQT_SIGNAL(clicked()), -// this, TQT_SLOT(slotsrcPackagePushButtonPressed())); +// connect(buildAllPushButton, TQ_SIGNAL(clicked()), +// this, TQ_SLOT(slotbuildAllPushButtonPressed())); +// connect(exportSPECPushButton, TQ_SIGNAL(clicked()), +// this, TQ_SLOT(slotexportSPECPushButtonPressed())); +// connect(importSPECPushButton, TQ_SIGNAL(clicked()), +// this, TQ_SLOT(slotimportSPECPushButtonPressed())); +// connect(srcPackagePushButton, TQ_SIGNAL(clicked()), +// this, TQ_SLOT(slotsrcPackagePushButtonPressed())); parseDotRpmmacros(); } diff --git a/parts/documentation/KDevDocumentationIface.h b/parts/documentation/KDevDocumentationIface.h index c55143e7..733bc7bf 100644 --- a/parts/documentation/KDevDocumentationIface.h +++ b/parts/documentation/KDevDocumentationIface.h @@ -26,7 +26,7 @@ class DocumentationPart; class KDevDocumentationIface : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP public: diff --git a/parts/documentation/addcatalogdlg.h b/parts/documentation/addcatalogdlg.h index b074ecb6..461bf56d 100644 --- a/parts/documentation/addcatalogdlg.h +++ b/parts/documentation/addcatalogdlg.h @@ -28,7 +28,7 @@ class DocumentationPlugin; class AddCatalogDlg: public AddCatalogDlgBase { - Q_OBJECT + TQ_OBJECT public: AddCatalogDlg( TQValueList<DocumentationPlugin*> const & plugins, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); diff --git a/parts/documentation/addcatalogdlgbase.ui b/parts/documentation/addcatalogdlgbase.ui index b524720f..2734918d 100644 --- a/parts/documentation/addcatalogdlgbase.ui +++ b/parts/documentation/addcatalogdlgbase.ui @@ -135,9 +135,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -152,9 +149,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -195,10 +189,10 @@ <slot>locationURLChanged(const TQString&)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>locationURLChanged( const TQString & )</slot> <slot>docTypeChanged( const TQString & )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp index f626e246..6312006b 100644 --- a/parts/documentation/bookmarkview.cpp +++ b/parts/documentation/bookmarkview.cpp @@ -133,16 +133,16 @@ BookmarkView::BookmarkView(DocumentationWidget *parent, const char *name) showBookmarks(); - connect(m_view, TQT_SIGNAL(executed(TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(itemExecuted(TQListViewItem*, const TQPoint&, int ))); - connect(m_addButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(addBookmark())); - connect(m_editButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editBookmark())); - connect(m_removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeBookmark())); - - connect(m_widget->part(), TQT_SIGNAL(bookmarkLocation(const TQString&, const KURL& )), - this, TQT_SLOT(addBookmark(const TQString&, const KURL& ))); - connect(m_view, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); + connect(m_view, TQ_SIGNAL(executed(TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(itemExecuted(TQListViewItem*, const TQPoint&, int ))); + connect(m_addButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(addBookmark())); + connect(m_editButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editBookmark())); + connect(m_removeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeBookmark())); + + connect(m_widget->part(), TQ_SIGNAL(bookmarkLocation(const TQString&, const KURL& )), + this, TQ_SLOT(addBookmark(const TQString&, const KURL& ))); + connect(m_view, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); } BookmarkView::~BookmarkView() @@ -268,7 +268,7 @@ void BookmarkView::addBookmark(const TQString &title, const KURL &url) void BookmarkView::itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int // c ) { - if ((button != Qt::RightButton) || (!item)) + if ((button != TQt::RightButton) || (!item)) return; DocumentationItem *docItem = dynamic_cast<DocumentationItem*>(item); if (!docItem) diff --git a/parts/documentation/bookmarkview.h b/parts/documentation/bookmarkview.h index 36283e0c..cdd102a0 100644 --- a/parts/documentation/bookmarkview.h +++ b/parts/documentation/bookmarkview.h @@ -49,7 +49,7 @@ private: class BookmarkView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: BookmarkView(DocumentationWidget *parent = 0, const char *name = 0); diff --git a/parts/documentation/contentsview.cpp b/parts/documentation/contentsview.cpp index 3707f318..d77126b1 100644 --- a/parts/documentation/contentsview.cpp +++ b/parts/documentation/contentsview.cpp @@ -47,10 +47,10 @@ ContentsView::ContentsView(DocumentationWidget *parent, const char *name) m_view->setSorting(-1); m_view->setAllColumnsShowFocus( true ); - connect(m_view, TQT_SIGNAL(executed(TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(itemExecuted(TQListViewItem*, const TQPoint&, int ))); - connect(m_view, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); + connect(m_view, TQ_SIGNAL(executed(TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(itemExecuted(TQListViewItem*, const TQPoint&, int ))); + connect(m_view, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); } ContentsView::~ContentsView() @@ -73,7 +73,7 @@ void ContentsView::itemExecuted(TQListViewItem *item, const TQPoint &/*p*/, int void ContentsView::itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int // c ) { - if ((button != Qt::RightButton) || (!item)) + if ((button != TQt::RightButton) || (!item)) return; DocumentationItem *docItem = dynamic_cast<DocumentationItem*>(item); if (!docItem) diff --git a/parts/documentation/contentsview.h b/parts/documentation/contentsview.h index e170b7dc..a638a5c9 100644 --- a/parts/documentation/contentsview.h +++ b/parts/documentation/contentsview.h @@ -29,7 +29,7 @@ class TDEListView; class ContentsView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ContentsView(DocumentationWidget *parent, const char *name = 0); diff --git a/parts/documentation/docconfiglistview.cpp b/parts/documentation/docconfiglistview.cpp index 55b108ec..47b0c0f0 100644 --- a/parts/documentation/docconfiglistview.cpp +++ b/parts/documentation/docconfiglistview.cpp @@ -40,10 +40,10 @@ DocConfigListView::DocConfigListView(TQWidget *parent, const char *name) setResizeMode( TQListView::LastColumn ); setSorting(3); - connect(this, TQT_SIGNAL(clicked(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(itemClicked(TQListViewItem*, const TQPoint&, int ))); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(itemDoubleClicked(TQListViewItem*, const TQPoint&, int ))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(itemClicked(TQListViewItem*, const TQPoint&, int ))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(itemDoubleClicked(TQListViewItem*, const TQPoint&, int ))); } DocConfigListView::~DocConfigListView() diff --git a/parts/documentation/docconfiglistview.h b/parts/documentation/docconfiglistview.h index 811c49b1..13db2301 100644 --- a/parts/documentation/docconfiglistview.h +++ b/parts/documentation/docconfiglistview.h @@ -24,7 +24,7 @@ class DocConfigListView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: DocConfigListView(TQWidget *parent = 0, const char *name = 0); diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp index 8dd6c0b8..8cfacada 100644 --- a/parts/documentation/docglobalconfigwidget.cpp +++ b/parts/documentation/docglobalconfigwidget.cpp @@ -64,7 +64,7 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, { (*it)->loadCatalogConfiguration( m_View ); } - connect( m_View, TQT_SIGNAL(itemActivated()), this, TQT_SLOT(editCollectionButtonClicked()) ); + connect( m_View, TQ_SIGNAL(itemActivated()), this, TQ_SLOT(editCollectionButtonClicked()) ); TDEConfig *config = m_part->config(); diff --git a/parts/documentation/docglobalconfigwidget.h b/parts/documentation/docglobalconfigwidget.h index 8fee856c..48d33817 100644 --- a/parts/documentation/docglobalconfigwidget.h +++ b/parts/documentation/docglobalconfigwidget.h @@ -31,7 +31,7 @@ class TDEListView; class DocGlobalConfigWidget : public DocGlobalConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: DocGlobalConfigWidget(DocumentationPart *part, DocumentationWidget *widget, diff --git a/parts/documentation/docglobalconfigwidgetbase.ui b/parts/documentation/docglobalconfigwidgetbase.ui index 5d2d4038..2befa99f 100644 --- a/parts/documentation/docglobalconfigwidgetbase.ui +++ b/parts/documentation/docglobalconfigwidgetbase.ui @@ -557,7 +557,7 @@ <tabstop>info_box</tabstop> <tabstop>man_box</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>addCollectionButtonClicked()</slot> <slot>editCollectionButtonClicked()</slot> <slot>removeCollectionButtonClicked()</slot> @@ -565,7 +565,7 @@ <slot>collectionsBoxCurrentChanged( int )</slot> <slot>updateConfig()</slot> <slot>updateIndex()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kurlrequester.h</include> diff --git a/parts/documentation/docprojectconfigwidget.h b/parts/documentation/docprojectconfigwidget.h index 0b7b4452..a35a0795 100644 --- a/parts/documentation/docprojectconfigwidget.h +++ b/parts/documentation/docprojectconfigwidget.h @@ -26,7 +26,7 @@ class DocumentationPart; class DocumentationPlugin; class DocProjectConfigWidget: public DocProjectConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: DocProjectConfigWidget(DocumentationPart *part, TQWidget *parent = 0, const char *name = 0); diff --git a/parts/documentation/docprojectconfigwidgetbase.ui b/parts/documentation/docprojectconfigwidgetbase.ui index 8914aaa1..a882bc77 100644 --- a/parts/documentation/docprojectconfigwidgetbase.ui +++ b/parts/documentation/docprojectconfigwidgetbase.ui @@ -140,9 +140,9 @@ <tabstop>catalogURL</tabstop> <tabstop>docSystemCombo</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>changeDocSystem(const TQString &)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kurlrequester.h</include> diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp index 1d284a64..09aaa042 100644 --- a/parts/documentation/documentation_part.cpp +++ b/parts/documentation/documentation_part.cpp @@ -87,11 +87,11 @@ DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const T m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createGlobalConfigPage(i18n("Documentation"), GLOBALDOC_OPTIONS, info()->icon() ); m_configProxy->createProjectConfigPage(i18n("Project Documentation"), PROJECTDOC_OPTIONS, info()->icon() ); - connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); - connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); - connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); - connect(core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed())); + connect(m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); + connect(core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened())); + connect(core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed())); m_widget = new DocumentationWidget(this); m_widget->setIcon(SmallIcon(info()->icon())); @@ -109,7 +109,7 @@ DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const T setupActions(); checkLastVersion(); - TQTimer::singleShot(5, this, TQT_SLOT(init())); + TQTimer::singleShot(5, this, TQ_SLOT(init())); new KDevDocumentationIface(this); } @@ -147,7 +147,7 @@ void DocumentationPart::loadDocumentationPlugins() { kdDebug() << " success" << endl; docPlugin->init(m_widget->contents()); - connect(this, TQT_SIGNAL(indexSelected(IndexBox* )), docPlugin, TQT_SLOT(createIndex(IndexBox* ))); + connect(this, TQ_SIGNAL(indexSelected(IndexBox* )), docPlugin, TQ_SLOT(createIndex(IndexBox* ))); m_plugins.append(docPlugin); } } @@ -172,13 +172,13 @@ void DocumentationPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *pag case GLOBALDOC_OPTIONS: { DocGlobalConfigWidget *w1 = new DocGlobalConfigWidget(this, m_widget, page, "doc config widget"); - connect(dlg, TQT_SIGNAL(okClicked()), w1, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w1, TQ_SLOT(accept())); break; } case PROJECTDOC_OPTIONS: { DocProjectConfigWidget *w1 = new DocProjectConfigWidget(this, page, "doc project config"); - connect(dlg, TQT_SIGNAL(okClicked()), w1, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w1, TQ_SLOT(accept())); break; } } @@ -199,7 +199,7 @@ bool DocumentationPart::configure(int page) DocGlobalConfigWidget *w1 = new DocGlobalConfigWidget(this, m_widget, dlg.plainPage()); l->addWidget(w1); w1->docTab->setCurrentPage(page); - connect(&dlg, TQT_SIGNAL(okClicked()), w1, TQT_SLOT(accept())); + connect(&dlg, TQ_SIGNAL(okClicked()), w1, TQ_SLOT(accept())); return (dlg.exec() == TQDialog::Accepted); } @@ -211,7 +211,7 @@ void DocumentationPart::setupActions() TDEAction *action; action = new TDEAction(i18n("&Search in Documentation..."), CTRL+ALT+Key_S, - this, TQT_SLOT(searchInDocumentation()), + this, TQ_SLOT(searchInDocumentation()), actionCollection(), "help_search_in_doc" ); action->setToolTip(i18n("Full text search in the documentation")); action->setWhatsThis(i18n("<b>Search in documentation</b><p>" @@ -222,7 +222,7 @@ void DocumentationPart::setupActions() "configuration dialog of the documentation plugin.")); action = new TDEAction(i18n("&Look in Documentation Index..."), CTRL+ALT+Key_I, - this, TQT_SLOT(lookInDocumentationIndex()), + this, TQ_SLOT(lookInDocumentationIndex()), actionCollection(), "help_look_in_index" ); action->setToolTip(i18n("Look in the documentation index")); action->setWhatsThis(i18n("<b>Look in documentation index</b><p>" @@ -231,19 +231,19 @@ void DocumentationPart::setupActions() "the documentation index.")); action = new TDEAction(i18n("Man Page..."), 0, - this, TQT_SLOT(manPage()), + this, TQ_SLOT(manPage()), actionCollection(), "help_manpage" ); action->setToolTip(i18n("Show a manpage")); action->setWhatsThis(i18n("<b>Show a manpage</b><p>Opens a man page using embedded viewer.")); action = new TDEAction(i18n("Info Page..."), 0, - this, TQT_SLOT(infoPage()), + this, TQ_SLOT(infoPage()), actionCollection(), "help_infopage"); action->setToolTip(i18n("Show an infopage")); action->setWhatsThis(i18n("<b>Show an infopage</b><p>Opens an info page using embedded viewer.")); action = new TDEAction(i18n("Find Documentation..."), 0, - this, TQT_SLOT(findInDocumentation()), + this, TQ_SLOT(findInDocumentation()), actionCollection(), "help_find_documentation"); action->setToolTip(i18n("Find Documentation")); action->setWhatsThis(i18n("<b>Find documentation</b><p>" @@ -467,7 +467,7 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context) int id = -1; if (hasContextFeature(Finder)) { id = popup->insertItem(i18n("Find Documentation: %1").arg(squeezed), - this, TQT_SLOT(contextFindDocumentation())); + this, TQ_SLOT(contextFindDocumentation())); popup->setWhatsThis(id, i18n("<b>Find documentation</b><p>" "Opens the documentation finder tab and searches " "all possible sources of documentation like " @@ -476,7 +476,7 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context) } if (hasContextFeature(IndexLookup)) { id = popup->insertItem(i18n("Look in Documentation Index: %1").arg(squeezed), - this, TQT_SLOT(contextLookInDocumentationIndex())); + this, TQ_SLOT(contextLookInDocumentationIndex())); popup->setWhatsThis(id, i18n("<b>Look in documentation index</b><p>" "Opens the documentation index tab. It allows " "a term to be entered which will be looked for in " @@ -484,7 +484,7 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context) } if (hasContextFeature(FullTextSearch)) { id = popup->insertItem(i18n("Search in Documentation: %1").arg(squeezed), - this, TQT_SLOT(contextSearchInDocumentation())); + this, TQ_SLOT(contextSearchInDocumentation())); popup->setWhatsThis(id, i18n("<b>Search in documentation</b><p>Searches " "for a term under the cursor in " "the documentation. For this to work, " @@ -493,12 +493,12 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context) } if (hasContextFeature(GotoMan)) { id = popup->insertItem(i18n("Goto Manpage: %1").arg(squeezed), - this, TQT_SLOT(contextManPage())); + this, TQ_SLOT(contextManPage())); popup->setWhatsThis(id, i18n("<b>Goto manpage</b><p>Tries to open a man page for the term under the cursor.")); } if (hasContextFeature(GotoInfo)) { id = popup->insertItem( i18n("Goto Infopage: %1").arg(squeezed), - this, TQT_SLOT(contextInfoPage()) ); + this, TQ_SLOT(contextInfoPage()) ); popup->setWhatsThis(id, i18n("<b>Goto infopage</b><p>Tries to open an info page for the term under the cursor.")); } if (id != -1) diff --git a/parts/documentation/documentation_part.h b/parts/documentation/documentation_part.h index 02564a3f..8385f25e 100644 --- a/parts/documentation/documentation_part.h +++ b/parts/documentation/documentation_part.h @@ -41,7 +41,7 @@ class TQPopupMenu; */ class DocumentationPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: enum ContextFeature { Finder, IndexLookup, FullTextSearch, GotoMan, GotoInfo }; diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp index b1ab69ca..7d533753 100644 --- a/parts/documentation/documentation_widget.cpp +++ b/parts/documentation/documentation_widget.cpp @@ -64,7 +64,7 @@ DocumentationWidget::DocumentationWidget(DocumentationPart *part) m_bookmarks = new BookmarkView(this); m_tab->addItem(m_bookmarks, i18n("Bookmarks")); - connect(m_tab, TQT_SIGNAL(currentChanged(int)), this, TQT_SLOT(tabChanged(int))); + connect(m_tab, TQ_SIGNAL(currentChanged(int)), this, TQ_SLOT(tabChanged(int))); } DocumentationWidget::~DocumentationWidget() diff --git a/parts/documentation/documentation_widget.h b/parts/documentation/documentation_widget.h index a813b393..0086163f 100644 --- a/parts/documentation/documentation_widget.h +++ b/parts/documentation/documentation_widget.h @@ -36,7 +36,7 @@ class TDEListView; class DocumentationWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: DocumentationWidget(DocumentationPart *part); diff --git a/parts/documentation/editbookmarkdlg.ui b/parts/documentation/editbookmarkdlg.ui index 875f4546..013c0080 100644 --- a/parts/documentation/editbookmarkdlg.ui +++ b/parts/documentation/editbookmarkdlg.ui @@ -89,9 +89,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -106,9 +103,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/parts/documentation/editcatalogdlg.h b/parts/documentation/editcatalogdlg.h index 4cd248ee..5aaa6eed 100644 --- a/parts/documentation/editcatalogdlg.h +++ b/parts/documentation/editcatalogdlg.h @@ -26,7 +26,7 @@ class DocumentationPlugin; class EditCatalogDlg : public EditCatalogBase { - Q_OBJECT + TQ_OBJECT public: EditCatalogDlg(DocumentationPlugin *plugin, diff --git a/parts/documentation/editcatalogdlgbase.ui b/parts/documentation/editcatalogdlgbase.ui index 4355d579..34769563 100644 --- a/parts/documentation/editcatalogdlgbase.ui +++ b/parts/documentation/editcatalogdlgbase.ui @@ -63,9 +63,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -80,9 +77,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -184,9 +178,9 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>locationURLChanged( const TQString & )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp index ebddcd4c..46027878 100644 --- a/parts/documentation/find_documentation.cpp +++ b/parts/documentation/find_documentation.cpp @@ -46,20 +46,20 @@ FindDocumentation::FindDocumentation(DocumentationWidget* parent, const char* na man_item(0), info_item(0), index_item(0), google_item(0), contents_item(0), last_item(0), m_widget(parent) { - TQWidget* tmp = TQT_TQWIDGET(TQApplication::desktop()); + TQWidget* tmp = TQApplication::desktop(); setGeometry(tmp->width()/2 - width()/2, tmp->height()/2 - height()/2, width(), height()); - proc_man = new TDEProcess( TQT_TQOBJECT(this) ); - proc_info = new TDEProcess( TQT_TQOBJECT(this) ); + proc_man = new TDEProcess( this ); + proc_info = new TDEProcess( this ); - connect( proc_man, TQT_SIGNAL(processExited( TDEProcess* )), - this, TQT_SLOT(procManExited( TDEProcess* )) ); - connect( proc_man, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int)), - this, TQT_SLOT(procManReadStdout( TDEProcess*, char*, int)) ); + connect( proc_man, TQ_SIGNAL(processExited( TDEProcess* )), + this, TQ_SLOT(procManExited( TDEProcess* )) ); + connect( proc_man, TQ_SIGNAL(receivedStdout( TDEProcess*, char*, int)), + this, TQ_SLOT(procManReadStdout( TDEProcess*, char*, int)) ); - connect( proc_info, TQT_SIGNAL(processExited( TDEProcess* )), - this, TQT_SLOT(procInfoExited( TDEProcess* )) ); - connect( proc_info, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int)), - this, TQT_SLOT(procInfoReadStdout( TDEProcess*, char*, int)) ); + connect( proc_info, TQ_SIGNAL(processExited( TDEProcess* )), + this, TQ_SLOT(procInfoExited( TDEProcess* )) ); + connect( proc_info, TQ_SIGNAL(receivedStdout( TDEProcess*, char*, int)), + this, TQ_SLOT(procInfoReadStdout( TDEProcess*, char*, int)) ); result_list->header()->hide(); result_list->setSorting(-1); @@ -75,7 +75,7 @@ FindDocumentation::~FindDocumentation() void FindDocumentation::buttonPressedOnItem( int button, TQListViewItem * item, const TQPoint & pos, int // c ) { - if ((button != Qt::RightButton) || (!item)) + if ((button != TQt::RightButton) || (!item)) return; DocumentationItem *docItem = dynamic_cast<DocumentationItem*>(item); if (!docItem) diff --git a/parts/documentation/find_documentation.h b/parts/documentation/find_documentation.h index b1fb6f05..b93f964f 100644 --- a/parts/documentation/find_documentation.h +++ b/parts/documentation/find_documentation.h @@ -32,7 +32,7 @@ class TDEProcess; class FindDocumentation : public FindDocumentationBase { -Q_OBJECT +TQ_OBJECT public: FindDocumentation(DocumentationWidget* parent, const char* name = 0); diff --git a/parts/documentation/find_documentation_options.h b/parts/documentation/find_documentation_options.h index ab1a3cc9..d12e748b 100644 --- a/parts/documentation/find_documentation_options.h +++ b/parts/documentation/find_documentation_options.h @@ -28,7 +28,7 @@ class TDEConfig; class FindDocumentationOptions : public FindDocumentationOptionsBase { -Q_OBJECT +TQ_OBJECT public: FindDocumentationOptions(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE); diff --git a/parts/documentation/find_documentation_optionsbase.ui b/parts/documentation/find_documentation_optionsbase.ui index 5d85bdf1..2a31e034 100644 --- a/parts/documentation/find_documentation_optionsbase.ui +++ b/parts/documentation/find_documentation_optionsbase.ui @@ -147,9 +147,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -164,9 +161,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -210,9 +204,9 @@ sources and change their priority here.</string> <slot>sourceMoveDown()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>sourceMoveUp()</slot> <slot>sourceMoveDown()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/parts/documentation/find_documentationbase.ui b/parts/documentation/find_documentationbase.ui index d7a4e46a..4e917917 100644 --- a/parts/documentation/find_documentationbase.ui +++ b/parts/documentation/find_documentationbase.ui @@ -148,7 +148,7 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>clickOptions()</slot> <slot>setSearchTerm( const TQString & term )</slot> <slot>startSearch()</slot> @@ -161,7 +161,7 @@ <slot>procInfoReadFromStdout()</slot> <slot>clickOnItem( TQListViewItem * item )</slot> <slot>buttonPressedOnItem( int button, TQListViewItem * item, const TQPoint & pos, int c )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="1" margin="1"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/documentation/indexview.cpp b/parts/documentation/indexview.cpp index 3e0a3921..6024bdac 100644 --- a/parts/documentation/indexview.cpp +++ b/parts/documentation/indexview.cpp @@ -52,11 +52,11 @@ IndexView::IndexView(DocumentationWidget *parent, const char *name) m_index = new IndexBox(this); l->addWidget(m_index); - connect(m_index, TQT_SIGNAL(executed(TQListBoxItem* )), this, TQT_SLOT(searchInIndex(TQListBoxItem* ))); - connect(m_index, TQT_SIGNAL(mouseButtonPressed(int, TQListBoxItem*, const TQPoint& )), - this, TQT_SLOT(itemMouseButtonPressed(int, TQListBoxItem*, const TQPoint& ))); - connect(m_edit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(searchInIndex())); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(showIndex(const TQString&))); + connect(m_index, TQ_SIGNAL(executed(TQListBoxItem* )), this, TQ_SLOT(searchInIndex(TQListBoxItem* ))); + connect(m_index, TQ_SIGNAL(mouseButtonPressed(int, TQListBoxItem*, const TQPoint& )), + this, TQ_SLOT(itemMouseButtonPressed(int, TQListBoxItem*, const TQPoint& ))); + connect(m_edit, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(searchInIndex())); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(showIndex(const TQString&))); m_edit->installEventFilter(this); } @@ -123,7 +123,7 @@ bool IndexView::eventFilter(TQObject *watched, TQEvent *e) if (!watched || !e) return true; - if ((TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(m_edit)) && (e->type() == TQEvent::KeyPress)) + if ((watched == m_edit) && (e->type() == TQEvent::KeyPress)) { TQKeyEvent *ke = (TQKeyEvent*)e; if (ke->key() == Key_Up) @@ -162,7 +162,7 @@ bool IndexView::eventFilter(TQObject *watched, TQEvent *e) void IndexView::itemMouseButtonPressed(int button, TQListBoxItem *item, const TQPoint &pos) { - if ((button != Qt::RightButton) || (!item)) + if ((button != TQt::RightButton) || (!item)) return; IndexItem *docItem = dynamic_cast<IndexItem*>(item); if (!docItem) diff --git a/parts/documentation/indexview.h b/parts/documentation/indexview.h index 5538f870..d76ee504 100644 --- a/parts/documentation/indexview.h +++ b/parts/documentation/indexview.h @@ -30,7 +30,7 @@ class FindDocumentation; class IndexView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: IndexView(DocumentationWidget *parent = 0, const char *name = 0); diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp index 0282d82a..43822380 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp +++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp @@ -168,7 +168,7 @@ IndexItem::List IndexItem::urls() const TQValueList<IndexItemProto*> itemProtos = m_listbox->items[text()]; for (TQValueList<IndexItemProto*>::const_iterator it = itemProtos.begin(); it != itemProtos.end(); ++it) - urlList.append(tqMakePair((*it)->description(), (*it)->url())); + urlList.append(qMakePair((*it)->description(), (*it)->url())); return urlList; } @@ -224,7 +224,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu y = (fm.height() + 2 + marg - boxsize) / 2; TQStyleOption opt(this); - lv->style().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p, + lv->style().drawPrimitive(TQStyle::PE_CheckListIndicator, p, TQRect(x, y, boxsize, fm.height() + 2 + marg), cg, styleflags, opt); return; @@ -685,7 +685,7 @@ ProjectDocumentationPlugin::ProjectDocumentationPlugin(DocumentationPlugin *docP kdDebug() << "ProjectDocumentationPlugin::ProjectDocumentationPlugin for type " << type << endl; m_watch = new KDirWatch(this); - connect(m_watch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(reinit())); + connect(m_watch, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(reinit())); m_watch->startScan(); } diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.h b/parts/documentation/interfaces/kdevdocumentationplugin.h index ba9d1948..0d8256f4 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.h +++ b/parts/documentation/interfaces/kdevdocumentationplugin.h @@ -216,7 +216,7 @@ a list of URL's for the full text search tool. */ class DocumentationPlugin: public TQObject { - Q_OBJECT + TQ_OBJECT public: /**Capability of documentation plugin.*/ @@ -390,7 +390,7 @@ friend class DocumentationCatalogItem; Represents functionality to display project documentation catalog and index in documentation browser. */ class ProjectDocumentationPlugin: public TQObject { - Q_OBJECT + TQ_OBJECT public: ProjectDocumentationPlugin(DocumentationPlugin *docPlugin, DocumentationPlugin::ProjectDocType type); diff --git a/parts/documentation/plugins/chm/docchmplugin.h b/parts/documentation/plugins/chm/docchmplugin.h index 5ac7d120..683a586f 100644 --- a/parts/documentation/plugins/chm/docchmplugin.h +++ b/parts/documentation/plugins/chm/docchmplugin.h @@ -24,7 +24,7 @@ class DocCHMPlugin :public DocumentationPlugin { - Q_OBJECT + TQ_OBJECT public: DocCHMPlugin(TQObject* parent, const char* name, TQStringList args = TQStringList()); diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.h b/parts/documentation/plugins/devhelp/docdevhelpplugin.h index 19ff8a75..ad7c9a41 100644 --- a/parts/documentation/plugins/devhelp/docdevhelpplugin.h +++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.h @@ -27,7 +27,7 @@ class DocDevHelpPlugin: public DocumentationPlugin { - Q_OBJECT + TQ_OBJECT public: DocDevHelpPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.h b/parts/documentation/plugins/doxygen/docdoxygenplugin.h index afa57cf6..36d6a61b 100644 --- a/parts/documentation/plugins/doxygen/docdoxygenplugin.h +++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.h @@ -27,7 +27,7 @@ class TQDomElement; class DocDoxygenPlugin: public DocumentationPlugin { - Q_OBJECT + TQ_OBJECT public: DocDoxygenPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h index b6b5c037..5d090cec 100644 --- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h +++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h @@ -26,7 +26,7 @@ class DocKDevTOCPlugin : public DocumentationPlugin { - Q_OBJECT + TQ_OBJECT public: DocKDevTOCPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); diff --git a/parts/documentation/plugins/qt/docqtplugin.h b/parts/documentation/plugins/qt/docqtplugin.h index 31b14b9b..10b60274 100644 --- a/parts/documentation/plugins/qt/docqtplugin.h +++ b/parts/documentation/plugins/qt/docqtplugin.h @@ -27,7 +27,7 @@ class TDEConfig; class DocQtPlugin : public DocumentationPlugin { - Q_OBJECT + TQ_OBJECT public: DocQtPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp index 952228c4..4ee167f0 100644 --- a/parts/documentation/protocols/chm/kchmpart.cpp +++ b/parts/documentation/protocols/chm/kchmpart.cpp @@ -101,8 +101,8 @@ bool KChmPart::openFile() m_htmlData.truncate(0); m_job = TDEIO::get( TQString("chm:")+m_file+"/", true, false ); - connect( m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQT_SLOT( readData( TDEIO::Job *, const TQByteArray &) ) ); - connect( m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( jobDone( TDEIO::Job * ) ) ); + connect( m_job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQ_SLOT( readData( TDEIO::Job *, const TQByteArray &) ) ); + connect( m_job, TQ_SIGNAL( result( TDEIO::Job * ) ), TQ_SLOT( jobDone( TDEIO::Job * ) ) ); return true; } diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h index 9d1812b1..12c24990 100644 --- a/parts/documentation/protocols/chm/kchmpart.h +++ b/parts/documentation/protocols/chm/kchmpart.h @@ -32,7 +32,7 @@ class TDEAboutData; class KChmPartFactory: public KParts::Factory { - Q_OBJECT + TQ_OBJECT public: KChmPartFactory( TQObject *parent = 0, const char *name = 0 ); @@ -54,7 +54,7 @@ class KChmPartFactory: public KParts::Factory class KChmPart : public KDevHTMLPart { - Q_OBJECT + TQ_OBJECT public: KChmPart( TQWidget *, const char * = 0 ); diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp index 67dca0ed..49e9d425 100644 --- a/parts/documentation/searchview.cpp +++ b/parts/documentation/searchview.cpp @@ -102,13 +102,13 @@ SearchView::SearchView(DocumentationPart *part, TQWidget *parent, const char *na m_view->setAllColumnsShowFocus(true); m_view->setResizeMode( TQListView::LastColumn ); - connect(m_configButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateConfig())); - connect(m_indexButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateIndex())); - connect(m_edit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(search())); - connect(m_goSearchButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(search())); - connect(m_view, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(executed(TQListViewItem*))); - connect(m_view, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); + connect(m_configButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateConfig())); + connect(m_indexButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateIndex())); + connect(m_edit, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(search())); + connect(m_goSearchButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(search())); + connect(m_view, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(executed(TQListViewItem*))); + connect(m_view, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); } SearchView::~SearchView() @@ -195,10 +195,10 @@ void SearchView::search() proc->setEnvironment("PICDIR", picdir); *proc << exe << "-c" << (indexdir + "/htdig.conf") << query; - connect( proc, TQT_SIGNAL(receivedStdout(TDEProcess *,char*,int)), - this, TQT_SLOT(htsearchStdout(TDEProcess *,char*,int)) ); - connect( proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(htsearchExited(TDEProcess *)) ); + connect( proc, TQ_SIGNAL(receivedStdout(TDEProcess *,char*,int)), + this, TQ_SLOT(htsearchStdout(TDEProcess *,char*,int)) ); + connect( proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(htsearchExited(TDEProcess *)) ); searchResult = ""; @@ -303,7 +303,7 @@ void SearchView::executed(TQListViewItem *item) void SearchView::itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int // c ) { - if ((button != Qt::RightButton) || (!item)) + if ((button != TQt::RightButton) || (!item)) return; DocumentationItem *docItem = dynamic_cast<DocumentationItem*>(item); if (!docItem) diff --git a/parts/documentation/searchview.h b/parts/documentation/searchview.h index 7c3602c1..90fd5442 100644 --- a/parts/documentation/searchview.h +++ b/parts/documentation/searchview.h @@ -32,7 +32,7 @@ class TQListViewItem; class SearchView: public TQWidget { - Q_OBJECT + TQ_OBJECT public: SearchView(DocumentationPart *part, TQWidget *parent = 0, const char *name = 0); diff --git a/parts/documentation/selecttopic.h b/parts/documentation/selecttopic.h index 6ca5ad8b..daa6e4f1 100644 --- a/parts/documentation/selecttopic.h +++ b/parts/documentation/selecttopic.h @@ -25,7 +25,7 @@ #include "kdevdocumentationplugin.h" class SelectTopic: public SelectTopicBase{ -Q_OBJECT +TQ_OBJECT public: SelectTopic(IndexItem::List &urls, TQWidget *parent = 0, const char *name = 0); diff --git a/parts/documentation/selecttopicbase.ui b/parts/documentation/selecttopicbase.ui index f57b2c10..a2931c19 100644 --- a/parts/documentation/selecttopicbase.ui +++ b/parts/documentation/selecttopicbase.ui @@ -60,9 +60,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -77,9 +74,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -135,8 +129,8 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>newSlot()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp index c99c4a2c..109b36e8 100644 --- a/parts/documentation/tools/htdig/htdigindex.cpp +++ b/parts/documentation/tools/htdig/htdigindex.cpp @@ -88,9 +88,9 @@ ProgressDialog::ProgressDialog(bool index, TQWidget *parent, const char *name) setState(0); setMinimumWidth(300); - connect(this, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelClicked())); - connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedStart())); + connect(this, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(cancelClicked())); + connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(okClicked())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedStart())); } ProgressDialog::~ProgressDialog() @@ -268,8 +268,8 @@ void ProgressDialog::startHtdigProcess(bool initial) if (initial) { *proc << "-i"; } - connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(htdigExited(TDEProcess *))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(htdigExited(TDEProcess *))); htdigRunning = true; @@ -387,8 +387,8 @@ void ProgressDialog::startHtmergeProcess() kdDebug(9002) << "Running htmerge" << endl; - connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(htmergeExited(TDEProcess *))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(htmergeExited(TDEProcess *))); htmergeRunning = true; diff --git a/parts/documentation/tools/htdig/htdigindex.h b/parts/documentation/tools/htdig/htdigindex.h index 667112a3..a5ae5225 100644 --- a/parts/documentation/tools/htdig/htdigindex.h +++ b/parts/documentation/tools/htdig/htdigindex.h @@ -24,7 +24,7 @@ class KProgress; class ProgressDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ProgressDialog(bool index, TQWidget *parent=0, const char *name=0); diff --git a/parts/doxygen/doxygenconfigwidget.cpp b/parts/doxygen/doxygenconfigwidget.cpp index b880b6f2..1f2a36c4 100644 --- a/parts/doxygen/doxygenconfigwidget.cpp +++ b/parts/doxygen/doxygenconfigwidget.cpp @@ -68,7 +68,7 @@ DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *par sm // type ); TQWhatsThis::add(inputString, option->docs().simplifyWhiteSpace()); - connect(inputString, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); + connect(inputString, TQ_SIGNAL(changed()), this, TQ_SLOT(changed())); m_inputWidgets->insert(option->name(), inputString); addDependency(m_switches, option->dependsOn(), option->name()); } @@ -86,7 +86,7 @@ DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *par for (sli.toFirst(); sli.current(); ++sli) inputString->addValue(sli.current()); TQWhatsThis::add(inputString, option->docs().simplifyWhiteSpace()); - connect(inputString, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); + connect(inputString, TQ_SIGNAL(changed()), this, TQ_SLOT(changed())); m_inputWidgets->insert(option->name(),inputString); addDependency(m_switches, option->dependsOn(), option->name()); } @@ -109,7 +109,7 @@ DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *par lm // type ); TQWhatsThis::add(inputStrList, option->docs().simplifyWhiteSpace()); - connect(inputStrList, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); + connect(inputStrList, TQ_SIGNAL(changed()), this, TQ_SLOT(changed())); m_inputWidgets->insert(option->name(),inputStrList); addDependency(m_switches, option->dependsOn(), option->name()); } @@ -124,7 +124,7 @@ DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *par *((ConfigBool *)option)->valueRef() // variable ); TQWhatsThis::add(inputBool, option->docs().simplifyWhiteSpace()); - connect(inputBool, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); + connect(inputBool, TQ_SIGNAL(changed()), this, TQ_SLOT(changed())); m_inputWidgets->insert(option->name(), inputBool); addDependency(m_switches, option->dependsOn(), option->name()); } @@ -140,7 +140,7 @@ DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *par ((ConfigInt *)option)->maxVal() // max value ); TQWhatsThis::add(inputInt, option->docs().simplifyWhiteSpace()); - connect(inputInt, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); + connect(inputInt, TQ_SIGNAL(changed()), this, TQ_SLOT(changed())); m_inputWidgets->insert(option->name(), inputInt); addDependency(m_switches, option->dependsOn(), option->name()); } @@ -153,7 +153,7 @@ DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *par TQDictIterator<TQObject> di(*m_switches); for (; di.current(); ++di) { TQObject *obj = di.current(); - connect(obj, TQT_SIGNAL(toggle(const TQString&, bool)), this, TQT_SLOT(toggle(const TQString&, bool))); + connect(obj, TQ_SIGNAL(toggle(const TQString&, bool)), this, TQ_SLOT(toggle(const TQString&, bool))); // UGLY HACK: assumes each item depends on a boolean without checking! emit toggle(di.currentKey(), ((InputBool *)obj)->getState()); } @@ -226,7 +226,7 @@ void DoxygenConfigWidget::init() TQDictIterator<TQObject> dio(*m_switches); for (; dio.current(); ++dio) { TQObject *obj = dio.current(); - connect(obj, TQT_SIGNAL(toggle(const TQString&, bool)), this, TQT_SLOT(toggle(const TQString&, bool))); + connect(obj, TQ_SIGNAL(toggle(const TQString&, bool)), this, TQ_SLOT(toggle(const TQString&, bool))); // UGLY HACK: assumes each item depends on a boolean without checking! emit toggle(dio.currentKey(), ((InputBool *)obj)->getState()); } diff --git a/parts/doxygen/doxygenconfigwidget.h b/parts/doxygen/doxygenconfigwidget.h index 2a65801e..97087dc7 100644 --- a/parts/doxygen/doxygenconfigwidget.h +++ b/parts/doxygen/doxygenconfigwidget.h @@ -23,7 +23,7 @@ class IInput; class DoxygenConfigWidget : public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp index 36d41e8d..14912757 100644 --- a/parts/doxygen/doxygenpart.cpp +++ b/parts/doxygen/doxygenpart.cpp @@ -59,32 +59,32 @@ DoxygenPart::DoxygenPart(TQObject *parent, const char *name, const TQStringList TDEAction *action; action = new TDEAction( i18n("Build API Documentation"), 0, - this, TQT_SLOT(slotDoxygen()), + this, TQ_SLOT(slotDoxygen()), actionCollection(), "build_doxygen" ); action->setToolTip(i18n("Build API documentation")); action->setWhatsThis(i18n("<b>Build API documentation</b><p>Runs doxygen on a project Doxyfile to generate API documentation. " "If the search engine is enabled in Doxyfile, this also runs doxytag to create it.")); action = new TDEAction( i18n("Clean API Documentation"), 0, - this, TQT_SLOT(slotDoxClean()), + this, TQ_SLOT(slotDoxClean()), actionCollection(), "clean_doxygen" ); action->setToolTip(i18n("Clean API documentation")); action->setWhatsThis(i18n("<b>Clean API documentation</b><p>Removes all generated by doxygen files.")); -// connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); +// connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("Doxygen"), PROJECTOPTIONS, info()->icon() ); - connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - m_actionDocumentFunction = new TDEAction(i18n("Document Current Function"), 0, CTRL+SHIFT+Key_S, this, TQT_SLOT(slotDocumentFunction()), actionCollection(), "edit_document_function"); + m_actionDocumentFunction = new TDEAction(i18n("Document Current Function"), 0, CTRL+SHIFT+Key_S, this, TQ_SLOT(slotDocumentFunction()), actionCollection(), "edit_document_function"); m_actionDocumentFunction->setToolTip( i18n("Create a documentation template above a function")); m_actionDocumentFunction->setWhatsThis(i18n("<b>Document Current Function</b><p>Creates a documentation template according to a function's signature above a function definition/declaration.")); m_tmpDir.setAutoDelete(true); - connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(slotActivePartChanged(KParts::Part* ))); - m_actionPreview = new TDEAction(i18n("Preview Doxygen Output"), 0, CTRL+ALT+Key_P, this, TQT_SLOT(slotRunPreview()), actionCollection(), "show_preview_doxygen_output"); + connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SLOT(slotActivePartChanged(KParts::Part* ))); + m_actionPreview = new TDEAction(i18n("Preview Doxygen Output"), 0, CTRL+ALT+Key_P, this, TQ_SLOT(slotRunPreview()), actionCollection(), "show_preview_doxygen_output"); m_actionPreview->setToolTip( i18n("Show a preview of the Doxygen output of this file") ); m_actionPreview->setWhatsThis( i18n("<b>Preview Doxygen output</b><p>Runs Doxygen over the current file and shows the created index.html.") ); @@ -116,7 +116,7 @@ void DoxygenPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, adjustDoxyfile(); DoxygenConfigWidget *w = new DoxygenConfigWidget(project()->projectDirectory() + "/Doxyfile", page ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } } @@ -474,7 +474,7 @@ void DoxygenPart::slotRunPreview( ) if (pStyle != 0 && !stylesheet.isNull()) *pStyle->valueRef() = stylesheet; - connect(appFrontend, TQT_SIGNAL(processExited()), this, TQT_SLOT(slotPreviewProcessExited())); + connect(appFrontend, TQ_SIGNAL(processExited()), this, TQ_SLOT(slotPreviewProcessExited())); appFrontend->startAppCommand("", "doxygen \"" + file.name() + "\"", false); } diff --git a/parts/doxygen/doxygenpart.h b/parts/doxygen/doxygenpart.h index aaa438de..47d215ca 100644 --- a/parts/doxygen/doxygenpart.h +++ b/parts/doxygen/doxygenpart.h @@ -39,7 +39,7 @@ namespace KTextEditor{ class DoxygenPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/doxygen/input.cpp b/parts/doxygen/input.cpp index 1194d0bc..703525f3 100644 --- a/parts/doxygen/input.cpp +++ b/parts/doxygen/input.cpp @@ -121,7 +121,7 @@ InputBool::InputBool(const TQCString &k, const TQString &text, TQWidget * parent layout->addWidget(cb); layout->addStretch(1); - connect( cb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(valueChanged(bool))); + connect( cb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(valueChanged(bool))); } @@ -165,7 +165,7 @@ InputInt::InputInt(const TQString &label, TQWidget *parent, int &val, int minVal layout->addWidget(sp); layout->addStretch(1); - connect(sp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int))); + connect(sp, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(valueChanged(int))); } @@ -226,13 +226,13 @@ InputString::InputString(const TQString & label, } if (le) - connect( le, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(textChanged(const TQString&)) ); + connect( le, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(textChanged(const TQString&)) ); if (br) - connect( br, TQT_SIGNAL(clicked()), this, TQT_SLOT(browse()) ); + connect( br, TQ_SIGNAL(clicked()), this, TQ_SLOT(browse()) ); if (com) - connect( com, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(textChanged(const TQString &)) ); + connect( com, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(textChanged(const TQString &)) ); } InputString::~InputString() @@ -376,22 +376,22 @@ InputStrList::InputStrList(const TQString & label, layout->addWidget(dw, 0, 1); layout->addWidget(lb, 1, 1); - connect( le, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(addString()) ); - connect( add, TQT_SIGNAL(clicked()), - this, TQT_SLOT(addString()) ); - connect( del, TQT_SIGNAL(clicked()), - this, TQT_SLOT(delString()) ); - connect( upd, TQT_SIGNAL(clicked()), - this, TQT_SLOT(updateString()) ); + connect( le, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(addString()) ); + connect( add, TQ_SIGNAL(clicked()), + this, TQ_SLOT(addString()) ); + connect( del, TQ_SIGNAL(clicked()), + this, TQ_SLOT(delString()) ); + connect( upd, TQ_SIGNAL(clicked()), + this, TQ_SLOT(updateString()) ); if (brFile) - connect( brFile, TQT_SIGNAL(clicked()), - this, TQT_SLOT(browseFiles()) ); + connect( brFile, TQ_SIGNAL(clicked()), + this, TQ_SLOT(browseFiles()) ); if (brDir) - connect( brDir, TQT_SIGNAL(clicked()), - this, TQT_SLOT(browseDir()) ); - connect( lb, TQT_SIGNAL(selected(const TQString &)), - this, TQT_SLOT(selectText(const TQString &)) ); + connect( brDir, TQ_SIGNAL(clicked()), + this, TQ_SLOT(browseDir()) ); + connect( lb, TQ_SIGNAL(selected(const TQString &)), + this, TQ_SLOT(selectText(const TQString &)) ); strList = sl; } diff --git a/parts/doxygen/input.h b/parts/doxygen/input.h index 9a5189da..97599f37 100644 --- a/parts/doxygen/input.h +++ b/parts/doxygen/input.h @@ -35,7 +35,7 @@ class IInput class InputBool : public TQWidget, public IInput { - Q_OBJECT + TQ_OBJECT public: @@ -44,7 +44,7 @@ public: void init(); virtual void setEnabled(bool b); - virtual TQObject *qobject() { return TQT_TQOBJECT(this); } + virtual TQObject *qobject() { return this; } virtual bool getState() const { return state; } signals: @@ -63,7 +63,7 @@ private: class InputInt : public TQWidget, public IInput { - Q_OBJECT + TQ_OBJECT public: @@ -73,7 +73,7 @@ public: void init(); virtual void setEnabled(bool); - TQObject *qobject() { return TQT_TQOBJECT(this); } + TQObject *qobject() { return this; } signals: void changed(); @@ -92,7 +92,7 @@ private: class InputString : public TQWidget, public IInput { - Q_OBJECT + TQ_OBJECT public: @@ -109,7 +109,7 @@ public: void init(); void addValue(const char *s); void setEnabled(bool); - TQObject *qobject() { return TQT_TQOBJECT(this); } + TQObject *qobject() { return this; } signals: void changed(); @@ -133,7 +133,7 @@ private: class InputStrList : public TQWidget, public IInput { - Q_OBJECT + TQ_OBJECT public: @@ -149,7 +149,7 @@ public: void init(); void setEnabled(bool); - TQObject *qobject() { return TQT_TQOBJECT(this); } + TQObject *qobject() { return this; } signals: void changed(); diff --git a/parts/filecreate/addglobaldlg.cpp b/parts/filecreate/addglobaldlg.cpp index c8c1676b..c9287efc 100644 --- a/parts/filecreate/addglobaldlg.cpp +++ b/parts/filecreate/addglobaldlg.cpp @@ -71,8 +71,8 @@ AddGlobalDlg::AddGlobalDlg( TQWidget* parent, const char* name, bool modal, WFla resize( TQSize(511, 282).expandedTo(minimumSizeHint()) ); // signals and slots connections - connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); - connect( buttonCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); + connect( buttonOk, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); + connect( buttonCancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) ); } /* diff --git a/parts/filecreate/addglobaldlg.h b/parts/filecreate/addglobaldlg.h index 57631e1e..762296e7 100644 --- a/parts/filecreate/addglobaldlg.h +++ b/parts/filecreate/addglobaldlg.h @@ -22,7 +22,7 @@ class TQPushButton; class AddGlobalDlg : public TQDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/filecreate/fcconfigwidget.h b/parts/filecreate/fcconfigwidget.h index 98623bbb..bc39949d 100644 --- a/parts/filecreate/fcconfigwidget.h +++ b/parts/filecreate/fcconfigwidget.h @@ -28,7 +28,7 @@ class FileType; class FCConfigWidget : public FCConfigWidgetBase { -Q_OBJECT +TQ_OBJECT public: FCConfigWidget(FileCreatePart * part, bool global, TQWidget *parent, const char *name); diff --git a/parts/filecreate/fcconfigwidgetbase.ui b/parts/filecreate/fcconfigwidgetbase.ui index be039483..7c710cb5 100644 --- a/parts/filecreate/fcconfigwidgetbase.ui +++ b/parts/filecreate/fcconfigwidgetbase.ui @@ -520,7 +520,7 @@ <variables> <variable>AddGlobalDlg *global_dlg;</variable> </variables> -<Q_SLOTS> +<slots> <slot>removetemplate_button_clicked()</slot> <slot>copyToProject_button_clicked()</slot> <slot>newtype_button_clicked()</slot> @@ -534,7 +534,7 @@ <slot>edit_template_contents_button_clicked()</slot> <slot>edit_template_content_button_clicked()</slot> <slot>edit_type_content_button_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/parts/filecreate/fctemplateedit.cpp b/parts/filecreate/fctemplateedit.cpp index b019ddb9..878d7c7a 100644 --- a/parts/filecreate/fctemplateedit.cpp +++ b/parts/filecreate/fctemplateedit.cpp @@ -14,8 +14,8 @@ FCTemplateEdit::FCTemplateEdit(TQWidget *parent, const char *name): FCTemplateEditBase(parent, name) { - connect( templatename_edit, TQT_SIGNAL(textChanged ( const TQString & )), - this, TQT_SLOT( slotTemplateNameChanged( ))); + connect( templatename_edit, TQ_SIGNAL(textChanged ( const TQString & )), + this, TQ_SLOT( slotTemplateNameChanged( ))); slotTemplateNameChanged(); } diff --git a/parts/filecreate/fctemplateedit.h b/parts/filecreate/fctemplateedit.h index ca03aa6e..dd78df9d 100644 --- a/parts/filecreate/fctemplateedit.h +++ b/parts/filecreate/fctemplateedit.h @@ -16,7 +16,7 @@ class FCTemplateEdit : public FCTemplateEditBase { -Q_OBJECT +TQ_OBJECT public: FCTemplateEdit(TQWidget *parent=0, const char *name=0); diff --git a/parts/filecreate/fctemplateeditbase.ui b/parts/filecreate/fctemplateeditbase.ui index 6e34899d..a208ab49 100644 --- a/parts/filecreate/fctemplateeditbase.ui +++ b/parts/filecreate/fctemplateeditbase.ui @@ -176,9 +176,9 @@ <tabstop>ok_button</tabstop> <tabstop>cancel_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>init()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/parts/filecreate/fctemplateeditbase.ui.h b/parts/filecreate/fctemplateeditbase.ui.h index 5750f988..66296b44 100644 --- a/parts/filecreate/fctemplateeditbase.ui.h +++ b/parts/filecreate/fctemplateeditbase.ui.h @@ -22,5 +22,5 @@ void FCTemplateEditBase::init() { - templatename_edit->setValidator(new TQRegExpValidator(TQRegExp("^\\S*$"), TQT_TQOBJECT(this))); + templatename_edit->setValidator(new TQRegExpValidator(TQRegExp("^\\S*$"), this)); } diff --git a/parts/filecreate/fctypeedit.cpp b/parts/filecreate/fctypeedit.cpp index 5ee4eb0d..63d73248 100644 --- a/parts/filecreate/fctypeedit.cpp +++ b/parts/filecreate/fctypeedit.cpp @@ -16,8 +16,8 @@ FCTypeEdit::FCTypeEdit(TQWidget *parent, char *name) : FCTypeEditBase(parent, name) { - connect( typeext_edit, TQT_SIGNAL( textChanged ( const TQString & )),this, TQT_SLOT( slotTypeEditTextChanged())); - connect( typename_edit, TQT_SIGNAL( textChanged ( const TQString & )),this, TQT_SLOT( slotTypeEditTextChanged( ))); + connect( typeext_edit, TQ_SIGNAL( textChanged ( const TQString & )),this, TQ_SLOT( slotTypeEditTextChanged())); + connect( typename_edit, TQ_SIGNAL( textChanged ( const TQString & )),this, TQ_SLOT( slotTypeEditTextChanged( ))); slotTypeEditTextChanged( ); } diff --git a/parts/filecreate/fctypeedit.h b/parts/filecreate/fctypeedit.h index 062cf7d9..d9dcc9f9 100644 --- a/parts/filecreate/fctypeedit.h +++ b/parts/filecreate/fctypeedit.h @@ -16,7 +16,7 @@ class FCTypeEdit : public FCTypeEditBase { -Q_OBJECT +TQ_OBJECT public: FCTypeEdit(TQWidget *parent = 0, char *name = 0); diff --git a/parts/filecreate/fctypeeditbase.ui b/parts/filecreate/fctypeeditbase.ui index 53fe4203..62198bda 100644 --- a/parts/filecreate/fctypeeditbase.ui +++ b/parts/filecreate/fctypeeditbase.ui @@ -263,9 +263,9 @@ <tabstop>ok_button</tabstop> <tabstop>cancel_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>init()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/parts/filecreate/fctypeeditbase.ui.h b/parts/filecreate/fctypeeditbase.ui.h index 07576b6b..0ddc4f1e 100644 --- a/parts/filecreate/fctypeeditbase.ui.h +++ b/parts/filecreate/fctypeeditbase.ui.h @@ -22,5 +22,5 @@ void FCTypeEditBase::init() { - typeext_edit->setValidator(new TQRegExpValidator(TQRegExp("^\\S*$"), TQT_TQOBJECT(this))); + typeext_edit->setValidator(new TQRegExpValidator(TQRegExp("^\\S*$"), this)); } diff --git a/parts/filecreate/file-templates/CMakeLists.txt b/parts/filecreate/file-templates/CMakeLists.txt index 04405e1a..5a00aff2 100644 --- a/parts/filecreate/file-templates/CMakeLists.txt +++ b/parts/filecreate/file-templates/CMakeLists.txt @@ -11,7 +11,5 @@ install( FILES ui ui-dialog ui-mainwin ui-confdialog ui-dialogb ui-widget - ui-dialogr ui-tabdialog ui-wizard dox ts ui-mainwin-qt4 - ui-widget-qt4 ui-dialogb-qt4 ui-dialogr-qt4 ui-dialog-qt4 - qrc + ui-dialogr ui-tabdialog ui-wizard dox ts DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates ) diff --git a/parts/filecreate/file-templates/Makefile.am b/parts/filecreate/file-templates/Makefile.am index 672a1cfa..2117ccb1 100644 --- a/parts/filecreate/file-templates/Makefile.am +++ b/parts/filecreate/file-templates/Makefile.am @@ -1,2 +1,2 @@ rcdir = $(kde_datadir)/kdevfilecreate/file-templates -rc_DATA = ui ui-dialog ui-mainwin ui-confdialog ui-dialogb ui-widget ui-dialogr ui-tabdialog ui-wizard dox ts ui-mainwin-qt4 ui-widget-qt4 ui-dialogb-qt4 ui-dialogr-qt4 ui-dialog-qt4 qrc +rc_DATA = ui ui-dialog ui-mainwin ui-confdialog ui-dialogb ui-widget ui-dialogr ui-tabdialog ui-wizard dox ts diff --git a/parts/filecreate/file-templates/qrc b/parts/filecreate/file-templates/qrc deleted file mode 100644 index 4a4d7e46..00000000 --- a/parts/filecreate/file-templates/qrc +++ /dev/null @@ -1,5 +0,0 @@ -<RCC> - <qresource prefix="/" > - <file></file> - </qresource> -</RCC> diff --git a/parts/filecreate/file-templates/ui b/parts/filecreate/file-templates/ui index 670a758b..5f42faf0 100644 --- a/parts/filecreate/file-templates/ui +++ b/parts/filecreate/file-templates/ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>Form1</class> -<widget class=TQWIDGET_OBJECT_NAME_STRING> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> diff --git a/parts/filecreate/file-templates/ui-confdialog b/parts/filecreate/file-templates/ui-confdialog index b61af20d..5429e04f 100644 --- a/parts/filecreate/file-templates/ui-confdialog +++ b/parts/filecreate/file-templates/ui-confdialog @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>MyDialog1</class> -<widget class=TQDIALOG_OBJECT_NAME_STRING> +<widget class="TQDialog"> <property name="name"> <cstring>MyDialog1</cstring> </property> @@ -28,7 +28,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLISTBOX_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQListBox" row="0" column="0"> <item> <property name="text"> <string>New Item</string> @@ -46,11 +46,11 @@ </sizepolicy> </property> </widget> - <widget class=TQTABWIDGET_OBJECT_NAME_STRING row="0" column="1"> + <widget class="TQTabWidget" row="0" column="1"> <property name="name"> <cstring>tabWidget</cstring> </property> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>Widget2</cstring> </property> @@ -58,7 +58,7 @@ <string>Tab</string> </attribute> </widget> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>Widget3</cstring> </property> @@ -67,7 +67,7 @@ </attribute> </widget> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -81,7 +81,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonHelp</cstring> </property> @@ -112,16 +112,13 @@ </size> </property> </spacer> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -129,16 +126,13 @@ <bool>true</bool> </property> </widget> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/parts/filecreate/file-templates/ui-dialog b/parts/filecreate/file-templates/ui-dialog index 92e9bfff..16eb3a67 100644 --- a/parts/filecreate/file-templates/ui-dialog +++ b/parts/filecreate/file-templates/ui-dialog @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>Form1</class> -<widget class=TQDIALOG_OBJECT_NAME_STRING> +<widget class="TQDialog"> <property name="name"> <cstring>Form1</cstring> </property> diff --git a/parts/filecreate/file-templates/ui-dialog-qt4 b/parts/filecreate/file-templates/ui-dialog-qt4 deleted file mode 100644 index b2096e86..00000000 --- a/parts/filecreate/file-templates/ui-dialog-qt4 +++ /dev/null @@ -1,22 +0,0 @@ -<ui version="4.0" > - <author></author> - <comment></comment> - <exportmacro></exportmacro> - <class>Dialog</class> - <widget class=TQDIALOG_OBJECT_NAME_STRING name="Dialog" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>400</width> - <height>300</height> - </rect> - </property> - <property name="windowTitle" > - <string>Dialog</string> - </property> - </widget> - <pixmapfunction></pixmapfunction> - <resources/> - <connections/> -</ui> diff --git a/parts/filecreate/file-templates/ui-dialogb b/parts/filecreate/file-templates/ui-dialogb index e02e5ea6..f771fe9a 100644 --- a/parts/filecreate/file-templates/ui-dialogb +++ b/parts/filecreate/file-templates/ui-dialogb @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>MyDialog1</class> -<widget class=TQDIALOG_OBJECT_NAME_STRING> +<widget class="TQDialog"> <property name="name"> <cstring>MyDialog1</cstring> </property> @@ -18,7 +18,7 @@ <property name="sizeGripEnabled"> <bool>true</bool> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -40,7 +40,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonHelp</cstring> </property> @@ -71,16 +71,13 @@ </size> </property> </spacer> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -88,16 +85,13 @@ <bool>true</bool> </property> </widget> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/parts/filecreate/file-templates/ui-dialogb-qt4 b/parts/filecreate/file-templates/ui-dialogb-qt4 deleted file mode 100644 index 33167acc..00000000 --- a/parts/filecreate/file-templates/ui-dialogb-qt4 +++ /dev/null @@ -1,100 +0,0 @@ -<ui version="4.0" > - <author></author> - <comment></comment> - <exportmacro></exportmacro> - <class>Dialog</class> - <widget class=TQDIALOG_OBJECT_NAME_STRING name="Dialog" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>400</width> - <height>300</height> - </rect> - </property> - <property name="windowTitle" > - <string>Dialog</string> - </property> - <widget class=TQWIDGET_OBJECT_NAME_STRING name="layoutWidget" > - <property name="geometry" > - <rect> - <x>20</x> - <y>250</y> - <width>351</width> - <height>33</height> - </rect> - </property> - <layout class=TQHBOXLAYOUT_OBJECT_NAME_STRING > - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" > - <size> - <width>131</width> - <height>31</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING name="okButton" > - <property name="text" > - <string>OK</string> - </property> - </widget> - </item> - <item> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING name="cancelButton" > - <property name="text" > - <string>Cancel</string> - </property> - </widget> - </item> - </layout> - </widget> - </widget> - <pixmapfunction></pixmapfunction> - <resources/> - <connections> - <connection> - <sender>okButton</sender> - <signal>clicked()</signal> - <receiver>Dialog</receiver> - <slot>accept()</slot> - <hints> - <hint type="sourcelabel" > - <x>278</x> - <y>253</y> - </hint> - <hint type="destinationlabel" > - <x>96</x> - <y>254</y> - </hint> - </hints> - </connection> - <connection> - <sender>cancelButton</sender> - <signal>clicked()</signal> - <receiver>Dialog</receiver> - <slot>reject()</slot> - <hints> - <hint type="sourcelabel" > - <x>369</x> - <y>253</y> - </hint> - <hint type="destinationlabel" > - <x>179</x> - <y>282</y> - </hint> - </hints> - </connection> - </connections> -</ui> diff --git a/parts/filecreate/file-templates/ui-dialogr b/parts/filecreate/file-templates/ui-dialogr index f5d5ffad..bc0e217b 100644 --- a/parts/filecreate/file-templates/ui-dialogr +++ b/parts/filecreate/file-templates/ui-dialogr @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>MyDialog1</class> -<widget class=TQDIALOG_OBJECT_NAME_STRING> +<widget class="TQDialog"> <property name="name"> <cstring>MyDialog1</cstring> </property> @@ -18,7 +18,7 @@ <property name="sizeGripEnabled"> <bool>true</bool> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -40,16 +40,13 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -57,21 +54,18 @@ <bool>true</bool> </property> </widget> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> </widget> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonHelp</cstring> </property> diff --git a/parts/filecreate/file-templates/ui-dialogr-qt4 b/parts/filecreate/file-templates/ui-dialogr-qt4 deleted file mode 100644 index d047e11c..00000000 --- a/parts/filecreate/file-templates/ui-dialogr-qt4 +++ /dev/null @@ -1,100 +0,0 @@ -<ui version="4.0" > - <author></author> - <comment></comment> - <exportmacro></exportmacro> - <class>Dialog</class> - <widget class=TQDIALOG_OBJECT_NAME_STRING name="Dialog" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>400</width> - <height>300</height> - </rect> - </property> - <property name="windowTitle" > - <string>Dialog</string> - </property> - <widget class=TQWIDGET_OBJECT_NAME_STRING name="layoutWidget" > - <property name="geometry" > - <rect> - <x>300</x> - <y>20</y> - <width>77</width> - <height>106</height> - </rect> - </property> - <layout class=TQVBOXLAYOUT_OBJECT_NAME_STRING > - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING name="okButton" > - <property name="text" > - <string>OK</string> - </property> - </widget> - </item> - <item> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING name="cancelButton" > - <property name="text" > - <string>Cancel</string> - </property> - </widget> - </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - </widget> - <pixmapfunction></pixmapfunction> - <resources/> - <connections> - <connection> - <sender>okButton</sender> - <signal>clicked()</signal> - <receiver>Dialog</receiver> - <slot>accept()</slot> - <hints> - <hint type="sourcelabel" > - <x>351</x> - <y>38</y> - </hint> - <hint type="destinationlabel" > - <x>233</x> - <y>29</y> - </hint> - </hints> - </connection> - <connection> - <sender>cancelButton</sender> - <signal>clicked()</signal> - <receiver>Dialog</receiver> - <slot>reject()</slot> - <hints> - <hint type="sourcelabel" > - <x>330</x> - <y>66</y> - </hint> - <hint type="destinationlabel" > - <x>197</x> - <y>125</y> - </hint> - </hints> - </connection> - </connections> -</ui> diff --git a/parts/filecreate/file-templates/ui-mainwin b/parts/filecreate/file-templates/ui-mainwin index fd24b2f5..62d6d51a 100644 --- a/parts/filecreate/file-templates/ui-mainwin +++ b/parts/filecreate/file-templates/ui-mainwin @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>Form1</class> -<widget class=TQMAINWINDOW_OBJECT_NAME_STRING> +<widget class="TQMainWindow"> <property name="name"> <cstring>Form1</cstring> </property> @@ -111,9 +111,6 @@ <property name="menuText"> <string>Save &As...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -142,9 +139,6 @@ <property name="menuText"> <string>E&xit</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -258,9 +252,6 @@ <property name="menuText"> <string>&Contents...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -272,9 +263,6 @@ <property name="menuText"> <string>&Index...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -286,9 +274,6 @@ <property name="menuText"> <string>&About</string> </property> - <property name="accel"> - <string></string> - </property> </action> </actions> <images> @@ -415,7 +400,7 @@ <slot>helpAbout()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>fileNew()</slot> <slot>fileOpen()</slot> <slot>fileSave()</slot> @@ -431,6 +416,6 @@ <slot>helpIndex()</slot> <slot>helpContents()</slot> <slot>helpAbout()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/parts/filecreate/file-templates/ui-mainwin-qt4 b/parts/filecreate/file-templates/ui-mainwin-qt4 deleted file mode 100644 index a444cfa3..00000000 --- a/parts/filecreate/file-templates/ui-mainwin-qt4 +++ /dev/null @@ -1,34 +0,0 @@ -<ui version="4.0" > - <author></author> - <comment></comment> - <exportmacro></exportmacro> - <class>MainWindow</class> - <widget class=TQMAINWINDOW_OBJECT_NAME_STRING name="MainWindow" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>800</width> - <height>600</height> - </rect> - </property> - <property name="windowTitle" > - <string>MainWindow</string> - </property> - <widget class=TQWIDGET_OBJECT_NAME_STRING name="centralwidget" /> - <widget class=TQMENUBAR_OBJECT_NAME_STRING name="menubar" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>800</width> - <height>33</height> - </rect> - </property> - </widget> - <widget class="QStatusBar" name="statusbar" /> - </widget> - <pixmapfunction></pixmapfunction> - <resources/> - <connections/> -</ui> diff --git a/parts/filecreate/file-templates/ui-tabdialog b/parts/filecreate/file-templates/ui-tabdialog index 56ac7bd7..c87b78fb 100644 --- a/parts/filecreate/file-templates/ui-tabdialog +++ b/parts/filecreate/file-templates/ui-tabdialog @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>MyDialog1</class> -<widget class=TQDIALOG_OBJECT_NAME_STRING> +<widget class="TQDialog"> <property name="name"> <cstring>MyDialog1</cstring> </property> @@ -28,11 +28,11 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQTABWIDGET_OBJECT_NAME_STRING> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget</cstring> </property> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>Widget8</cstring> </property> @@ -40,7 +40,7 @@ <string>Tab</string> </attribute> </widget> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>Widget9</cstring> </property> @@ -49,7 +49,7 @@ </attribute> </widget> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -63,7 +63,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonHelp</cstring> </property> @@ -94,16 +94,13 @@ </size> </property> </spacer> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -111,16 +108,13 @@ <bool>true</bool> </property> </widget> - <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/parts/filecreate/file-templates/ui-widget b/parts/filecreate/file-templates/ui-widget index 670a758b..5f42faf0 100644 --- a/parts/filecreate/file-templates/ui-widget +++ b/parts/filecreate/file-templates/ui-widget @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>Form1</class> -<widget class=TQWIDGET_OBJECT_NAME_STRING> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> diff --git a/parts/filecreate/file-templates/ui-widget-qt4 b/parts/filecreate/file-templates/ui-widget-qt4 deleted file mode 100644 index d8b6e63c..00000000 --- a/parts/filecreate/file-templates/ui-widget-qt4 +++ /dev/null @@ -1,22 +0,0 @@ -<ui version="4.0" > - <author></author> - <comment></comment> - <exportmacro></exportmacro> - <class>Form</class> - <widget class=TQWIDGET_OBJECT_NAME_STRING name="Form" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>400</width> - <height>300</height> - </rect> - </property> - <property name="windowTitle" > - <string>Form</string> - </property> - </widget> - <pixmapfunction></pixmapfunction> - <resources/> - <connections/> -</ui> diff --git a/parts/filecreate/file-templates/ui-wizard b/parts/filecreate/file-templates/ui-wizard index b942afb2..5fbb675a 100644 --- a/parts/filecreate/file-templates/ui-wizard +++ b/parts/filecreate/file-templates/ui-wizard @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>Form1</class> -<widget class=TQWIZARD_OBJECT_NAME_STRING> +<widget class="TQWizard"> <property name="name"> <cstring>Form1</cstring> </property> @@ -15,7 +15,7 @@ <property name="caption"> <string>Form1</string> </property> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> diff --git a/parts/filecreate/filecreate_filedialog.cpp b/parts/filecreate/filecreate_filedialog.cpp index 3aa86c96..0a500dd5 100644 --- a/parts/filecreate/filecreate_filedialog.cpp +++ b/parts/filecreate/filecreate_filedialog.cpp @@ -30,8 +30,8 @@ namespace FileCreate { m_extraWidget = extraWidget; m_typeChooser = dynamic_cast<TypeChooser*>(extraWidget); - connect(this, TQT_SIGNAL(filterChanged(const TQString &)), this, TQT_SLOT(slotActionFilterChanged(const TQString &)) ); - connect(locationEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotActionTextChanged(const TQString &)) ); + connect(this, TQ_SIGNAL(filterChanged(const TQString &)), this, TQ_SLOT(slotActionFilterChanged(const TQString &)) ); + connect(locationEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotActionTextChanged(const TQString &)) ); } diff --git a/parts/filecreate/filecreate_filedialog.h b/parts/filecreate/filecreate_filedialog.h index 54365717..ac6a7a00 100644 --- a/parts/filecreate/filecreate_filedialog.h +++ b/parts/filecreate/filecreate_filedialog.h @@ -20,7 +20,7 @@ namespace FileCreate { class FileDialog : public KFileDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/filecreate/filecreate_newfile.cpp b/parts/filecreate/filecreate_newfile.cpp index f1a69059..52c01b42 100644 --- a/parts/filecreate/filecreate_newfile.cpp +++ b/parts/filecreate/filecreate_newfile.cpp @@ -62,7 +62,7 @@ namespace FileCreate { m_addToProject->setChecked( true ); m_urlreq->setMode((int) KFile::Directory); - connect( m_filename, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotFileNameChanged(const TQString & ) ) ); + connect( m_filename, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotFileNameChanged(const TQString & ) ) ); slotFileNameChanged( m_filename->text() ); } diff --git a/parts/filecreate/filecreate_newfile.h b/parts/filecreate/filecreate_newfile.h index be11024d..67f83b49 100644 --- a/parts/filecreate/filecreate_newfile.h +++ b/parts/filecreate/filecreate_newfile.h @@ -25,7 +25,7 @@ class KLineEdit; namespace FileCreate { class NewFileChooser : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: NewFileChooser(TQWidget *parent=0); diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp index a1529097..75dfe5de 100644 --- a/parts/filecreate/filecreate_part.cpp +++ b/parts/filecreate/filecreate_part.cpp @@ -68,23 +68,23 @@ FileCreatePart::FileCreatePart(TQObject *parent, const char *name, const TQStrin setInstance(FileCreateFactory::instance()); setXMLFile("kdevpart_filecreate.rc"); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotProjectClosed()) ); _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("File Templates"), PROJECTSETTINGSPAGE, info()->icon() ); _configProxy->createGlobalConfigPage( i18n("File Templates"), GLOBALSETTINGSPAGE, info()->icon() ); - connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - TDEToolBarPopupAction * newAction = new TDEToolBarPopupAction( i18n("&New"), "document-new", CTRL+TQt::Key_N, this, TQT_SLOT(slotNewFile()), actionCollection(), "file_new"); + TDEToolBarPopupAction * newAction = new TDEToolBarPopupAction( i18n("&New"), "document-new", CTRL+TQt::Key_N, this, TQ_SLOT(slotNewFile()), actionCollection(), "file_new"); newAction->setWhatsThis( i18n("<b>New file</b><p>Creates a new file. Also adds it the project if the <b>Add to project</b> checkbox is turned on.") ); newAction->setToolTip( i18n("Create a new file") ); m_newPopupMenu = newAction->popupMenu(); - connect(m_newPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotAboutToShowNewPopupMenu())); + connect(m_newPopupMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotAboutToShowNewPopupMenu())); - TQTimer::singleShot( 0, this, TQT_SLOT(slotGlobalInitialize()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotGlobalInitialize()) ); } @@ -105,14 +105,14 @@ void FileCreatePart::insertConfigWidget( const KDialogBase * dlg, TQWidget * pag case PROJECTSETTINGSPAGE: { FCConfigWidget* w = new FCConfigWidget( this, false, page, "filecreate config widget" ); - connect( dlg, TQT_SIGNAL( okClicked( ) ), w, TQT_SLOT( accept( ) ) ); + connect( dlg, TQ_SIGNAL( okClicked( ) ), w, TQ_SLOT( accept( ) ) ); } break; case GLOBALSETTINGSPAGE: { FCConfigWidget *w = new FCConfigWidget( this, true, page, "filecreate config widget" ); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); } break; } @@ -136,7 +136,7 @@ void FileCreatePart::slotAboutToShowNewPopupMenu() filetype->icon(), TDEIcon::Desktop, TDEIcon::SizeSmall, TDEIcon::DefaultState, NULL, true); m_newPopupMenu->insertItem(iconPix, filetype->name(), this, - TQT_SLOT(slotNewFilePopup(int)), 0, ++id ); + TQ_SLOT(slotNewFilePopup(int)), 0, ++id ); m_newPopupMenu->setItemParameter( id, filetype->id() ); } else { @@ -151,7 +151,7 @@ void FileCreatePart::slotAboutToShowNewPopupMenu() subtype->icon(), TDEIcon::Desktop, TDEIcon::SizeSmall, TDEIcon::DefaultState, NULL, true); subMenu->insertItem(iconPix, subtype->name(), this, - TQT_SLOT(slotNewFilePopup(int)), 0, ++id ); + TQ_SLOT(slotNewFilePopup(int)), 0, ++id ); subMenu->setItemParameter( id, subtype->id() ); } } @@ -187,7 +187,7 @@ void FileCreatePart::slotNewFile() { } void FileCreatePart::slotProjectOpened() { - TQTimer::singleShot( 0, this, TQT_SLOT(slotInitialize()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotInitialize()) ); } void FileCreatePart::addFileType(const TQString & filename) { @@ -207,7 +207,7 @@ void FileCreatePart::addFileType(const TQString & filename) { void FileCreatePart::slotProjectClosed() { m_filetypes.clear(); - TQTimer::singleShot( 0, this, TQT_SLOT(slotGlobalInitialize()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotGlobalInitialize()) ); } void FileCreatePart::slotFiletypeSelected(const FileType * filetype) { diff --git a/parts/filecreate/filecreate_part.h b/parts/filecreate/filecreate_part.h index ab870791..d281db5a 100644 --- a/parts/filecreate/filecreate_part.h +++ b/parts/filecreate/filecreate_part.h @@ -38,7 +38,7 @@ using namespace FileCreate; class FileCreatePart : public KDevCreateFile { - Q_OBJECT + TQ_OBJECT friend class FCConfigWidget; diff --git a/parts/filecreate/filecreate_typechoosersig.h b/parts/filecreate/filecreate_typechoosersig.h index 5ee090a2..4f8eb2d1 100644 --- a/parts/filecreate/filecreate_typechoosersig.h +++ b/parts/filecreate/filecreate_typechoosersig.h @@ -8,7 +8,7 @@ namespace FileCreate { class FileType; class Signaller : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp index 4638725c..118e3606 100644 --- a/parts/filecreate/filecreate_widget2.cpp +++ b/parts/filecreate/filecreate_widget2.cpp @@ -88,7 +88,7 @@ namespace FileCreate { void FriendlyWidget::refresh() { - disconnect( this, TQT_SIGNAL(currentChanged(int,int)), this, TQT_SLOT(slotCellSelected(int,int)) ); + disconnect( this, TQ_SIGNAL(currentChanged(int,int)), this, TQ_SLOT(slotCellSelected(int,int)) ); empty(); @@ -117,7 +117,7 @@ namespace FileCreate { resizeCells(); if (currentSelection()>-1) removeSelection(currentSelection()); - connect( this, TQT_SIGNAL(currentChanged(int,int)), this, TQT_SLOT(slotCellSelected(int,int)) ); + connect( this, TQ_SIGNAL(currentChanged(int,int)), this, TQ_SLOT(slotCellSelected(int,int)) ); } @@ -165,7 +165,7 @@ namespace FileCreate { } m_selected = typeForRow.contains(row) ? typeForRow[row] : NULL; - TQTimer::singleShot(0, this, TQT_SLOT(slotDoSelection()) ); + TQTimer::singleShot(0, this, TQ_SLOT(slotDoSelection()) ); } diff --git a/parts/filecreate/filecreate_widget2.h b/parts/filecreate/filecreate_widget2.h index 217d37ce..ef9908a9 100644 --- a/parts/filecreate/filecreate_widget2.h +++ b/parts/filecreate/filecreate_widget2.h @@ -30,7 +30,7 @@ namespace FileCreate { class FriendlyWidget : public TQTable, public TypeChooser { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/filecreate/filecreate_widget3.cpp b/parts/filecreate/filecreate_widget3.cpp index caf1ac74..a86d3155 100644 --- a/parts/filecreate/filecreate_widget3.cpp +++ b/parts/filecreate/filecreate_widget3.cpp @@ -46,7 +46,7 @@ namespace FileCreate { "Globally available file types are listed and can be configured in TDevelop settings dialog, <b>New File Wizard</b> tab.")); - connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(slotTypeSelected(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotTypeSelected(TQListViewItem*)) ); } diff --git a/parts/filecreate/filecreate_widget3.h b/parts/filecreate/filecreate_widget3.h index ac8b866e..bd0bd594 100644 --- a/parts/filecreate/filecreate_widget3.h +++ b/parts/filecreate/filecreate_widget3.h @@ -29,7 +29,7 @@ namespace FileCreate { class ListWidget : public TDEListView, public TypeChooser { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/filecreate/template-info.xml b/parts/filecreate/template-info.xml index bddd5d65..235fb064 100644 --- a/parts/filecreate/template-info.xml +++ b/parts/filecreate/template-info.xml @@ -64,24 +64,6 @@ <subtype ref="mainwin" name="Qt3 Main Window" icon="widget_doc"> <descr>A new empty main window.</descr> </subtype> - <subtype ref="widget-qt4" name="Qt4 Widget" icon="widget_doc"> - <descr>A new Qt4 widget.</descr> - </subtype> - <subtype ref="dialog-qt4" name="Qt4 Dialog" icon="widget_doc"> - <descr>A new empty Qt4 Dialog box.</descr> - </subtype> - <subtype ref="mainwin-qt4" name="Qt4 Main Window" icon="widget_doc"> - <descr>A new empty Qt4 main window.</descr> - </subtype> - <subtype ref="dialogr-qt4" name="Qt4 Dialog with Buttons (right)" icon="widget_doc"> - <descr>A new Qt4 Dialog box with buttons on the right.</descr> - </subtype> - <subtype ref="dialogb-qt4" name="Qt4 Dialog with Buttons (bottom)" icon="widget_doc"> - <descr>A new Qt4 Dialog box with buttons on the bottom.</descr> - </subtype> - </type> - <type ext="qrc" name="Qt4 Resource" create="template" icon="template_source"> - <descr>A new Qt4 Resource file.</descr> </type> <type ext="cpp" name="C++ Source" create="template" icon="source_cpp"> <descr>A new empty C++ file.</descr> diff --git a/parts/filelist/filelist_widget.cpp b/parts/filelist/filelist_widget.cpp index 49141dc0..d8af5988 100644 --- a/parts/filelist/filelist_widget.cpp +++ b/parts/filelist/filelist_widget.cpp @@ -45,26 +45,26 @@ FileListWidget::FileListWidget(ProjectviewPart *part, TQWidget *parent) setSelectionMode( TQListView::Extended ); -// connect( _part->partController(), TQT_SIGNAL( partAdded(KParts::Part*) ), this, TQT_SLOT(partAdded(KParts::Part*)) ); -// connect( _part->partController(), TQT_SIGNAL( partRemoved(KParts::Part*) ), this, TQT_SLOT(partRemoved()) ); - connect( _part->partController(), TQT_SIGNAL( partAdded(KParts::Part*) ), this, TQT_SLOT(startRefreshTimer()) ); - connect( _part->partController(), TQT_SIGNAL( partRemoved(KParts::Part*) ), this, TQT_SLOT(startRefreshTimer()) ); - connect( _part->partController(), TQT_SIGNAL( activePartChanged(KParts::Part*) ), this, TQT_SLOT( activePartChanged(KParts::Part* )) ); +// connect( _part->partController(), TQ_SIGNAL( partAdded(KParts::Part*) ), this, TQ_SLOT(partAdded(KParts::Part*)) ); +// connect( _part->partController(), TQ_SIGNAL( partRemoved(KParts::Part*) ), this, TQ_SLOT(partRemoved()) ); + connect( _part->partController(), TQ_SIGNAL( partAdded(KParts::Part*) ), this, TQ_SLOT(startRefreshTimer()) ); + connect( _part->partController(), TQ_SIGNAL( partRemoved(KParts::Part*) ), this, TQ_SLOT(startRefreshTimer()) ); + connect( _part->partController(), TQ_SIGNAL( activePartChanged(KParts::Part*) ), this, TQ_SLOT( activePartChanged(KParts::Part* )) ); - connect( this, TQT_SIGNAL( executed( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( executed( TQListViewItem * ) ), this, TQ_SLOT( itemClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), this, TQ_SLOT( itemClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), - this, TQT_SLOT( popupMenu(TQListViewItem *, const TQPoint & , int ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), + this, TQ_SLOT( popupMenu(TQListViewItem *, const TQPoint & , int ) ) ); - connect( _part->partController(), TQT_SIGNAL(documentChangedState(const KURL &, DocumentState)), - this, TQT_SLOT(documentChangedState(const KURL&, DocumentState )) ); + connect( _part->partController(), TQ_SIGNAL(documentChangedState(const KURL &, DocumentState)), + this, TQ_SLOT(documentChangedState(const KURL&, DocumentState )) ); - connect( _part->partController(), TQT_SIGNAL(partURLChanged(KParts::ReadOnlyPart * )), this, TQT_SLOT(refreshFileList()) ); + connect( _part->partController(), TQ_SIGNAL(partURLChanged(KParts::ReadOnlyPart * )), this, TQ_SLOT(refreshFileList()) ); setItemMargin(10); - connect( &m_refreshTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(refreshFileList()) ); + connect( &m_refreshTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(refreshFileList()) ); startRefreshTimer(); } @@ -226,9 +226,9 @@ void FileListWidget::popupMenu( TQListViewItem * item, const TQPoint & p, int ) { TDEPopupMenu popup; popup.insertTitle( i18n("File List") ); - popup.insertItem( i18n("Close Selected"), this, TQT_SLOT(closeSelectedFiles()) ); - popup.insertItem( i18n("Save Selected"), this, TQT_SLOT(saveSelectedFiles()) ); - popup.insertItem( i18n("Reload Selected"), this, TQT_SLOT(reloadSelectedFiles()) ); + popup.insertItem( i18n("Close Selected"), this, TQ_SLOT(closeSelectedFiles()) ); + popup.insertItem( i18n("Save Selected"), this, TQ_SLOT(saveSelectedFiles()) ); + popup.insertItem( i18n("Reload Selected"), this, TQ_SLOT(reloadSelectedFiles()) ); FileContext context( getSelectedURLs() ); _part->core()->fillContextMenu( &popup, &context ); diff --git a/parts/filelist/filelist_widget.h b/parts/filelist/filelist_widget.h index ace8ed0b..c1b862fc 100644 --- a/parts/filelist/filelist_widget.h +++ b/parts/filelist/filelist_widget.h @@ -32,7 +32,7 @@ namespace KParts { class Part; } class FileListWidget : public TDEListView, public TQToolTip { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/filelist/projectviewconfig.h b/parts/filelist/projectviewconfig.h index 8a39f6db..0957d060 100644 --- a/parts/filelist/projectviewconfig.h +++ b/parts/filelist/projectviewconfig.h @@ -26,7 +26,7 @@ class ProjectviewConfig: public ProjectviewConfigBase { - Q_OBJECT + TQ_OBJECT public: ProjectviewConfig(TQWidget *parent = 0, const char *name = 0); diff --git a/parts/filelist/projectviewconfigbase.ui b/parts/filelist/projectviewconfigbase.ui index 7e362f85..564a92d0 100644 --- a/parts/filelist/projectviewconfigbase.ui +++ b/parts/filelist/projectviewconfigbase.ui @@ -26,9 +26,6 @@ <property name="text"> <string>Display toolbar in toolview (note: change needs a restart)</string> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>Uncheck this if you want the toolbar together with all other toolbars. You can disable it then</string> </property> @@ -43,9 +40,6 @@ <property name="text"> <string>Only save project files in a session</string> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>Check this if you want to ignore files that are not part of the project</string> </property> @@ -60,9 +54,6 @@ <property name="text"> <string>Close all open files before opening a session</string> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>Check this if you want the currently open files closed before opening a session</string> </property> diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp index 8db2a727..99b45623 100644 --- a/parts/filelist/projectviewpart.cpp +++ b/parts/filelist/projectviewpart.cpp @@ -79,14 +79,14 @@ ProjectviewPart::ProjectviewPart(TQObject *parent, const char *name, const TQStr m_configProxy->createGlobalConfigPage(i18n("File List"), GLOBALDOC_OPTIONS, info()->icon()); m_configProxy->createProjectConfigPage(i18n("File List"), PROJECTDOC_OPTIONS, info()->icon()); - connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int)), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); + connect(m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int)), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); - connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); - connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); - connect(core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed())); + connect(core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened())); + connect(core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed())); TDEConfig * config = kapp->config(); config->setGroup("File List Plugin"); @@ -98,7 +98,7 @@ ProjectviewPart::ProjectviewPart(TQObject *parent, const char *name, const TQStr setClientBuilder(m_guibuilder); } m_restored = false; - TQTimer::singleShot(0, this, TQT_SLOT(init())); + TQTimer::singleShot(0, this, TQ_SLOT(init())); } ProjectviewPart::~ProjectviewPart() @@ -277,21 +277,21 @@ void ProjectviewPart::setupActions() { m_openPrjViewAction = new TDESelectAction(i18n("Open Session..."), 0, actionCollection(), "viewsession_open"); - connect(m_openPrjViewAction, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotOpenProjectView(const TQString &))); + connect(m_openPrjViewAction, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotOpenProjectView(const TQString &))); m_openPrjViewAction->setToolTip(i18n("Open Session")); - m_savePrjViewAction = new TDEAction(i18n("Save Session"), "document-save", 0, this, TQT_SLOT(slotSaveProjectView()), actionCollection(), "viewsession_save"); + m_savePrjViewAction = new TDEAction(i18n("Save Session"), "document-save", 0, this, TQ_SLOT(slotSaveProjectView()), actionCollection(), "viewsession_save"); - m_newPrjViewAction = new TDEAction(i18n("New Session..."), "document-new", 0, this, TQT_SLOT(slotSaveAsProjectView()), actionCollection(), "viewsession_new"); + m_newPrjViewAction = new TDEAction(i18n("New Session..."), "document-new", 0, this, TQ_SLOT(slotSaveAsProjectView()), actionCollection(), "viewsession_new"); m_deletePrjViewAction = new TDESelectAction(i18n("Delete Session"), "edit-delete", 0, actionCollection(), "viewsession_delete"); - connect(m_deletePrjViewAction, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotDeleteProjectView(const TQString &))); + connect(m_deletePrjViewAction, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotDeleteProjectView(const TQString &))); m_deletePrjViewAction->setToolTip(i18n("Delete Session")); - m_deleteCurrentPrjViewAction = new TDEAction(i18n("Delete Session"), "edit-delete", 0, this, TQT_SLOT(slotDeleteProjectViewCurent()), actionCollection(), "viewsession_deletecurrent"); + m_deleteCurrentPrjViewAction = new TDEAction(i18n("Delete Session"), "edit-delete", 0, this, TQ_SLOT(slotDeleteProjectViewCurent()), actionCollection(), "viewsession_deletecurrent"); m_deleteCurrentPrjViewAction->setToolTip(i18n("Delete Session")); @@ -306,13 +306,13 @@ void ProjectviewPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, case PROJECTDOC_OPTIONS: { ProjectviewProjectConfig *w = new ProjectviewProjectConfig(this, page, "project config"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } case GLOBALDOC_OPTIONS: { ProjectviewConfig *w = new ProjectviewConfig(page, "global config"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } } @@ -332,7 +332,7 @@ void ProjectviewPart::contextMenu(TQPopupMenu */*popup*/, const Context */*conte // // or create menu items on the fly // // int id = -1; // // id = popup->insertItem(i18n("Do Something Here"), -// // this, TQT_SLOT(doSomething())); +// // this, TQ_SLOT(doSomething())); // // popup->setWhatsThis(id, i18n("<b>Do something here</b><p>Describe here what does this action do." // } // else if (context->hasType(Context::FileContext)) diff --git a/parts/filelist/projectviewpart.h b/parts/filelist/projectviewpart.h index 392a9cdf..0111460d 100644 --- a/parts/filelist/projectviewpart.h +++ b/parts/filelist/projectviewpart.h @@ -55,7 +55,7 @@ FIXME at project open I get the default view and the open files at last close */ class ProjectviewPart: public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/filelist/projectviewprojectconfig.h b/parts/filelist/projectviewprojectconfig.h index a0a4429e..8bbe30db 100644 --- a/parts/filelist/projectviewprojectconfig.h +++ b/parts/filelist/projectviewprojectconfig.h @@ -27,7 +27,7 @@ class ProjectviewPart; class ProjectviewProjectConfig: public ProjectviewProjectConfigBase { - Q_OBJECT + TQ_OBJECT public: ProjectviewProjectConfig(ProjectviewPart *part, TQWidget *parent = 0, const char *name = 0); diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp index de9b5fef..a417931e 100644 --- a/parts/fileselector/fileselector_part.cpp +++ b/parts/fileselector/fileselector_part.cpp @@ -41,11 +41,11 @@ FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQS m_filetree = new KDevFileSelector( this, mainWindow(), partController(), 0, "fileselectorwidget" ); - connect( m_filetree->dirOperator(), TQT_SIGNAL(fileSelected(const KFileItem*)), - this, TQT_SLOT(fileSelected(const KFileItem*))); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); + connect( m_filetree->dirOperator(), TQ_SIGNAL(fileSelected(const KFileItem*)), + this, TQ_SLOT(fileSelected(const KFileItem*))); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(slotConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), this, TQ_SLOT(slotConfigWidget(KDialogBase*)) ); m_filetree->setCaption( i18n("File Selector") ); m_filetree->setIcon( SmallIcon( info()->icon() ) ); @@ -54,7 +54,7 @@ FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQS m_filetree->readConfig( instance()->config(), "fileselector" ); - m_newFileAction = new TDEAction(i18n("New File..."), CTRL+ALT+SHIFT+Key_N, this, TQT_SLOT(newFile()), this, "new_file"); + m_newFileAction = new TDEAction(i18n("New File..."), CTRL+ALT+SHIFT+Key_N, this, TQ_SLOT(newFile()), this, "new_file"); } FileSelectorPart::~FileSelectorPart() @@ -84,7 +84,7 @@ void FileSelectorPart::slotConfigWidget( KDialogBase * dlg ) { TQVBox* vbox = dlg->addVBoxPage( i18n("File Selector"), i18n("File Selector"), BarIcon( info()->icon(), TDEIcon::SizeMedium) ); KFSConfigPage* page = new KFSConfigPage( vbox, 0, m_filetree ); - connect( dlg, TQT_SIGNAL( okClicked( ) ), page, TQT_SLOT( apply( ) ) ); + connect( dlg, TQ_SIGNAL( okClicked( ) ), page, TQ_SLOT( apply( ) ) ); // ### implement reload } diff --git a/parts/fileselector/fileselector_part.h b/parts/fileselector/fileselector_part.h index f415444d..6f96ab5d 100644 --- a/parts/fileselector/fileselector_part.h +++ b/parts/fileselector/fileselector_part.h @@ -13,7 +13,7 @@ class KDialogBase; class FileSelectorPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: FileSelectorPart(TQObject *parent, const char *name, const TQStringList &); diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp index 894bf185..83ff0fb6 100644 --- a/parts/fileselector/fileselector_widget.cpp +++ b/parts/fileselector/fileselector_widget.cpp @@ -125,7 +125,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main TQVBoxLayout* lo = new TQVBoxLayout(this); - TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceTQToolBar ); + TQtMsgHandler oldHandler = qInstallMsgHandler( silenceTQToolBar ); KDevFileSelectorToolBarParent *tbp=new KDevFileSelectorToolBarParent(this); toolbar = new KDevFileSelectorToolBar(tbp); @@ -133,7 +133,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main lo->addWidget(tbp); toolbar->setMovingEnabled(false); toolbar->setFlat(true); - tqInstallMsgHandler( oldHandler ); + qInstallMsgHandler( oldHandler ); cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" ); cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); @@ -173,41 +173,41 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main filter = new KHistoryCombo( true, filterBox, "filter"); filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(filter, 2); - connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) ); + connect( btnFilter, TQ_SIGNAL( clicked() ), this, TQ_SLOT( btnFilterClick() ) ); lo->addWidget(filterBox); - connect( filter, TQT_SIGNAL( activated(const TQString&) ), - TQT_SLOT( slotFilterChange(const TQString&) ) ); + connect( filter, TQ_SIGNAL( activated(const TQString&) ), + TQ_SLOT( slotFilterChange(const TQString&) ) ); - connect( filter, TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT( slotFilterChange(const TQString&) ) ); - connect( filter, TQT_SIGNAL( returnPressed(const TQString&) ), - filter, TQT_SLOT( addToHistory(const TQString&) ) ); + connect( filter, TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT( slotFilterChange(const TQString&) ) ); + connect( filter, TQ_SIGNAL( returnPressed(const TQString&) ), + filter, TQ_SLOT( addToHistory(const TQString&) ) ); // tdeaction for the dir sync method acSyncDir = new TDEAction( i18n("Current Document Directory"), "dirsynch", 0, - TQT_TQOBJECT(this), TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" ); + this, TQ_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" ); toolbar->setIconText( TDEToolBar::IconOnly ); toolbar->setIconSize( 16 ); toolbar->setEnableContextMenu( false ); - connect( cmbPath, TQT_SIGNAL( urlActivated( const KURL& )), - this, TQT_SLOT( cmbPathActivated( const KURL& ) )); - connect( cmbPath, TQT_SIGNAL( returnPressed( const TQString& )), - this, TQT_SLOT( cmbPathReturnPressed( const TQString& ) )); - connect(dir, TQT_SIGNAL(urlEntered(const KURL&)), - this, TQT_SLOT(dirUrlEntered(const KURL&)) ); + connect( cmbPath, TQ_SIGNAL( urlActivated( const KURL& )), + this, TQ_SLOT( cmbPathActivated( const KURL& ) )); + connect( cmbPath, TQ_SIGNAL( returnPressed( const TQString& )), + this, TQ_SLOT( cmbPathReturnPressed( const TQString& ) )); + connect(dir, TQ_SIGNAL(urlEntered(const KURL&)), + this, TQ_SLOT(dirUrlEntered(const KURL&)) ); - connect(dir, TQT_SIGNAL(finishedLoading()), - this, TQT_SLOT(dirFinishedLoading()) ); + connect(dir, TQ_SIGNAL(finishedLoading()), + this, TQ_SLOT(dirFinishedLoading()) ); // enable dir sync button if current doc has a valid URL - connect ( partController, TQT_SIGNAL(activePartChanged(KParts::Part*) ), - this, TQT_SLOT(viewChanged() ) ); + connect ( partController, TQ_SIGNAL(activePartChanged(KParts::Part*) ), + this, TQ_SLOT(viewChanged() ) ); // Connect the bookmark handler - connect( bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )), - this, TQT_SLOT( setDir( const TQString& ) ) ); + connect( bookmarkHandler, TQ_SIGNAL( openURL( const TQString& )), + this, TQ_SLOT( setDir( const TQString& ) ) ); waitingUrl = TQString(); @@ -256,7 +256,7 @@ void KDevFileSelector::readConfig(TDEConfig *config, const TQString & name) if ( ! loc.isEmpty() ) { waitingDir = loc; - TQTimer::singleShot(0, this, TQT_SLOT(initialDirChangeHack())); + TQTimer::singleShot(0, this, TQ_SLOT(initialDirChangeHack())); } } @@ -275,11 +275,11 @@ void KDevFileSelector::readConfig(TDEConfig *config, const TQString & name) // connect events as needed /// @todo - solve startup problem: no need to set location for each doc opened! if ( autoSyncEvents & DocumentChanged ) - connect( partController, TQT_SIGNAL( viewChanged() ), this, TQT_SLOT( autoSync() ) ); + connect( partController, TQ_SIGNAL( viewChanged() ), this, TQ_SLOT( autoSync() ) ); if ( autoSyncEvents & DocumentOpened ) - connect( partController, TQT_SIGNAL( partAdded(KParts::Part*) ), - this, TQT_SLOT( autoSync(KParts::Part*) ) ); + connect( partController, TQ_SIGNAL( partAdded(KParts::Part*) ), + this, TQ_SLOT( autoSync(KParts::Part*) ) ); } @@ -519,7 +519,7 @@ bool KDevFileSelector::eventFilter( TQObject* o, TQEvent *e ) And the popup is rather useless, if the paths are only partly visible. */ TQListBox *lb = cmbPath->listBox(); - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lb) && e->type() == TQEvent::Show ) + if ( o == lb && e->type() == TQEvent::Show ) { int add = lb->height() < lb->contentsHeight() ? lb->verticalScrollBar()->width() : 0; @@ -585,25 +585,25 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelect lo->setSpacing( spacing ); // Toolbar - a lot for a little... - TQGroupBox *gbToolbar = new TQGroupBox( 1, Qt::Vertical, i18n("Toolbar"), this ); + TQGroupBox *gbToolbar = new TQGroupBox( 1, TQt::Vertical, i18n("Toolbar"), this ); acSel = new TDEActionSelector( gbToolbar ); acSel->setAvailableLabel( i18n("A&vailable actions:") ); acSel->setSelectedLabel( i18n("S&elected actions:") ); lo->addWidget( gbToolbar ); - connect( acSel, TQT_SIGNAL( added( TQListBoxItem * ) ), this, TQT_SLOT( slotChanged() ) ); - connect( acSel, TQT_SIGNAL( removed( TQListBoxItem * ) ), this, TQT_SLOT( slotChanged() ) ); - connect( acSel, TQT_SIGNAL( movedUp( TQListBoxItem * ) ), this, TQT_SLOT( slotChanged() ) ); - connect( acSel, TQT_SIGNAL( movedDown( TQListBoxItem * ) ), this, TQT_SLOT( slotChanged() ) ); + connect( acSel, TQ_SIGNAL( added( TQListBoxItem * ) ), this, TQ_SLOT( slotChanged() ) ); + connect( acSel, TQ_SIGNAL( removed( TQListBoxItem * ) ), this, TQ_SLOT( slotChanged() ) ); + connect( acSel, TQ_SIGNAL( movedUp( TQListBoxItem * ) ), this, TQ_SLOT( slotChanged() ) ); + connect( acSel, TQ_SIGNAL( movedDown( TQListBoxItem * ) ), this, TQ_SLOT( slotChanged() ) ); // Sync - TQGroupBox *gbSync = new TQGroupBox( 1, Qt::Horizontal, i18n("Auto Synchronization"), this ); + TQGroupBox *gbSync = new TQGroupBox( 1, TQt::Horizontal, i18n("Auto Synchronization"), this ); cbSyncActive = new TQCheckBox( i18n("When a docu&ment becomes active"), gbSync ); cbSyncOpen = new TQCheckBox( i18n("When a document is o&pened"), gbSync ); cbSyncShow = new TQCheckBox( i18n("When the file selector becomes visible"), gbSync ); lo->addWidget( gbSync ); - connect( cbSyncActive, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); - connect( cbSyncOpen, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); - connect( cbSyncShow, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); + connect( cbSyncActive, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) ); + connect( cbSyncOpen, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) ); + connect( cbSyncShow, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) ); // Histories TQHBox *hbPathHist = new TQHBox ( this ); @@ -611,22 +611,22 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelect sbPathHistLength = new TQSpinBox( hbPathHist ); lbPathHist->setBuddy( sbPathHistLength ); lo->addWidget( hbPathHist ); - connect( sbPathHistLength, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) ); + connect( sbPathHistLength, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) ); TQHBox *hbFilterHist = new TQHBox ( this ); TQLabel *lbFilterHist = new TQLabel( i18n("Remember &filters:"), hbFilterHist ); sbFilterHistLength = new TQSpinBox( hbFilterHist ); lbFilterHist->setBuddy( sbFilterHistLength ); lo->addWidget( hbFilterHist ); - connect( sbFilterHistLength, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) ); + connect( sbFilterHistLength, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) ); // Session - TQGroupBox *gbSession = new TQGroupBox( 1, Qt::Horizontal, i18n("Session"), this ); + TQGroupBox *gbSession = new TQGroupBox( 1, TQt::Horizontal, i18n("Session"), this ); cbSesLocation = new TQCheckBox( i18n("Restore loca&tion"), gbSession ); cbSesFilter = new TQCheckBox( i18n("Restore last f&ilter"), gbSession ); lo->addWidget( gbSession ); - connect( cbSesLocation, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); - connect( cbSesFilter, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); + connect( cbSesLocation, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) ); + connect( cbSesFilter, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) ); // make it look nice lo->addStretch( 1 ); @@ -713,16 +713,16 @@ void KFSConfigPage::apply() s |= KDevFileSelector::GotVisible; fileSelector->autoSyncEvents = s; // reset connections - disconnect( fileSelector->partController, 0, fileSelector, TQT_SLOT( autoSync() ) ); + disconnect( fileSelector->partController, 0, fileSelector, TQ_SLOT( autoSync() ) ); disconnect( fileSelector->partController, 0, - fileSelector, TQT_SLOT( autoSync( KParts::Part *) ) ); + fileSelector, TQ_SLOT( autoSync( KParts::Part *) ) ); if ( s & KDevFileSelector::DocumentChanged ) - connect( fileSelector->partController, TQT_SIGNAL( viewChanged() ), - fileSelector, TQT_SLOT( autoSync() ) ); + connect( fileSelector->partController, TQ_SIGNAL( viewChanged() ), + fileSelector, TQ_SLOT( autoSync() ) ); if ( s & KDevFileSelector::DocumentOpened ) connect( fileSelector->partController, - TQT_SIGNAL( partAdded(KParts::Part *) ), - fileSelector, TQT_SLOT( autoSync(KParts::Part *) ) ); + TQ_SIGNAL( partAdded(KParts::Part *) ), + fileSelector, TQ_SLOT( autoSync(KParts::Part *) ) ); // histories fileSelector->cmbPath->setMaxItems( sbPathHistLength->value() ); diff --git a/parts/fileselector/fileselector_widget.h b/parts/fileselector/fileselector_widget.h index ef64f88c..9462d383 100644 --- a/parts/fileselector/fileselector_widget.h +++ b/parts/fileselector/fileselector_widget.h @@ -59,7 +59,7 @@ namespace KTextEditor /* I think this fix for not moving toolbars is better */ class KDevFileSelectorToolBar: public TDEToolBar { - Q_OBJECT + TQ_OBJECT public: KDevFileSelectorToolBar(TQWidget *parent); @@ -70,7 +70,7 @@ public: class KDevFileSelectorToolBarParent: public TQFrame { - Q_OBJECT + TQ_OBJECT public: KDevFileSelectorToolBarParent(TQWidget *parent); @@ -86,7 +86,7 @@ protected: class KDevDirOperator: public KDirOperator { - Q_OBJECT + TQ_OBJECT public: KDevDirOperator(FileSelectorPart *part, const KURL &urlName=KURL(), TQWidget *parent=0, const char *name=0) @@ -103,7 +103,7 @@ private: class KDevFileSelector : public TQWidget { - Q_OBJECT + TQ_OBJECT friend class KFSConfigPage; @@ -180,7 +180,7 @@ private: */ class KFSConfigPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KFSConfigPage( TQWidget* parent=0, const char *name=0, KDevFileSelector *kfs=0); diff --git a/parts/fileselector/kbookmarkhandler.h b/parts/fileselector/kbookmarkhandler.h index 4ec065aa..c54f92ca 100644 --- a/parts/fileselector/kbookmarkhandler.h +++ b/parts/fileselector/kbookmarkhandler.h @@ -30,7 +30,7 @@ class TDEActionMenu; class KBookmarkHandler : public TQObject, public KBookmarkOwner { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/fileselector/tdeactionselector.cpp b/parts/fileselector/tdeactionselector.cpp index 1c639477..488897e5 100644 --- a/parts/fileselector/tdeactionselector.cpp +++ b/parts/fileselector/tdeactionselector.cpp @@ -98,18 +98,18 @@ TDEActionSelector::TDEActionSelector( TQWidget *parent, const char *name ) loadIcons(); - connect( d->btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonAddClicked()) ); - connect( d->btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonRemoveClicked()) ); - connect( d->btnUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonUpClicked()) ); - connect( d->btnDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonDownClicked()) ); - connect( d->availableListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), - this, TQT_SLOT(itemDoubleClicked(TQListBoxItem*)) ); - connect( d->selectedListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), - this, TQT_SLOT(itemDoubleClicked(TQListBoxItem*)) ); - connect( d->availableListBox, TQT_SIGNAL(currentChanged(TQListBoxItem*)), - this, TQT_SLOT(slotCurrentChanged(TQListBoxItem *)) ); - connect( d->selectedListBox, TQT_SIGNAL(currentChanged(TQListBoxItem*)), - this, TQT_SLOT(slotCurrentChanged(TQListBoxItem *)) ); + connect( d->btnAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonAddClicked()) ); + connect( d->btnRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonRemoveClicked()) ); + connect( d->btnUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonUpClicked()) ); + connect( d->btnDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonDownClicked()) ); + connect( d->availableListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), + this, TQ_SLOT(itemDoubleClicked(TQListBoxItem*)) ); + connect( d->selectedListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), + this, TQ_SLOT(itemDoubleClicked(TQListBoxItem*)) ); + connect( d->availableListBox, TQ_SIGNAL(currentChanged(TQListBoxItem*)), + this, TQ_SLOT(slotCurrentChanged(TQListBoxItem *)) ); + connect( d->selectedListBox, TQ_SIGNAL(currentChanged(TQListBoxItem*)), + this, TQ_SLOT(slotCurrentChanged(TQListBoxItem *)) ); d->availableListBox->installEventFilter( this ); d->selectedListBox->installEventFilter( this ); @@ -391,7 +391,7 @@ bool TDEActionSelector::eventFilter( TQObject *o, TQEvent *e ) } return true; } - else if ( o->inherits( TQLISTBOX_OBJECT_NAME_STRING ) ) + else if ( o->inherits( "TQListBox" ) ) { switch ( ((TQKeyEvent*)e)->key() ) { diff --git a/parts/fileselector/tdeactionselector.h b/parts/fileselector/tdeactionselector.h index 213363cf..2de231eb 100644 --- a/parts/fileselector/tdeactionselector.h +++ b/parts/fileselector/tdeactionselector.h @@ -74,7 +74,7 @@ class TDEActionSelectorPrivate; */ class TDEActionSelector : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_ENUMS( ButtonIconSize InsertionPolicy ) TQ_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE setMoveOnDoubleClick ) diff --git a/parts/fileview/addfilegroupdlg.cpp b/parts/fileview/addfilegroupdlg.cpp index c11c9c81..97947ea4 100644 --- a/parts/fileview/addfilegroupdlg.cpp +++ b/parts/fileview/addfilegroupdlg.cpp @@ -27,14 +27,14 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString title_edit = new KLineEdit(old_title, this); title_edit->setFocus(); title_label->setBuddy(title_edit); - connect( title_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) ); + connect( title_edit, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotTextChanged() ) ); TQLabel *pattern_label = new TQLabel(i18n("&Pattern:"), this); pattern_edit = new KLineEdit(old_pattern, this); pattern_label->setBuddy(pattern_edit); TQFontMetrics fm(pattern_edit->fontMetrics()); pattern_edit->setMinimumWidth(fm.width('X')*35); - connect( pattern_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) ); + connect( pattern_edit, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotTextChanged() ) ); TQVBoxLayout *layout = new TQVBoxLayout(this, 10); TQGridLayout *grid = new TQGridLayout(2, 2); @@ -54,8 +54,8 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); m_pOk->setDefault(true); - connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); - connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); + connect( m_pOk, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); + connect( cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) ); buttonbox->layout(); layout->addWidget(buttonbox, 0); slotTextChanged(); diff --git a/parts/fileview/addfilegroupdlg.h b/parts/fileview/addfilegroupdlg.h index 3465893e..ff67bf93 100644 --- a/parts/fileview/addfilegroupdlg.h +++ b/parts/fileview/addfilegroupdlg.h @@ -18,7 +18,7 @@ class TQPushButton; class AddFileGroupDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/fileview/filegroupsconfigwidget.h b/parts/fileview/filegroupsconfigwidget.h index 545471b0..500afa31 100644 --- a/parts/fileview/filegroupsconfigwidget.h +++ b/parts/fileview/filegroupsconfigwidget.h @@ -19,7 +19,7 @@ class FileGroupsPart; class FileGroupsConfigWidget : public FileGroupsConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/fileview/filegroupsconfigwidgetbase.ui b/parts/fileview/filegroupsconfigwidgetbase.ui index 01574b69..5abee50c 100644 --- a/parts/fileview/filegroupsconfigwidgetbase.ui +++ b/parts/fileview/filegroupsconfigwidgetbase.ui @@ -217,13 +217,13 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">addGroup()</slot> <slot access="protected">editGroup()</slot> <slot access="protected">removeGroup()</slot> <slot access="protected">moveUp()</slot> <slot access="protected">moveDown()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/parts/fileview/filegroupspart.cpp b/parts/fileview/filegroupspart.cpp index 91b1a0bc..3b3ffa21 100644 --- a/parts/fileview/filegroupspart.cpp +++ b/parts/fileview/filegroupspart.cpp @@ -52,19 +52,19 @@ FileGroupsPart::FileGroupsPart(TQObject *parent, const char *name, const TQStrin _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("File Groups"), FILEGROUPS_OPTIONS, info()->icon() ); - connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); // File groups - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), - m_filegroups, TQT_SLOT(addFiles(const TQStringList&)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), - m_filegroups, TQT_SLOT(removeFiles(const TQStringList&)) ); -/* connect( project(), TQT_SIGNAL(addedFileToProject(const TQString&)), - m_filegroups, TQT_SLOT(addFile(const TQString&)) ); - connect( project(), TQT_SIGNAL(removedFileFromProject(const TQString&)), - m_filegroups, TQT_SLOT(removeFile(const TQString&)) );*/ + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList&)), + m_filegroups, TQ_SLOT(addFiles(const TQStringList&)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList&)), + m_filegroups, TQ_SLOT(removeFiles(const TQStringList&)) ); +/* connect( project(), TQ_SIGNAL(addedFileToProject(const TQString&)), + m_filegroups, TQ_SLOT(addFile(const TQString&)) ); + connect( project(), TQ_SIGNAL(removedFileFromProject(const TQString&)), + m_filegroups, TQ_SLOT(removeFile(const TQString&)) );*/ m_filegroups->refresh(); } @@ -84,7 +84,7 @@ void FileGroupsPart::refresh() // This method may be called from m_filetree's slot, // so we make sure not to modify the list view during // the execution of the slot - TQTimer::singleShot(0, m_filegroups, TQT_SLOT(refresh())); + TQTimer::singleShot(0, m_filegroups, TQ_SLOT(refresh())); } void FileGroupsPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber ) @@ -92,6 +92,6 @@ void FileGroupsPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * pag if ( pagenumber == FILEGROUPS_OPTIONS ) { FileGroupsConfigWidget *w = new FileGroupsConfigWidget(this, page, "file groups config widget"); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } } diff --git a/parts/fileview/filegroupspart.h b/parts/fileview/filegroupspart.h index 314f1663..97612ab4 100644 --- a/parts/fileview/filegroupspart.h +++ b/parts/fileview/filegroupspart.h @@ -22,7 +22,7 @@ class KDialogBase; class FileGroupsPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp index 8400b2f1..9a45dc66 100644 --- a/parts/fileview/filegroupswidget.cpp +++ b/parts/fileview/filegroupswidget.cpp @@ -162,7 +162,7 @@ FileGroupsWidget::FileGroupsWidget(FileGroupsPart *part) */ LocationID=-1; - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); setRootIsDecorated(true); setResizeMode(TQListView::LastColumn); setSorting(-1); @@ -171,20 +171,20 @@ FileGroupsWidget::FileGroupsWidget(FileGroupsPart *part) // addColumn(i18n("Location")); - connect( this, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotItemExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotItemExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); m_actionToggleShowNonProjectFiles = new TDEToggleAction( i18n("Show Non Project Files"), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(slotToggleShowNonProjectFiles()), TQT_TQOBJECT(this), "actiontoggleshowshownonprojectfiles" ); + this, TQ_SLOT(slotToggleShowNonProjectFiles()), this, "actiontoggleshowshownonprojectfiles" ); m_actionToggleShowNonProjectFiles->setCheckedState(i18n("Hide Non Project Files")); m_actionToggleShowNonProjectFiles->setWhatsThis(i18n("<b>Show non project files</b><p>Shows files that do not belong to a project in a file tree.")); m_actionToggleDisplayLocation = new TDEToggleAction( i18n("Display Location Column"), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(slotToggleDisplayLocation()), TQT_TQOBJECT(this), "actiontoggleshowlocation" ); + this, TQ_SLOT(slotToggleDisplayLocation()), this, "actiontoggleshowlocation" ); m_actionToggleDisplayLocation->setWhatsThis(i18n("<b>Display the Location Column</b><p>Displays a column with the location of the files.")); m_part = part; @@ -261,7 +261,7 @@ void FileGroupsWidget::slotContextMenu(TDEListView *, TQListViewItem *item, cons "customization dialog"); TQVBox *vbox = dlg.addVBoxPage(i18n("File Groups")); FileGroupsConfigWidget *w = new FileGroupsConfigWidget(m_part, vbox, "file groups config widget"); - connect(&dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(&dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); dlg.exec(); } } diff --git a/parts/fileview/filegroupswidget.h b/parts/fileview/filegroupswidget.h index 3294db32..a2f0dc3c 100644 --- a/parts/fileview/filegroupswidget.h +++ b/parts/fileview/filegroupswidget.h @@ -20,7 +20,7 @@ class KDevProject; class FileGroupsWidget : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/fileview/filetreeviewwidgetimpl.cpp b/parts/fileview/filetreeviewwidgetimpl.cpp index af6f9e1f..1af5fe51 100644 --- a/parts/fileview/filetreeviewwidgetimpl.cpp +++ b/parts/fileview/filetreeviewwidgetimpl.cpp @@ -38,7 +38,7 @@ FileTreeViewWidgetImpl::FileTreeViewWidgetImpl( FileTreeWidget *parent, const ch // Actions m_actionToggleShowNonProjectFiles = new TDEToggleAction( i18n("Show Non Project Files"), TDEShortcut(), - this, TQT_SLOT(slotToggleShowNonProjectFiles()), this, "actiontoggleshowshownonprojectfiles" ); + this, TQ_SLOT(slotToggleShowNonProjectFiles()), this, "actiontoggleshowshownonprojectfiles" ); m_actionToggleShowNonProjectFiles->setCheckedState(i18n("Hide Non Project Files")); m_actionToggleShowNonProjectFiles->setWhatsThis(i18n("<b>Show non project files</b><p>Shows files that do not belong to a project in a file tree.")); @@ -63,7 +63,7 @@ FileTreeViewWidgetImpl::~FileTreeViewWidgetImpl() FileTreeWidget *FileTreeViewWidgetImpl::fileTree() const { - return static_cast<FileTreeWidget *>( TQT_TQWIDGET(parent()) ); + return static_cast<FileTreeWidget *>( parent() ); } /////////////////////////////////////////////////////////////////////////////// @@ -96,7 +96,7 @@ void FileTreeViewWidgetImpl::fillPopupMenu( TQPopupMenu *popupMenu, TQListViewIt // kill the call-back's from working) if (item == fileTree()->firstChild() && canReloadTree()) { - int id = popupMenu->insertItem( i18n( "Reload Tree"), this, TQT_SLOT( slotReloadTree() ) ); + int id = popupMenu->insertItem( i18n( "Reload Tree"), this, TQ_SLOT( slotReloadTree() ) ); popupMenu->setWhatsThis( id, i18n("<b>Reload tree</b><p>Reloads the project files tree.") ); } diff --git a/parts/fileview/filetreeviewwidgetimpl.h b/parts/fileview/filetreeviewwidgetimpl.h index bca8b1cd..9e69d8de 100644 --- a/parts/fileview/filetreeviewwidgetimpl.h +++ b/parts/fileview/filetreeviewwidgetimpl.h @@ -38,7 +38,7 @@ class TQPopupMenu; */ class FileTreeViewWidgetImpl : public TQObject { - Q_OBJECT + TQ_OBJECT public: FileTreeViewWidgetImpl( FileTreeWidget *parent, const char *name ); diff --git a/parts/fileview/filetreewidget.cpp b/parts/fileview/filetreewidget.cpp index f89bf71d..d4bfedaf 100644 --- a/parts/fileview/filetreewidget.cpp +++ b/parts/fileview/filetreewidget.cpp @@ -70,19 +70,19 @@ FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFil setDragEnabled( false ); // Slot connections - connect( this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotItemExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, TQ_SLOT(slotItemExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); // Intercepts KDevelop core signals and VCS notifications (if available) - connect( m_part->project(), TQT_SIGNAL( activeDirectoryChanged( const TQString&, const TQString& ) ), - this, TQT_SLOT( changeActiveDirectory( const TQString&, const TQString& ) ) ); - connect( m_part->project(), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ), - this, TQT_SLOT( addProjectFiles( const TQStringList & ) ) ); - connect( m_part->project(), TQT_SIGNAL( removedFilesFromProject( const TQStringList & ) ), - this, TQT_SLOT( removeProjectFiles( const TQStringList & ) ) ); + connect( m_part->project(), TQ_SIGNAL( activeDirectoryChanged( const TQString&, const TQString& ) ), + this, TQ_SLOT( changeActiveDirectory( const TQString&, const TQString& ) ) ); + connect( m_part->project(), TQ_SIGNAL( addedFilesToProject( const TQStringList & ) ), + this, TQ_SLOT( addProjectFiles( const TQStringList & ) ) ); + connect( m_part->project(), TQ_SIGNAL( removedFilesFromProject( const TQStringList & ) ), + this, TQ_SLOT( removeProjectFiles( const TQStringList & ) ) ); // Safeguard against VCS plug-in unloading at run-time - connect( m_impl, TQT_SIGNAL(implementationInvalidated()), this, TQT_SLOT(slotImplementationInvalidated()) ); + connect( m_impl, TQ_SIGNAL(implementationInvalidated()), this, TQ_SLOT(slotImplementationInvalidated()) ); // Hide pattern for files TQDomDocument &dom = *m_part->projectDom(); @@ -112,7 +112,7 @@ void FileTreeWidget::openDirectory( const TQString& dirName ) // if we're reloading if (m_rootBranch) { - disconnect( m_rootBranch, TQT_SIGNAL(populateFinished(KFileTreeViewItem*)), this, TQT_SLOT(finishPopulate(KFileTreeViewItem*)) ); + disconnect( m_rootBranch, TQ_SIGNAL(populateFinished(KFileTreeViewItem*)), this, TQ_SLOT(finishPopulate(KFileTreeViewItem*)) ); removeBranch( m_rootBranch ); m_projectFiles.clear(); } @@ -128,7 +128,7 @@ void FileTreeWidget::openDirectory( const TQString& dirName ) b->setChildRecurse( false ); m_rootBranch = addBranch( b ); m_rootBranch->setOpen( true ); - connect( m_rootBranch, TQT_SIGNAL(populateFinished(KFileTreeViewItem*)), this, TQT_SLOT(finishPopulate(KFileTreeViewItem*)) ); + connect( m_rootBranch, TQ_SIGNAL(populateFinished(KFileTreeViewItem*)), this, TQ_SLOT(finishPopulate(KFileTreeViewItem*)) ); } /////////////////////////////////////////////////////////////////////////////// diff --git a/parts/fileview/filetreewidget.h b/parts/fileview/filetreewidget.h index f6abb0c6..4ac62aad 100644 --- a/parts/fileview/filetreewidget.h +++ b/parts/fileview/filetreewidget.h @@ -46,7 +46,7 @@ class KDevVersionControl; */ class FileTreeWidget : public KFileTreeView { - Q_OBJECT + TQ_OBJECT public: FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFileInfoProvider *infoProvider ); diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp index 25aa8f62..a9b7b3a5 100644 --- a/parts/fileview/fileviewpart.cpp +++ b/parts/fileview/fileviewpart.cpp @@ -66,10 +66,10 @@ FileViewPart::FileViewPart(TQObject *parent, const char *name, const TQStringLis _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("File Tree"), FILETREE_OPTIONS, info()->icon() ); - connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - TQTimer::singleShot( 1000, this, TQT_SLOT(init()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(init()) ); } /////////////////////////////////////////////////////////////////////////////// @@ -149,7 +149,7 @@ void FileViewPart::insertConfigWidget( const KDialogBase* dlg, TQWidget * page, if ( pagenumber == FILETREE_OPTIONS ) { VCSColorsConfigWidget *w = new VCSColorsConfigWidget( this, vcsColors, page, "vcscolorsconfigwidget" ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(slotAccept()) ); } } diff --git a/parts/fileview/fileviewpart.h b/parts/fileview/fileviewpart.h index 68eb6a56..f4be9861 100644 --- a/parts/fileview/fileviewpart.h +++ b/parts/fileview/fileviewpart.h @@ -23,7 +23,7 @@ class KDevVersionControl; class FileViewPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/fileview/partwidget.cpp b/parts/fileview/partwidget.cpp index bf68de83..4387b26c 100644 --- a/parts/fileview/partwidget.cpp +++ b/parts/fileview/partwidget.cpp @@ -60,10 +60,10 @@ PartWidget::PartWidget( FileViewPart *part, TQWidget *parent ) m_filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(m_filter, 2); - connect( m_btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBtnFilterClick() ) ); - connect( m_filter, TQT_SIGNAL( activated(const TQString&) ), this, TQT_SLOT( slotFilterChange(const TQString&) ) ); - connect( m_filter, TQT_SIGNAL( returnPressed(const TQString&) ), - m_filter, TQT_SLOT( addToHistory(const TQString&) ) ); + connect( m_btnFilter, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBtnFilterClick() ) ); + connect( m_filter, TQ_SIGNAL( activated(const TQString&) ), this, TQ_SLOT( slotFilterChange(const TQString&) ) ); + connect( m_filter, TQ_SIGNAL( returnPressed(const TQString&) ), + m_filter, TQ_SLOT( addToHistory(const TQString&) ) ); TQWhatsThis::add ( m_filter, diff --git a/parts/fileview/partwidget.h b/parts/fileview/partwidget.h index 53a52bc9..c7f8c02c 100644 --- a/parts/fileview/partwidget.h +++ b/parts/fileview/partwidget.h @@ -18,7 +18,7 @@ class FileViewPart; class PartWidget : public TQVBox { - Q_OBJECT + TQ_OBJECT public: PartWidget( FileViewPart *part, TQWidget *parent = 0 ); diff --git a/parts/fileview/stdfiletreewidgetimpl.h b/parts/fileview/stdfiletreewidgetimpl.h index 5502c192..13f393f1 100644 --- a/parts/fileview/stdfiletreewidgetimpl.h +++ b/parts/fileview/stdfiletreewidgetimpl.h @@ -22,7 +22,7 @@ */ class StdFileTreeWidgetImpl : public FileTreeViewWidgetImpl { - Q_OBJECT + TQ_OBJECT public: StdFileTreeWidgetImpl( FileTreeWidget *parent ); diff --git a/parts/fileview/vcscolorsconfigwidget.h b/parts/fileview/vcscolorsconfigwidget.h index d8a3b726..5fd9aedc 100644 --- a/parts/fileview/vcscolorsconfigwidget.h +++ b/parts/fileview/vcscolorsconfigwidget.h @@ -36,7 +36,7 @@ struct VCSColors class VCSColorsConfigWidget : public VCSColorsConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/fileview/vcsfiletreewidgetimpl.cpp b/parts/fileview/vcsfiletreewidgetimpl.cpp index 450a6a58..21086959 100644 --- a/parts/fileview/vcsfiletreewidgetimpl.cpp +++ b/parts/fileview/vcsfiletreewidgetimpl.cpp @@ -198,27 +198,27 @@ VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFil parent->addColumn( "Work" ); parent->addColumn( "Repo" ); - connect( m_vcsInfoProvider, TQT_SIGNAL(statusReady(const VCSFileInfoMap&, void *)), - this, TQT_SLOT(vcsDirStatusReady(const VCSFileInfoMap&, void*)) ); + connect( m_vcsInfoProvider, TQ_SIGNAL(statusReady(const VCSFileInfoMap&, void *)), + this, TQ_SLOT(vcsDirStatusReady(const VCSFileInfoMap&, void*)) ); // Harakiri itself if the infoProvider object is destroyed since we cannot work anymore :-( - connect( m_vcsInfoProvider, TQT_SIGNAL(destroyed()), TQT_SIGNAL(implementationInvalidated()) ); + connect( m_vcsInfoProvider, TQ_SIGNAL(destroyed()), TQ_SIGNAL(implementationInvalidated()) ); m_actionToggleShowVCSFields = new TDEToggleAction( i18n("Show VCS Fields"), TDEShortcut(), this, "actiontoggleshowvcsfieldstoggleaction" ); m_actionToggleShowVCSFields->setCheckedState(i18n("Hide VCS Fields")); TQString aboutAction = i18n("<b>Show VCS fields</b><p>Shows <b>Revision</b> and <b>Timestamp</b> for each file contained in VCS repository."); m_actionToggleShowVCSFields->setWhatsThis( aboutAction ); - connect( m_actionToggleShowVCSFields, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleShowVCSFields(bool)) ); + connect( m_actionToggleShowVCSFields, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleShowVCSFields(bool)) ); m_actionSyncWithRepository = new TDEAction( i18n( "Sync with Repository"), TDEShortcut(), - this, TQT_SLOT(slotSyncWithRepository()), this, "actionsyncwithrepository" ); + this, TQ_SLOT(slotSyncWithRepository()), this, "actionsyncwithrepository" ); aboutAction = i18n("<b>Sync with repository</b><p>Synchronize file status with remote repository."); m_actionSyncWithRepository->setWhatsThis( aboutAction ); TQDomDocument &dom = projectDom(); m_actionToggleShowVCSFields->setChecked( DomUtil::readBoolEntry(dom, "/kdevfileview/tree/showvcsfields") ); slotToggleShowVCSFields( showVCSFields() ); // show or hide fields depending on read settings - connect( parent, TQT_SIGNAL(expanded(TQListViewItem*)), this, TQT_SLOT(slotDirectoryExpanded(TQListViewItem*))); + connect( parent, TQ_SIGNAL(expanded(TQListViewItem*)), this, TQ_SLOT(slotDirectoryExpanded(TQListViewItem*))); } /////////////////////////////////////////////////////////////////////////////// diff --git a/parts/fileview/vcsfiletreewidgetimpl.h b/parts/fileview/vcsfiletreewidgetimpl.h index 00a38b32..f0c33a9e 100644 --- a/parts/fileview/vcsfiletreewidgetimpl.h +++ b/parts/fileview/vcsfiletreewidgetimpl.h @@ -24,7 +24,7 @@ class TDEToggleAction; */ class VCSFileTreeWidgetImpl : public FileTreeViewWidgetImpl { - Q_OBJECT + TQ_OBJECT public: VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFileInfoProvider *infoProvider ); diff --git a/parts/filter/filterpart.cpp b/parts/filter/filterpart.cpp index 3a1351ad..a68f1ec5 100644 --- a/parts/filter/filterpart.cpp +++ b/parts/filter/filterpart.cpp @@ -38,13 +38,13 @@ FilterPart::FilterPart(TQObject *parent, const char *name, const TQStringList &) TDEAction *action; action = new TDEAction( i18n("Execute Command..."), 0, - this, TQT_SLOT(slotShellInsert()), + this, TQ_SLOT(slotShellInsert()), actionCollection(), "tools_insertshell" ); action->setToolTip(i18n("Execute shell command")); action->setWhatsThis(i18n("<b>Execute shell command</b><p>Executes a shell command and outputs its result into the current document.")); action = new TDEAction( i18n("Filter Selection Through Command..."), 0, - this, TQT_SLOT(slotShellFilter()), + this, TQ_SLOT(slotShellFilter()), actionCollection(), "tools_filtershell" ); action->setToolTip(i18n("Filter selection through a shell command")); action->setWhatsThis(i18n("<b>Filter selection through shell command</b><p>Filters selection through a shell command and outputs its result into the current document.")); diff --git a/parts/filter/filterpart.h b/parts/filter/filterpart.h index b8322425..44a78e3c 100644 --- a/parts/filter/filterpart.h +++ b/parts/filter/filterpart.h @@ -21,7 +21,7 @@ class ShellFilterDialog; class FilterPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/filter/kdevfilterIface.h b/parts/filter/kdevfilterIface.h index fae74022..58d75eb1 100644 --- a/parts/filter/kdevfilterIface.h +++ b/parts/filter/kdevfilterIface.h @@ -9,7 +9,7 @@ class FilterPart; class KDevFilterIface : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP public: diff --git a/parts/filter/shellfilterdlg.cpp b/parts/filter/shellfilterdlg.cpp index a5100d5b..967f09a4 100644 --- a/parts/filter/shellfilterdlg.cpp +++ b/parts/filter/shellfilterdlg.cpp @@ -44,10 +44,10 @@ ShellFilterDialog::ShellFilterDialog() buttonbox->layout(); layout->addWidget(buttonbox); - connect( start_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotStartClicked()) ); - connect( cancel_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(reject()) ); + connect( start_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotStartClicked()) ); + connect( cancel_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(reject()) ); m_proc = 0; @@ -81,12 +81,12 @@ void ShellFilterDialog::slotStartClicked() delete m_proc; m_proc = new KShellProcess("/bin/sh"); (*m_proc) << combo->currentText(); - connect( m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char *, int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char *, int)) ); - connect( m_proc, TQT_SIGNAL(wroteStdin(TDEProcess*)), - this, TQT_SLOT(slotWroteStdin(TDEProcess*)) ); - connect( m_proc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); + connect( m_proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char *, int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*, char *, int)) ); + connect( m_proc, TQ_SIGNAL(wroteStdin(TDEProcess*)), + this, TQ_SLOT(slotWroteStdin(TDEProcess*)) ); + connect( m_proc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*)) ); m_proc->start(TDEProcess::NotifyOnExit, TDEProcess::All); m_proc->writeStdin(m_instr, m_instr.length()); } diff --git a/parts/filter/shellfilterdlg.h b/parts/filter/shellfilterdlg.h index 87657501..f82f474b 100644 --- a/parts/filter/shellfilterdlg.h +++ b/parts/filter/shellfilterdlg.h @@ -22,7 +22,7 @@ class TDEProcess; class ShellFilterDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/filter/shellinsertdlg.cpp b/parts/filter/shellinsertdlg.cpp index 057e8121..a379ec53 100644 --- a/parts/filter/shellinsertdlg.cpp +++ b/parts/filter/shellinsertdlg.cpp @@ -45,11 +45,11 @@ ShellInsertDialog::ShellInsertDialog() buttonbox->layout(); layout->addWidget(buttonbox); - connect( start_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotStartClicked()) ); - connect( cancel_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(reject()) ); - connect( combo->lineEdit(), TQT_SIGNAL(textChanged( const TQString &)), this, TQT_SLOT(executeTextChanged( const TQString &))); + connect( start_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotStartClicked()) ); + connect( cancel_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(reject()) ); + connect( combo->lineEdit(), TQ_SIGNAL(textChanged( const TQString &)), this, TQ_SLOT(executeTextChanged( const TQString &))); m_proc = 0; TDEConfig *config = FilterFactory::instance()->config(); @@ -97,10 +97,10 @@ void ShellInsertDialog::slotStartClicked() delete m_proc; m_proc = new KShellProcess("/bin/sh"); (*m_proc) << combo->currentText(); - connect( m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char *, int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char *, int)) ); - connect( m_proc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); + connect( m_proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char *, int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*, char *, int)) ); + connect( m_proc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*)) ); m_proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); } diff --git a/parts/filter/shellinsertdlg.h b/parts/filter/shellinsertdlg.h index fda59678..8c40ddbc 100644 --- a/parts/filter/shellinsertdlg.h +++ b/parts/filter/shellinsertdlg.h @@ -22,7 +22,7 @@ class TDEProcess; class ShellInsertDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/fullscreen/fullscreen_part.cpp b/parts/fullscreen/fullscreen_part.cpp index 98581a9c..1d31f618 100644 --- a/parts/fullscreen/fullscreen_part.cpp +++ b/parts/fullscreen/fullscreen_part.cpp @@ -40,7 +40,7 @@ FullScreenPart::FullScreenPart(TQObject *parent, const char *name, const TQStrin m_bFullScreen = false; - m_pFullScreen = KStdAction::fullScreen(this, TQT_SLOT(slotToggleFullScreen()), actionCollection(), mainWindow()->main()); + m_pFullScreen = KStdAction::fullScreen(this, TQ_SLOT(slotToggleFullScreen()), actionCollection(), mainWindow()->main()); } FullScreenPart::~FullScreenPart() diff --git a/parts/fullscreen/fullscreen_part.h b/parts/fullscreen/fullscreen_part.h index fcb566e8..6e43f87f 100644 --- a/parts/fullscreen/fullscreen_part.h +++ b/parts/fullscreen/fullscreen_part.h @@ -19,7 +19,7 @@ class TDEAction; class FullScreenPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: FullScreenPart(TQObject *parent, const char *name, const TQStringList &); diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp index 6333805f..70f301a0 100644 --- a/parts/grepview/grepdlg.cpp +++ b/parts/grepview/grepdlg.cpp @@ -173,7 +173,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name layout->addWidget(files_label, 5, 0, AlignRight | AlignVCenter); files_combo = new KComboBox(true, this); - files_label->setBuddy(TQT_TQWIDGET(files_combo->focusProxy())); + files_label->setBuddy(files_combo->focusProxy()); files_combo->insertStrList(filepatterns); layout->addWidget(files_combo, 5, 1); @@ -182,7 +182,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name TQStringList exclude_list = config->readListEntry("exclude_patterns"); exclude_combo = new KComboBox(true, this); - exclude_label->setBuddy(TQT_TQWIDGET(files_combo->focusProxy())); + exclude_label->setBuddy(files_combo->focusProxy()); if (exclude_list.count()) { exclude_combo->insertStringList(exclude_list); } @@ -249,15 +249,15 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name "by the pattern input field, resulting in the regular expression " "to search for.")); - connect( template_combo, TQT_SIGNAL(activated(int)), - TQT_SLOT(templateActivated(int)) ); - connect( search_button, TQT_SIGNAL(clicked()), - TQT_SLOT(slotSearchClicked()) ); - connect( done_button, TQT_SIGNAL(clicked()), - TQT_SLOT(hide()) ); - connect( pattern_combo->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & ) ), - TQT_SLOT( slotPatternChanged( const TQString & ) ) ); - connect( synch_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSynchDirectory()) ); + connect( template_combo, TQ_SIGNAL(activated(int)), + TQ_SLOT(templateActivated(int)) ); + connect( search_button, TQ_SIGNAL(clicked()), + TQ_SLOT(slotSearchClicked()) ); + connect( done_button, TQ_SIGNAL(clicked()), + TQ_SLOT(hide()) ); + connect( pattern_combo->lineEdit(), TQ_SIGNAL( textChanged ( const TQString & ) ), + TQ_SLOT( slotPatternChanged( const TQString & ) ) ); + connect( synch_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSynchDirectory()) ); slotPatternChanged( pattern_combo->currentText() ); } diff --git a/parts/grepview/grepdlg.h b/parts/grepview/grepdlg.h index fa00badb..ca00fd1d 100644 --- a/parts/grepview/grepdlg.h +++ b/parts/grepview/grepdlg.h @@ -27,7 +27,7 @@ class KLineEdit; class GrepDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/grepview/grepviewpart.cpp b/parts/grepview/grepviewpart.cpp index 92f4ebb6..2d67bdb2 100644 --- a/parts/grepview/grepviewpart.cpp +++ b/parts/grepview/grepviewpart.cpp @@ -41,12 +41,12 @@ GrepViewPart::GrepViewPart( TQObject *parent, const char *name, const TQStringLi setXMLFile("kdevgrepview.rc"); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(stopButtonClicked(KDevPlugin*)) ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(stopButtonClicked(KDevPlugin*)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); m_widget = new GrepViewWidget(this); m_widget->setIcon(SmallIcon("grep")); @@ -63,7 +63,7 @@ GrepViewPart::GrepViewPart( TQObject *parent, const char *name, const TQStringLi TDEAction *action; action = new TDEAction(i18n("Find in Fi&les..."), "grep", CTRL+ALT+Key_F, - this, TQT_SLOT(slotGrep()), + this, TQ_SLOT(slotGrep()), actionCollection(), "edit_grep"); action->setToolTip( i18n("Search for expressions over several files") ); action->setWhatsThis( i18n("<b>Find in files</b><p>" @@ -117,7 +117,7 @@ void GrepViewPart::contextMenu(TQPopupMenu *popup, const Context *context) m_popupstr = ident; TQString squeezed = KStringHandler::csqueeze(ident, 30); int id = popup->insertItem( i18n("Grep: %1").arg(squeezed), - this, TQT_SLOT(slotContextGrep()) ); + this, TQ_SLOT(slotContextGrep()) ); popup->setWhatsThis(id, i18n("<b>Grep</b><p>Opens the find in files dialog " "and sets the pattern to the text under the cursor.")); popup->insertSeparator(); diff --git a/parts/grepview/grepviewpart.h b/parts/grepview/grepviewpart.h index 4ebd7638..da2aead6 100644 --- a/parts/grepview/grepviewpart.h +++ b/parts/grepview/grepviewpart.h @@ -24,7 +24,7 @@ class GrepViewWidget; class GrepViewPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/grepview/grepviewwidget.cpp b/parts/grepview/grepviewwidget.cpp index 1d709dff..d6c67cc0 100644 --- a/parts/grepview/grepviewwidget.cpp +++ b/parts/grepview/grepviewwidget.cpp @@ -137,25 +137,25 @@ GrepViewWidget::GrepViewWidget(GrepViewPart *part) : TQWidget(0, "grepview widg m_tabWidget->addTab(m_curOutput, i18n("Search Results")); grepdlg = new GrepDialog( part, this, "grep widget"); - connect( grepdlg, TQT_SIGNAL(searchClicked()), this, TQT_SLOT(searchActivated()) ); - connect( m_curOutput, TQT_SIGNAL(processExited(TDEProcess* )), this, TQT_SLOT(slotSearchProcessExited()) ); + connect( grepdlg, TQ_SIGNAL(searchClicked()), this, TQ_SLOT(searchActivated()) ); + connect( m_curOutput, TQ_SIGNAL(processExited(TDEProcess* )), this, TQ_SLOT(slotSearchProcessExited()) ); - connect( m_tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotOutputTabChanged()) ); + connect( m_tabWidget, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(slotOutputTabChanged()) ); - connect( m_curOutput, TQT_SIGNAL(clicked(TQListBoxItem*)), - this, TQT_SLOT(slotExecuted(TQListBoxItem*)) ); - connect( m_curOutput, TQT_SIGNAL(returnPressed(TQListBoxItem*)), - this, TQT_SLOT(slotExecuted(TQListBoxItem*)) ); + connect( m_curOutput, TQ_SIGNAL(clicked(TQListBoxItem*)), + this, TQ_SLOT(slotExecuted(TQListBoxItem*)) ); + connect( m_curOutput, TQ_SIGNAL(returnPressed(TQListBoxItem*)), + this, TQ_SLOT(slotExecuted(TQListBoxItem*)) ); - connect( m_curOutput, TQT_SIGNAL(contextMenuRequested( TQListBoxItem*, const TQPoint&)), this, TQT_SLOT(popupMenu(TQListBoxItem*, const TQPoint&))); + connect( m_curOutput, TQ_SIGNAL(contextMenuRequested( TQListBoxItem*, const TQPoint&)), this, TQ_SLOT(popupMenu(TQListBoxItem*, const TQPoint&))); m_part = part; m_closeButton = new TQToolButton(m_tabWidget);//@todo change text/icon m_closeButton->setIconSet(SmallIconSet("tab_remove")); m_closeButton->setEnabled(false); - connect (m_closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCloseCurrentOutput())); + connect (m_closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCloseCurrentOutput())); m_tabWidget->setCornerWidget(m_closeButton); } @@ -459,10 +459,10 @@ void GrepViewWidget::slotKeepOutput( ) m_curOutput = new GrepViewProcessWidget(m_tabWidget); m_tabWidget->insertTab(m_curOutput, i18n("Search Results"), 0); - connect( m_curOutput, TQT_SIGNAL(clicked(TQListBoxItem*)), this, TQT_SLOT(slotExecuted(TQListBoxItem*)) ); - connect( m_curOutput, TQT_SIGNAL(returnPressed(TQListBoxItem*)), this, TQT_SLOT(slotExecuted(TQListBoxItem*)) ); - connect( m_curOutput, TQT_SIGNAL(processExited(TDEProcess* )), this, TQT_SLOT(slotSearchProcessExited()) ); - connect( m_curOutput, TQT_SIGNAL(contextMenuRequested( TQListBoxItem*, const TQPoint&)), this, TQT_SLOT(popupMenu(TQListBoxItem*, const TQPoint&))); + connect( m_curOutput, TQ_SIGNAL(clicked(TQListBoxItem*)), this, TQ_SLOT(slotExecuted(TQListBoxItem*)) ); + connect( m_curOutput, TQ_SIGNAL(returnPressed(TQListBoxItem*)), this, TQ_SLOT(slotExecuted(TQListBoxItem*)) ); + connect( m_curOutput, TQ_SIGNAL(processExited(TDEProcess* )), this, TQ_SLOT(slotSearchProcessExited()) ); + connect( m_curOutput, TQ_SIGNAL(contextMenuRequested( TQListBoxItem*, const TQPoint&)), this, TQ_SLOT(popupMenu(TQListBoxItem*, const TQPoint&))); } void GrepViewWidget::slotCloseCurrentOutput( ) diff --git a/parts/grepview/grepviewwidget.h b/parts/grepview/grepviewwidget.h index 3bf803b5..68fd988b 100644 --- a/parts/grepview/grepviewwidget.h +++ b/parts/grepview/grepviewwidget.h @@ -24,7 +24,7 @@ class TQHBoxLayout; class TQToolButton; class GrepViewProcessWidget : public ProcessWidget { - Q_OBJECT + TQ_OBJECT public: GrepViewProcessWidget(TQWidget* parent) : ProcessWidget(parent) {}; @@ -59,7 +59,7 @@ private: class GrepViewWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/konsole/konsoleviewpart.cpp b/parts/konsole/konsoleviewpart.cpp index 873ab790..118cb756 100644 --- a/parts/konsole/konsoleviewpart.cpp +++ b/parts/konsole/konsoleviewpart.cpp @@ -48,7 +48,7 @@ KonsoleViewPart::KonsoleViewPart(TQObject *parent, const char *name, const TQStr mainWindow()->embedOutputView(m_widget, i18n("Konsole"), i18n("Embedded console window")); - connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); + connect(core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened())); } diff --git a/parts/konsole/konsoleviewpart.h b/parts/konsole/konsoleviewpart.h index 9bcecb38..0b831778 100644 --- a/parts/konsole/konsoleviewpart.h +++ b/parts/konsole/konsoleviewpart.h @@ -21,7 +21,7 @@ class KDevShellWidget; class KonsoleViewPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: KonsoleViewPart(TQObject *parent, const char *name, const TQStringList &); diff --git a/parts/konsole/konsoleviewwidget.cpp b/parts/konsole/konsoleviewwidget.cpp index 7c21cab2..5a62b7a6 100644 --- a/parts/konsole/konsoleviewwidget.cpp +++ b/parts/konsole/konsoleviewwidget.cpp @@ -30,7 +30,7 @@ KonsoleViewWidget::KonsoleViewWidget(KonsoleViewPart *part) : TQWidget(0, "konsole widget"), part(0), owner( part ) { - connect(part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(activePartChanged(KParts::Part*))); + connect(part->partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SLOT(activePartChanged(KParts::Part*))); vbox = new TQVBoxLayout(this); } @@ -58,11 +58,11 @@ void KonsoleViewWidget::activate() if (!part) return; - part->widget()->setFocusPolicy(TQ_WheelFocus); + part->widget()->setFocusPolicy(TQWidget::WheelFocus); setFocusProxy(part->widget()); part->widget()->setFocus(); - if (part->widget()->inherits(TQFRAME_OBJECT_NAME_STRING)) + if (part->widget()->inherits("TQFrame")) ((TQFrame*)part->widget())->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); vbox->addWidget(part->widget()); @@ -70,7 +70,7 @@ void KonsoleViewWidget::activate() // this->activePartChanged( owner->partController()->activePart() ); part->widget()->show(); - connect(part, TQT_SIGNAL(destroyed()), this, TQT_SLOT(partDestroyed())); + connect(part, TQ_SIGNAL(destroyed()), this, TQ_SLOT(partDestroyed())); } diff --git a/parts/konsole/konsoleviewwidget.h b/parts/konsole/konsoleviewwidget.h index 2bf3160a..b3781871 100644 --- a/parts/konsole/konsoleviewwidget.h +++ b/parts/konsole/konsoleviewwidget.h @@ -29,7 +29,7 @@ class TQVBoxLayout; class KonsoleViewWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KonsoleViewWidget(KonsoleViewPart *part); diff --git a/parts/openwith/openwithpart.cpp b/parts/openwith/openwithpart.cpp index 63fcc6d9..feca079c 100644 --- a/parts/openwith/openwithpart.cpp +++ b/parts/openwith/openwithpart.cpp @@ -26,8 +26,8 @@ OpenWithPart::OpenWithPart(TQObject *parent, const char *name, const TQStringLis { setInstance( OpenWithFactory::instance() ); - connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu*,const Context *)), - this, TQT_SLOT(fillContextMenu(TQPopupMenu*,const Context *))); + connect(core(), TQ_SIGNAL(contextMenu(TQPopupMenu*,const Context *)), + this, TQ_SLOT(fillContextMenu(TQPopupMenu*,const Context *))); } @@ -45,7 +45,7 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context) popup->insertSeparator(); - popup->insertItem( i18n("Open as UTF-8"), this, TQT_SLOT(openAsUtf8()) ); + popup->insertItem( i18n("Open as UTF-8"), this, TQ_SLOT(openAsUtf8()) ); TDEPopupMenu * openAsPopup = new TDEPopupMenu( popup ); @@ -58,7 +58,7 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context) TQStringList::const_iterator it = encodings.constBegin(); while ( it != encodings.constEnd() ) { - openAsPopup->insertItem( *it, this, TQT_SLOT(openAsEncoding(int)), 0, i ); + openAsPopup->insertItem( *it, this, TQ_SLOT(openAsEncoding(int)), 0, i ); ++it; i++; } @@ -74,7 +74,7 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context) for (it = offers.begin(); it != offers.end(); ++it) { TDEAction *action = new TDEAction((*it)->name(), (*it)->icon(), 0, 0, TQFile::encodeName( (*it)->desktopEntryPath() ).data()); - connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(openWithService())); + connect(action, TQ_SIGNAL(activated()), this, TQ_SLOT(openWithService())); action->plug( openWithPopup ); } } @@ -85,14 +85,14 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context) openWithPopup->insertSeparator(); // make sure the generic "Open with ..." entry gets appended to the submenu - id = openWithPopup->insertItem(i18n("Open With..."), this, TQT_SLOT(openWithDialog())); + id = openWithPopup->insertItem(i18n("Open With..."), this, TQ_SLOT(openWithDialog())); openWithPopup->setWhatsThis(id, i18n("<b>Open With...</b><p>Provides a dialog to choose the application to open the selected file.")); } void OpenWithPart::openWithService() { - KService::Ptr ptr = KService::serviceByDesktopPath(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); + KService::Ptr ptr = KService::serviceByDesktopPath(sender()->name()); if (ptr) { KRun::run(*ptr, m_urls); diff --git a/parts/openwith/openwithpart.h b/parts/openwith/openwithpart.h index bd338a3f..6cbbd6c0 100644 --- a/parts/openwith/openwithpart.h +++ b/parts/openwith/openwithpart.h @@ -11,7 +11,7 @@ class Context; class OpenWithPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp index 3d8b47bf..5a961419 100644 --- a/parts/outputviews/appoutputviewpart.cpp +++ b/parts/outputviews/appoutputviewpart.cpp @@ -51,10 +51,10 @@ AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const T mainWindow()->embedOutputView(m_widget, i18n("Application"), i18n("Output of the executed user program")); hideView(); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); - connect(m_widget, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited())); - connect(m_widget, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SIGNAL(processExited())); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(slotStopButtonClicked(KDevPlugin*)) ); + connect(m_widget, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotProcessExited())); + connect(m_widget, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SIGNAL(processExited())); } diff --git a/parts/outputviews/appoutputviewpart.h b/parts/outputviews/appoutputviewpart.h index 1067af97..db643f54 100644 --- a/parts/outputviews/appoutputviewpart.h +++ b/parts/outputviews/appoutputviewpart.h @@ -22,7 +22,7 @@ class AppOutputWidget; class AppOutputViewPart : public KDevAppFrontend { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp index 50060339..a8931f86 100644 --- a/parts/outputviews/appoutputwidget.cpp +++ b/parts/outputviews/appoutputwidget.cpp @@ -40,9 +40,9 @@ AppOutputWidget::AppOutputWidget(AppOutputViewPart* part) : ProcessWidget(0, "app output widget"), m_part(part) { - connect(this, TQT_SIGNAL(executed(TQListBoxItem*)), TQT_SLOT(slotRowSelected(TQListBoxItem*))); - connect(this, TQT_SIGNAL(rightButtonClicked( TQListBoxItem *, const TQPoint & )), - TQT_SLOT(slotContextMenu( TQListBoxItem *, const TQPoint & ))); + connect(this, TQ_SIGNAL(executed(TQListBoxItem*)), TQ_SLOT(slotRowSelected(TQListBoxItem*))); + connect(this, TQ_SIGNAL(rightButtonClicked( TQListBoxItem *, const TQPoint & )), + TQ_SLOT(slotContextMenu( TQListBoxItem *, const TQPoint & ))); TDEConfig *config = kapp->config(); config->setGroup("General Options"); setFont(config->readFontEntry("OutputViewFont")); @@ -251,24 +251,24 @@ void AppOutputWidget::slotContextMenu( TQListBoxItem *, const TQPoint &p ) { TDEPopupMenu popup(this, "filter output"); - int id = popup.insertItem( i18n("Clear output"), this, TQT_SLOT(clearViewAndContents()) ); + int id = popup.insertItem( i18n("Clear output"), this, TQ_SLOT(clearViewAndContents()) ); popup.setItemEnabled( id, m_contentList.size() > 0 ); - popup.insertItem( i18n("Copy selected lines"), this, TQT_SLOT(copySelected()) ); + popup.insertItem( i18n("Copy selected lines"), this, TQ_SLOT(copySelected()) ); popup.insertSeparator(); - popup.insertItem( i18n("Save unfiltered"), this, TQT_SLOT(saveAll()) ); - id = popup.insertItem( i18n("Save filtered output"), this, TQT_SLOT(saveFiltered()) ); + popup.insertItem( i18n("Save unfiltered"), this, TQ_SLOT(saveAll()) ); + id = popup.insertItem( i18n("Save filtered output"), this, TQ_SLOT(saveFiltered()) ); popup.setItemEnabled( id, m_filter.m_isActive ); popup.insertSeparator(); - id = popup.insertItem( i18n("Clear filter"), this, TQT_SLOT(clearFilter()) ); + id = popup.insertItem( i18n("Clear filter"), this, TQ_SLOT(clearFilter()) ); popup.setItemEnabled( id, m_filter.m_isActive ); - popup.insertItem( i18n("Edit filter"), this, TQT_SLOT(editFilter() ) ); + popup.insertItem( i18n("Edit filter"), this, TQ_SLOT(editFilter() ) ); popup.insertSeparator(); - popup.insertItem( i18n("Hide view"), this, TQT_SLOT(hideView()) ); + popup.insertItem( i18n("Hide view"), this, TQ_SLOT(hideView()) ); popup.exec(p); } diff --git a/parts/outputviews/appoutputwidget.h b/parts/outputviews/appoutputwidget.h index 9e5810ea..9c95b879 100644 --- a/parts/outputviews/appoutputwidget.h +++ b/parts/outputviews/appoutputwidget.h @@ -21,7 +21,7 @@ class AppOutputViewPart; class AppOutputWidget : public ProcessWidget { - Q_OBJECT + TQ_OBJECT friend class AppOutputViewPart; public: diff --git a/parts/outputviews/compileerrorfilter.h b/parts/outputviews/compileerrorfilter.h index 81a78020..e703baaf 100644 --- a/parts/outputviews/compileerrorfilter.h +++ b/parts/outputviews/compileerrorfilter.h @@ -21,7 +21,7 @@ class MakeItem; class CompileErrorFilter : public TQObject, public OutputFilter { -Q_OBJECT +TQ_OBJECT public: diff --git a/parts/outputviews/directorystatusmessagefilter.h b/parts/outputviews/directorystatusmessagefilter.h index 13d23d02..dbcd4424 100644 --- a/parts/outputviews/directorystatusmessagefilter.h +++ b/parts/outputviews/directorystatusmessagefilter.h @@ -20,7 +20,7 @@ class ExitingDirectoryItem; class DirectoryStatusMessageFilter : public TQObject, public OutputFilter { -Q_OBJECT +TQ_OBJECT public: diff --git a/parts/outputviews/filterdlg.ui b/parts/outputviews/filterdlg.ui index eae824f3..07a8d1f5 100644 --- a/parts/outputviews/filterdlg.ui +++ b/parts/outputviews/filterdlg.ui @@ -60,9 +60,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -77,9 +74,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/parts/outputviews/makeactionfilter.h b/parts/outputviews/makeactionfilter.h index f030f555..bf71a9e0 100644 --- a/parts/outputviews/makeactionfilter.h +++ b/parts/outputviews/makeactionfilter.h @@ -22,7 +22,7 @@ class ActionItem; class MakeActionFilter : public TQObject, public OutputFilter { -Q_OBJECT +TQ_OBJECT public: diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp index 2df7d384..d1b1df76 100644 --- a/parts/outputviews/makeviewpart.cpp +++ b/parts/outputviews/makeviewpart.cpp @@ -52,17 +52,17 @@ MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringLis mainWindow()->embedOutputView(m_widget, i18n("Messages"), i18n("Compiler output messages")); TDEAction *action; - action = new TDEAction( i18n("&Next Error"), Key_F4, TQT_TQOBJECT(m_widget), TQT_SLOT(nextError()), + action = new TDEAction( i18n("&Next Error"), Key_F4, m_widget, TQ_SLOT(nextError()), actionCollection(), "view_next_error"); action->setToolTip( i18n("Go to the next error") ); action->setWhatsThis(i18n("<b>Next error</b><p>Switches to the file and line where the next error was reported from.")); - action = new TDEAction( i18n("&Previous Error"), SHIFT+Key_F4, TQT_TQOBJECT(m_widget), TQT_SLOT(prevError()), + action = new TDEAction( i18n("&Previous Error"), SHIFT+Key_F4, m_widget, TQ_SLOT(prevError()), actionCollection(), "view_previous_error"); action->setToolTip( i18n("Go to the previous error") ); action->setWhatsThis(i18n("<b>Previous error</b><p>Switches to the file and line where the previous error was reported from.")); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(slotStopButtonClicked(KDevPlugin*)) ); } diff --git a/parts/outputviews/makeviewpart.h b/parts/outputviews/makeviewpart.h index 89f2a8bd..b11d2f54 100644 --- a/parts/outputviews/makeviewpart.h +++ b/parts/outputviews/makeviewpart.h @@ -22,7 +22,7 @@ class MakeWidget; class MakeViewPart : public KDevMakeFrontend { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp index 029efdc6..e05295f1 100644 --- a/parts/outputviews/makewidget.cpp +++ b/parts/outputviews/makewidget.cpp @@ -178,44 +178,44 @@ MakeWidget::MakeWidget(MakeViewPart *part) dirstack.setAutoDelete(true); - childproc = new TDEProcess(TQT_TQOBJECT(this)); + childproc = new TDEProcess(this); procLineMaker = new ProcessLineMaker( childproc ); - connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)), - this, TQT_SLOT(insertStdoutLine(const TQCString&) )); - connect( procLineMaker, TQT_SIGNAL(receivedStderrLine(const TQCString&)), - this, TQT_SLOT(insertStderrLine(const TQCString&) )); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStdoutLine(const TQCString&)), - this, TQT_SLOT(storePartialStdoutLine(const TQCString&) )); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)), - this, TQT_SLOT(storePartialStderrLine(const TQCString&) )); - - connect( childproc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*) )) ; - - connect( &m_directoryStatusFilter, TQT_SIGNAL(item(EnteringDirectoryItem*)), - this, TQT_SLOT(slotEnteredDirectory(EnteringDirectoryItem*)) ); - connect( &m_directoryStatusFilter, TQT_SIGNAL(item(ExitingDirectoryItem*)), - this, TQT_SLOT(slotExitedDirectory(ExitingDirectoryItem*)) ); - connect( &m_errorFilter, TQT_SIGNAL(item(MakeItem*)), - this, TQT_SLOT(insertItem(MakeItem*)) ); - connect( &m_actionFilter, TQT_SIGNAL(item(MakeItem*)), - this, TQT_SLOT(insertItem(MakeItem*)) ); - connect( &m_otherFilter, TQT_SIGNAL(item(MakeItem*)), - this, TQT_SLOT(insertItem(MakeItem*)) ); - - connect( verticalScrollBar(), TQT_SIGNAL(sliderPressed()), - this, TQT_SLOT(verticScrollingOn()) ); - connect( verticalScrollBar(), TQT_SIGNAL(sliderReleased()), - this, TQT_SLOT(verticScrollingOff()) ); - connect( horizontalScrollBar(), TQT_SIGNAL(sliderPressed()), - this, TQT_SLOT(horizScrollingOn()) ); - connect( horizontalScrollBar(), TQT_SIGNAL(sliderReleased()), - this, TQT_SLOT(horizScrollingOff()) ); + connect( procLineMaker, TQ_SIGNAL(receivedStdoutLine(const TQCString&)), + this, TQ_SLOT(insertStdoutLine(const TQCString&) )); + connect( procLineMaker, TQ_SIGNAL(receivedStderrLine(const TQCString&)), + this, TQ_SLOT(insertStderrLine(const TQCString&) )); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStdoutLine(const TQCString&)), + this, TQ_SLOT(storePartialStdoutLine(const TQCString&) )); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStderrLine(const TQCString&)), + this, TQ_SLOT(storePartialStderrLine(const TQCString&) )); + + connect( childproc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*) )) ; + + connect( &m_directoryStatusFilter, TQ_SIGNAL(item(EnteringDirectoryItem*)), + this, TQ_SLOT(slotEnteredDirectory(EnteringDirectoryItem*)) ); + connect( &m_directoryStatusFilter, TQ_SIGNAL(item(ExitingDirectoryItem*)), + this, TQ_SLOT(slotExitedDirectory(ExitingDirectoryItem*)) ); + connect( &m_errorFilter, TQ_SIGNAL(item(MakeItem*)), + this, TQ_SLOT(insertItem(MakeItem*)) ); + connect( &m_actionFilter, TQ_SIGNAL(item(MakeItem*)), + this, TQ_SLOT(insertItem(MakeItem*)) ); + connect( &m_otherFilter, TQ_SIGNAL(item(MakeItem*)), + this, TQ_SLOT(insertItem(MakeItem*)) ); + + connect( verticalScrollBar(), TQ_SIGNAL(sliderPressed()), + this, TQ_SLOT(verticScrollingOn()) ); + connect( verticalScrollBar(), TQ_SIGNAL(sliderReleased()), + this, TQ_SLOT(verticScrollingOff()) ); + connect( horizontalScrollBar(), TQ_SIGNAL(sliderPressed()), + this, TQ_SLOT(horizScrollingOn()) ); + connect( horizontalScrollBar(), TQ_SIGNAL(sliderReleased()), + this, TQ_SLOT(horizScrollingOff()) ); // this slot doesn't exist anymore -// connect( m_part->partController(), TQT_SIGNAL(loadedFile(const KURL&)), -// this, TQT_SLOT(slotDocumentOpened(const KURL&)) ); +// connect( m_part->partController(), TQ_SIGNAL(loadedFile(const KURL&)), +// this, TQ_SLOT(slotDocumentOpened(const KURL&)) ); } MakeWidget::~MakeWidget() @@ -389,7 +389,7 @@ void MakeWidget::prevError() void MakeWidget::contentsMouseReleaseEvent( TQMouseEvent* e ) { TQTextEdit::contentsMouseReleaseEvent(e); - if ( e->button() != Qt::LeftButton ) + if ( e->button() != TQt::LeftButton ) return; searchItem(paragraphAt(e->pos())); } @@ -588,7 +588,7 @@ void MakeWidget::slotProcessExited(TDEProcess *) // and its TDEProcess object can be reused. if (childproc->normalExit() && !childproc->exitStatus()) { - TQTimer::singleShot(0, this, TQT_SLOT(startNextJob())); + TQTimer::singleShot(0, this, TQ_SLOT(startNextJob())); // if (commandList.isEmpty()) // The last command on the list was successful so restore the // output view to what it had before the compilation process started @@ -698,23 +698,23 @@ TQPopupMenu* MakeWidget::createPopupMenu( const TQPoint& pos ) pMenu->setCheckable(true); pMenu->insertSeparator(); - int id = pMenu->insertItem(i18n("Line Wrapping"), this, TQT_SLOT(toggleLineWrapping()) ); + int id = pMenu->insertItem(i18n("Line Wrapping"), this, TQ_SLOT(toggleLineWrapping()) ); pMenu->setItemChecked(id, m_bLineWrapping); pMenu->setWhatsThis(id, i18n("<b>Line wrapping</b><p>Enables or disables wrapping of command lines displayed.")); pMenu->insertSeparator(); - id = pMenu->insertItem(i18n("Very Short Compiler Output"), this, TQT_SLOT(slotVeryShortCompilerOutput()) ); + id = pMenu->insertItem(i18n("Very Short Compiler Output"), this, TQ_SLOT(slotVeryShortCompilerOutput()) ); pMenu->setWhatsThis(id, i18n("<b>Very short compiler output</b><p>Displays only warnings, errors and the file names which are compiled.")); pMenu->setItemChecked(id, m_compilerOutputLevel == eVeryShort); - id = pMenu->insertItem(i18n("Short Compiler Output"), this, TQT_SLOT(slotShortCompilerOutput()) ); + id = pMenu->insertItem(i18n("Short Compiler Output"), this, TQ_SLOT(slotShortCompilerOutput()) ); pMenu->setWhatsThis(id, i18n("<b>Short compiler output</b><p>Suppresses all the compiler flags and formats to something readable.")); pMenu->setItemChecked(id, m_compilerOutputLevel == eShort); - id = pMenu->insertItem(i18n("Full Compiler Output"), this, TQT_SLOT(slotFullCompilerOutput()) ); + id = pMenu->insertItem(i18n("Full Compiler Output"), this, TQ_SLOT(slotFullCompilerOutput()) ); pMenu->setWhatsThis(id, i18n("<b>Full compiler output</b><p>Displays unmodified compiler output.")); pMenu->setItemChecked(id, m_compilerOutputLevel == eFull); pMenu->insertSeparator(); - id = pMenu->insertItem(i18n("Show Directory Navigation Messages"), this, TQT_SLOT(toggleShowDirNavigMessages())); + id = pMenu->insertItem(i18n("Show Directory Navigation Messages"), this, TQ_SLOT(toggleShowDirNavigMessages())); pMenu->setWhatsThis(id, i18n("<b>Show directory navigation messages</b><p>Shows <b>cd</b> commands that are executed while building.")); pMenu->setItemChecked(id, DirectoryItem::getShowDirectoryMessages()); diff --git a/parts/outputviews/makewidget.h b/parts/outputviews/makewidget.h index b01c95c4..127ae064 100644 --- a/parts/outputviews/makewidget.h +++ b/parts/outputviews/makewidget.h @@ -36,7 +36,7 @@ namespace KTextEditor { class Document; } class MakeWidget : public TQTextEdit { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/outputviews/otherfilter.h b/parts/outputviews/otherfilter.h index 4bfc0733..849ecab9 100644 --- a/parts/outputviews/otherfilter.h +++ b/parts/outputviews/otherfilter.h @@ -20,7 +20,7 @@ class MakeItem; class OtherFilter : public TQObject, public OutputFilter { -Q_OBJECT +TQ_OBJECT public: diff --git a/parts/partexplorer/partexplorer_plugin.cpp b/parts/partexplorer/partexplorer_plugin.cpp index 57b1cd58..9741c6aa 100644 --- a/parts/partexplorer/partexplorer_plugin.cpp +++ b/parts/partexplorer/partexplorer_plugin.cpp @@ -40,7 +40,7 @@ PartExplorerPlugin::PartExplorerPlugin( TQObject *parent, const char *name, con m_widget = new PartExplorerForm( mainWindow()->main() ); // mainWindow()->embedSelectView( m_widget, i18n("PartExplorer"), i18n("Query system services")); - TDEAction *action = new TDEAction( i18n("&Part Explorer"), 0, this, TQT_SLOT(slotShowForm()), + TDEAction *action = new TDEAction( i18n("&Part Explorer"), 0, this, TQ_SLOT(slotShowForm()), actionCollection(), "show_partexplorerform" ); action->setToolTip(i18n("TDETrader query execution")); action->setWhatsThis(i18n("<b>Part explorer</b><p>Shows a dialog for TDETrader query execution. Search your TDE documentation for more information about TDE services and TDETrader.")); diff --git a/parts/partexplorer/partexplorer_plugin.h b/parts/partexplorer/partexplorer_plugin.h index eea44750..0a10d96b 100644 --- a/parts/partexplorer/partexplorer_plugin.h +++ b/parts/partexplorer/partexplorer_plugin.h @@ -23,7 +23,7 @@ class PartExplorerForm; class PartExplorerPlugin : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/parts/partexplorer/partexplorerform.cpp b/parts/partexplorer/partexplorerform.cpp index 76e4fc50..14a926f5 100644 --- a/parts/partexplorer/partexplorerform.cpp +++ b/parts/partexplorer/partexplorerform.cpp @@ -131,11 +131,11 @@ PartExplorerForm::PartExplorerForm( TQWidget *parent ) // Resize dialog resize( 480, 512 ); -// connect( m_base->typeCombo->lineEdit(), TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotSearchRequested()) ); -// connect( m_base->constraintsText, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotSearchRequested()) ); +// connect( m_base->typeCombo->lineEdit(), TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotSearchRequested()) ); +// connect( m_base->constraintsText, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotSearchRequested()) ); - connect( actionButton(User1), TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSearchRequested()) ); -// connect( m_base->typeCombo->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotServicetypeChanged( const TQString& ) ) ); + connect( actionButton(User1), TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSearchRequested()) ); +// connect( m_base->typeCombo->lineEdit(), TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotServicetypeChanged( const TQString& ) ) ); // slotServicetypeChanged( m_base->typeCombo->lineEdit()->text() ); // populating with all known servicetypes @@ -212,7 +212,7 @@ void PartExplorerForm::fillServiceList( const TDETrader::OfferList &services ) TQVariant property = service->property( propertyName ); TQString propertyType = property.typeName(); TQString propertyValue; - if (propertyType == TQSTRINGLIST_OBJECT_NAME_STRING) { + if (propertyType == "TQStringList") { propertyValue = property.toStringList().join(", "); } else { diff --git a/parts/partexplorer/partexplorerform.h b/parts/partexplorer/partexplorerform.h index e5bcabc1..fd882671 100644 --- a/parts/partexplorer/partexplorerform.h +++ b/parts/partexplorer/partexplorerform.h @@ -25,7 +25,7 @@ class PartExplorerFormBase; */ class PartExplorerForm : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: PartExplorerForm( TQWidget *parent = 0 ); diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp index 78c97eb6..0d127a9c 100644 --- a/parts/quickopen/quickopen_part.cpp +++ b/parts/quickopen/quickopen_part.cpp @@ -56,26 +56,26 @@ QuickOpenPart::QuickOpenPart(TQObject *parent, const char *name, const TQStringL setXMLFile("kdevpart_quickopen.rc"); m_actionQuickOpen = new TDEAction( i18n("Quick Open File..."), CTRL + ALT + Key_O, - this, TQT_SLOT(slotQuickFileOpen()), + this, TQ_SLOT(slotQuickFileOpen()), actionCollection(), "quick_open" ); m_actionQuickOpen->setToolTip(i18n("Quick open file in project")); m_actionQuickOpen->setWhatsThis(i18n("<b>Quick open</b><p>Provides a file name input form with completion listbox to quickly open file in a project.")); m_actionQuickOpenClass = new TDEAction( i18n("Quick Open Class..."), CTRL + ALT + Key_C, - this, TQT_SLOT(slotQuickOpenClass()), + this, TQ_SLOT(slotQuickOpenClass()), actionCollection(), "quick_open_class" ); m_actionQuickOpenClass->setToolTip(i18n("Find class in project")); m_actionQuickOpenClass->setWhatsThis(i18n("<b>Find class</b><p>Provides a class name input form with completion listbox to quickly open a file where the class is defined.")); - m_actionFunctionOpen = new TDEAction( i18n("Quick Open Method..."), CTRL + ALT + Key_M, this, TQT_SLOT(slotQuickOpenFunction()), actionCollection(), "quick_open_function" ); + m_actionFunctionOpen = new TDEAction( i18n("Quick Open Method..."), CTRL + ALT + Key_M, this, TQ_SLOT(slotQuickOpenFunction()), actionCollection(), "quick_open_function" ); m_actionFunctionOpen->setToolTip(i18n("Quick open function in project")); - m_switchToAction = new TDEAction(i18n("Switch To..."), TDEShortcut("CTRL+/"), this, TQT_SLOT(slotSwitchTo()), actionCollection(), "file_switchto"); + m_switchToAction = new TDEAction(i18n("Switch To..."), TDEShortcut("CTRL+/"), this, TQ_SLOT(slotSwitchTo()), actionCollection(), "file_switchto"); m_switchToAction->setToolTip(i18n("Switch to")); m_switchToAction->setWhatsThis(i18n("<b>Switch to</b><p>Prompts to enter the name of previously opened file to switch to.")); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotProjectClosed()) ); } diff --git a/parts/quickopen/quickopen_part.h b/parts/quickopen/quickopen_part.h index fa1d85e3..98329db6 100644 --- a/parts/quickopen/quickopen_part.h +++ b/parts/quickopen/quickopen_part.h @@ -29,7 +29,7 @@ class TDEAction; class QuickOpenPart : public KDevQuickOpen { - Q_OBJECT + TQ_OBJECT public: QuickOpenPart(TQObject *parent, const char *name, const TQStringList &); diff --git a/parts/quickopen/quickopenbase.ui b/parts/quickopen/quickopenbase.ui index 1fb873fc..23c028c7 100644 --- a/parts/quickopen/quickopenbase.ui +++ b/parts/quickopen/quickopenbase.ui @@ -87,9 +87,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -104,9 +101,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -167,12 +161,12 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotTextChanged( const TQString & )</slot> <slot>executed( TQListBoxItem * )</slot> <slot>slotExecuted( TQListBoxItem * )</slot> <slot>slotReturnPressed()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/quickopen/quickopenclassdialog.h b/parts/quickopen/quickopenclassdialog.h index 13e01360..3e2df273 100644 --- a/parts/quickopen/quickopenclassdialog.h +++ b/parts/quickopen/quickopenclassdialog.h @@ -29,7 +29,7 @@ class QuickOpenPart; class QuickOpenClassDialog : public QuickOpenDialog { - Q_OBJECT + TQ_OBJECT public: QuickOpenClassDialog(QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); diff --git a/parts/quickopen/quickopendialog.cpp b/parts/quickopen/quickopendialog.cpp index dc90a20c..dd07f2eb 100644 --- a/parts/quickopen/quickopendialog.cpp +++ b/parts/quickopen/quickopendialog.cpp @@ -32,7 +32,7 @@ QuickOpenDialog::QuickOpenDialog(QuickOpenPart* part, TQWidget* parent, const ch : QuickOpenDialogBase( parent, name, modal, fl ), m_part( part ) { nameEdit->installEventFilter(this); - connect( &m_typeTimeout, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTextChangedDelayed()) ); + connect( &m_typeTimeout, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTextChangedDelayed()) ); } QuickOpenDialog::~QuickOpenDialog() @@ -74,7 +74,7 @@ bool QuickOpenDialog::eventFilter( TQObject * watched, TQEvent * e ) if (!watched || !e) return true; - if ((TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(nameEdit)) && (e->type() == TQEvent::KeyPress)) + if ((watched == nameEdit) && (e->type() == TQEvent::KeyPress)) { TQKeyEvent *ke = (TQKeyEvent*)e; if (ke->key() == Key_Up) diff --git a/parts/quickopen/quickopendialog.h b/parts/quickopen/quickopendialog.h index d763b31e..f768b4aa 100644 --- a/parts/quickopen/quickopendialog.h +++ b/parts/quickopen/quickopendialog.h @@ -33,7 +33,7 @@ class TDECompletion; class QuickOpenDialog : public QuickOpenDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/quickopen/quickopenfiledialog.h b/parts/quickopen/quickopenfiledialog.h index 6db19401..2f94e0db 100644 --- a/parts/quickopen/quickopenfiledialog.h +++ b/parts/quickopen/quickopenfiledialog.h @@ -31,7 +31,7 @@ class TDECompletion; class QuickOpenFileDialog : public QuickOpenDialog { - Q_OBJECT + TQ_OBJECT public: QuickOpenFileDialog(QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); diff --git a/parts/quickopen/quickopenfunctionchooseform.h b/parts/quickopen/quickopenfunctionchooseform.h index 06f58e47..a5dd5085 100644 --- a/parts/quickopen/quickopenfunctionchooseform.h +++ b/parts/quickopen/quickopenfunctionchooseform.h @@ -27,7 +27,7 @@ class QuickOpenFunctionChooseForm : public QuickOpenFunctionChooseFormBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/quickopen/quickopenfunctionchooseformbase.ui b/parts/quickopen/quickopenfunctionchooseformbase.ui index 48916460..290440c1 100644 --- a/parts/quickopen/quickopenfunctionchooseformbase.ui +++ b/parts/quickopen/quickopenfunctionchooseformbase.ui @@ -218,10 +218,10 @@ <tabstop>okBtn</tabstop> <tabstop>cancelBtn</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot specifier="pure virtual">slotFileChange( int id )</slot> <slot specifier="pure virtual">slotArgsChange( int id )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include> diff --git a/parts/quickopen/quickopenfunctiondialog.h b/parts/quickopen/quickopenfunctiondialog.h index dc5c69e4..1927f673 100644 --- a/parts/quickopen/quickopenfunctiondialog.h +++ b/parts/quickopen/quickopenfunctiondialog.h @@ -31,7 +31,7 @@ class QuickOpenPart; class QuickOpenFunctionDialog : public QuickOpenDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/regexptest/regexptestdlg.h b/parts/regexptest/regexptestdlg.h index 4c7094a6..32fd1119 100644 --- a/parts/regexptest/regexptestdlg.h +++ b/parts/regexptest/regexptestdlg.h @@ -19,7 +19,7 @@ class KDevPlugin; class RegexpTestDialog : public RegexpTestDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/regexptest/regexptestdlgbase.ui b/parts/regexptest/regexptestdlgbase.ui index 8d6bf504..e21bba69 100644 --- a/parts/regexptest/regexptestdlgbase.ui +++ b/parts/regexptest/regexptestdlgbase.ui @@ -336,11 +336,11 @@ <tabstop>cancelbutton</tabstop> <tabstop>extendedposix_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">insertQuoted()</slot> <slot>somethingChanged()</slot> <slot access="protected">showRegExpEditor()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/parts/regexptest/regexptestpart.cpp b/parts/regexptest/regexptestpart.cpp index 1e16d144..2fec05f6 100644 --- a/parts/regexptest/regexptestpart.cpp +++ b/parts/regexptest/regexptestpart.cpp @@ -33,7 +33,7 @@ RegexpTestPart::RegexpTestPart(TQObject *parent, const char *name, const TQStrin TDEAction *action; action = new TDEAction( i18n("Debug Regular Expression..."), 0, - this, TQT_SLOT(slotRegexpTest()), + this, TQ_SLOT(slotRegexpTest()), actionCollection(), "tools_regexptest" ); action->setToolTip(i18n("Debug regular expression")); action->setWhatsThis(i18n("<b>Debug regular expression</b><p>Allows to enter a regular expression " diff --git a/parts/regexptest/regexptestpart.h b/parts/regexptest/regexptestpart.h index ec153d90..479bee03 100644 --- a/parts/regexptest/regexptestpart.h +++ b/parts/regexptest/regexptestpart.h @@ -21,7 +21,7 @@ class RegexpTestDialog; class RegexpTestPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/replace/replace_part.cpp b/parts/replace/replace_part.cpp index 447548ef..d5329308 100644 --- a/parts/replace/replace_part.cpp +++ b/parts/replace/replace_part.cpp @@ -53,7 +53,7 @@ ReplacePart::ReplacePart(TQObject *parent, const char *name, const TQStringList& mainWindow()->setViewAvailable( m_widget, false ); action = new TDEAction(i18n("Find-Select-Replace..."), 0, - CTRL+SHIFT+Key_R, this, TQT_SLOT(slotReplace()), actionCollection(), "edit_replace_across"); + CTRL+SHIFT+Key_R, this, TQ_SLOT(slotReplace()), actionCollection(), "edit_replace_across"); action->setToolTip( i18n("Project wide string replacement") ); action->setWhatsThis( i18n("<b>Find-Select-Replace</b><p>" "Opens the project wide string replacement dialog. There you " @@ -62,9 +62,9 @@ ReplacePart::ReplacePart(TQObject *parent, const char *name, const TQStringList& "you specify. Matches will be displayed in the <b>Replace</b> window, you " "can replace them with the specified string, exclude them from replace operation or cancel the whole replace.") ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(enableAction())); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(disableAction())); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(enableAction())); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(disableAction())); } void ReplacePart::enableAction() @@ -100,7 +100,7 @@ void ReplacePart::contextMenu(TQPopupMenu *popup, const Context *context) m_popupstr = ident; TQString squeezed = KStringHandler::csqueeze(ident, 30); int id = popup->insertItem( i18n("Replace Project Wide: %1").arg(squeezed), - this, TQT_SLOT(slotReplace()) ); + this, TQ_SLOT(slotReplace()) ); popup->setWhatsThis(id, i18n("<b>Replace Project Wide</b><p>Opens the find in files dialog " "and sets the pattern to the text under the cursor.")); popup->insertSeparator(); diff --git a/parts/replace/replace_part.h b/parts/replace/replace_part.h index fbd0f2f7..d00cc11d 100644 --- a/parts/replace/replace_part.h +++ b/parts/replace/replace_part.h @@ -24,7 +24,7 @@ class Context; class ReplacePart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/replace/replace_widget.cpp b/parts/replace/replace_widget.cpp index 6b1bcbda..22a256ae 100644 --- a/parts/replace/replace_widget.cpp +++ b/parts/replace/replace_widget.cpp @@ -81,13 +81,13 @@ ReplaceWidget::ReplaceWidget(ReplacePart *part) layout->addWidget( _listview ); // setup signals - connect( m_dialog->find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( find() ) ); + connect( m_dialog->find_button, TQ_SIGNAL( clicked() ), TQ_SLOT( find() ) ); - connect( _replace, TQT_SIGNAL( clicked() ), TQT_SLOT( replace() ) ); - connect( _cancel, TQT_SIGNAL( clicked() ), TQT_SLOT( clear() ) ); - connect( _listview, TQT_SIGNAL( editDocument( const TQString &, int ) ), TQT_SLOT( editDocument( const TQString &, int ) ) ); + connect( _replace, TQ_SIGNAL( clicked() ), TQ_SLOT( replace() ) ); + connect( _cancel, TQ_SIGNAL( clicked() ), TQ_SLOT( clear() ) ); + connect( _listview, TQ_SIGNAL( editDocument( const TQString &, int ) ), TQ_SLOT( editDocument( const TQString &, int ) ) ); - connect( m_part->core(), TQT_SIGNAL( stopButtonClicked( KDevPlugin * ) ), TQT_SLOT( stopButtonClicked( KDevPlugin * ) ) ); + connect( m_part->core(), TQ_SIGNAL( stopButtonClicked( KDevPlugin * ) ), TQ_SLOT( stopButtonClicked( KDevPlugin * ) ) ); } //BEGIN Slots diff --git a/parts/replace/replace_widget.h b/parts/replace/replace_widget.h index c9063928..e666b872 100644 --- a/parts/replace/replace_widget.h +++ b/parts/replace/replace_widget.h @@ -28,7 +28,7 @@ class ReplaceView; class ReplaceWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/replace/replacedlgimpl.cpp b/parts/replace/replacedlgimpl.cpp index 3fcdd761..412f0545 100644 --- a/parts/replace/replacedlgimpl.cpp +++ b/parts/replace/replacedlgimpl.cpp @@ -41,13 +41,13 @@ ReplaceDlgImpl::ReplaceDlgImpl(TQWidget* parent, const char* name, bool modal, W : ReplaceDlg(parent,name, modal,fl), _regexp_dialog( 0 ) { - connect( find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( saveComboHistories() ) ); - connect( regexp_button, TQT_SIGNAL( clicked() ), TQT_SLOT( showRegExpEditor() ) ); - connect( find_combo, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( validateFind( const TQString & ) ) ); - connect( regexp_combo, TQT_SIGNAL( textChanged ( const TQString & ) ), - TQT_SLOT( validateExpression( const TQString & ) ) ); - connect( strings_regexp_radio, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( toggleExpression( bool ) ) ); + connect( find_button, TQ_SIGNAL( clicked() ), TQ_SLOT( saveComboHistories() ) ); + connect( regexp_button, TQ_SIGNAL( clicked() ), TQ_SLOT( showRegExpEditor() ) ); + connect( find_combo, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( validateFind( const TQString & ) ) ); + connect( regexp_combo, TQ_SIGNAL( textChanged ( const TQString & ) ), + TQ_SLOT( validateExpression( const TQString & ) ) ); + connect( strings_regexp_radio, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( toggleExpression( bool ) ) ); // disable the editor button if the regexp editor isn't installed if ( TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) diff --git a/parts/replace/replacedlgimpl.h b/parts/replace/replacedlgimpl.h index cc53029e..f71adaa6 100644 --- a/parts/replace/replacedlgimpl.h +++ b/parts/replace/replacedlgimpl.h @@ -8,7 +8,7 @@ class TQDialog; class ReplaceDlgImpl : public ReplaceDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/replace/replaceitem.cpp b/parts/replace/replaceitem.cpp index 20471d67..ebd92797 100644 --- a/parts/replace/replaceitem.cpp +++ b/parts/replace/replaceitem.cpp @@ -116,7 +116,7 @@ void ReplaceItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, else y = (fm.height() + 2 + marg - boxsize) / 2; - lv->style().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p, + lv->style().drawPrimitive(TQStyle::PE_CheckListIndicator, p, TQRect(x, y, boxsize, fm.height() + 2 + marg), cg, styleflags, TQStyleOption(this)); diff --git a/parts/replace/replaceview.cpp b/parts/replace/replaceview.cpp index a85b0818..2304a31b 100644 --- a/parts/replace/replaceview.cpp +++ b/parts/replace/replaceview.cpp @@ -40,9 +40,9 @@ ReplaceView::ReplaceView( TQWidget * parent ) : TDEListView( parent ), _latestfi pal.setActive( cg ); setPalette( pal ); - connect( this, TQT_SIGNAL( clicked( TQListViewItem * ) ), TQT_SLOT( slotClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( mouseButtonPressed( int, TQListViewItem *, const TQPoint &, int) ), - TQT_SLOT( slotMousePressed(int, TQListViewItem *, const TQPoint &, int) ) ); + connect( this, TQ_SIGNAL( clicked( TQListViewItem * ) ), TQ_SLOT( slotClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( mouseButtonPressed( int, TQListViewItem *, const TQPoint &, int) ), + TQ_SLOT( slotMousePressed(int, TQListViewItem *, const TQPoint &, int) ) ); } void ReplaceView::makeReplacementsForFile( TQTextStream & istream, TQTextStream & ostream, ReplaceItem const * fileitem ) @@ -112,11 +112,11 @@ void ReplaceView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& po if ( ReplaceItem * item = dynamic_cast<ReplaceItem*>( i ) ) { - if ( btn == Qt::RightButton ) + if ( btn == TQt::RightButton ) { // popup menu? } - else if ( btn == Qt::LeftButton ) + else if ( btn == TQt::LeftButton ) { // map pos to item/column and call ReplacetItem::activate(pos) item->activate( col, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(item).top() ) ); diff --git a/parts/replace/replaceview.h b/parts/replace/replaceview.h index 1b7591aa..6f3d2b04 100644 --- a/parts/replace/replaceview.h +++ b/parts/replace/replaceview.h @@ -23,7 +23,7 @@ class ReplaceItem; class ReplaceView : public TDEListView { - Q_OBJECT + TQ_OBJECT signals: diff --git a/parts/scripting/scriptingglobalconfig.h b/parts/scripting/scriptingglobalconfig.h index b5e3ad17..9d9d1f91 100644 --- a/parts/scripting/scriptingglobalconfig.h +++ b/parts/scripting/scriptingglobalconfig.h @@ -27,7 +27,7 @@ class scriptingPart; class scriptingGlobalConfig: public scriptingGlobalConfigBase { - Q_OBJECT + TQ_OBJECT public: scriptingGlobalConfig(scriptingPart *part, TQWidget *parent = 0, const char *name = 0); diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp index d0558b79..eba3d6cb 100644 --- a/parts/scripting/scriptingpart.cpp +++ b/parts/scripting/scriptingpart.cpp @@ -55,12 +55,12 @@ scriptingPart::scriptingPart(TQObject *parent, const char *name, const TQStringL m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createGlobalConfigPage(i18n("Scripting"), GLOBALDOC_OPTIONS, info()->icon()); - connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); + connect(m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); - TQTimer::singleShot(0, this, TQT_SLOT(init())); + TQTimer::singleShot(0, this, TQ_SLOT(init())); } scriptingPart::~scriptingPart() @@ -98,7 +98,7 @@ void scriptingPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, u case GLOBALDOC_OPTIONS: { scriptingGlobalConfig *w = new scriptingGlobalConfig(this, page, "global config"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } } diff --git a/parts/scripting/scriptingpart.h b/parts/scripting/scriptingpart.h index 832318b9..0dc63d45 100644 --- a/parts/scripting/scriptingpart.h +++ b/parts/scripting/scriptingpart.h @@ -36,7 +36,7 @@ Please read the README.dox file for more info about this part */ class scriptingPart: public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: scriptingPart(TQObject *parent, const char *name, const TQStringList &args); diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp index 1c650ce2..75815de5 100644 --- a/parts/snippet/snippet_part.cpp +++ b/parts/snippet/snippet_part.cpp @@ -51,12 +51,12 @@ SnippetPart::SnippetPart(TQObject *parent, const char *name, const TQStringList& mainWindow()->embedSelectViewRight( m_widget, i18n("Code Snippets"), i18n("Insert a code snippet") ); - connect( core(), TQT_SIGNAL( configWidget( KDialogBase * ) ), this, TQT_SLOT( slotConfigWidget( KDialogBase * ) ) ); + connect( core(), TQ_SIGNAL( configWidget( KDialogBase * ) ), this, TQ_SLOT( slotConfigWidget( KDialogBase * ) ) ); /*The next two connects are used to check if certain SnippetGroups need to be opened according to the languages supported by this project*/ - connect( core(), TQT_SIGNAL( projectOpened() ), m_widget, TQT_SLOT( languageChanged() ) ); - connect( core(), TQT_SIGNAL( languageChanged() ), m_widget, TQT_SLOT( languageChanged() ) ); + connect( core(), TQ_SIGNAL( projectOpened() ), m_widget, TQ_SLOT( languageChanged() ) ); + connect( core(), TQ_SIGNAL( languageChanged() ), m_widget, TQ_SLOT( languageChanged() ) ); setupActions(); } @@ -73,7 +73,7 @@ SnippetPart::~SnippetPart() void SnippetPart::setupActions() { - new TDEAction( i18n("Show Snippet Tree"), CTRL+ALT+SHIFT+Key_S, this, TQT_SLOT(slotShowView()), actionCollection(), "snippet_showview"); + new TDEAction( i18n("Show Snippet Tree"), CTRL+ALT+SHIFT+Key_S, this, TQ_SLOT(slotShowView()), actionCollection(), "snippet_showview"); } /*! @@ -105,7 +105,7 @@ void SnippetPart::slotConfigWidget( KDialogBase *dlg ) w->leDelimiter->setText(m_widget->getSnippetConfig()->getDelimiter()); w->cbToolTip->setChecked(m_widget->getSnippetConfig()->useToolTips()); w->btnGroupAutoOpen->setButton(m_widget->getSnippetConfig()->getAutoOpenGroups()); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotOKClicked()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(slotOKClicked()) ); } diff --git a/parts/snippet/snippet_part.h b/parts/snippet/snippet_part.h index 8ffd8fce..90052c2e 100644 --- a/parts/snippet/snippet_part.h +++ b/parts/snippet/snippet_part.h @@ -26,7 +26,7 @@ For more info read the README.dox file */ class SnippetPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp index 9cd4ae4b..67ba0371 100644 --- a/parts/snippet/snippet_widget.cpp +++ b/parts/snippet/snippet_widget.cpp @@ -64,20 +64,20 @@ SnippetWidget::SnippetWidget(SnippetPart *part) setRootIsDecorated(true); //connect the signals - connect( this, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), - this, TQT_SLOT( showPopupMenu(TQListViewItem *, const TQPoint & , int ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), + this, TQ_SLOT( showPopupMenu(TQListViewItem *, const TQPoint & , int ) ) ); - connect( this, TQT_SIGNAL( executed (TQListViewItem *) ), - this, TQT_SLOT( slotExecuted( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL( returnPressed (TQListViewItem *) ), - this, TQT_SLOT( slotExecuted( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( executed (TQListViewItem *) ), + this, TQ_SLOT( slotExecuted( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( returnPressed (TQListViewItem *) ), + this, TQ_SLOT( slotExecuted( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL( dropped(TQDropEvent *, TQListViewItem *) ), - this, TQT_SLOT( slotDropped(TQDropEvent *, TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( dropped(TQDropEvent *, TQListViewItem *) ), + this, TQ_SLOT( slotDropped(TQDropEvent *, TQListViewItem *) ) ); _cfg = 0; - TQTimer::singleShot(0, this, TQT_SLOT(initConfig())); + TQTimer::singleShot(0, this, TQ_SLOT(initConfig())); } SnippetWidget::~SnippetWidget() @@ -551,19 +551,19 @@ void SnippetWidget::showPopupMenu( TQListViewItem * item, const TQPoint & p, int if ( item ) { popup.insertTitle( selectedItem->getName() ); - popup.insertItem( i18n("Add Item..."), this, TQT_SLOT( slotAdd() ) ); - popup.insertItem( i18n("Add Group..."), this, TQT_SLOT( slotAddGroup() ) ); + popup.insertItem( i18n("Add Item..."), this, TQ_SLOT( slotAdd() ) ); + popup.insertItem( i18n("Add Group..."), this, TQ_SLOT( slotAddGroup() ) ); if (dynamic_cast<SnippetGroup*>(item)) { - popup.insertItem( i18n("Edit..."), this, TQT_SLOT( slotEditGroup() ) ); + popup.insertItem( i18n("Edit..."), this, TQ_SLOT( slotEditGroup() ) ); } else { - popup.insertItem( i18n("Edit..."), this, TQT_SLOT( slotEdit() ) ); + popup.insertItem( i18n("Edit..."), this, TQ_SLOT( slotEdit() ) ); } - popup.insertItem( i18n("Remove"), this, TQT_SLOT( slotRemove() ) ); + popup.insertItem( i18n("Remove"), this, TQ_SLOT( slotRemove() ) ); } else { popup.insertTitle(i18n("Code Snippets")); - popup.insertItem( i18n("Add Group..."), this, TQT_SLOT( slotAddGroup() ) ); + popup.insertItem( i18n("Add Group..."), this, TQ_SLOT( slotAddGroup() ) ); } popup.exec(p); @@ -735,8 +735,8 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ // --END-- building a dynamic dialog //connect the buttons to the TQDialog default slots - connect(btn1, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(reject()) ); - connect(btn2, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(accept()) ); + connect(btn1, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(reject()) ); + connect(btn2, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(accept()) ); //prepare to execute the dialog bool bReturn = false; @@ -848,8 +848,8 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri // --END-- building a dynamic dialog //connect the buttons to the TQDialog default slots - connect(btn1, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(reject()) ); - connect(btn2, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(accept()) ); + connect(btn1, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(reject()) ); + connect(btn2, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(accept()) ); //execute the dialog TQString strReturn = ""; diff --git a/parts/snippet/snippet_widget.h b/parts/snippet/snippet_widget.h index 8b6c17a1..5ed9ec82 100644 --- a/parts/snippet/snippet_widget.h +++ b/parts/snippet/snippet_widget.h @@ -39,7 +39,7 @@ tooltips which contains the text of the snippet */ class SnippetWidget : public TDEListView, public TQToolTip { - Q_OBJECT + TQ_OBJECT friend class SnippetSettings; //to allow SnippetSettings to call languageChanged() diff --git a/parts/snippet/snippetdlg.ui b/parts/snippet/snippetdlg.ui index f7bafb74..7b924164 100644 --- a/parts/snippet/snippetdlg.ui +++ b/parts/snippet/snippetdlg.ui @@ -197,9 +197,9 @@ <tabstop>btnAdd</tabstop> <tabstop>btnCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotHelp()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/parts/snippet/snippetsettings.h b/parts/snippet/snippetsettings.h index 4c0d922a..92d34309 100644 --- a/parts/snippet/snippetsettings.h +++ b/parts/snippet/snippetsettings.h @@ -23,7 +23,7 @@ same named .ui file */ class SnippetSettings : public SnippetSettingsBase { -Q_OBJECT +TQ_OBJECT public: SnippetSettings(TQWidget *parent = 0, const char *name = 0); diff --git a/parts/snippet/snippetsettingsbase.ui b/parts/snippet/snippetsettingsbase.ui index 9d1d0c9d..9d816561 100644 --- a/parts/snippet/snippetsettingsbase.ui +++ b/parts/snippet/snippetsettingsbase.ui @@ -92,9 +92,6 @@ <property name="text"> <string>Single dialog for each variable within a snippet</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>true</bool> </property> @@ -109,9 +106,6 @@ <property name="text"> <string>One dialog for all variables within a snippet</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>false</bool> </property> @@ -207,9 +201,6 @@ <property name="text"> <string>The group's language is supported by the project</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>false</bool> </property> diff --git a/parts/texttools/texttoolspart.cpp b/parts/texttools/texttoolspart.cpp index 7e38f061..26cb14de 100644 --- a/parts/texttools/texttoolspart.cpp +++ b/parts/texttools/texttoolspart.cpp @@ -36,8 +36,8 @@ TextToolsPart::TextToolsPart(TQObject *parent, const char *name, const TQStringL m_widget = 0; - connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(activePartChanged(KParts::Part*)) ); + connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(activePartChanged(KParts::Part*)) ); } diff --git a/parts/texttools/texttoolspart.h b/parts/texttools/texttoolspart.h index 0d822a65..7b428c83 100644 --- a/parts/texttools/texttoolspart.h +++ b/parts/texttools/texttoolspart.h @@ -21,7 +21,7 @@ class TextToolsWidget; class TextToolsPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/texttools/texttoolswidget.cpp b/parts/texttools/texttoolswidget.cpp index db2f0acc..f1e31ca1 100644 --- a/parts/texttools/texttoolswidget.cpp +++ b/parts/texttools/texttoolswidget.cpp @@ -68,14 +68,14 @@ TextToolsWidget::TextToolsWidget(TextToolsPart *part, TQWidget *parent, const ch m_part = part; m_timer = new TQTimer(this); - connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotItemPressed(int,TQListViewItem*)) ); - // connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - // this, TQT_SLOT(slotItemPressed(int,TQListViewItem*)) ); - connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotReturnPressed(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotItemPressed(int,TQListViewItem*)) ); + // connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + // this, TQ_SLOT(slotItemPressed(int,TQListViewItem*)) ); + connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotReturnPressed(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); } @@ -128,7 +128,7 @@ void TextToolsWidget::slotItemPressed(int button, TQListViewItem *item) cursorIface->setCursorPosition(line, col); } - if (button == Qt::MidButton) { + if (button == TQt::MidButton) { KTextEditor::SelectionInterface *selectionIface = dynamic_cast<KTextEditor::SelectionInterface*>(rwpart); if (selectionIface) { @@ -144,7 +144,7 @@ void TextToolsWidget::slotItemPressed(int button, TQListViewItem *item) void TextToolsWidget::slotReturnPressed(TQListViewItem *item) { - slotItemPressed(Qt::LeftButton, item); + slotItemPressed(TQt::LeftButton, item); } @@ -171,8 +171,8 @@ void TextToolsWidget::stop() void TextToolsWidget::setMode(Mode mode, KParts::Part *part) { - connect( part, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(startTimer()) ); + connect( part, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(startTimer()) ); m_editIface = dynamic_cast<KTextEditor::EditInterface*>(part); switch (mode) { @@ -181,18 +181,18 @@ void TextToolsWidget::setMode(Mode mode, KParts::Part *part) << "table" << "tr"; m_emptyTags << "br" << "hr" << "img" << "input" << "p" << "meta"; - connect( m_timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(parseXML()) ); + connect( m_timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(parseXML()) ); break; case Docbook: m_relevantTags << "chapter" << "sect1" << "sect2" << "para" << "formalpara"; - connect( m_timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(parseXML()) ); + connect( m_timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(parseXML()) ); break; case LaTeX: - connect( m_timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(parseLaTeX()) ); + connect( m_timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(parseLaTeX()) ); break; default: ; } diff --git a/parts/texttools/texttoolswidget.h b/parts/texttools/texttoolswidget.h index eaca3ac7..0b435ac4 100644 --- a/parts/texttools/texttoolswidget.h +++ b/parts/texttools/texttoolswidget.h @@ -23,7 +23,7 @@ namespace KTextEditor { class EditInterface; } class TextToolsWidget : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp index 9172d44b..6d276e88 100644 --- a/parts/tipofday/tipofday_part.cpp +++ b/parts/tipofday/tipofday_part.cpp @@ -34,13 +34,13 @@ TipOfDayPart::TipOfDayPart(TQObject *parent, const char *name, const TQStringLis TDEAction *action; action = new TDEAction(i18n("&Tip of the Day"), "idea", 0, - this, TQT_SLOT(showTip()), actionCollection(), "help_tipofday"); + this, TQ_SLOT(showTip()), actionCollection(), "help_tipofday"); action->setToolTip(i18n("A tip how to use TDevelop")); action->setWhatsThis(i18n("<b>Tip of the day</b><p>" "Will display another good tip \n" "contributed by KDevelop users.")); - connect(core(), TQT_SIGNAL(coreInitialized()), this, TQT_SLOT(showOnStart())); + connect(core(), TQ_SIGNAL(coreInitialized()), this, TQ_SLOT(showOnStart())); } diff --git a/parts/tipofday/tipofday_part.h b/parts/tipofday/tipofday_part.h index 4b982800..a347946f 100644 --- a/parts/tipofday/tipofday_part.h +++ b/parts/tipofday/tipofday_part.h @@ -12,7 +12,7 @@ class TipOfDayPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/tools/addtooldlg.ui b/parts/tools/addtooldlg.ui index ece7a089..79dd24ae 100644 --- a/parts/tools/addtooldlg.ui +++ b/parts/tools/addtooldlg.ui @@ -226,11 +226,11 @@ executed.</p></string> <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot returnType="TQString">getApp()</slot> <slot access="private">treeSelectionChanged( TQListViewItem * lvi )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/parts/tools/addtooldlg.ui.h b/parts/tools/addtooldlg.ui.h index fea69766..61b52809 100644 --- a/parts/tools/addtooldlg.ui.h +++ b/parts/tools/addtooldlg.ui.h @@ -12,7 +12,7 @@ void AddToolDialog::init() { - connect( tree, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(treeSelectionChanged(TQListViewItem*)) ); + connect( tree, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(treeSelectionChanged(TQListViewItem*)) ); tree->header()->hide(); } diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp index 8c13a4ea..e8372597 100644 --- a/parts/tools/kapplicationtree.cpp +++ b/parts/tools/kapplicationtree.cpp @@ -139,8 +139,8 @@ KDevApplicationTree::KDevApplicationTree( TQWidget *parent, const char* name ) addDesktopGroup( TQString() ); - connect( this, TQT_SIGNAL( currentChanged(TQListViewItem*) ), TQT_SLOT( slotItemHighlighted(TQListViewItem*) ) ); - connect( this, TQT_SIGNAL( selectionChanged(TQListViewItem*) ), TQT_SLOT( slotSelectionChanged(TQListViewItem*) ) ); + connect( this, TQ_SIGNAL( currentChanged(TQListViewItem*) ), TQ_SLOT( slotItemHighlighted(TQListViewItem*) ) ); + connect( this, TQ_SIGNAL( selectionChanged(TQListViewItem*) ), TQ_SLOT( slotSelectionChanged(TQListViewItem*) ) ); } // ---------------------------------------------------------------------- diff --git a/parts/tools/kapplicationtree.h b/parts/tools/kapplicationtree.h index 0ba2cc9f..ddd9f68a 100644 --- a/parts/tools/kapplicationtree.h +++ b/parts/tools/kapplicationtree.h @@ -73,7 +73,7 @@ protected: */ class KDevApplicationTree : public TDEListView { - Q_OBJECT + TQ_OBJECT public: KDevApplicationTree( TQWidget *parent, const char* name = 0 ); diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp index 61f962ad..94c3d2fa 100644 --- a/parts/tools/tools_part.cpp +++ b/parts/tools/tools_part.cpp @@ -49,17 +49,17 @@ ToolsPart::ToolsPart(TQObject *parent, const char *name, const TQStringList &) m_configProxy = new ConfigWidgetProxy( core() ); m_configProxy->createGlobalConfigPage( i18n("Tools Menu"), TOOLSSETTINGS, info()->icon() ); m_configProxy->createGlobalConfigPage( i18n("External Tools"), EXTRATOOLSSETTINGS, info()->icon() ); - connect( m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + connect( m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - connect(core(), TQT_SIGNAL(coreInitialized()), this, TQT_SLOT(updateMenu())); + connect(core(), TQ_SIGNAL(coreInitialized()), this, TQ_SLOT(updateMenu())); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); // Apparently action lists can only be plugged after the // xmlgui client has been registered - TQTimer::singleShot(0, this, TQT_SLOT(updateToolsMenu())); + TQTimer::singleShot(0, this, TQ_SLOT(updateToolsMenu())); } @@ -73,14 +73,14 @@ void ToolsPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, un if ( pagenumber == TOOLSSETTINGS ) { ToolsConfig *w = new ToolsConfig( page, "tools config widget" ); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); - connect(dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(updateMenu())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); + connect(dlg, TQ_SIGNAL(destroyed()), this, TQ_SLOT(updateMenu())); } else if ( pagenumber == EXTRATOOLSSETTINGS ) { ToolsConfigWidget *w2 = new ToolsConfigWidget( page, "tools config widget" ); - connect(dlg, TQT_SIGNAL(okClicked()), w2, TQT_SLOT(accept())); - connect(dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(updateToolsMenu())); + connect(dlg, TQ_SIGNAL(okClicked()), w2, TQ_SLOT(accept())); + connect(dlg, TQ_SIGNAL(destroyed()), this, TQ_SLOT(updateToolsMenu())); } } @@ -103,7 +103,7 @@ void ToolsPart::updateMenu() continue; TDEAction *action = new TDEAction(df.readName(), df.readIcon(), 0, - this, TQT_SLOT(slotToolActivated()), (TQObject*)0, name.latin1()); + this, TQ_SLOT(slotToolActivated()), (TQObject*)0, name.latin1()); actions.append(action); } @@ -113,7 +113,7 @@ void ToolsPart::updateMenu() void ToolsPart::slotToolActivated() { - TQString df = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(); + TQString df = sender()->name(); kapp->startServiceByDesktopPath(df); } @@ -180,7 +180,7 @@ void ToolsPart::updateToolsMenu() config->setGroup("Tool Menu " + menutext); bool isdesktopfile = config->readBoolEntry("DesktopFile"); TDEAction *action = new TDEAction(*it, 0, - this, TQT_SLOT(toolsMenuActivated()), + this, TQ_SLOT(toolsMenuActivated()), (TQObject*) 0, menutext.utf8()); if (isdesktopfile) { KDesktopFile df(config->readPathEntry("CommandLine")); @@ -212,19 +212,19 @@ void ToolsPart::contextMenu(TQPopupMenu *popup, const Context *context) TQStringList l = config->readListEntry("Dir Context"); TQStringList::ConstIterator it; for (it = l.begin(); it != l.end(); ++it) - externalToolMenuEntries.insert( popup->insertItem( (*it), this, TQT_SLOT(dirContextActivated(int)) ), (*it) ); + externalToolMenuEntries.insert( popup->insertItem( (*it), this, TQ_SLOT(dirContextActivated(int)) ), (*it) ); } else { TQStringList l = config->readListEntry("File Context"); TQStringList::ConstIterator it; for (it = l.begin(); it != l.end(); ++it) - externalToolMenuEntries.insert( popup->insertItem( (*it), this, TQT_SLOT(fileContextActivated(int)) ), (*it) ); + externalToolMenuEntries.insert( popup->insertItem( (*it), this, TQ_SLOT(fileContextActivated(int)) ), (*it) ); } } void ToolsPart::toolsMenuActivated() { - TQString menutext = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(); + TQString menutext = sender()->name(); TDEConfig *config = ToolsFactory::instance()->config(); config->setGroup("Tool Menu " + menutext); TQString cmdline = config->readPathEntry("CommandLine"); diff --git a/parts/tools/tools_part.h b/parts/tools/tools_part.h index 20af2ea8..8c87fd4f 100644 --- a/parts/tools/tools_part.h +++ b/parts/tools/tools_part.h @@ -22,7 +22,7 @@ class ToolsWidget; class ToolsPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/tools/toolsconfig.cpp b/parts/tools/toolsconfig.cpp index f21713e9..adb2ab2f 100644 --- a/parts/tools/toolsconfig.cpp +++ b/parts/tools/toolsconfig.cpp @@ -50,13 +50,13 @@ void ToolsConfig::showEvent(TQShowEvent *e) _toList->show(); vbox->addWidget(_toList); - connect(_toList, TQT_SIGNAL(clicked()), this, TQT_SLOT(toList())); + connect(_toList, TQ_SIGNAL(clicked()), this, TQ_SLOT(toList())); _toTree = new TQPushButton(TQApplication::reverseLayout() ? ">>" : "<<", this); _toTree->show(); vbox->addWidget(_toTree); - connect(_toTree, TQT_SIGNAL(clicked()), this, TQT_SLOT(toTree())); + connect(_toTree, TQ_SIGNAL(clicked()), this, TQ_SLOT(toTree())); vbox = new TQVBoxLayout(hbox); _list = new TQListBox(this); @@ -72,8 +72,8 @@ void ToolsConfig::showEvent(TQShowEvent *e) fill(); checkButtons(); - connect(_tree, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(checkButtons())); - connect(_list, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(checkButtons())); + connect(_tree, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(checkButtons())); + connect(_list, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(checkButtons())); } diff --git a/parts/tools/toolsconfig.h b/parts/tools/toolsconfig.h index 074d5900..2c1158fa 100644 --- a/parts/tools/toolsconfig.h +++ b/parts/tools/toolsconfig.h @@ -26,7 +26,7 @@ public: class ToolsConfig : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/tools/toolsconfigwidget.h b/parts/tools/toolsconfigwidget.h index 99b2c95d..d8baa9c5 100644 --- a/parts/tools/toolsconfigwidget.h +++ b/parts/tools/toolsconfigwidget.h @@ -22,7 +22,7 @@ struct ToolsConfigEntry; class ToolsConfigWidget : public ToolsConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/tools/toolsconfigwidgetbase.ui b/parts/tools/toolsconfigwidgetbase.ui index 67f9b7b5..4f9dfc4c 100644 --- a/parts/tools/toolsconfigwidgetbase.ui +++ b/parts/tools/toolsconfigwidgetbase.ui @@ -397,14 +397,14 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">dircontextaddClicked()</slot> <slot access="protected">filecontextaddClicked()</slot> <slot access="protected">filecontextremoveClicked()</slot> <slot access="protected">dircontextremoveClicked()</slot> <slot access="protected">toolsmenuaddClicked()</slot> <slot access="protected">toolsmenuremoveClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/parts/uimode/uichooser.ui b/parts/uimode/uichooser.ui index 98fe652f..bf9f71d3 100644 --- a/parts/uimode/uichooser.ui +++ b/parts/uimode/uichooser.ui @@ -242,9 +242,9 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">maybeEnableCloseOnHover(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/parts/uimode/uichooser_part.cpp b/parts/uimode/uichooser_part.cpp index a547bdef..a8b40350 100644 --- a/parts/uimode/uichooser_part.cpp +++ b/parts/uimode/uichooser_part.cpp @@ -25,8 +25,8 @@ UIChooserPart::UIChooserPart(TQObject *parent, const char *name, const TQStringL _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createGlobalConfigPage( i18n("User Interface"), UICHOOSERSETTINGSPAGE, info()->icon() ); - connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); + connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); } @@ -42,7 +42,7 @@ void UIChooserPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page if ( pagenumber == UICHOOSERSETTINGSPAGE ) { UIChooserWidget * w = new UIChooserWidget( this, page, "UIChooser widget" ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } } diff --git a/parts/uimode/uichooser_part.h b/parts/uimode/uichooser_part.h index ff822e1d..98c92707 100644 --- a/parts/uimode/uichooser_part.h +++ b/parts/uimode/uichooser_part.h @@ -14,7 +14,7 @@ class ConfigWidgetProxy; class UIChooserPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/uimode/uichooser_widget.h b/parts/uimode/uichooser_widget.h index 11cb031d..e1ee25bf 100644 --- a/parts/uimode/uichooser_widget.h +++ b/parts/uimode/uichooser_widget.h @@ -11,7 +11,7 @@ class UIChooserPart; class UIChooserWidget : public UIChooser { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/valgrind/dialog_widget.ui b/parts/valgrind/dialog_widget.ui index 74b4a941..f09997c1 100644 --- a/parts/valgrind/dialog_widget.ui +++ b/parts/valgrind/dialog_widget.ui @@ -331,10 +331,10 @@ <tabstop>ctParamEdit</tabstop> <tabstop>kcExecutableEdit</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="private" specifier="non virtual">checkBoxToggled()</slot> <slot>init()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/parts/valgrind/valgrind_dialog.cpp b/parts/valgrind/valgrind_dialog.cpp index 23d45735..3770f5d6 100644 --- a/parts/valgrind/valgrind_dialog.cpp +++ b/parts/valgrind/valgrind_dialog.cpp @@ -25,10 +25,10 @@ ValgrindDialog::ValgrindDialog( Type type, TQWidget* parent ) w->executableEdit->setFocus(); w->stack->raiseWidget(m_type); setMainWidget( w ); - connect( w->executableEdit->lineEdit(), TQT_SIGNAL( textChanged( const TQString &)), this, TQT_SLOT( valgrindTextChanged())); - connect( w->valExecutableEdit->lineEdit(), TQT_SIGNAL( textChanged( const TQString &)), this, TQT_SLOT( valgrindTextChanged())); - connect( w->ctExecutableEdit->lineEdit(), TQT_SIGNAL( textChanged( const TQString &)), this, TQT_SLOT( valgrindTextChanged())); - connect( w->kcExecutableEdit->lineEdit(), TQT_SIGNAL( textChanged( const TQString &)), this, TQT_SLOT( valgrindTextChanged())); + connect( w->executableEdit->lineEdit(), TQ_SIGNAL( textChanged( const TQString &)), this, TQ_SLOT( valgrindTextChanged())); + connect( w->valExecutableEdit->lineEdit(), TQ_SIGNAL( textChanged( const TQString &)), this, TQ_SLOT( valgrindTextChanged())); + connect( w->ctExecutableEdit->lineEdit(), TQ_SIGNAL( textChanged( const TQString &)), this, TQ_SLOT( valgrindTextChanged())); + connect( w->kcExecutableEdit->lineEdit(), TQ_SIGNAL( textChanged( const TQString &)), this, TQ_SLOT( valgrindTextChanged())); enableButtonOK( false ); } diff --git a/parts/valgrind/valgrind_dialog.h b/parts/valgrind/valgrind_dialog.h index 99e7bd55..6e4f598b 100644 --- a/parts/valgrind/valgrind_dialog.h +++ b/parts/valgrind/valgrind_dialog.h @@ -13,7 +13,7 @@ class DialogWidget; **/ class ValgrindDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: enum Type { Memcheck = 0, Calltree = 1 }; diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp index 5c78d952..0b984575 100644 --- a/parts/valgrind/valgrind_part.cpp +++ b/parts/valgrind/valgrind_part.cpp @@ -33,16 +33,16 @@ ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringLi setXMLFile( "kdevpart_valgrind.rc" ); proc = new KShellProcess(); - connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int )), - this, TQT_SLOT(receivedStdout( TDEProcess*, char*, int )) ); - connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*, char*, int )), - this, TQT_SLOT(receivedStderr( TDEProcess*, char*, int )) ); - connect( proc, TQT_SIGNAL(processExited( TDEProcess* )), - this, TQT_SLOT(processExited( TDEProcess* )) ); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); - connect( core(), TQT_SIGNAL(projectOpened()), - this, TQT_SLOT(projectOpened()) ); + connect( proc, TQ_SIGNAL(receivedStdout( TDEProcess*, char*, int )), + this, TQ_SLOT(receivedStdout( TDEProcess*, char*, int )) ); + connect( proc, TQ_SIGNAL(receivedStderr( TDEProcess*, char*, int )), + this, TQ_SLOT(receivedStderr( TDEProcess*, char*, int )) ); + connect( proc, TQ_SIGNAL(processExited( TDEProcess* )), + this, TQ_SLOT(processExited( TDEProcess* )) ); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(slotStopButtonClicked(KDevPlugin*)) ); + connect( core(), TQ_SIGNAL(projectOpened()), + this, TQ_SLOT(projectOpened()) ); m_widget = new ValgrindWidget( this ); m_widget->setIcon( SmallIcon("fork") ); @@ -59,12 +59,12 @@ ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringLi "some abuses of the POSIX pthread API." ) ); TDEAction* action = new TDEAction( i18n("&Valgrind Memory Leak Check"), 0, this, - TQT_SLOT(slotExecValgrind()), actionCollection(), "tools_valgrind" ); + TQ_SLOT(slotExecValgrind()), actionCollection(), "tools_valgrind" ); action->setToolTip(i18n("Valgrind memory leak check")); action->setWhatsThis(i18n("<b>Valgrind memory leak check</b><p>Runs Valgrind - a tool to help you find memory-management problems in your programs.")); action = new TDEAction( i18n("P&rofile with KCachegrind"), 0, this, - TQT_SLOT(slotExecCalltree()), actionCollection(), "tools_calltree" ); + TQ_SLOT(slotExecCalltree()), actionCollection(), "tools_calltree" ); action->setToolTip(i18n("Profile with KCachegrind")); action->setWhatsThis(i18n("<b>Profile with KCachegrind</b><p>Runs your program in calltree and then displays profiler information in KCachegrind.")); diff --git a/parts/valgrind/valgrind_part.h b/parts/valgrind/valgrind_part.h index 6a05737b..b1464104 100644 --- a/parts/valgrind/valgrind_part.h +++ b/parts/valgrind/valgrind_part.h @@ -15,7 +15,7 @@ class TDEProcess; class ValgrindPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/valgrind/valgrind_widget.cpp b/parts/valgrind/valgrind_widget.cpp index 70484704..75f0c506 100644 --- a/parts/valgrind/valgrind_widget.cpp +++ b/parts/valgrind/valgrind_widget.cpp @@ -101,17 +101,17 @@ ValgrindWidget::ValgrindWidget( ValgrindPart *part ) vbl->addWidget( lv ); popup = new TQPopupMenu( lv, "valPopup" ); - popup->insertItem( i18n( "&Open Valgrind Output..." ), _part, TQT_SLOT(loadOutput()), 0, 0 ); + popup->insertItem( i18n( "&Open Valgrind Output..." ), _part, TQ_SLOT(loadOutput()), 0, 0 ); popup->insertSeparator(); - popup->insertItem( i18n( "Expand All Items" ), this, TQT_SLOT(expandAll()), 0, 2 ); - popup->insertItem( i18n( "Collapse All Items" ), this, TQT_SLOT(collapseAll()), 0, 3 ); - - connect( popup, TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(aboutToShowPopup()) ); - connect( lv, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(executed(TQListViewItem*)) ); - connect( lv, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + popup->insertItem( i18n( "Expand All Items" ), this, TQ_SLOT(expandAll()), 0, 2 ); + popup->insertItem( i18n( "Collapse All Items" ), this, TQ_SLOT(collapseAll()), 0, 3 ); + + connect( popup, TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(aboutToShowPopup()) ); + connect( lv, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(executed(TQListViewItem*)) ); + connect( lv, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); } diff --git a/parts/valgrind/valgrind_widget.h b/parts/valgrind/valgrind_widget.h index bb525758..e0539ee2 100644 --- a/parts/valgrind/valgrind_widget.h +++ b/parts/valgrind/valgrind_widget.h @@ -14,7 +14,7 @@ class TQPopupMenu; class ValgrindWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/vcsmanager/vcsmanagerpart.cpp b/parts/vcsmanager/vcsmanagerpart.cpp index e8606636..e1719371 100644 --- a/parts/vcsmanager/vcsmanagerpart.cpp +++ b/parts/vcsmanager/vcsmanagerpart.cpp @@ -58,10 +58,10 @@ VCSManagerPart::VCSManagerPart(TQObject *parent, const char *name, const TQStrin m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createProjectConfigPage(i18n("Version Control"), PROJECTDOC_OPTIONS, info()->icon()); - connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), - this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); + connect(m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), + this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); - connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); + connect(core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened())); } VCSManagerPart::~VCSManagerPart() @@ -76,7 +76,7 @@ void VCSManagerPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, case PROJECTDOC_OPTIONS: { VCSManagerProjectConfig *w = new VCSManagerProjectConfig(this, page, "project config"); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); break; } } diff --git a/parts/vcsmanager/vcsmanagerpart.h b/parts/vcsmanager/vcsmanagerpart.h index 1fbccbff..7347f134 100644 --- a/parts/vcsmanager/vcsmanagerpart.h +++ b/parts/vcsmanager/vcsmanagerpart.h @@ -37,7 +37,7 @@ Please read the README.dox file for more info about this part */ class VCSManagerPart: public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: VCSManagerPart(TQObject *parent, const char *name, const TQStringList &args); diff --git a/parts/vcsmanager/vcsmanagerprojectconfig.h b/parts/vcsmanager/vcsmanagerprojectconfig.h index 7e33497c..a3baf19a 100644 --- a/parts/vcsmanager/vcsmanagerprojectconfig.h +++ b/parts/vcsmanager/vcsmanagerprojectconfig.h @@ -28,7 +28,7 @@ class VCSManagerPart; class VCSManagerProjectConfig: public VCSManagerProjectConfigBase { - Q_OBJECT + TQ_OBJECT public: VCSManagerProjectConfig( VCSManagerPart *part, TQWidget *parent = 0, const char *name = 0); diff --git a/src/Mainpage.dox b/src/Mainpage.dox index 8b5a020c..69e2e239 100644 --- a/src/Mainpage.dox +++ b/src/Mainpage.dox @@ -62,8 +62,8 @@ Example: app.processEvents(); - QObject::connect(PluginController::getInstance(), SIGNAL(loadingPlugin(const QString &)), - splash, SLOT(showMessage(const QString &))); + TQObject::connect(PluginController::getInstance(), TQ_SIGNAL(loadingPlugin(const TQString &)), + splash, TQ_SLOT(showMessage(const TQString &))); splash->message( i18n( "Loading Settings" ) ); TopLevel::getInstance()->loadSettings(); @@ -98,12 +98,12 @@ Example: virtual void createGlobalSettingsPage(KDialogBase */*dlg*/) {}; virtual void acceptGlobalSettingsPage(KDialogBase */*dlg*/) {}; - virtual QString xmlFile() + virtual TQString xmlFile() { return "myappui.rc"; } - virtual QString defaultProfile() + virtual TQString defaultProfile() { return "MyApp"; } @@ -19,7 +19,7 @@ Core implementation. */ class Core : public KDevCore { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/documentationpart.h b/src/documentationpart.h index dd86ce8a..bb00a165 100644 --- a/src/documentationpart.h +++ b/src/documentationpart.h @@ -10,7 +10,7 @@ Implements shell-dependent "duplicate" and "open in new window" actions of KDevH */ class HTMLDocumentationPart : public KDevHTMLPart { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp index 73ff852b..75e0ba13 100644 --- a/src/editorproxy.cpp +++ b/src/editorproxy.cpp @@ -40,13 +40,13 @@ EditorProxy::EditorProxy() : TQObject() { m_delayedLineTimer = new TQTimer( this ); - connect( m_delayedLineTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT(setLineNumberDelayed()) ); + connect( m_delayedLineTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT(setLineNumberDelayed()) ); TDEConfig *config = kapp->config(); m_delayedViewCreationCompatibleUI = true; TDEAction *ac = new TDEAction( i18n("Show Context Menu"), 0, this, - TQT_SLOT(showPopup()), TopLevel::getInstance()->main()->actionCollection(), "show_popup" ); + TQ_SLOT(showPopup()), TopLevel::getInstance()->main()->actionCollection(), "show_popup" ); TDEShortcut cut ;/*= TDEStdAccel::shortcut(TDEStdAccel::PopupMenuContext);*/ cut.append(KKey(CTRL+Key_Return)); ac->setShortcut(cut); @@ -143,7 +143,7 @@ void EditorProxy::installPopup( KParts::Part * part ) iface->installPopup( popup ); - connect(popup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(popupAboutToShow())); + connect(popup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(popupAboutToShow())); // ugly hack: mark the "original" items m_popupIds.resize(popup->count()); diff --git a/src/editorproxy.h b/src/editorproxy.h index 7cbd9ec9..d23147cd 100644 --- a/src/editorproxy.h +++ b/src/editorproxy.h @@ -17,7 +17,7 @@ class TQTimer; class EditorProxy : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/generalinfowidget.cpp b/src/generalinfowidget.cpp index 794ab8cd..9beeb3e9 100644 --- a/src/generalinfowidget.cpp +++ b/src/generalinfowidget.cpp @@ -32,10 +32,10 @@ TQString makeRelativePath(const TQString& fromPath, const TQString& toPath); GeneralInfoWidget::GeneralInfoWidget(TQDomDocument &projectDom, TQWidget *parent, const char *name) : GeneralInfoWidgetBase(parent, name), m_projectDom(projectDom) { - connect(project_directory_edit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotProjectDirectoryChanged(const TQString&))); - connect(project_directory_combo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotProjectDirectoryComboChanged())); + connect(project_directory_edit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotProjectDirectoryChanged(const TQString&))); + connect(project_directory_combo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotProjectDirectoryComboChanged())); readConfig(); } diff --git a/src/generalinfowidget.h b/src/generalinfowidget.h index d7f0b3b1..bfc85462 100644 --- a/src/generalinfowidget.h +++ b/src/generalinfowidget.h @@ -22,7 +22,7 @@ class TQDomDocument; General project information widget. */ class GeneralInfoWidget : public GeneralInfoWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp index 7a8695ff..f07f9b4d 100644 --- a/src/languageselectwidget.cpp +++ b/src/languageselectwidget.cpp @@ -63,7 +63,7 @@ void LanguageSelectWidget::init() TQVBoxLayout *layout = new TQVBoxLayout(this); TQGroupBox * groupBox1 = new TQGroupBox( i18n("Additional Language Support"), this ); - groupBox1->setColumnLayout(0, Qt::Vertical ); + groupBox1->setColumnLayout(0, TQt::Vertical ); groupBox1->layout()->setSpacing( 6 ); groupBox1->layout()->setMargin( 11 ); TQVBoxLayout * groupBox1Layout = new TQVBoxLayout( groupBox1->layout() ); @@ -81,7 +81,7 @@ void LanguageSelectWidget::init() layout->addWidget( groupBox1 ); TQGroupBox * groupBox2 = new TQGroupBox( i18n("Description"), this ); - groupBox2->setColumnLayout(0, Qt::Vertical ); + groupBox2->setColumnLayout(0, TQt::Vertical ); groupBox2->layout()->setSpacing( 6 ); groupBox2->layout()->setMargin( 11 ); TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->layout() ); @@ -94,7 +94,7 @@ void LanguageSelectWidget::init() layout->addWidget( groupBox2 ); - connect( _pluginList, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQT_SLOT( itemSelected( TQListViewItem * ) ) ); + connect( _pluginList, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQ_SLOT( itemSelected( TQListViewItem * ) ) ); readProjectConfig(); } diff --git a/src/languageselectwidget.h b/src/languageselectwidget.h index 75349930..40ef86ad 100644 --- a/src/languageselectwidget.h +++ b/src/languageselectwidget.h @@ -20,7 +20,7 @@ class TQListView; class LanguageSelectWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/main.cpp b/src/main.cpp index 65177e53..7faf9b53 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -102,8 +102,8 @@ int main(int argc, char *argv[]) if (splash) splash->message( i18n( "Loading Settings" ) ); TopLevel::getInstance()->loadSettings(); - TQObject::connect(PluginController::getInstance(), TQT_SIGNAL(loadingPlugin(const TQString &)), - splash, TQT_SLOT(message(const TQString &))); + TQObject::connect(PluginController::getInstance(), TQ_SIGNAL(loadingPlugin(const TQString &)), + splash, TQ_SLOT(message(const TQString &))); if (splash) splash->show(); PluginController::getInstance()->loadInitialPlugins(); diff --git a/src/main_assistant.cpp b/src/main_assistant.cpp index 10b5fd56..b548aa3b 100644 --- a/src/main_assistant.cpp +++ b/src/main_assistant.cpp @@ -94,8 +94,8 @@ int main(int argc, char *argv[]) app.processEvents(); - TQObject::connect(PluginController::getInstance(), TQT_SIGNAL(loadingPlugin(const TQString &)), - splash, TQT_SLOT(message(const TQString &))); + TQObject::connect(PluginController::getInstance(), TQ_SIGNAL(loadingPlugin(const TQString &)), + splash, TQ_SLOT(message(const TQString &))); if (splash) splash->message( i18n( "Loading Settings" ) ); TopLevel::getInstance()->loadSettings(); diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp index c0c63e2e..38414c00 100644 --- a/src/mainwindowshare.cpp +++ b/src/mainwindowshare.cpp @@ -81,11 +81,11 @@ MainWindowShare::MainWindowShare(TQObject* pParent, const char* name) void MainWindowShare::init() { - connect(Core::getInstance(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(Core::getInstance(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); - connect( m_pMainWnd->actionCollection(), TQT_SIGNAL( actionStatusText( const TQString & ) ), - this, TQT_SLOT( slotActionStatusText( const TQString & ) ) ); + connect( m_pMainWnd->actionCollection(), TQ_SIGNAL( actionStatusText( const TQString & ) ), + this, TQ_SLOT( slotActionStatusText( const TQString & ) ) ); } void MainWindowShare::slotActionStatusText( const TQString &text ) @@ -105,83 +105,83 @@ void MainWindowShare::createActions() { ProjectManager::getInstance()->createActions( m_pMainWnd->actionCollection() ); - KStdAction::quit(this->parent(), TQT_SLOT(close()), m_pMainWnd->actionCollection()); + KStdAction::quit(this->parent(), TQ_SLOT(close()), m_pMainWnd->actionCollection()); TDEAction* action; m_stopProcesses = new TDEToolBarPopupAction( i18n( "&Stop" ), "process-stop", - Key_Escape, this, TQT_SLOT(slotStopButtonPressed()), + Key_Escape, this, TQ_SLOT(slotStopButtonPressed()), m_pMainWnd->actionCollection(), "stop_processes" ); m_stopProcesses->setToolTip(i18n("Stop")); m_stopProcesses->setWhatsThis(i18n("<b>Stop</b><p>Stops all running processes (like building process, grep command, etc.). When placed onto a toolbar provides a popup menu to choose a process to stop.")); m_stopProcesses->setEnabled( false ); - connect(m_stopProcesses->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotStopMenuAboutToShow())); - connect(m_stopProcesses->popupMenu(), TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotStopPopupActivated(int))); + connect(m_stopProcesses->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotStopMenuAboutToShow())); + connect(m_stopProcesses->popupMenu(), TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotStopPopupActivated(int))); - connect( Core::getInstance(), TQT_SIGNAL(activeProcessChanged(KDevPlugin*, bool)), - this, TQT_SLOT(slotActiveProcessChanged(KDevPlugin*, bool)) ); + connect( Core::getInstance(), TQ_SIGNAL(activeProcessChanged(KDevPlugin*, bool)), + this, TQ_SLOT(slotActiveProcessChanged(KDevPlugin*, bool)) ); action = KStdAction::showMenubar( - this, TQT_SLOT(slotShowMenuBar()), + this, TQ_SLOT(slotShowMenuBar()), m_pMainWnd->actionCollection(), "settings_show_menubar" ); action->setToolTip(beautifyToolTip(action->text())); action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you switch the menubar on/off."))); action = KStdAction::keyBindings( - this, TQT_SLOT(slotKeyBindings()), + this, TQ_SLOT(slotKeyBindings()), m_pMainWnd->actionCollection(), "settings_configure_shortcuts" ); action->setToolTip(beautifyToolTip(action->text())); action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure shortcut keys."))); action = KStdAction::configureToolbars( - this, TQT_SLOT(slotConfigureToolbars()), + this, TQ_SLOT(slotConfigureToolbars()), m_pMainWnd->actionCollection(), "settings_configure_toolbars" ); action->setToolTip(beautifyToolTip(action->text())); action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure toolbars."))); action = KStdAction::configureNotifications( - this, TQT_SLOT(slotConfigureNotifications()), + this, TQ_SLOT(slotConfigureNotifications()), m_pMainWnd->actionCollection(), "settings_configure_notifications" ); action->setToolTip(beautifyToolTip(action->text())); action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure system notifications."))); - action = KStdAction::preferences(this, TQT_SLOT(slotSettings()), + action = KStdAction::preferences(this, TQ_SLOT(slotSettings()), m_pMainWnd->actionCollection(), "settings_configure" ); action->setToolTip( i18n( "Configure TDevelop" ) ); action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(i18n( "Configure TDevelop" )).arg(i18n("Lets you customize TDevelop."))); - m_toggleStatusbar = KStdAction::showToolbar(this, TQT_SLOT(slotToggleStatusbar()),m_pMainWnd->actionCollection(), "settings_statusbar"); + m_toggleStatusbar = KStdAction::showToolbar(this, TQ_SLOT(slotToggleStatusbar()),m_pMainWnd->actionCollection(), "settings_statusbar"); m_toggleStatusbar->setText(i18n("Show &Statusbar")); m_toggleStatusbar->setToolTip( i18n("Show statusbar") ); m_toggleStatusbar->setWhatsThis(i18n("<b>Show statusbar</b><p>Hides or shows the statusbar.")); - action = new TDEAction( i18n("&Next Window"), ALT+Key_Right, this, TQT_SIGNAL(gotoNextWindow()),m_pMainWnd->actionCollection(), "view_next_window"); + action = new TDEAction( i18n("&Next Window"), ALT+Key_Right, this, TQ_SIGNAL(gotoNextWindow()),m_pMainWnd->actionCollection(), "view_next_window"); action->setToolTip( i18n("Next window") ); action->setWhatsThis(i18n("<b>Next window</b><p>Switches to the next window.")); - action = new TDEAction( i18n("&Previous Window"), ALT+Key_Left, this, TQT_SIGNAL(gotoPreviousWindow()),m_pMainWnd->actionCollection(), "view_previous_window"); + action = new TDEAction( i18n("&Previous Window"), ALT+Key_Left, this, TQ_SIGNAL(gotoPreviousWindow()),m_pMainWnd->actionCollection(), "view_previous_window"); action->setToolTip( i18n("Previous window") ); action->setWhatsThis(i18n("<b>Previous window</b><p>Switches to the previous window.")); - action = new TDEAction( i18n("&Last Accessed Window"), ALT+Key_Up, this, TQT_SIGNAL(gotoLastWindow()), m_pMainWnd->actionCollection(), "view_last_window"); + action = new TDEAction( i18n("&Last Accessed Window"), ALT+Key_Up, this, TQ_SIGNAL(gotoLastWindow()), m_pMainWnd->actionCollection(), "view_last_window"); action->setToolTip( i18n("Last accessed window") ); action->setWhatsThis(i18n("<b>Last accessed window</b><p>Switches to the last viewed window (Hold the Alt key pressed and walk on by repeating the Up key).")); - action = new TDEAction( i18n("&First Accessed Window"), ALT+Key_Down, this, TQT_SIGNAL(gotoFirstWindow()), m_pMainWnd->actionCollection(), "view_first_window"); + action = new TDEAction( i18n("&First Accessed Window"), ALT+Key_Down, this, TQ_SIGNAL(gotoFirstWindow()), m_pMainWnd->actionCollection(), "view_first_window"); action->setToolTip( i18n("First accessed window") ); action->setWhatsThis(i18n("<b>First accessed window</b><p>Switches to the first accessed window (Hold the Alt key pressed and walk on by repeating the Down key).")); - action = new TDEAction( i18n("Configure Plugins..."), SmallIconSet("configure"), 0, PluginController::getInstance(), TQT_SLOT(selectPlugins()), m_pMainWnd->actionCollection(), "settings_configure_plugins" ); + action = new TDEAction( i18n("Configure Plugins..."), SmallIconSet("configure"), 0, PluginController::getInstance(), TQ_SLOT(selectPlugins()), m_pMainWnd->actionCollection(), "settings_configure_plugins" ); - m_configureEditorAction = new TDEAction( i18n("Configure &Editor..."), SmallIconSet("configure"), 0, this, TQT_SLOT( slotConfigureEditors() ), m_pMainWnd->actionCollection(), "settings_configure_editors"); + m_configureEditorAction = new TDEAction( i18n("Configure &Editor..."), SmallIconSet("configure"), 0, this, TQ_SLOT( slotConfigureEditors() ), m_pMainWnd->actionCollection(), "settings_configure_editors"); m_configureEditorAction->setToolTip( i18n("Configure editor settings") ); m_configureEditorAction->setWhatsThis(i18n("<b>Configure editor</b><p>Opens editor configuration dialog.")); m_configureEditorAction->setEnabled( false ); KDevPartController * partController = API::getInstance()->partController(); - connect( partController, TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(slotActivePartChanged(KParts::Part* )) ); + connect( partController, TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SLOT(slotActivePartChanged(KParts::Part* )) ); } void MainWindowShare::slotReportBug() @@ -367,15 +367,15 @@ void MainWindowShare::slotGUICreated( KParts::Part * part ) if ( TDEAction * action = part->action("file_save") ) { kdDebug(9000) << " *** found \"file_save\" action - disconnecting" << endl; - disconnect( action, TQT_SIGNAL(activated()), 0, 0 ); - connect( action, TQT_SIGNAL(activated()), PartController::getInstance(), TQT_SLOT(slotSave()) ); + disconnect( action, TQ_SIGNAL(activated()), 0, 0 ); + connect( action, TQ_SIGNAL(activated()), PartController::getInstance(), TQ_SLOT(slotSave()) ); } if ( TDEAction * action = part->action("file_reload") ) { kdDebug(9000) << " *** found \"file_reload\" action - disconnecting" << endl; - disconnect( action, TQT_SIGNAL(activated()), 0, 0 ); - connect( action, TQT_SIGNAL(activated()), PartController::getInstance(), TQT_SLOT(slotReload()) ); + disconnect( action, TQ_SIGNAL(activated()), 0, 0 ); + connect( action, TQ_SIGNAL(activated()), PartController::getInstance(), TQ_SLOT(slotReload()) ); } } @@ -429,7 +429,7 @@ void MainWindowShare::slotConfigureToolbars() { m_pMainWnd->saveMainWindowSettings( TDEGlobal::config(), "Mainwindow" ); KEditToolbar dlg( m_pMainWnd->factory() ); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(slotNewToolbarConfig())); dlg.exec(); } @@ -438,7 +438,7 @@ void MainWindowShare::contextMenu(TQPopupMenu* popup, const Context *) if ( m_pMainWnd->menuBar()->isVisible() ) return; - int id = popup->insertItem( i18n("Show &Menubar"), m_pMainWnd->menuBar(), TQT_SLOT(show()) ); + int id = popup->insertItem( i18n("Show &Menubar"), m_pMainWnd->menuBar(), TQ_SLOT(show()) ); popup->TQMenuData::setWhatsThis(id, i18n("<b>Show menubar</b><p>Lets you switch the menubar on/off.")); } diff --git a/src/mainwindowshare.h b/src/mainwindowshare.h index a9ec620a..d112c6f9 100644 --- a/src/mainwindowshare.h +++ b/src/mainwindowshare.h @@ -29,7 +29,7 @@ Shared main window functionality. */ class MainWindowShare : public TQObject { - Q_OBJECT + TQ_OBJECT public: MainWindowShare(TQObject* pParent = 0L, const char* name = 0L); diff --git a/src/multibuffer.cpp b/src/multibuffer.cpp index 33110d01..fe988c02 100644 --- a/src/multibuffer.cpp +++ b/src/multibuffer.cpp @@ -57,12 +57,12 @@ MultiBuffer::MultiBuffer( TQWidget *parent ) API::getInstance() ->languageSupport() ) { setOrientation( lang->splitOrientation() ); - connect( lang, TQT_SIGNAL( splitOrientationChanged( Qt::Orientation ) ), - this, TQT_SLOT( setOrientation( Qt::Orientation ) ) ); + connect( lang, TQ_SIGNAL( splitOrientationChanged( TQt::Orientation ) ), + this, TQ_SLOT( setOrientation( TQt::Orientation ) ) ); } else { - setOrientation( Qt::Vertical ); + setOrientation( TQt::Vertical ); } } @@ -147,7 +147,7 @@ void MultiBuffer::registerURL( const KURL &url, KParts::Part *part ) void MultiBuffer::registerDelayedActivation( KParts::Part *part, int line, int col ) { - m_delayedActivation[ part ] = tqMakePair( line, col ); + m_delayedActivation[ part ] = qMakePair( line, col ); } KParts::Part* MultiBuffer::createPart( const TQString &mimeType, @@ -221,8 +221,8 @@ void MultiBuffer::show() // We're managing the view deletion by being its parent, // don't let the part self-destruct - disconnect( view, TQT_SIGNAL( destroyed() ), - document, TQT_SLOT( slotWidgetDestroyed() ) ); + disconnect( view, TQ_SIGNAL( destroyed() ), + document, TQ_SLOT( slotWidgetDestroyed() ) ); document->insertChildClient( view ); PartController::getInstance() ->integrateTextEditorPart( document ); @@ -249,7 +249,7 @@ void MultiBuffer::show() TQSplitter::show(); } -void MultiBuffer::setOrientation( Qt::Orientation orientation ) +void MultiBuffer::setOrientation( TQt::Orientation orientation ) { TQSplitter::setOrientation( orientation ); } diff --git a/src/multibuffer.h b/src/multibuffer.h index b0a024f1..12967e34 100644 --- a/src/multibuffer.h +++ b/src/multibuffer.h @@ -39,7 +39,7 @@ typedef TQMap< KParts::Part*, TQPair<int, int> > ActivationMap; class MultiBuffer : public TQSplitter { - Q_OBJECT + TQ_OBJECT public: MultiBuffer( TQWidget * parent = 0 ); @@ -67,7 +67,7 @@ public: public slots: virtual void show(); - virtual void setOrientation( Qt::Orientation ); + virtual void setOrientation( TQt::Orientation ); void activePartChanged( const KURL &url ); protected: diff --git a/src/newui/button.cpp b/src/newui/button.cpp index 930ce733..fc8bf826 100644 --- a/src/newui/button.cpp +++ b/src/newui/button.cpp @@ -47,7 +47,7 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, hide(); setFlat(true); setToggleButton(true); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setDescription(m_description); setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); resize(sizeHint()); @@ -56,9 +56,9 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, TQToolTip::add(this, m_realText); m_assignAccelAction = new TDEAction(i18n("Assign Accelerator..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(assignAccel()), TQT_TQOBJECT(this)); + this, TQ_SLOT(assignAccel()), this); m_clearAccelAction = new TDEAction(i18n("Clear Accelerator"), 0, - TQT_TQOBJECT(this), TQT_SLOT(clearAccel()), TQT_TQOBJECT(this)); + this, TQ_SLOT(clearAccel()), this); TDEConfig *config = kapp->config(); config->setGroup("UI"); @@ -229,7 +229,7 @@ TQSize Button::sizeHint(const TQString &text) const h = TQMAX(h, sz.height()); } - return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). + return (style().sizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). expandedTo(TQApplication::globalStrut())); } diff --git a/src/newui/button.h b/src/newui/button.h index 63d0da59..68028fa9 100644 --- a/src/newui/button.h +++ b/src/newui/button.h @@ -38,7 +38,7 @@ A TQPushButton derivative with a size of a TQToolBar. Button can be rotated (placed onto different places in ideal mode). */ class Button : public TQPushButton { - Q_OBJECT + TQ_OBJECT public: Button(ButtonBar *parent, const TQString text, const TQIconSet &icon = TQIconSet(), diff --git a/src/newui/buttonbar.h b/src/newui/buttonbar.h index f0ae292b..f698fdb0 100644 --- a/src/newui/buttonbar.h +++ b/src/newui/buttonbar.h @@ -52,7 +52,7 @@ Looks like a toolbar but has another behaviour. It is suitable for placing on the left(right, bottom, top) corners of a window as a bar with slider. */ class ButtonBar : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ButtonBar(Place place, ButtonMode mode = IconsAndText, diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp index 88f25d18..60292252 100644 --- a/src/newui/ddockwindow.cpp +++ b/src/newui/ddockwindow.cpp @@ -85,9 +85,9 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position) m_widgetStack = new TQWidgetStack(this); m_internalLayout->addWidget(m_widgetStack); - m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockLeft()), TQT_TQOBJECT(this) ); - m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockRight()), TQT_TQOBJECT(this) ); - m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockBottom()), TQT_TQOBJECT(this) ); + m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, this, TQ_SLOT(moveToDockLeft()), this ); + m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, this, TQ_SLOT(moveToDockRight()), this ); + m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, this, TQ_SLOT(moveToDockBottom()), this ); setVisible(m_visible); @@ -192,8 +192,8 @@ void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipAc m_bar->addButton(button); m_widgetStack->addWidget(widget); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectWidget())); - connect(button, TQT_SIGNAL(contextMenu(TQPopupMenu*)), this, TQT_SLOT(contextMenu(TQPopupMenu*)) ); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectWidget())); + connect(button, TQ_SIGNAL(contextMenu(TQPopupMenu*)), this, TQ_SLOT(contextMenu(TQPopupMenu*)) ); if (!skipActivation) { @@ -375,7 +375,7 @@ void DDockWindow::selectPrevWidget() void DDockWindow::contextMenu(TQPopupMenu * menu) { - m_lastContextMenuButton = static_cast<Ideal::Button*>( TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>( sender() )) ); + m_lastContextMenuButton = static_cast<Ideal::Button*>( const_cast<TQObject*>( sender() ) ); menu->insertSeparator(); diff --git a/src/newui/ddockwindow.h b/src/newui/ddockwindow.h index 4190958a..29421914 100644 --- a/src/newui/ddockwindow.h +++ b/src/newui/ddockwindow.h @@ -39,7 +39,7 @@ namespace Ideal { } class DDockWindow : public TQDockWindow { - Q_OBJECT + TQ_OBJECT public: enum Position { Bottom, Left, Right }; diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp index d42c0d5f..d3c70d4e 100644 --- a/src/newui/dmainwindow.cpp +++ b/src/newui/dmainwindow.cpp @@ -34,7 +34,7 @@ DMainWindow::DMainWindow(TQWidget *parent, const char *name) { loadSettings(); createToolWindows(); - m_central = new Ideal::DockSplitter(Qt::Horizontal, this); + m_central = new Ideal::DockSplitter(TQt::Horizontal, this); m_activeTabWidget = createTab(); m_central->addDock(0, 0, m_activeTabWidget); setCentralWidget(m_central); @@ -208,10 +208,10 @@ DTabWidget *DMainWindow::createTab() DTabWidget *tab = new DTabWidget(m_central); m_tabs.append(tab); if (tab->closeButton()) - connect(tab->closeButton(), TQT_SIGNAL(clicked()), this, TQT_SLOT(closeTab())); - connect(tab, TQT_SIGNAL(closeRequest(TQWidget*)), this, TQT_SLOT(closeTab(TQWidget*))); - connect(tab, TQT_SIGNAL(contextMenu(TQWidget*,const TQPoint &)), - this, TQT_SLOT(tabContext(TQWidget*,const TQPoint &))); + connect(tab->closeButton(), TQ_SIGNAL(clicked()), this, TQ_SLOT(closeTab())); + connect(tab, TQ_SIGNAL(closeRequest(TQWidget*)), this, TQ_SLOT(closeTab(TQWidget*))); + connect(tab, TQ_SIGNAL(contextMenu(TQWidget*,const TQPoint &)), + this, TQ_SLOT(tabContext(TQWidget*,const TQPoint &))); return tab; } @@ -274,7 +274,7 @@ void DMainWindow::addDockWidget(DDockWindow::Position position, TQWidget *view, { toolWindow(position)->addWidget(title, view); m_docks[view] = position; - connect(view, TQT_SIGNAL(destroyed()), this, TQT_SLOT(widgetDestroyed())); + connect(view, TQ_SIGNAL(destroyed()), this, TQ_SLOT(widgetDestroyed())); } void DMainWindow::removeDockWidget(TQWidget *view) @@ -295,7 +295,7 @@ DDockWindow::Position DMainWindow::dockWidgetPosition(TQWidget *view) void DMainWindow::widgetDestroyed() { - TQWidget *w = TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); + TQWidget *w = static_cast<TQWidget*>(const_cast<TQObject*>(sender())); if (m_docks.contains(w)) { diff --git a/src/newui/dmainwindow.h b/src/newui/dmainwindow.h index 7ccb51f6..8745c454 100644 --- a/src/newui/dmainwindow.h +++ b/src/newui/dmainwindow.h @@ -32,7 +32,7 @@ namespace Ideal { /**Main window which provides simplified IDEA mode.*/ class DMainWindow: public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: DMainWindow(TQWidget *parent = 0, const char *name = 0); diff --git a/src/newui/docksplitter.cpp b/src/newui/docksplitter.cpp index 6cfa9445..3b447b80 100644 --- a/src/newui/docksplitter.cpp +++ b/src/newui/docksplitter.cpp @@ -23,16 +23,16 @@ namespace Ideal { -DockSplitter::DockSplitter(Qt::Orientation orientation, TQWidget *parent, const char *name) +DockSplitter::DockSplitter(TQt::Orientation orientation, TQWidget *parent, const char *name) :TQSplitter(parent, name), m_orientation(orientation) { switch (m_orientation) { - case Qt::Horizontal: - setOrientation(Qt::Vertical); + case TQt::Horizontal: + setOrientation(TQt::Vertical); break; - case Qt::Vertical: - setOrientation(Qt::Horizontal); + case TQt::Vertical: + setOrientation(TQt::Horizontal); break; } setOpaqueResize(true); @@ -73,11 +73,11 @@ void DockSplitter::appendSplitter() { switch (m_orientation) { - case Qt::Horizontal: - m_splitters.append(new TQSplitter(Qt::Horizontal, this)); + case TQt::Horizontal: + m_splitters.append(new TQSplitter(TQt::Horizontal, this)); break; - case Qt::Vertical: - m_splitters.append(new TQSplitter(Qt::Vertical, this)); + case TQt::Vertical: + m_splitters.append(new TQSplitter(TQt::Vertical, this)); break; } m_splitters[m_splitters.size()-1]->setOpaqueResize(true); @@ -166,8 +166,8 @@ TQPair<uint, uint> DockSplitter::indexOf(TQWidget *dock) for (uint i = 0; i < m_docks.count(); ++i) for (uint j = 0; j < m_docks[i].count(); ++j) if (dock == m_docks[i][j]) - return tqMakePair(i, j); - return tqMakePair(0u, 0u); + return qMakePair(i, j); + return qMakePair(0u, 0u); } } diff --git a/src/newui/docksplitter.h b/src/newui/docksplitter.h index c61f6c91..1d2a2d56 100644 --- a/src/newui/docksplitter.h +++ b/src/newui/docksplitter.h @@ -31,10 +31,10 @@ class DockWidget; @short Splitter for docks */ class DockSplitter: public TQSplitter { - Q_OBJECT + TQ_OBJECT public: - DockSplitter(Qt::Orientation orientation, TQWidget *parent = 0, const char *name = 0); + DockSplitter(TQt::Orientation orientation, TQWidget *parent = 0, const char *name = 0); ~DockSplitter(); void addDock(uint row, uint col, TQWidget *dock); @@ -53,7 +53,7 @@ protected: bool isRowEmpty(int row); private: - Qt::Orientation m_orientation; + TQt::Orientation m_orientation; TQValueList<TQSplitter*> m_splitters; TQValueList<TQValueList<TQWidget*> > m_docks; }; diff --git a/src/newui/dtabwidget.cpp b/src/newui/dtabwidget.cpp index 1480785a..f96f3ca0 100644 --- a/src/newui/dtabwidget.cpp +++ b/src/newui/dtabwidget.cpp @@ -29,7 +29,7 @@ DTabWidget::DTabWidget(TQWidget *parent, const char *name) :KTabWidget(parent, name), m_closeButton(0) { - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setMargin(0); loadSettings(); @@ -49,8 +49,8 @@ DTabWidget::DTabWidget(TQWidget *parent, const char *name) setTabReorderingEnabled(true); } - connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(setFocus(TQWidget*))); -// connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(updateHistory(TQWidget*))); + connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(setFocus(TQWidget*))); +// connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(updateHistory(TQWidget*))); } void DTabWidget::loadSettings() diff --git a/src/newui/dtabwidget.h b/src/newui/dtabwidget.h index 4d7b6f7f..c1b2fca1 100644 --- a/src/newui/dtabwidget.h +++ b/src/newui/dtabwidget.h @@ -25,7 +25,7 @@ class TQToolButton; class DTabWidget: public KTabWidget { - Q_OBJECT + TQ_OBJECT public: DTabWidget(TQWidget *parent=0, const char *name=0); diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp index 33e50afd..086d641e 100644 --- a/src/partcontroller.cpp +++ b/src/partcontroller.cpp @@ -92,9 +92,9 @@ struct ModificationData PartController::PartController(TQWidget *parent) : KDevPartController(parent), _editorFactory(0L), m_currentActivePart(0), m_removingActivePart(false) { - connect(this, TQT_SIGNAL(partRemoved(KParts::Part*)), this, TQT_SLOT(slotPartRemoved(KParts::Part* )) ); - connect(this, TQT_SIGNAL(partAdded(KParts::Part*)), this, TQT_SLOT(slotPartAdded(KParts::Part* )) ); - connect(this, TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(slotActivePartChanged(KParts::Part*))); + connect(this, TQ_SIGNAL(partRemoved(KParts::Part*)), this, TQ_SLOT(slotPartRemoved(KParts::Part* )) ); + connect(this, TQ_SIGNAL(partAdded(KParts::Part*)), this, TQ_SLOT(slotPartAdded(KParts::Part* )) ); + connect(this, TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SLOT(slotActivePartChanged(KParts::Part*))); setupActions(); @@ -126,56 +126,56 @@ void PartController::setupActions() { TDEActionCollection *ac = TopLevel::getInstance()->main()->actionCollection(); - TDEAction* newAction = KStdAction::open(this, TQT_SLOT(slotOpenFile()), ac, "file_open"); + TDEAction* newAction = KStdAction::open(this, TQ_SLOT(slotOpenFile()), ac, "file_open"); newAction->setToolTip( i18n("Open file") ); newAction->setWhatsThis( i18n("<b>Open file</b><p>Opens an existing file without adding it to the project.</p>") ); - m_openRecentAction = KStdAction::openRecent( this, TQT_SLOT(slotOpenRecent(const KURL&) ), ac, "file_open_recent" ); + m_openRecentAction = KStdAction::openRecent( this, TQ_SLOT(slotOpenRecent(const KURL&) ), ac, "file_open_recent" ); m_openRecentAction->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(m_openRecentAction->text())).arg(i18n("Opens recently opened file."))); m_openRecentAction->loadEntries( kapp->config(), "RecentFiles" ); - m_saveAllFilesAction = new TDEAction(i18n("Save Al&l"), 0, this, TQT_SLOT(slotSaveAllFiles()), ac, "file_save_all"); + m_saveAllFilesAction = new TDEAction(i18n("Save Al&l"), 0, this, TQ_SLOT(slotSaveAllFiles()), ac, "file_save_all"); m_saveAllFilesAction->setToolTip( i18n("Save all modified files") ); m_saveAllFilesAction->setWhatsThis(i18n("<b>Save all</b><p>Saves all modified files.")); m_saveAllFilesAction->setEnabled(false); - m_revertAllFilesAction = new TDEAction(i18n("Rever&t All"), 0, this, TQT_SLOT(slotRevertAllFiles()), ac, "file_revert_all"); + m_revertAllFilesAction = new TDEAction(i18n("Rever&t All"), 0, this, TQ_SLOT(slotRevertAllFiles()), ac, "file_revert_all"); m_revertAllFilesAction->setToolTip(i18n("Revert all changes")); m_revertAllFilesAction->setWhatsThis(i18n("<b>Revert all</b><p>Reverts all changes in opened files. Prompts to save changes so the reversion can be canceled for each modified file.")); m_revertAllFilesAction->setEnabled(false); - m_closeWindowAction = KStdAction::close(this, TQT_SLOT(slotCloseWindow()), ac, "file_close"); + m_closeWindowAction = KStdAction::close(this, TQ_SLOT(slotCloseWindow()), ac, "file_close"); m_closeWindowAction->setToolTip( i18n("Close current file") ); m_closeWindowAction->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(m_closeWindowAction->text())).arg(i18n("Closes current file."))); m_closeWindowAction->setEnabled(false); - m_closeAllWindowsAction = new TDEAction(i18n("Close All"), 0, this, TQT_SLOT(slotCloseAllWindows()), ac, "file_close_all"); + m_closeAllWindowsAction = new TDEAction(i18n("Close All"), 0, this, TQ_SLOT(slotCloseAllWindows()), ac, "file_close_all"); m_closeAllWindowsAction->setToolTip( i18n("Close all files") ); m_closeAllWindowsAction->setWhatsThis(i18n("<b>Close all</b><p>Close all opened files.")); m_closeAllWindowsAction->setEnabled(false); - m_closeOtherWindowsAction = new TDEAction(i18n("Close All Others"), 0, this, TQT_SLOT(slotCloseOtherWindows()), ac, "file_closeother"); + m_closeOtherWindowsAction = new TDEAction(i18n("Close All Others"), 0, this, TQ_SLOT(slotCloseOtherWindows()), ac, "file_closeother"); m_closeOtherWindowsAction->setToolTip( i18n("Close other files") ); m_closeOtherWindowsAction->setWhatsThis(i18n("<b>Close all others</b><p>Close all opened files except current.")); m_closeOtherWindowsAction->setEnabled(false); new TDEActionSeparator(ac, "dummy_separator"); - m_backAction = new TDEToolBarPopupAction(i18n("Back"), "back", 0, this, TQT_SLOT(slotBack()), ac, "history_back"); + m_backAction = new TDEToolBarPopupAction(i18n("Back"), "back", 0, this, TQ_SLOT(slotBack()), ac, "history_back"); m_backAction->setEnabled( false ); m_backAction->setToolTip(i18n("Back")); m_backAction->setWhatsThis(i18n("<b>Back</b><p>Moves backwards one step in the navigation history.")); - connect(m_backAction->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotBackAboutToShow())); - connect(m_backAction->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotBackPopupActivated(int))); + connect(m_backAction->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotBackAboutToShow())); + connect(m_backAction->popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotBackPopupActivated(int))); - m_forwardAction = new TDEToolBarPopupAction(i18n("Forward"), "forward", 0, this, TQT_SLOT(slotForward()), ac, "history_forward"); + m_forwardAction = new TDEToolBarPopupAction(i18n("Forward"), "forward", 0, this, TQ_SLOT(slotForward()), ac, "history_forward"); m_forwardAction->setEnabled( false ); m_forwardAction->setToolTip(i18n("Forward")); m_forwardAction->setWhatsThis(i18n("<b>Forward</b><p>Moves forward one step in the navigation history.")); - connect(m_forwardAction->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotForwardAboutToShow())); - connect(m_forwardAction->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotForwardPopupActivated(int))); + connect(m_forwardAction->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotForwardAboutToShow())); + connect(m_forwardAction->popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotForwardPopupActivated(int))); - m_gotoLastEditPosAction = new TDEAction( i18n("Goto Last Edit Position"), "go-bottom", 0, this, TQT_SLOT(gotoLastEditPos()), ac, "goto_last_edit_pos" ); + m_gotoLastEditPosAction = new TDEAction( i18n("Goto Last Edit Position"), "go-bottom", 0, this, TQ_SLOT(gotoLastEditPos()), ac, "goto_last_edit_pos" ); m_gotoLastEditPosAction->setEnabled( false ); m_gotoLastEditPosAction->setToolTip( i18n("Goto Last Edit Position") ); m_gotoLastEditPosAction->setWhatsThis( i18n("<b>Goto Last Edit Position</b><p>Open the last edited file and position cursor at the point of edit") ); @@ -395,14 +395,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, if ( dom != 0 ) { // The global option specifies a fallback if the project - // has no setting or no project is open. However for TQt4 - // projects we want to use ExternalDesigner in any case. - if ( DomUtil::readIntEntry( *dom, "/kdevcppsupport/qt/version", 3 ) == 4 ) - { - designerPluginPaths = DomUtil::readListEntry(*dom, "/kdevcppsupport/qt/designerpluginpaths", "path" ); - DesignerSetting = "ExternalDesigner"; - } - + // has no setting or no project is open. DesignerSetting = DomUtil::readEntry(*dom, "/kdevcppsupport/qt/designerintegration", DesignerSetting ); designerExec = DomUtil::readEntry(*dom, "/kdevcppsupport/qt/designer", designerExec ); } @@ -581,8 +574,8 @@ void PartController::showDocument(const KURL &url, bool newWin) { part = new HTMLDocumentationPart; integratePart(part,docUrl); - connect(part, TQT_SIGNAL(fileNameChanged(KParts::ReadOnlyPart* )), - this, TQT_SIGNAL(partURLChanged(KParts::ReadOnlyPart* ))); + connect(part, TQ_SIGNAL(fileNameChanged(KParts::ReadOnlyPart* )), + this, TQ_SIGNAL(partURLChanged(KParts::ReadOnlyPart* ))); } else { @@ -685,14 +678,14 @@ void PartController::integratePart(KParts::Part *part, const KURL &url, emit loadedFile( ro_part->url() ); - connect( part, TQT_SIGNAL(modifiedOnDisc(Kate::Document*, bool, unsigned char)), this, TQT_SLOT(slotDocumentDirty(Kate::Document*, bool, unsigned char)) ); + connect( part, TQ_SIGNAL(modifiedOnDisc(Kate::Document*, bool, unsigned char)), this, TQ_SLOT(slotDocumentDirty(Kate::Document*, bool, unsigned char)) ); // let's get notified when a document has been changed - connect(part, TQT_SIGNAL(completed()), this, TQT_SLOT(slotUploadFinished())); + connect(part, TQ_SIGNAL(completed()), this, TQ_SLOT(slotUploadFinished())); // yes, we're cheating again. this signal exists for katepart's // Document object and our HTMLDocumentationPart -// connect(part, TQT_SIGNAL(fileNameChanged()), this, TQT_SLOT(slotFileNameChanged())); +// connect(part, TQ_SIGNAL(fileNameChanged()), this, TQ_SLOT(slotFileNameChanged())); // Connect to the document's views newStatus() signal in order to keep track of the // modified-status of the document. @@ -704,22 +697,22 @@ void PartController::integratePart(KParts::Part *part, const KURL &url, if (designerPart && API::getInstance()->languageSupport()) { kdDebug() << "integrating designer part with language support" << endl; - connect(designerPart, TQT_SIGNAL(addedFunction(DesignerType, const TQString&, Function )), + connect(designerPart, TQ_SIGNAL(addedFunction(DesignerType, const TQString&, Function )), API::getInstance()->languageSupport(), - TQT_SLOT(addFunction(DesignerType, const TQString&, Function ))); - connect(designerPart, TQT_SIGNAL(editedFunction(DesignerType, const TQString&, Function, Function )), API::getInstance()->languageSupport(), - TQT_SLOT(editFunction(DesignerType, const TQString&, Function, Function ))); - connect(designerPart, TQT_SIGNAL(removedFunction(DesignerType, const TQString&, Function )), + TQ_SLOT(addFunction(DesignerType, const TQString&, Function ))); + connect(designerPart, TQ_SIGNAL(editedFunction(DesignerType, const TQString&, Function, Function )), API::getInstance()->languageSupport(), + TQ_SLOT(editFunction(DesignerType, const TQString&, Function, Function ))); + connect(designerPart, TQ_SIGNAL(removedFunction(DesignerType, const TQString&, Function )), API::getInstance()->languageSupport(), - TQT_SLOT(removeFunction(DesignerType, const TQString&, Function ))); - connect(designerPart, TQT_SIGNAL(editFunction(DesignerType, const TQString&, const TQString& )), + TQ_SLOT(removeFunction(DesignerType, const TQString&, Function ))); + connect(designerPart, TQ_SIGNAL(editFunction(DesignerType, const TQString&, const TQString& )), API::getInstance()->languageSupport(), - TQT_SLOT(openFunction(DesignerType, const TQString&, const TQString& ))); - connect(designerPart, TQT_SIGNAL(editSource(DesignerType, const TQString& )), + TQ_SLOT(openFunction(DesignerType, const TQString&, const TQString& ))); + connect(designerPart, TQ_SIGNAL(editSource(DesignerType, const TQString& )), API::getInstance()->languageSupport(), - TQT_SLOT(openSource(DesignerType, const TQString& ))); - connect(designerPart, TQT_SIGNAL(newStatus(const TQString &, int)), - this, TQT_SLOT(slotNewDesignerStatus(const TQString &, int))); + TQ_SLOT(openSource(DesignerType, const TQString& ))); + connect(designerPart, TQ_SIGNAL(newStatus(const TQString &, int)), + this, TQ_SLOT(slotNewDesignerStatus(const TQString &, int))); } } @@ -740,14 +733,14 @@ void PartController::integrateTextEditorPart(KTextEditor::Document* doc) if ( !doc ) return; - connect( doc, TQT_SIGNAL(textChanged()), this, TQT_SLOT(textChanged()) ); - connect( doc, TQT_SIGNAL(fileNameChanged()), - this, TQT_SLOT(slotDocumentUrlChanged())); + connect( doc, TQ_SIGNAL(textChanged()), this, TQ_SLOT(textChanged()) ); + connect( doc, TQ_SIGNAL(fileNameChanged()), + this, TQ_SLOT(slotDocumentUrlChanged())); if( doc->widget() ) { - connect( doc->widget(), TQT_SIGNAL(dropEventPass(TQDropEvent *)), - TopLevel::getInstance()->main(), TQT_SLOT(slotDropEvent(TQDropEvent *)) ); + connect( doc->widget(), TQ_SIGNAL(dropEventPass(TQDropEvent *)), + TopLevel::getInstance()->main(), TQ_SLOT(slotDropEvent(TQDropEvent *)) ); } if ( KTextEditor::View * view = dynamic_cast<KTextEditor::View*>( doc->widget() ) ) @@ -787,7 +780,7 @@ void PartController::integrateTextEditorPart(KTextEditor::Document* doc) TQPtrListIterator<KTextEditor::View> it( list ); while ( it.current() ) { - connect( it, TQT_SIGNAL( newStatus() ), this, TQT_SLOT( slotNewStatus() ) ); + connect( it, TQ_SIGNAL( newStatus() ), this, TQ_SLOT( slotNewStatus() ) ); ++it; } } @@ -1334,7 +1327,7 @@ void PartController::slotActivePartChanged( KParts::Part *part ) } updateMenuItems(); - TQTimer::singleShot( 100, this, TQT_SLOT(slotWaitForFactoryHack()) ); + TQTimer::singleShot( 100, this, TQ_SLOT(slotWaitForFactoryHack()) ); } void PartController::showPart( KParts::Part* part, const TQString& name, const TQString& shortDescription ) @@ -1386,7 +1379,7 @@ void PartController::slotDocumentDirty( Kate::Document * d, bool isModified, uns p->doc = doc; p->isModified = isModified; p->reason = reason; - KDevJobTimer::singleShot( 0, this, TQT_SLOT(slotDocumentDirtyStepTwo(void*)), p ); + KDevJobTimer::singleShot( 0, this, TQ_SLOT(slotDocumentDirtyStepTwo(void*)), p ); } } @@ -1522,7 +1515,7 @@ void PartController::slotNewStatus( ) { kdDebug(9000) << k_funcinfo << endl; - TQObject * senderobj = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() )); + TQObject * senderobj = const_cast<TQObject*>(sender()); KTextEditor::View * view = dynamic_cast<KTextEditor::View*>( senderobj ); if ( view ) { @@ -1761,7 +1754,7 @@ void PartController::slotWaitForFactoryHack( ) { if ( !activePart()->factory() ) { - TQTimer::singleShot( 100, this, TQT_SLOT(slotWaitForFactoryHack()) ); + TQTimer::singleShot( 100, this, TQ_SLOT(slotWaitForFactoryHack()) ); return; } else @@ -1848,7 +1841,7 @@ void PartController::gotoLastEditPos() void PartController::slotDocumentUrlChanged() { - TQObject *obj = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); + TQObject *obj = const_cast<TQObject*>(sender()); KTextEditor::Document *doc = dynamic_cast<KTextEditor::Document*>( obj ); if (!doc) return; diff --git a/src/partcontroller.h b/src/partcontroller.h index 2e621c38..e5fc872b 100644 --- a/src/partcontroller.h +++ b/src/partcontroller.h @@ -42,7 +42,7 @@ Part controler implementation. */ class PartController : public KDevPartController { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp index 30aa9171..7166ab34 100644 --- a/src/plugincontroller.cpp +++ b/src/plugincontroller.cpp @@ -244,8 +244,8 @@ void PluginController::integratePart(KXMLGUIClient *part) Core::setupShourtcutTips(part); TopLevel::getInstance()->main()->guiFactory()->addClient(part); - connect( part->actionCollection(), TQT_SIGNAL( actionStatusText( const TQString & ) ), - TopLevel::getInstance()->main()->actionCollection(), TQT_SIGNAL( actionStatusText( const TQString & ) ) ); + connect( part->actionCollection(), TQ_SIGNAL( actionStatusText( const TQString & ) ), + TopLevel::getInstance()->main()->actionCollection(), TQ_SIGNAL( actionStatusText( const TQString & ) ) ); } void PluginController::integrateAndRememberPart(const TQString &name, KDevPlugin *part) diff --git a/src/plugincontroller.h b/src/plugincontroller.h index d5c3f423..dc721698 100644 --- a/src/plugincontroller.h +++ b/src/plugincontroller.h @@ -22,7 +22,7 @@ Loads and unloads plugins. */ class PluginController : public KDevPluginController { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/pluginselectdialog.cpp b/src/pluginselectdialog.cpp index a626a0dd..f7e92089 100644 --- a/src/pluginselectdialog.cpp +++ b/src/pluginselectdialog.cpp @@ -51,8 +51,8 @@ PluginSelectDialog::PluginSelectDialog(TQWidget* parent, const char* name, bool plugin_list->addColumn(""); plugin_list->header()->hide(); - connect( plugin_list, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQT_SLOT( itemSelected( TQListViewItem * ) ) ); - connect( urllabel, TQT_SIGNAL( leftClickedURL( const TQString & ) ), this, TQT_SLOT( openURL( const TQString & ) ) ); + connect( plugin_list, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQ_SLOT( itemSelected( TQListViewItem * ) ) ); + connect( urllabel, TQ_SIGNAL( leftClickedURL( const TQString & ) ), this, TQ_SLOT( openURL( const TQString & ) ) ); init(); } diff --git a/src/pluginselectdialog.h b/src/pluginselectdialog.h index aa85937c..fc00c5f7 100644 --- a/src/pluginselectdialog.h +++ b/src/pluginselectdialog.h @@ -19,7 +19,7 @@ class PluginController; class PluginSelectDialog : public PluginSelectDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/pluginselectdialogbase.ui b/src/pluginselectdialogbase.ui index 8f53d109..81795f29 100644 --- a/src/pluginselectdialogbase.ui +++ b/src/pluginselectdialogbase.ui @@ -169,9 +169,9 @@ <slot>saveAsDefault()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">saveAsDefault()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kurllabel.h</include> diff --git a/src/profileengine/editor/profileeditor.h b/src/profileengine/editor/profileeditor.h index 45763d98..8a154a7b 100644 --- a/src/profileengine/editor/profileeditor.h +++ b/src/profileengine/editor/profileeditor.h @@ -28,7 +28,7 @@ class TQListViewItem; class TDEListViewItem; class ProfileEditor : public ProfileEditorBase { - Q_OBJECT + TQ_OBJECT public: ProfileEditor(TQWidget *parent = 0, const char *name = 0); diff --git a/src/profileengine/editor/profileeditorbase.ui b/src/profileengine/editor/profileeditorbase.ui index 36acd44d..b9d17720 100644 --- a/src/profileengine/editor/profileeditorbase.ui +++ b/src/profileengine/editor/profileeditorbase.ui @@ -649,7 +649,7 @@ <tabstop>disabledList</tabstop> <tabstop>pluginsView</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>profileExecuted(TQListViewItem *item)</slot> <slot>propertyExecuted(TQListBoxItem *item)</slot> <slot>addProfile()</slot> @@ -660,7 +660,7 @@ <slot>delEnabled()</slot> <slot>addDisabled()</slot> <slot>delDisabled()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index 19a88d78..adebaee4 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -94,14 +94,14 @@ void ProjectManager::createActions( TDEActionCollection* ac ) TDEAction *action; action = new TDEAction(i18n("&Open Project..."), "project_open", 0, - this, TQT_SLOT(slotOpenProject()), + this, TQ_SLOT(slotOpenProject()), ac, "project_open"); action->setToolTip( i18n("Open project")); action->setWhatsThis(i18n("<b>Open project</b><p>Opens a KDevelop3 or KDevelop2 project.")); m_openRecentProjectAction = new TDERecentFilesAction(i18n("Open &Recent Project"), 0, - this, TQT_SLOT(loadProject(const KURL &)), + this, TQ_SLOT(loadProject(const KURL &)), ac, "project_open_recent"); m_openRecentProjectAction->setToolTip(i18n("Open recent project")); m_openRecentProjectAction->setWhatsThis(i18n("<b>Open recent project</b><p>Opens recently opened project.")); @@ -109,14 +109,14 @@ void ProjectManager::createActions( TDEActionCollection* ac ) m_closeProjectAction = new TDEAction(i18n("C&lose Project"), "window-close",0, - this, TQT_SLOT(closeProject()), + this, TQ_SLOT(closeProject()), ac, "project_close"); m_closeProjectAction->setEnabled(false); m_closeProjectAction->setToolTip(i18n("Close project")); m_closeProjectAction->setWhatsThis(i18n("<b>Close project</b><p>Closes the current project.")); m_projectOptionsAction = new TDEAction(i18n("Project &Options"), "configure", 0, - this, TQT_SLOT(slotProjectOptions()), + this, TQ_SLOT(slotProjectOptions()), ac, "project_options" ); m_projectOptionsAction->setToolTip(i18n("Project options")); m_projectOptionsAction->setWhatsThis(i18n("<b>Project options</b><p>Lets you customize project options.")); @@ -151,7 +151,7 @@ void ProjectManager::slotProjectOptions() TQVBox *box = dlg.addVBoxPage( i18n("General"), i18n("General"), BarIcon( "tdevelop", TDEIcon::SizeMedium ) ); GeneralInfoWidget *g = new GeneralInfoWidget(*API::getInstance()->projectDom(), box, "general informations widget"); - connect (&dlg, TQT_SIGNAL(okClicked()), g, TQT_SLOT(accept())); + connect (&dlg, TQ_SIGNAL(okClicked()), g, TQ_SLOT(accept())); TDEConfig *config = kapp->config(); config->setGroup("Project Settings Dialog"); @@ -239,7 +239,7 @@ bool ProjectManager::loadProject(const KURL &projectURL) m_info = new ProjectInfo; m_info->m_projectURL = url; - TQTimer::singleShot( 0, this, TQT_SLOT(slotLoadProject()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotLoadProject()) ); // no one cares about this value return true; diff --git a/src/projectmanager.h b/src/projectmanager.h index 3a92409e..e3df8b05 100644 --- a/src/projectmanager.h +++ b/src/projectmanager.h @@ -39,7 +39,7 @@ Loads and unloads projects. */ class ProjectManager : public TQObject, public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projectsession.cpp b/src/projectsession.cpp index afdaf0b5..272258dd 100644 --- a/src/projectsession.cpp +++ b/src/projectsession.cpp @@ -118,7 +118,7 @@ bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQ ++it; } - TQTimer::singleShot( 0, this, TQT_SLOT(loadDocument()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(loadDocument()) ); return true; } @@ -444,7 +444,7 @@ void ProjectSession::loadDocument( ) _docDataList.pop_front(); loadDocument(); - //TQTimer::singleShot( 0, this, TQT_SLOT(loadDocument()) ); + //TQTimer::singleShot( 0, this, TQ_SLOT(loadDocument()) ); } } diff --git a/src/projectsession.h b/src/projectsession.h index e386bdbc..a5b3ab38 100644 --- a/src/projectsession.h +++ b/src/projectsession.h @@ -34,7 +34,7 @@ class KDevPlugin; **/ class ProjectSession : public TQObject { - Q_OBJECT + TQ_OBJECT // methods public: diff --git a/src/settingswidget.ui b/src/settingswidget.ui index f43efe86..15b00c75 100644 --- a/src/settingswidget.ui +++ b/src/settingswidget.ui @@ -439,9 +439,6 @@ <property name="text"> <string>Directory &navigation messages</string> </property> - <property name="accel"> - <string>Alt+N</string> - </property> <property name="toolTip" stdset="0"> <string>Check this if you want to know what directory make is in</string> </property> diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp index 6d74fb5d..b18f4cb5 100644 --- a/src/simplemainwindow.cpp +++ b/src/simplemainwindow.cpp @@ -61,11 +61,11 @@ SimpleMainWindow::SimpleMainWindow(TQWidget* parent, const char *name) :DMainWindow(parent, name) { resize(800, 600); // starts tdevelop at 800x600 the first time - m_mainWindowShare = new MainWindowShare(TQT_TQOBJECT(this)); + m_mainWindowShare = new MainWindowShare(this); - connect(m_bottomDock, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(raiseEditor())); - connect(m_leftDock, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(raiseEditor())); - connect(m_rightDock, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(raiseEditor())); + connect(m_bottomDock, TQ_SIGNAL(hidden()), this, TQ_SLOT(raiseEditor())); + connect(m_leftDock, TQ_SIGNAL(hidden()), this, TQ_SLOT(raiseEditor())); + connect(m_rightDock, TQ_SIGNAL(hidden()), this, TQ_SLOT(raiseEditor())); } SimpleMainWindow::~ SimpleMainWindow( ) @@ -97,7 +97,7 @@ void SimpleMainWindow::init() if (help_menu) { help_menu->insertItem(SmallIconSet("contents"), i18n("TDevelop &Programming Handbook"), - TQT_TQOBJECT(this), TQT_SLOT(slotProgrammingHandbook()), 0, -1, 1); + this, TQ_SLOT(slotProgrammingHandbook()), 0, -1, 1); } menuBar()->setEnabled( false ); @@ -116,19 +116,19 @@ void SimpleMainWindow::init() i18n("Could Not Find Plugins") ); } - connect(Core::getInstance(), TQT_SIGNAL(coreInitialized()), TQT_TQOBJECT(this), TQT_SLOT(slotCoreInitialized())); - connect(Core::getInstance(), TQT_SIGNAL(projectOpened()), TQT_TQOBJECT(this), TQT_SLOT(projectOpened())); - connect(Core::getInstance(), TQT_SIGNAL(projectClosed()), TQT_TQOBJECT(this), TQT_SLOT(projectClosed())); - connect(Core::getInstance(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - TQT_TQOBJECT(this), TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); - connect(PartController::getInstance(), TQT_SIGNAL(partURLChanged(KParts::ReadOnlyPart *)), - TQT_TQOBJECT(this), TQT_SLOT(slotPartURLChanged(KParts::ReadOnlyPart * ))); - connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - TQT_TQOBJECT(this), TQT_SLOT(activePartChanged(KParts::Part*))); + connect(Core::getInstance(), TQ_SIGNAL(coreInitialized()), this, TQ_SLOT(slotCoreInitialized())); + connect(Core::getInstance(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened())); + connect(Core::getInstance(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed())); + connect(Core::getInstance(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(PartController::getInstance(), TQ_SIGNAL(partURLChanged(KParts::ReadOnlyPart *)), + this, TQ_SLOT(slotPartURLChanged(KParts::ReadOnlyPart * ))); + connect(PartController::getInstance(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(activePartChanged(KParts::Part*))); connect(PartController::getInstance(), - TQT_SIGNAL(documentChangedState(const KURL &, DocumentState)), - TQT_TQOBJECT(this), TQT_SLOT(documentChangedState(const KURL&, DocumentState))); + TQ_SIGNAL(documentChangedState(const KURL &, DocumentState)), + this, TQ_SLOT(documentChangedState(const KURL&, DocumentState))); loadSettings(); } @@ -413,65 +413,65 @@ void SimpleMainWindow::createFramework() { PartController::createInstance( this ); - connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - TQT_TQOBJECT(this), TQT_SLOT(createGUI(KParts::Part*))); + connect(PartController::getInstance(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(createGUI(KParts::Part*))); } void SimpleMainWindow::createActions() { m_raiseEditor = new TDEAction(i18n("Raise &Editor"), ALT+Key_C, - TQT_TQOBJECT(this), TQT_SLOT(raiseEditor()), actionCollection(), "raise_editor"); + this, TQ_SLOT(raiseEditor()), actionCollection(), "raise_editor"); m_raiseEditor->setToolTip(i18n("Raise editor")); m_raiseEditor->setWhatsThis(i18n("<b>Raise editor</b><p>Focuses the editor.")); m_lowerAllDocks = new TDEAction(i18n("Lower All Docks"), CTRL+SHIFT+Key_C, - TQT_TQOBJECT(this), TQT_SLOT(lowerAllDocks()), actionCollection(), "lower_all_docks"); + this, TQ_SLOT(lowerAllDocks()), actionCollection(), "lower_all_docks"); - new TDEAction(i18n("Switch to next TabWidget"), 0, TQT_TQOBJECT(this), - TQT_SLOT(switchToNextTabWidget()), actionCollection(), "switch_to_next_tabwidget" ); + new TDEAction(i18n("Switch to next TabWidget"), 0, this, + TQ_SLOT(switchToNextTabWidget()), actionCollection(), "switch_to_next_tabwidget" ); m_splitHor = new TDEAction(i18n("Split &Horizontal"), CTRL+SHIFT+Key_T, - TQT_TQOBJECT(this), TQT_SLOT(slotSplitHorizontalBase()), actionCollection(), "split_h"); + this, TQ_SLOT(slotSplitHorizontalBase()), actionCollection(), "split_h"); m_splitHor->setIcon("view_top_bottom"); m_splitVer = new TDEAction(i18n("Split &Vertical"), CTRL+SHIFT+Key_L, - TQT_TQOBJECT(this), TQT_SLOT(slotSplitVerticalBase()), actionCollection(), "split_v"); + this, TQ_SLOT(slotSplitVerticalBase()), actionCollection(), "split_v"); m_splitVer->setIcon("view_left_right"); m_splitHor1 = new TDEAction(i18n("Split &Horizontal"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h1"); + this, TQ_SLOT(slotSplitHorizontal()), actionCollection(), "split_h1"); m_splitHor1->setIcon("view_top_bottom"); m_splitVer1 = new TDEAction(i18n("Split &Vertical"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v1"); + this, TQ_SLOT(slotSplitVertical()), actionCollection(), "split_v1"); m_splitVer1->setIcon("view_left_right"); m_splitHor2 = new TDEAction(i18n("Split &Horizontal and Open"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h2"); + this, TQ_SLOT(slotSplitHorizontal()), actionCollection(), "split_h2"); m_splitHor2->setIcon("view_top_bottom"); m_splitVer2 = new TDEAction(i18n("Split &Vertical and Open"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v2"); + this, TQ_SLOT(slotSplitVertical()), actionCollection(), "split_v2"); m_splitVer2->setIcon("view_left_right"); m_raiseLeftDock = new TDEAction(i18n("Switch Left Dock"), CTRL+SHIFT+ALT+Key_L, - TQT_TQOBJECT(this), TQT_SLOT(raiseLeftDock()), actionCollection(), "switch_left_dock"); + this, TQ_SLOT(raiseLeftDock()), actionCollection(), "switch_left_dock"); m_raiseRightDock = new TDEAction(i18n("Switch Right Dock"), CTRL+SHIFT+ALT+Key_R, - TQT_TQOBJECT(this), TQT_SLOT(raiseRightDock()), actionCollection(), "switch_right_dock"); + this, TQ_SLOT(raiseRightDock()), actionCollection(), "switch_right_dock"); m_raiseBottomDock = new TDEAction(i18n("Switch Bottom Dock"), CTRL+SHIFT+ALT+Key_B, - TQT_TQOBJECT(this), TQT_SLOT(raiseBottomDock()), actionCollection(), "switch_bottom_dock"); + this, TQ_SLOT(raiseBottomDock()), actionCollection(), "switch_bottom_dock"); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolbars()), + KStdAction::configureToolbars(this, TQ_SLOT(configureToolbars()), actionCollection(), "set_configure_toolbars"); m_mainWindowShare->createActions(); - connect(m_mainWindowShare, TQT_SIGNAL(gotoNextWindow()), TQT_TQOBJECT(this), TQT_SLOT(gotoNextWindow())); - connect(m_mainWindowShare, TQT_SIGNAL(gotoPreviousWindow()), TQT_TQOBJECT(this), TQT_SLOT(gotoPreviousWindow())); - connect(m_mainWindowShare, TQT_SIGNAL(gotoFirstWindow()), TQT_TQOBJECT(this), TQT_SLOT(gotoFirstWindow())); - connect(m_mainWindowShare, TQT_SIGNAL(gotoLastWindow()), TQT_TQOBJECT(this), TQT_SLOT(gotoLastWindow())); + connect(m_mainWindowShare, TQ_SIGNAL(gotoNextWindow()), this, TQ_SLOT(gotoNextWindow())); + connect(m_mainWindowShare, TQ_SIGNAL(gotoPreviousWindow()), this, TQ_SLOT(gotoPreviousWindow())); + connect(m_mainWindowShare, TQ_SIGNAL(gotoFirstWindow()), this, TQ_SLOT(gotoFirstWindow())); + connect(m_mainWindowShare, TQ_SIGNAL(gotoLastWindow()), this, TQ_SLOT(gotoLastWindow())); } void SimpleMainWindow::raiseEditor() @@ -588,9 +588,9 @@ void SimpleMainWindow::documentChangedState(const KURL &url, DocumentState state void SimpleMainWindow::closeTab() { // actionCollection()->action("file_close")->activate(); - if (TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->isA(TQTOOLBUTTON_OBJECT_NAME_STRING) && TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->parent()->isA("DTabWidget")) + if (sender()->isA("TQToolButton") && sender()->parent()->isA("DTabWidget")) { - DTabWidget *tab = (DTabWidget*)TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->parent(); + DTabWidget *tab = (DTabWidget*)sender()->parent(); if (tab && tab->currentPage()) closeTab(tab->currentPage()); } @@ -598,7 +598,7 @@ void SimpleMainWindow::closeTab() void SimpleMainWindow::tabContext(TQWidget *w, const TQPoint &p) { - DTabWidget *tabWidget = static_cast<DTabWidget*>(TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))); + DTabWidget *tabWidget = static_cast<DTabWidget*>(const_cast<TQObject*>(sender())); if (!tabWidget) return; @@ -644,7 +644,7 @@ void SimpleMainWindow::tabContext(TQWidget *w, const TQPoint &p) ++it; } - connect(&tabMenu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(tabContextActivated(int))); + connect(&tabMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(tabContextActivated(int))); tabMenu.exec(p); } @@ -679,7 +679,7 @@ void SimpleMainWindow::configureToolbars() { saveMainWindowSettings(TDEGlobal::config(), "SimpleMainWindow"); KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(slotNewToolbarConfig())); dlg.exec(); } @@ -704,7 +704,7 @@ bool SimpleMainWindow::queryExit() void SimpleMainWindow::setupWindowMenu() { // get the xmlgui created one instead - m_windowMenu = static_cast<TQPopupMenu*>(TQT_TQWIDGET(main()->child("window", "TDEPopupMenu"))); + m_windowMenu = static_cast<TQPopupMenu*>(main()->child("window", "TDEPopupMenu")); if (!m_windowMenu) { @@ -718,8 +718,8 @@ void SimpleMainWindow::setupWindowMenu() actionCollection()->action("file_close_all")->plug(m_windowMenu); actionCollection()->action("file_closeother")->plug(m_windowMenu); - TQObject::connect(m_windowMenu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(openURL(int))); - TQObject::connect(m_windowMenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(fillWindowMenu())); + TQObject::connect(m_windowMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(openURL(int))); + TQObject::connect(m_windowMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(fillWindowMenu())); } void SimpleMainWindow::openURL(int w) @@ -772,12 +772,12 @@ void SimpleMainWindow::fillWindowMenu() int i = 0; if (list.count() > 0) - m_windowList << tqMakePair(m_windowMenu->insertSeparator(), KURL()); + m_windowList << qMakePair(m_windowMenu->insertSeparator(), KURL()); while (itt != list.end()) { temp = m_windowMenu->insertItem( i < 10 ? TQString("&%1 %2").arg(i).arg((*itt).fileName()) : (*itt).fileName() ); - m_windowList << tqMakePair(temp, *itt); + m_windowList << qMakePair(temp, *itt); ++i; ++itt; } diff --git a/src/simplemainwindow.h b/src/simplemainwindow.h index ede22520..e0328b1d 100644 --- a/src/simplemainwindow.h +++ b/src/simplemainwindow.h @@ -35,7 +35,7 @@ namespace KParts { } class SimpleMainWindow: public DMainWindow, public KDevMainWindow { - Q_OBJECT + TQ_OBJECT public: SimpleMainWindow(TQWidget* parent = 0, const char *name = 0); diff --git a/src/splashscreen.cpp b/src/splashscreen.cpp index 205656bd..b2e0f13a 100644 --- a/src/splashscreen.cpp +++ b/src/splashscreen.cpp @@ -13,7 +13,7 @@ KDevSplashScreen::KDevSplashScreen(const TQPixmap& pixmap, WFlags f) : TQSplashScreen(pixmap, f) { TQTimer *timer = new TQTimer( this ); - TQObject::connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animate())); + TQObject::connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(animate())); timer->start(150); state = 0; diff --git a/src/splashscreen.h b/src/splashscreen.h index b8d5563c..3206b923 100644 --- a/src/splashscreen.h +++ b/src/splashscreen.h @@ -13,7 +13,7 @@ Splash screen. */ class KDevSplashScreen : public TQSplashScreen { -Q_OBJECT +TQ_OBJECT public: diff --git a/src/statusbar.cpp b/src/statusbar.cpp index b4e11769..44cb4b70 100644 --- a/src/statusbar.cpp +++ b/src/statusbar.cpp @@ -39,8 +39,8 @@ KDevStatusBar::KDevStatusBar(TQWidget *parent, const char *name) _status->setAlignment(TQWidget::AlignCenter); addWidget(_status, 0, true); - connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(activePartChanged(KParts::Part*))); + connect(PartController::getInstance(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(activePartChanged(KParts::Part*))); } @@ -60,14 +60,14 @@ void KDevStatusBar::activePartChanged(KParts::Part *part) { if ((_viewmsgIface = dynamic_cast<KTextEditor::ViewStatusMsgInterface*>(part->widget()))) { - connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ), - this, TQT_SLOT( setStatus( const TQString & ) ) ); + connect( part->widget(), TQ_SIGNAL( viewStatusMsg( const TQString & ) ), + this, TQ_SLOT( setStatus( const TQString & ) ) ); _status->show(); } else if ((_cursorIface = dynamic_cast<KTextEditor::ViewCursorInterface*>(part->widget()))) { - connect(part->widget(), TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(cursorPositionChanged())); + connect(part->widget(), TQ_SIGNAL(cursorPositionChanged()), this, TQ_SLOT(cursorPositionChanged())); _status->show(); cursorPositionChanged(); diff --git a/src/statusbar.h b/src/statusbar.h index 2f5370ef..4a61a07e 100644 --- a/src/statusbar.h +++ b/src/statusbar.h @@ -26,7 +26,7 @@ Status bar. */ class KDevStatusBar : public KStatusBar { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/tdeconf_update/Makefile.am b/src/tdeconf_update/Makefile.am index f1854c84..56b1608a 100644 --- a/src/tdeconf_update/Makefile.am +++ b/src/tdeconf_update/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT $(all_includes) +AM_CPPFLAGS = -DKDE_NO_COMPAT $(all_includes) update_DATA = kdev-gen-settings.upd updatedir = $(kde_datadir)/tdeconf_update diff --git a/translations/desktop_files/tdevelop-desktops/br.po b/translations/desktop_files/tdevelop-desktops/br.po index 1db1dc31..b9ddf1db 100644 --- a/translations/desktop_files/tdevelop-desktops/br.po +++ b/translations/desktop_files/tdevelop-desktops/br.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -235,7 +235,6 @@ msgstr "" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -278,17 +277,6 @@ msgid "Your short description about the plugin goes here" msgstr "" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -#, fuzzy -msgid "A KDE4 Application" -msgstr "Meziant Qt4" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -348,7 +336,6 @@ msgstr "Perzh%{APPNAME}" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 #, fuzzy msgid "An %{APPNAME} Program" @@ -477,16 +464,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -msgid "KDevQt4Importer" -msgstr "" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 msgid "KDevQtImporter" msgstr "" @@ -2294,29 +2271,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -#, fuzzy -msgid "KDE4 Application framework" -msgstr "Skoazeller meziant" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 #, fuzzy msgid "Simple DCOP server" @@ -2467,9 +2421,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "Raktres QMake" @@ -2672,7 +2623,6 @@ msgstr "Meziant Opie" #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2863,80 +2813,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -#, fuzzy -msgid "Basic Qt4 Application" -msgstr "Meziant Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Meziant Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "Meziant Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -#, fuzzy -msgid "Qtopia 4 Application" -msgstr "Meziant Qt4" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 #, fuzzy @@ -2949,6 +2825,11 @@ msgstr "Meziant Qt3" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 #, fuzzy @@ -3412,7 +3293,6 @@ msgstr "" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3423,24 +3303,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -#, fuzzy -msgid "QtRuby4 Application" -msgstr "Meziant Qt4" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 #, fuzzy msgid "QtRuby Application" @@ -3615,12 +3477,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -#, fuzzy -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "Meziant Qt4" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3640,3 +3496,34 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "Arload" + +#, fuzzy +#~ msgid "A KDE4 Application" +#~ msgstr "Meziant Qt4" + +#, fuzzy +#~ msgid "KDE4 Application framework" +#~ msgstr "Skoazeller meziant" + +#, fuzzy +#~ msgid "Basic Qt4 Application" +#~ msgstr "Meziant Qt4" + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Meziant Qt4" + +#~ msgid "Qt4 Application" +#~ msgstr "Meziant Qt4" + +#, fuzzy +#~ msgid "Qtopia 4 Application" +#~ msgstr "Meziant Qt4" + +#, fuzzy +#~ msgid "QtRuby4 Application" +#~ msgstr "Meziant Qt4" + +#, fuzzy +#~ msgid "Qt4 C++ Application (QMake4 based)" +#~ msgstr "Meziant Qt4" diff --git a/translations/desktop_files/tdevelop-desktops/ca.po b/translations/desktop_files/tdevelop-desktops/ca.po index 68c84987..a9880f5b 100644 --- a/translations/desktop_files/tdevelop-desktops/ca.po +++ b/translations/desktop_files/tdevelop-desktops/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -239,7 +239,6 @@ msgstr "Suport per a Bash" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -282,16 +281,6 @@ msgid "Your short description about the plugin goes here" msgstr "Aquà va la descripció curta referent al connector" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "Una aplicació del KDE4" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -350,7 +339,6 @@ msgstr "Part per a %{APPNAME}" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "Un programa per a %{APPNAME}" @@ -482,17 +470,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "Importador PCS de directori personalitzat per a TDevelop" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "Importador PCS de Qt4 per a TDevelop" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "Importador PCS de Qt4 per a TDevelop" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 #, fuzzy msgid "KDevQtImporter" @@ -2425,30 +2402,6 @@ msgstr "" "Un connector per a Kate amb pà gina de configuració ha estat creat en %{dest}" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "Entorn de treball d'aplicacions pel KDE4" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" -"Genera una aplicació senzilla per al KDE4 amb una finestra principal, menús " -"i barres d'eines." - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "S'ha creat una aplicació per al KDE4 a %{dest}" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "Simple servidor DCOP" @@ -2612,9 +2565,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "Projecte QMake" @@ -2828,7 +2778,6 @@ msgstr "Genera una aplicació per a Opie." #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -3027,83 +2976,6 @@ msgstr "" "Una programa de hello world basat en QMake/Qt3 ha estat creat en %{dest}" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "Aplicació en Qt4 bà sica" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" -"Genera una aplicació molt simple basada en QMake/Qt4 (multi plataforma) -" -"requereix Qt4-" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "Una aplicació basada en Qt4/Qmake ha estat creada en %{dest}" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "Ruta absoluta per a QMake (Qt4)." - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "Ruta absoluta per a Designer (Qt4)." - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Aplicació Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" -"Genera una aplicació basada en QMake/Qt4 (multi plataforma) -Necessita Qt4-" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "Aplicació Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" -"Genera una aplicació basada en QMake/Qt4 (multi plataforma) -Necessita Qt4-" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "Aplicació per a Qtopia 4" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "Genera una aplicació basada en Qmake/Qt per a Qtopia 4.x" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "Una aplicació basada en Qtopia ha estat creada en %{dest}" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3115,6 +2987,11 @@ msgstr "Aplicació per a Qtopia" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "Genera una aplicació basada en TMake/Qt per a Qtopia 1.x" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "Una aplicació basada en Qtopia ha estat creada en %{dest}" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3599,7 +3476,6 @@ msgstr "Genera una simple aplicació de Hello World en QtRuby" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3610,25 +3486,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "Una simple aplicació en QtRuby ha estat creada en %{dest}" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "Aplicació en QtRuby4" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" -"Genera una aplicació basada en QtRuby4 (compatible plataforma creuada) - " -"Necessita QtRuby4" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "Una aplicació basada en QtRuby4 ha estat creada en %{dest}" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "Aplicació en QtRuby" @@ -3803,12 +3660,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -#, fuzzy -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "Aplicació Qt4" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3828,3 +3679,90 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "Aplicació en QtRuby" + +#~ msgid "A KDE4 Application" +#~ msgstr "Una aplicació del KDE4" + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "Importador PCS de Qt4 per a TDevelop" + +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "Importador PCS de Qt4 per a TDevelop" + +#~ msgid "KDE4 Application framework" +#~ msgstr "Entorn de treball d'aplicacions pel KDE4" + +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "" +#~ "Genera una aplicació senzilla per al KDE4 amb una finestra principal, " +#~ "menús i barres d'eines." + +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "S'ha creat una aplicació per al KDE4 a %{dest}" + +#~ msgid "Basic Qt4 Application" +#~ msgstr "Aplicació en Qt4 bà sica" + +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "" +#~ "Genera una aplicació molt simple basada en QMake/Qt4 (multi plataforma) -" +#~ "requereix Qt4-" + +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "Una aplicació basada en Qt4/Qmake ha estat creada en %{dest}" + +#~ msgid "Absolute Path for QMake (Qt4)." +#~ msgstr "Ruta absoluta per a QMake (Qt4)." + +#~ msgid "Absolute Path for Designer (Qt4)." +#~ msgstr "Ruta absoluta per a Designer (Qt4)." + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Aplicació Qt4" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Genera una aplicació basada en QMake/Qt4 (multi plataforma) -Necessita " +#~ "Qt4-" + +#~ msgid "Qt4 Application" +#~ msgstr "Aplicació Qt4" + +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Genera una aplicació basada en QMake/Qt4 (multi plataforma) -Necessita " +#~ "Qt4-" + +#~ msgid "Qtopia 4 Application" +#~ msgstr "Aplicació per a Qtopia 4" + +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "Genera una aplicació basada en Qmake/Qt per a Qtopia 4.x" + +#~ msgid "QtRuby4 Application" +#~ msgstr "Aplicació en QtRuby4" + +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "" +#~ "Genera una aplicació basada en QtRuby4 (compatible plataforma creuada) - " +#~ "Necessita QtRuby4" + +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "Una aplicació basada en QtRuby4 ha estat creada en %{dest}" + +#, fuzzy +#~ msgid "Qt4 C++ Application (QMake4 based)" +#~ msgstr "Aplicació Qt4" diff --git a/translations/desktop_files/tdevelop-desktops/cs.po b/translations/desktop_files/tdevelop-desktops/cs.po index 4b95de51..a69ecf27 100644 --- a/translations/desktop_files/tdevelop-desktops/cs.po +++ b/translations/desktop_files/tdevelop-desktops/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -239,7 +239,6 @@ msgstr "" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -281,16 +280,6 @@ msgid "Your short description about the plugin goes here" msgstr "" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -347,7 +336,6 @@ msgstr "" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "" @@ -473,16 +461,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -msgid "KDevQt4Importer" -msgstr "" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 msgid "KDevQtImporter" msgstr "" @@ -2267,28 +2245,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "" @@ -2434,9 +2390,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 msgid "C++/QMake project" msgstr "" @@ -2633,7 +2586,6 @@ msgstr "" #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2822,77 +2774,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -msgid "Qt4/QMake Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -2904,6 +2785,11 @@ msgstr "" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3362,7 +3248,6 @@ msgstr "" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3373,23 +3258,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "" @@ -3557,11 +3425,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" diff --git a/translations/desktop_files/tdevelop-desktops/cy.po b/translations/desktop_files/tdevelop-desktops/cy.po index 44989517..68cef142 100644 --- a/translations/desktop_files/tdevelop-desktops/cy.po +++ b/translations/desktop_files/tdevelop-desktops/cy.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -229,7 +229,6 @@ msgstr "" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -271,17 +270,6 @@ msgid "Your short description about the plugin goes here" msgstr "Mae eich disgrifiad byr am yr ategyn yn mynd yma" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -#, fuzzy -msgid "A KDE4 Application" -msgstr "Cymhwysiad KPart TDE" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -340,7 +328,6 @@ msgstr "" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "" @@ -467,16 +454,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -msgid "KDevQt4Importer" -msgstr "" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 msgid "KDevQtImporter" msgstr "" @@ -2268,28 +2245,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "" @@ -2436,9 +2391,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 msgid "C++/QMake project" msgstr "" @@ -2638,7 +2590,6 @@ msgstr "" #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2827,81 +2778,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -#, fuzzy -msgid "Basic Qt4 Application" -msgstr "Cymhwysiad" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Cymhwysiad" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -#, fuzzy -msgid "Qt4 Application" -msgstr "Cymhwysiad" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -#, fuzzy -msgid "Qtopia 4 Application" -msgstr "Cymhwysiad" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 #, fuzzy @@ -2914,6 +2790,11 @@ msgstr "Cymhwysiad" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3373,7 +3254,6 @@ msgstr "" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3384,24 +3264,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -#, fuzzy -msgid "QtRuby4 Application" -msgstr "Cymhwysiad" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 #, fuzzy msgid "QtRuby Application" @@ -3575,11 +3437,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3599,3 +3456,27 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "Cymhwysiad" + +#, fuzzy +#~ msgid "A KDE4 Application" +#~ msgstr "Cymhwysiad KPart TDE" + +#, fuzzy +#~ msgid "Basic Qt4 Application" +#~ msgstr "Cymhwysiad" + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Cymhwysiad" + +#, fuzzy +#~ msgid "Qt4 Application" +#~ msgstr "Cymhwysiad" + +#, fuzzy +#~ msgid "Qtopia 4 Application" +#~ msgstr "Cymhwysiad" + +#, fuzzy +#~ msgid "QtRuby4 Application" +#~ msgstr "Cymhwysiad" diff --git a/translations/desktop_files/tdevelop-desktops/da.po b/translations/desktop_files/tdevelop-desktops/da.po index 307e3f00..c909490b 100644 --- a/translations/desktop_files/tdevelop-desktops/da.po +++ b/translations/desktop_files/tdevelop-desktops/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -228,7 +228,6 @@ msgstr "Bash-understøttelse" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -271,16 +270,6 @@ msgid "Your short description about the plugin goes here" msgstr "Din korte beskrivelse af plugin skal være her" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "Et KDE4-program" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -340,7 +329,6 @@ msgstr "%{APPNAME} plugin" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "Et %{APPNAME} program" @@ -472,17 +460,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "TDevelop brugerdefineret mappe-PCS-importør" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "TDevelop Qt-importør" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "TDevelop Qt4 PCS importør" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 msgid "KDevQtImporter" msgstr "TDevelop Qt-importør" @@ -2368,30 +2345,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "Et plugin for Kate med en indstillingsside blev oprettet i %{dest}" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "KDE4 program-framework" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" -"Genererer et simpelt KDE4-program med et vindue pÃ¥ topniveau, menuer og " -"værktøjslinjer." - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "Et KDE4-program blev oprettet i %{dest}" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "Simpel DCOP-server" @@ -2547,9 +2500,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "QMake-projekt" @@ -2758,7 +2708,6 @@ msgstr "Generér et Opie-program." #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2955,83 +2904,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "et Qmake/Qt3 baseret Goddag verden program blev oprettet i %{dest}" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "Basalt Qt4-program" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" -"Generér et meget enkelt QMake/Qt4 baseret program (krydsplatform kompatibel) " -"- behøver Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "Et Qt4/Qmake baseret program blev oprettet i %{dest}" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "Absolut søgesti til QMake (Qt4)." - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "Absolut søgesti til Designer (Qt4)." - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Qt4-Program" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" -"Generér et QMake/Qt4 baseret program (krydsplatform kompatibel) - behøver Qt4" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "Qt4-Program" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" -"Generér et QMake/Qt4 baseret program (krydsplatform kompatibel) - behøver Qt4" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "Qtopia4-program" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "Genererer et QMake-/Qt-baseret program til Qtopia 4.x" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "Et Qtopia program blev oprettet i %{dest}" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3043,6 +2915,11 @@ msgstr "Qtopia-program" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "Generér et TMake/Qt baseret program for Qtopia 1.x" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "Et Qtopia program blev oprettet i %{dest}" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3525,7 +3402,6 @@ msgstr "Dette generere et simpelt QtRuby Goddag verden program" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3536,25 +3412,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "Et simpelt QtRuby program blev oprettet i %{dest}" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "QtRuby4-program" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" -"Genererer et QtRuby4-baseret program (krydsplatformskompatibelt) - kræver " -"QtRuby4" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "Et QtRuby4-baseret program blev oprettet i %{dest}" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "QtRuby-program" @@ -3729,12 +3586,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -#, fuzzy -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "Qt4-Program" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3754,3 +3605,90 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "QtRuby-program" + +#~ msgid "A KDE4 Application" +#~ msgstr "Et KDE4-program" + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "TDevelop Qt-importør" + +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "TDevelop Qt4 PCS importør" + +#~ msgid "KDE4 Application framework" +#~ msgstr "KDE4 program-framework" + +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "" +#~ "Genererer et simpelt KDE4-program med et vindue pÃ¥ topniveau, menuer og " +#~ "værktøjslinjer." + +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "Et KDE4-program blev oprettet i %{dest}" + +#~ msgid "Basic Qt4 Application" +#~ msgstr "Basalt Qt4-program" + +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "" +#~ "Generér et meget enkelt QMake/Qt4 baseret program (krydsplatform " +#~ "kompatibel) - behøver Qt4" + +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "Et Qt4/Qmake baseret program blev oprettet i %{dest}" + +#~ msgid "Absolute Path for QMake (Qt4)." +#~ msgstr "Absolut søgesti til QMake (Qt4)." + +#~ msgid "Absolute Path for Designer (Qt4)." +#~ msgstr "Absolut søgesti til Designer (Qt4)." + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Qt4-Program" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Generér et QMake/Qt4 baseret program (krydsplatform kompatibel) - behøver " +#~ "Qt4" + +#~ msgid "Qt4 Application" +#~ msgstr "Qt4-Program" + +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Generér et QMake/Qt4 baseret program (krydsplatform kompatibel) - behøver " +#~ "Qt4" + +#~ msgid "Qtopia 4 Application" +#~ msgstr "Qtopia4-program" + +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "Genererer et QMake-/Qt-baseret program til Qtopia 4.x" + +#~ msgid "QtRuby4 Application" +#~ msgstr "QtRuby4-program" + +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "" +#~ "Genererer et QtRuby4-baseret program (krydsplatformskompatibelt) - kræver " +#~ "QtRuby4" + +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "Et QtRuby4-baseret program blev oprettet i %{dest}" + +#, fuzzy +#~ msgid "Qt4 C++ Application (QMake4 based)" +#~ msgstr "Qt4-Program" diff --git a/translations/desktop_files/tdevelop-desktops/de.po b/translations/desktop_files/tdevelop-desktops/de.po index df4e6ba6..db991fc6 100644 --- a/translations/desktop_files/tdevelop-desktops/de.po +++ b/translations/desktop_files/tdevelop-desktops/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -230,7 +230,6 @@ msgstr "Unterstützung für Bash" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -273,16 +272,6 @@ msgid "Your short description about the plugin goes here" msgstr "Hierhin gehört eine kurze Beschreibung des Moduls" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "Eine KDE 4-Anwendung" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -342,7 +331,6 @@ msgstr "%{APPNAME}-Modul" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "Ein %{APPNAME}-Program" @@ -477,16 +465,6 @@ msgstr "" "Import für persistenten Klassenspeicher aus benutzerdefinierten Ordnern" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -msgid "KDevQt4Importer" -msgstr "Qt4-PCS-Import (TDevelop)" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "Qt4-Import für persistenten Klassenspeicher" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 msgid "KDevQtImporter" msgstr "Qt-PCS-Import (TDevelop)" @@ -2399,30 +2377,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "Ein Modul für Kate mit Konfigurationsseite wurde in %{dest} erstellt." #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "KDE 4-Anwendungsgrundgerüst" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" -"Erstellt eine einfache KDE 4-Anwendung mit einem Toplevel-Fenster, Menüs und " -"Werkzeugleisten." - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "Eine KDE 4-Anwendung wurde in %{dest} erstellt." - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "Einfacher DCOP-Server" @@ -2586,9 +2540,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "QMake-Projekt" @@ -2804,7 +2755,6 @@ msgstr "Erstellt eine Opie-Anwendung" #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -3002,85 +2952,6 @@ msgstr "" "Ein auf QMake basierendes \"Hello World\"-Programm wurde in %{dest} erstellt." #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "Einfache Qt4-Anwendung" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" -"Erstellt eine sehr einfache, auf QMake/Qt4 basierende Anwendung " -"(plattformunabhängig). - Benötigt Qt4." - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "Eine auf QMake/Qt4 basierende Anwendung wurde in %{dest} erstellt." - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "Absoluter Pfad für QMake (Qt4)." - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "Absoluter Pfad für Designer (Qt4)." - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Qt4-Anwendung" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" -"Erstellt eine auf QMake/Qt4 basierende Anwendung (plattformunabhängig). - " -"Benötigt Qt4." - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "Qt4-Anwendung" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" -"Erstellt eine auf QMake/Qt4 basierende Anwendung (plattformunabhängig). - " -"Benötigt Qt4." - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "Qtopia 4-Anwendung" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "Erstellt eine auf QMake/Qt basierende Anwendung für Qtopia 4.x" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "Eine Qtopia-Anwendung wurde in %{dest} erstellt." - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3092,6 +2963,11 @@ msgstr "Qtopia-Anwendung" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "Erstellt eine auf TMake/Qt basierende Anwendung für Qtopia 1.x" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "Eine Qtopia-Anwendung wurde in %{dest} erstellt." + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3582,7 +3458,6 @@ msgstr "Erstellt eine einfache auf QtRuby basierende \"Hello World\"-Anwendung" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3593,25 +3468,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "Eine einfache QtRuby-Anwendung wurde in %{dest} erstellt." #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "QtRuby4-Anwendung" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" -"Erstellt eine auf QtRuby4 basierende Anwendung (plattformunabhängig). - " -"Benötigt QtRuby4." - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "Eine auf QtRuby4 basierende Anwendung wurde in %{dest} erstellt." - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "QtRuby-Anwendung" @@ -3786,12 +3642,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -#, fuzzy -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "Qt4-Anwendung" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3811,3 +3661,89 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "QtRuby-Anwendung" + +#~ msgid "A KDE4 Application" +#~ msgstr "Eine KDE 4-Anwendung" + +#~ msgid "KDevQt4Importer" +#~ msgstr "Qt4-PCS-Import (TDevelop)" + +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "Qt4-Import für persistenten Klassenspeicher" + +#~ msgid "KDE4 Application framework" +#~ msgstr "KDE 4-Anwendungsgrundgerüst" + +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "" +#~ "Erstellt eine einfache KDE 4-Anwendung mit einem Toplevel-Fenster, Menüs " +#~ "und Werkzeugleisten." + +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "Eine KDE 4-Anwendung wurde in %{dest} erstellt." + +#~ msgid "Basic Qt4 Application" +#~ msgstr "Einfache Qt4-Anwendung" + +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "" +#~ "Erstellt eine sehr einfache, auf QMake/Qt4 basierende Anwendung " +#~ "(plattformunabhängig). - Benötigt Qt4." + +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "Eine auf QMake/Qt4 basierende Anwendung wurde in %{dest} erstellt." + +#~ msgid "Absolute Path for QMake (Qt4)." +#~ msgstr "Absoluter Pfad für QMake (Qt4)." + +#~ msgid "Absolute Path for Designer (Qt4)." +#~ msgstr "Absoluter Pfad für Designer (Qt4)." + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Qt4-Anwendung" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Erstellt eine auf QMake/Qt4 basierende Anwendung (plattformunabhängig). - " +#~ "Benötigt Qt4." + +#~ msgid "Qt4 Application" +#~ msgstr "Qt4-Anwendung" + +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Erstellt eine auf QMake/Qt4 basierende Anwendung (plattformunabhängig). - " +#~ "Benötigt Qt4." + +#~ msgid "Qtopia 4 Application" +#~ msgstr "Qtopia 4-Anwendung" + +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "Erstellt eine auf QMake/Qt basierende Anwendung für Qtopia 4.x" + +#~ msgid "QtRuby4 Application" +#~ msgstr "QtRuby4-Anwendung" + +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "" +#~ "Erstellt eine auf QtRuby4 basierende Anwendung (plattformunabhängig). - " +#~ "Benötigt QtRuby4." + +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "Eine auf QtRuby4 basierende Anwendung wurde in %{dest} erstellt." + +#, fuzzy +#~ msgid "Qt4 C++ Application (QMake4 based)" +#~ msgstr "Qt4-Anwendung" diff --git a/translations/desktop_files/tdevelop-desktops/el.po b/translations/desktop_files/tdevelop-desktops/el.po index 3625ef8f..8f1e33b7 100644 --- a/translations/desktop_files/tdevelop-desktops/el.po +++ b/translations/desktop_files/tdevelop-desktops/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -239,7 +239,6 @@ msgstr "ΥποστήÏιξη Bash" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -282,16 +281,6 @@ msgid "Your short description about the plugin goes here" msgstr "Η σÏντομη πεÏιγÏαφή σας σχετικά με το Ï€Ïόσθετο πηγαίνει εδώ" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "Μία εφαÏμογή του KDE4" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -350,7 +339,6 @@ msgstr "Τμήμα%{APPNAME}" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "Ένα Ï€ÏόγÏαμμα %{APPNAME}" @@ -483,17 +471,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "ΕισαγωγÎας PCS Ï€ÏοσαÏμοσμÎνου καταλόγου του TDevelop" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "ΕισαγωγÎας PCS TDevelop Qt4" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "ΕισαγωγÎας PCS TDevelop Qt4" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 #, fuzzy msgid "KDevQtImporter" @@ -2434,30 +2411,6 @@ msgstr "" "Ένα Ï€Ïόσθετο για το Kate με μια σελίδα ÏÏθμισης δημιουÏγήθηκε στο %{dest}" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "Πλαίσιο εφαÏμογής του KDE4" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" -"ΔημιουÏγεί μια απλή εφαÏμογή του KDE4 με Îνα ανώτεÏο παÏάθυÏο, μενοÏ, και " -"γÏαμμÎÏ‚ εÏγαλείων." - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "Μια εφαÏμογή KDE4 δημιουÏγήθηκε στο %{dest}" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "Απλός εξυπηÏετητής DCOP" @@ -2621,9 +2574,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "ΈÏγο QMake" @@ -2836,7 +2786,6 @@ msgstr "ΔημιουÏγία μιας εφαÏμογής Opie." #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -3039,85 +2988,6 @@ msgstr "" "%{dest}" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "Βασική εφαÏμογή Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" -"ΔημιουÏγία μια εφαÏμογής βασισμÎνης στα QMake/Qt4 (συμβατή με πολλαπλÎÏ‚ " -"πλατφόÏμες) -Απαιτεί το Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "Μια εφαÏμογή βασισμÎνη στα Qt4/Qmake δημιουÏγήθηκε στο %{dest}" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "Απόλυτη διαδÏομή για το QMake (Qt4)." - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "Απόλυτη διαδÏομή για τον Σχεδιαστή (Qt4)." - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "ΕφαÏμογή Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" -"ΔημιουÏγία μια εφαÏμογής βασισμÎνης στα QMake/Qt4 (συμβατή με πολλαπλÎÏ‚ " -"πλατφόÏμες)" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "ΕφαÏμογή Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" -"ΔημιουÏγία μια εφαÏμογής βασισμÎνης στα QMake/Qt4 (συμβατή με πολλαπλÎÏ‚ " -"πλατφόÏμες)" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "ΕφαÏμογή Qtopia 4" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "ΔημιουÏγία μιας εφαÏμογής βασισμÎνης στο Qmake/Qt για το Qtopia 4.x" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "Μια εφαÏμογή Qtopia δημιουÏγήθηκε στο %{dest}" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3129,6 +2999,11 @@ msgstr "ΕφαÏμογή Qtopia" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "ΔημιουÏγία μιας εφαÏμογής βασισμÎνης στα TMake/Qt για το Qtopia 1.x" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "Μια εφαÏμογή Qtopia δημιουÏγήθηκε στο %{dest}" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3622,7 +3497,6 @@ msgstr "Αυτό δημιουÏγεί μια απλή εφαÏμογή Γεια #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3633,25 +3507,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "Μια απλή εφαÏμογή QtRuby δημιουÏγήθηκε στο %{dest}" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "ΕφαÏμογή QtRuby4" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" -"ΔημιουÏγία μιας εφαÏμογής βασισμÎνης στην QtRuby4 (πολλαπλών πλατφόÏμων) - " -"Απαιτείται η QtRuby4" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "Μία εφαÏμογή βασισμÎνη στην QtRuby4 δημιουÏγήθηκε στο %{dest}" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "ΕφαÏμογή QtRuby" @@ -3828,12 +3683,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -#, fuzzy -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "ΕφαÏμογή Qt4" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3853,3 +3702,90 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "ΕφαÏμογή QtRuby" + +#~ msgid "A KDE4 Application" +#~ msgstr "Μία εφαÏμογή του KDE4" + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "ΕισαγωγÎας PCS TDevelop Qt4" + +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "ΕισαγωγÎας PCS TDevelop Qt4" + +#~ msgid "KDE4 Application framework" +#~ msgstr "Πλαίσιο εφαÏμογής του KDE4" + +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "" +#~ "ΔημιουÏγεί μια απλή εφαÏμογή του KDE4 με Îνα ανώτεÏο παÏάθυÏο, μενοÏ, και " +#~ "γÏαμμÎÏ‚ εÏγαλείων." + +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "Μια εφαÏμογή KDE4 δημιουÏγήθηκε στο %{dest}" + +#~ msgid "Basic Qt4 Application" +#~ msgstr "Βασική εφαÏμογή Qt4" + +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "" +#~ "ΔημιουÏγία μια εφαÏμογής βασισμÎνης στα QMake/Qt4 (συμβατή με πολλαπλÎÏ‚ " +#~ "πλατφόÏμες) -Απαιτεί το Qt4" + +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "Μια εφαÏμογή βασισμÎνη στα Qt4/Qmake δημιουÏγήθηκε στο %{dest}" + +#~ msgid "Absolute Path for QMake (Qt4)." +#~ msgstr "Απόλυτη διαδÏομή για το QMake (Qt4)." + +#~ msgid "Absolute Path for Designer (Qt4)." +#~ msgstr "Απόλυτη διαδÏομή για τον Σχεδιαστή (Qt4)." + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "ΕφαÏμογή Qt4" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "" +#~ "ΔημιουÏγία μια εφαÏμογής βασισμÎνης στα QMake/Qt4 (συμβατή με πολλαπλÎÏ‚ " +#~ "πλατφόÏμες)" + +#~ msgid "Qt4 Application" +#~ msgstr "ΕφαÏμογή Qt4" + +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "" +#~ "ΔημιουÏγία μια εφαÏμογής βασισμÎνης στα QMake/Qt4 (συμβατή με πολλαπλÎÏ‚ " +#~ "πλατφόÏμες)" + +#~ msgid "Qtopia 4 Application" +#~ msgstr "ΕφαÏμογή Qtopia 4" + +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "ΔημιουÏγία μιας εφαÏμογής βασισμÎνης στο Qmake/Qt για το Qtopia 4.x" + +#~ msgid "QtRuby4 Application" +#~ msgstr "ΕφαÏμογή QtRuby4" + +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "" +#~ "ΔημιουÏγία μιας εφαÏμογής βασισμÎνης στην QtRuby4 (πολλαπλών πλατφόÏμων) " +#~ "- Απαιτείται η QtRuby4" + +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "Μία εφαÏμογή βασισμÎνη στην QtRuby4 δημιουÏγήθηκε στο %{dest}" + +#, fuzzy +#~ msgid "Qt4 C++ Application (QMake4 based)" +#~ msgstr "ΕφαÏμογή Qt4" diff --git a/translations/desktop_files/tdevelop-desktops/en_GB.po b/translations/desktop_files/tdevelop-desktops/en_GB.po index 54f9a25c..f06654f1 100644 --- a/translations/desktop_files/tdevelop-desktops/en_GB.po +++ b/translations/desktop_files/tdevelop-desktops/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -226,7 +226,6 @@ msgstr "" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -268,16 +267,6 @@ msgid "Your short description about the plugin goes here" msgstr "" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -334,7 +323,6 @@ msgstr "" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "" @@ -460,16 +448,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -msgid "KDevQt4Importer" -msgstr "" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 msgid "KDevQtImporter" msgstr "" @@ -2278,32 +2256,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "A Noatun visualisation plugin was created in %{dest}" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -#, fuzzy -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" -"Generates a simple KDE application with one widget and a configuration " -"dialogue" - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -#, fuzzy -msgid "A KDE4 Application was created at %{dest}" -msgstr "A Noatun visualisation plugin was created in %{dest}" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "" @@ -2467,9 +2419,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 msgid "C++/QMake project" msgstr "" @@ -2693,7 +2642,6 @@ msgstr "" #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2892,79 +2840,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "A Noatun visualisation plugin was created in %{dest}" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -#, fuzzy -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "A Noatun visualisation plugin was created in %{dest}" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -msgid "Qt4/QMake Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -#, fuzzy -msgid "A Qtopia application was created in %{dest}" -msgstr "A Noatun visualisation plugin was created in %{dest}" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -2976,6 +2851,12 @@ msgstr "" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +#, fuzzy +msgid "A Qtopia application was created in %{dest}" +msgstr "A Noatun visualisation plugin was created in %{dest}" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3460,7 +3341,6 @@ msgstr "" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3472,24 +3352,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "A Noatun visualisation plugin was created in %{dest}" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -#, fuzzy -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "A Noatun visualisation plugin was created in %{dest}" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "" @@ -3661,11 +3523,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3684,3 +3541,23 @@ msgstr "" #: parts/appwizard/imports/ruby:3 msgid "Ruby Application" msgstr "" + +#, fuzzy +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "" +#~ "Generates a simple KDE application with one widget and a configuration " +#~ "dialogue" + +#, fuzzy +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "A Noatun visualisation plugin was created in %{dest}" + +#, fuzzy +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "A Noatun visualisation plugin was created in %{dest}" + +#, fuzzy +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "A Noatun visualisation plugin was created in %{dest}" diff --git a/translations/desktop_files/tdevelop-desktops/es.po b/translations/desktop_files/tdevelop-desktops/es.po index f413f109..b8822927 100644 --- a/translations/desktop_files/tdevelop-desktops/es.po +++ b/translations/desktop_files/tdevelop-desktops/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -239,7 +239,6 @@ msgstr "Soporte para Bash" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -282,16 +281,6 @@ msgid "Your short description about the plugin goes here" msgstr "Aquà va la descripción corta sobre el complemento" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "Una aplicación para KDE4" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -351,7 +340,6 @@ msgstr "Complemento %{APPNAME}" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "Un programa %{APPNAME}" @@ -483,17 +471,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "Importador PCS de carpeta personalizada de TDevelop" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "Importador PCS de Qt4 de TDevelop" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "Importador PCS de Qt4 de TDevelop" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 #, fuzzy msgid "KDevQtImporter" @@ -2426,30 +2403,6 @@ msgstr "" "%{dest}" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "Infraestructura de aplicación para KDE4" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" -"Genera una sencilla aplicación para KDE4 con una ventana principal, menús y " -"barras de herramientas." - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "Una aplicación para KDE4 ha sido creada en %{dest}" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "Sencillo servidor DCOP" @@ -2615,9 +2568,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "Proyecto QMake" @@ -2831,7 +2781,6 @@ msgstr "Genera una aplicación para Opie." #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -3035,85 +2984,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "Un programa «Hola mundo» basado en QMake/Qt3 ha sido creado en %{dest}" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "Aplicación Qt4 básica" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" -"Genera una aplicación muy sencilla basada en QMake/Qt4 (con compatibilidad " -"multiplataforma) - Necesita Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "Una aplicación basada en Qt4/Qmake ha sido creada en %{dest}" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "Ruta completa para QMake (Qt4)." - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "Ruta completa para Designer (Qt4)." - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Aplicación Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" -"Genera una aplicación basada en QMake/Qt4 (con compatibilidad " -"multiplataforma) - Necesita Qt4" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "Aplicación Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" -"Genera una aplicación basada en QMake/Qt4 (con compatibilidad " -"multiplataforma) - Necesita Qt4" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "Aplicación para Qtopia 4" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "Genera una aplicación basada en Qmake/Qt para Qtopia 4.x" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "Una aplicación para Qtopia ha sido creada en %{dest}" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3125,6 +2995,11 @@ msgstr "Aplicación para Qtopia" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "Genera una aplicación basada en TMake/Qt para Qtopia 1.x" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "Una aplicación para Qtopia ha sido creada en %{dest}" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3611,7 +3486,6 @@ msgstr "Genera una sencilla aplicación «Hola mundo» en QtRuby" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3622,25 +3496,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "Una sencilla aplicación en QtRuby ha sido creada en %{dest}" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "Aplicación en QtRuby4" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" -"Genera una aplicación basada en QtRuby4 (con compatibilidad multiplataforma) " -"- Necesita QtRuby4" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "Una aplicación basada en QtRuby4 ha sido creada en %{dest}" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "Aplicación en QtRuby" @@ -3815,12 +3670,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -#, fuzzy -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "Aplicación Qt4" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3840,3 +3689,90 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "Aplicación en QtRuby" + +#~ msgid "A KDE4 Application" +#~ msgstr "Una aplicación para KDE4" + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "Importador PCS de Qt4 de TDevelop" + +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "Importador PCS de Qt4 de TDevelop" + +#~ msgid "KDE4 Application framework" +#~ msgstr "Infraestructura de aplicación para KDE4" + +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "" +#~ "Genera una sencilla aplicación para KDE4 con una ventana principal, menús " +#~ "y barras de herramientas." + +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "Una aplicación para KDE4 ha sido creada en %{dest}" + +#~ msgid "Basic Qt4 Application" +#~ msgstr "Aplicación Qt4 básica" + +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "" +#~ "Genera una aplicación muy sencilla basada en QMake/Qt4 (con " +#~ "compatibilidad multiplataforma) - Necesita Qt4" + +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "Una aplicación basada en Qt4/Qmake ha sido creada en %{dest}" + +#~ msgid "Absolute Path for QMake (Qt4)." +#~ msgstr "Ruta completa para QMake (Qt4)." + +#~ msgid "Absolute Path for Designer (Qt4)." +#~ msgstr "Ruta completa para Designer (Qt4)." + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Aplicación Qt4" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Genera una aplicación basada en QMake/Qt4 (con compatibilidad " +#~ "multiplataforma) - Necesita Qt4" + +#~ msgid "Qt4 Application" +#~ msgstr "Aplicación Qt4" + +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Genera una aplicación basada en QMake/Qt4 (con compatibilidad " +#~ "multiplataforma) - Necesita Qt4" + +#~ msgid "Qtopia 4 Application" +#~ msgstr "Aplicación para Qtopia 4" + +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "Genera una aplicación basada en Qmake/Qt para Qtopia 4.x" + +#~ msgid "QtRuby4 Application" +#~ msgstr "Aplicación en QtRuby4" + +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "" +#~ "Genera una aplicación basada en QtRuby4 (con compatibilidad " +#~ "multiplataforma) - Necesita QtRuby4" + +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "Una aplicación basada en QtRuby4 ha sido creada en %{dest}" + +#, fuzzy +#~ msgid "Qt4 C++ Application (QMake4 based)" +#~ msgstr "Aplicación Qt4" diff --git a/translations/desktop_files/tdevelop-desktops/et.po b/translations/desktop_files/tdevelop-desktops/et.po index d3f69210..9797dcb1 100644 --- a/translations/desktop_files/tdevelop-desktops/et.po +++ b/translations/desktop_files/tdevelop-desktops/et.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -238,7 +238,6 @@ msgstr "Bash'i toetus" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -281,16 +280,6 @@ msgid "Your short description about the plugin goes here" msgstr "Sinu plugina lühikirjeldus" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "KDE4 rakendus" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -349,7 +338,6 @@ msgstr "%{APPNAME} komponent" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "%{APPNAME} programm" @@ -481,17 +469,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "TDevelopi kohandatud kataloogi PCS importija" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "TDevelopi Qt4 PCS importija" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "TDevelopi Qt4 PCS importija" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 #, fuzzy msgid "KDevQtImporter" @@ -2399,30 +2376,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "Seadistustedialoogiga Kate plugin loodi asukohta %{dest}" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "KDE4 rakenduse raamistik" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" -"Lihtsa KDE4 rakenduse loomine ühe tipptaseme akna, menüüde ja " -"tööriistaribadega." - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "KDE4 rakendus loodi asukohta %{dest}" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "Lihtne DCOP-server" @@ -2574,9 +2527,6 @@ msgstr "Lihtsa TDE rakenduse loomine projektihalduriga QMake'i põhjal" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "QMake projekt" @@ -2780,7 +2730,6 @@ msgstr "Opie rakenduse loomine." #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2976,81 +2925,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "\"Tere, maailm\" programm QMake'i/Qt3 põhjal loodi asukohta %{dest}" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "Elementaarne Qt4 rakendus" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" -"Väga lihtsa rakenduse loomine QMake'i/Qt4 põhjal (multiplatvormne) - vajalik " -"on Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "Rakendus Qt4/QMake'i põhjal loodi asukohta %{dest}" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "QMake (Qt4) absoluutne asukoht." - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "Disaineri (Qt4) absoluutne asukoht." - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Qt4 rakendus" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "Rakenduse loomine QMake'i/Qt4 põhjal (multiplatvormne)" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "Qt4 rakendus" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "Rakenduse loomine QMake'i/Qt4 põhjal (multiplatvormne)" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "Qtopia 4 rakendus" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "Qtopia 4.x rakenduse loomine QMake'i/Qt põhjal" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "Qtopia rakendus loodi asukohta %{dest}" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3062,6 +2936,11 @@ msgstr "Qtopia rakendus" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "Qtopia 1.x rakenduse loomine TMake'i/Qt põhjal " +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "Qtopia rakendus loodi asukohta %{dest}" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3536,7 +3415,6 @@ msgstr "Lihtsa QtRuby \"Tere, maailm\" rakenduse loomine" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3547,24 +3425,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "Lihtne KQtRuby rakendus loodi asukohta %{dest}" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "QtRuby4 rakendus" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" -"Rakenduse loomine QtRuby4 põhjal (multiplatvormne) - vajalik on QtRuby4" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "Rakendus QtRuby4 põhjal loodi asukohta %{dest}" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "QtRuby rakendus" @@ -3739,12 +3599,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -#, fuzzy -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "Qt4 rakendus" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3764,3 +3618,85 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "QtRuby rakendus" + +#~ msgid "A KDE4 Application" +#~ msgstr "KDE4 rakendus" + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "TDevelopi Qt4 PCS importija" + +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "TDevelopi Qt4 PCS importija" + +#~ msgid "KDE4 Application framework" +#~ msgstr "KDE4 rakenduse raamistik" + +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "" +#~ "Lihtsa KDE4 rakenduse loomine ühe tipptaseme akna, menüüde ja " +#~ "tööriistaribadega." + +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "KDE4 rakendus loodi asukohta %{dest}" + +#~ msgid "Basic Qt4 Application" +#~ msgstr "Elementaarne Qt4 rakendus" + +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "" +#~ "Väga lihtsa rakenduse loomine QMake'i/Qt4 põhjal (multiplatvormne) - " +#~ "vajalik on Qt4" + +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "Rakendus Qt4/QMake'i põhjal loodi asukohta %{dest}" + +#~ msgid "Absolute Path for QMake (Qt4)." +#~ msgstr "QMake (Qt4) absoluutne asukoht." + +#~ msgid "Absolute Path for Designer (Qt4)." +#~ msgstr "Disaineri (Qt4) absoluutne asukoht." + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Qt4 rakendus" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "Rakenduse loomine QMake'i/Qt4 põhjal (multiplatvormne)" + +#~ msgid "Qt4 Application" +#~ msgstr "Qt4 rakendus" + +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "Rakenduse loomine QMake'i/Qt4 põhjal (multiplatvormne)" + +#~ msgid "Qtopia 4 Application" +#~ msgstr "Qtopia 4 rakendus" + +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "Qtopia 4.x rakenduse loomine QMake'i/Qt põhjal" + +#~ msgid "QtRuby4 Application" +#~ msgstr "QtRuby4 rakendus" + +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "" +#~ "Rakenduse loomine QtRuby4 põhjal (multiplatvormne) - vajalik on QtRuby4" + +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "Rakendus QtRuby4 põhjal loodi asukohta %{dest}" + +#, fuzzy +#~ msgid "Qt4 C++ Application (QMake4 based)" +#~ msgstr "Qt4 rakendus" diff --git a/translations/desktop_files/tdevelop-desktops/eu.po b/translations/desktop_files/tdevelop-desktops/eu.po index 574fb388..b60d717a 100644 --- a/translations/desktop_files/tdevelop-desktops/eu.po +++ b/translations/desktop_files/tdevelop-desktops/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -239,7 +239,6 @@ msgstr "Bash-en euskarria" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -282,17 +281,6 @@ msgid "Your short description about the plugin goes here" msgstr "Hemen dihoa plugin-aren buruzko zure deskribapen motza" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -#, fuzzy -msgid "A KDE4 Application" -msgstr "TDE KPart aplikazio bat" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -352,7 +340,6 @@ msgstr "%{APPNAME} plugina" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "%{APPNAME} programa bat" @@ -484,18 +471,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "TDevelop-en direktorio pertsonalizatuko PCS inportatzailea" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "TDevelop PCS inportatzailea" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -#, fuzzy -msgid "TDevelop Qt4 PCS Importer" -msgstr "TDevelop PCS inportatzailea" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 #, fuzzy msgid "KDevQtImporter" @@ -2431,33 +2406,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "Konfigurazio orridun Kate plugin bat sortu da hemen:%{dest}" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -#, fuzzy -msgid "KDE4 Application framework" -msgstr "Aplikazioen lan-markoa" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -#, fuzzy -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" -"Goi-mailako lehio bat, menuak eta tresna-barrak dituen Java KDE aplikazio " -"bat sortzen du." - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -#, fuzzy -msgid "A KDE4 Application was created at %{dest}" -msgstr "A TDE aplikazio bat sortu da hemen: %{dest}" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "DCOP zerbitzari sinple bat" @@ -2616,9 +2564,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "QMake proiektua" @@ -2829,7 +2774,6 @@ msgstr "Sortu Opie aplikazio bat." #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -3039,92 +2983,6 @@ msgstr "" "CMake-en oinarritutako \"kaixo mundua\" programa bat sortu da hemen: %{dest}" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -#, fuzzy -msgid "Basic Qt4 Application" -msgstr "Qtopia aplikazioa" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -#, fuzzy -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" -"Sortu QtRuby lengoaian oinarritutako aplikazioa (plataforma gurutzatuekin " -"bateragarria)" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -#, fuzzy -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "Qmake-en oinarritutako TDE aplikazio bat sortu da hemen: %{dest}" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Qtopia aplikazioa" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" -"Sortu QtRuby lengoaian oinarritutako aplikazioa (plataforma gurutzatuekin " -"bateragarria)" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -#, fuzzy -msgid "Qt4 Application" -msgstr "Qtopia aplikazioa" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" -"Sortu QtRuby lengoaian oinarritutako aplikazioa (plataforma gurutzatuekin " -"bateragarria)" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -#, fuzzy -msgid "Qtopia 4 Application" -msgstr "Qtopia aplikazioa" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -#, fuzzy -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "Sortu TMake/Qt software-ean oinarritutako Qtopia 1.x aplikazio bat" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "Qtopia aplikazio bat sortu da hemen: %{dest}" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3136,6 +2994,11 @@ msgstr "Qtopia aplikazioa" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "Sortu TMake/Qt software-ean oinarritutako Qtopia 1.x aplikazio bat" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "Qtopia aplikazio bat sortu da hemen: %{dest}" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3627,7 +3490,6 @@ msgstr "Honek QtRuby \"Kaixo mundua\" aplikazio sinple bat sortzen du" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3638,28 +3500,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "QtRuby aplikazio sinple bat sortu da hemen: %{dest}" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -#, fuzzy -msgid "QtRuby4 Application" -msgstr "QtRuby aplikazioa" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -#, fuzzy -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" -"Sortu QtRuby lengoaian oinarritutako aplikazioa (plataforma gurutzatuekin " -"bateragarria)" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -#, fuzzy -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "QtRuby lengoaian oinarritutako aplikazioa sortu da hemen: %{dest}" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "QtRuby aplikazioa" @@ -3836,11 +3676,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3860,3 +3695,95 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "QtRuby aplikazioa" + +#, fuzzy +#~ msgid "A KDE4 Application" +#~ msgstr "TDE KPart aplikazio bat" + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "TDevelop PCS inportatzailea" + +#, fuzzy +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "TDevelop PCS inportatzailea" + +#, fuzzy +#~ msgid "KDE4 Application framework" +#~ msgstr "Aplikazioen lan-markoa" + +#, fuzzy +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "" +#~ "Goi-mailako lehio bat, menuak eta tresna-barrak dituen Java KDE aplikazio " +#~ "bat sortzen du." + +#, fuzzy +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "A TDE aplikazio bat sortu da hemen: %{dest}" + +#, fuzzy +#~ msgid "Basic Qt4 Application" +#~ msgstr "Qtopia aplikazioa" + +#, fuzzy +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "" +#~ "Sortu QtRuby lengoaian oinarritutako aplikazioa (plataforma gurutzatuekin " +#~ "bateragarria)" + +#, fuzzy +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "Qmake-en oinarritutako TDE aplikazio bat sortu da hemen: %{dest}" + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Qtopia aplikazioa" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Sortu QtRuby lengoaian oinarritutako aplikazioa (plataforma gurutzatuekin " +#~ "bateragarria)" + +#, fuzzy +#~ msgid "Qt4 Application" +#~ msgstr "Qtopia aplikazioa" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Sortu QtRuby lengoaian oinarritutako aplikazioa (plataforma gurutzatuekin " +#~ "bateragarria)" + +#, fuzzy +#~ msgid "Qtopia 4 Application" +#~ msgstr "Qtopia aplikazioa" + +#, fuzzy +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "Sortu TMake/Qt software-ean oinarritutako Qtopia 1.x aplikazio bat" + +#, fuzzy +#~ msgid "QtRuby4 Application" +#~ msgstr "QtRuby aplikazioa" + +#, fuzzy +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "" +#~ "Sortu QtRuby lengoaian oinarritutako aplikazioa (plataforma gurutzatuekin " +#~ "bateragarria)" + +#, fuzzy +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "QtRuby lengoaian oinarritutako aplikazioa sortu da hemen: %{dest}" diff --git a/translations/desktop_files/tdevelop-desktops/fa.po b/translations/desktop_files/tdevelop-desktops/fa.po index 76459780..0cb6977c 100644 --- a/translations/desktop_files/tdevelop-desktops/fa.po +++ b/translations/desktop_files/tdevelop-desktops/fa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -238,7 +238,6 @@ msgstr "پشتیبانی Bash" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -281,17 +280,6 @@ msgid "Your short description about the plugin goes here" msgstr "توصی٠کوتاه شما در مورد وصله در اینجا می‌آید" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -#, fuzzy -msgid "A KDE4 Application" -msgstr "یک کاربرد TDE KPart" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -350,7 +338,6 @@ msgstr "جزء %{APPNAME}" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "برنامۀ %{APPNAME}" @@ -482,18 +469,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "واردکنندۀ PCS Ùهرست سÙارشی TDevelop" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "واردکنندۀ TDevelop PCS" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -#, fuzzy -msgid "TDevelop Qt4 PCS Importer" -msgstr "واردکنندۀ TDevelop PCS" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 #, fuzzy msgid "KDevQtImporter" @@ -2405,33 +2380,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "وصله‌ای برای Kate با یک صÙØÛ€ پیکربندی در %{dest} ایجاد شد" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -#, fuzzy -msgid "KDE4 Application framework" -msgstr "چارچوب کاربرد" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -#, fuzzy -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" -"یک کاربرد سادۀ KDE جاوا با یک پنجرۀ Ø³Ø·Ø Ø¨Ø§Ù„Ø§ØŒ گزینگان Ùˆ میله‌های ابزار تولید " -"می‌کند." - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -#, fuzzy -msgid "A KDE4 Application was created at %{dest}" -msgstr "یک کاربرد TDE در %{dest} Ùراهم شد" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "کارساز سادۀ DCOP" @@ -2583,9 +2531,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "پروژۀ QMake" @@ -2790,7 +2735,6 @@ msgstr "یک کاربرد Opie تولید می‌کند." #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2991,86 +2935,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "یک برنامۀ Hello World بر مبنای CMake در %{dest} ایجاد شد" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -#, fuzzy -msgid "Basic Qt4 Application" -msgstr "کاربرد Qtopia" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -#, fuzzy -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "یک کاربرد بر مبنای QtRuby تولید می‌کند )همساز بین سکویی(" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -#, fuzzy -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "یک کاربرد TDE بر مبنای Qmake در %{dest} ایجاد شد" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "کاربرد Qtopia" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "یک کاربرد بر مبنای QtRuby تولید می‌کند )همساز بین سکویی(" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -#, fuzzy -msgid "Qt4 Application" -msgstr "کاربرد Qtopia" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "یک کاربرد بر مبنای QtRuby تولید می‌کند )همساز بین سکویی(" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -#, fuzzy -msgid "Qtopia 4 Application" -msgstr "کاربرد Qtopia" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -#, fuzzy -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "یک کاربرد بر مبنای TMake/Qt برای Qtopia 1.x تولید می‌کند" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "یک کاربرد Qtopia در %{dest} ایجاد شد" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3082,6 +2946,11 @@ msgstr "کاربرد Qtopia" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "یک کاربرد بر مبنای TMake/Qt برای Qtopia 1.x تولید می‌کند" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "یک کاربرد Qtopia در %{dest} ایجاد شد" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3557,7 +3426,6 @@ msgstr "یک کاربرد سادۀ QtRuby Hello World تولید می‌کند" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3568,26 +3436,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "یک کاربرد سادۀ QtRuby در %{dest} ایجاد شد" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -#, fuzzy -msgid "QtRuby4 Application" -msgstr "کاربرد QtRuby" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -#, fuzzy -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "یک کاربرد بر مبنای QtRuby تولید می‌کند )همساز بین سکویی(" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -#, fuzzy -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "یک کاربرد بر مبنای QtRuby در %{dest} ایجاد شد" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "کاربرد QtRuby" @@ -3762,11 +3610,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3786,3 +3629,87 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "کاربرد QtRuby" + +#, fuzzy +#~ msgid "A KDE4 Application" +#~ msgstr "یک کاربرد TDE KPart" + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "واردکنندۀ TDevelop PCS" + +#, fuzzy +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "واردکنندۀ TDevelop PCS" + +#, fuzzy +#~ msgid "KDE4 Application framework" +#~ msgstr "چارچوب کاربرد" + +#, fuzzy +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "" +#~ "یک کاربرد سادۀ KDE جاوا با یک پنجرۀ Ø³Ø·Ø Ø¨Ø§Ù„Ø§ØŒ گزینگان Ùˆ میله‌های ابزار " +#~ "تولید می‌کند." + +#, fuzzy +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "یک کاربرد TDE در %{dest} Ùراهم شد" + +#, fuzzy +#~ msgid "Basic Qt4 Application" +#~ msgstr "کاربرد Qtopia" + +#, fuzzy +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "یک کاربرد بر مبنای QtRuby تولید می‌کند )همساز بین سکویی(" + +#, fuzzy +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "یک کاربرد TDE بر مبنای Qmake در %{dest} ایجاد شد" + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "کاربرد Qtopia" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "یک کاربرد بر مبنای QtRuby تولید می‌کند )همساز بین سکویی(" + +#, fuzzy +#~ msgid "Qt4 Application" +#~ msgstr "کاربرد Qtopia" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "یک کاربرد بر مبنای QtRuby تولید می‌کند )همساز بین سکویی(" + +#, fuzzy +#~ msgid "Qtopia 4 Application" +#~ msgstr "کاربرد Qtopia" + +#, fuzzy +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "یک کاربرد بر مبنای TMake/Qt برای Qtopia 1.x تولید می‌کند" + +#, fuzzy +#~ msgid "QtRuby4 Application" +#~ msgstr "کاربرد QtRuby" + +#, fuzzy +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "یک کاربرد بر مبنای QtRuby تولید می‌کند )همساز بین سکویی(" + +#, fuzzy +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "یک کاربرد بر مبنای QtRuby در %{dest} ایجاد شد" diff --git a/translations/desktop_files/tdevelop-desktops/fr.po b/translations/desktop_files/tdevelop-desktops/fr.po index 9af5650c..e5168623 100644 --- a/translations/desktop_files/tdevelop-desktops/fr.po +++ b/translations/desktop_files/tdevelop-desktops/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -239,7 +239,6 @@ msgstr "Prise en charge de BASH" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -282,17 +281,6 @@ msgid "Your short description about the plugin goes here" msgstr "Une courte description de votre module externe s'insère ici" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -#, fuzzy -msgid "A KDE4 Application" -msgstr "Application Qt4" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -353,7 +341,6 @@ msgstr "Module externe pour %{APPNAME}" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "Un programme %{APPNAME}" @@ -485,16 +472,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "Importation PCS de dossiers personnalisés pour TDevelop" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -msgid "KDevQt4Importer" -msgstr "KDevQtImporter" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "Importation PCS de Qt4 pour TDevelop" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 #, fuzzy msgid "KDevQtImporter" @@ -2446,33 +2423,6 @@ msgstr "" "dans %{dest}" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -#, fuzzy -msgid "KDE4 Application framework" -msgstr "Infrastructure d'application" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -#, fuzzy -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" -"Génère une simple application KDE dans le language JAVA avec une fenêtre " -"principale, des menus, et des barres d'outils." - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -#, fuzzy -msgid "A KDE4 Application was created at %{dest}" -msgstr "Une application TDE a été créée dans %{dest}" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "Serveur DCOP simple" @@ -2641,9 +2591,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 msgid "C++/QMake project" msgstr "C++/QMake" @@ -2857,7 +2804,6 @@ msgstr "Génère une application Opie." #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -3062,86 +3008,6 @@ msgstr "" "Un programme « Bonjour monde » basé sur QMake / Qt3 a été créé dans %{dest}" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "Application Qt4 de base" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" -"Génère une application basée sur QMake / Qt4 très simple (compatible multi-" -"plateforme) - Nécessite Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "Une application basée sur Qt4 / Qmake a été créée dans %{dest}" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "Chemin absolu pour QMake (Qt4)." - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "Chemin absolu pour Designer (Qt4)." - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -msgid "Qt4/QMake Application" -msgstr "Une Application Qt4 / QMake" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" -"Génère une application basée sur QMake / Qt4. Ce programme est multi platte-" -"forme. Nécessite Qt4." - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "Application Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" -"Génère une application basée sur QMake / Qt4 (compatible multi-plateforme) - " -"Nécessite Qt4" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -#, fuzzy -msgid "Qtopia 4 Application" -msgstr "Une Application Qtopia" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -#, fuzzy -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "" -"Génère une application basée sur Qt / TMake pour l'environnement Qtopia 1.x." - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "Une application Qtopia a été créée dans %{dest}" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3154,6 +3020,11 @@ msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "" "Génère une application basée sur Qt / TMake pour l'environnement Qtopia 1.x." +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "Une application Qtopia a été créée dans %{dest}" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3656,7 +3527,6 @@ msgstr "Génère un programme « Bonjour monde » simple en QtRuby" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "Ruby/Qt" @@ -3667,28 +3537,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "Une application QtRuby simple a été créée dans %{dest}" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -#, fuzzy -msgid "QtRuby4 Application" -msgstr "Application QtRuby" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -#, fuzzy -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" -"Génère une application basée sur QMake / Qt4 (compatible multi-plateforme) - " -"Nécessite Qt4" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -#, fuzzy -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "Une application basée sur QtRuby a été créée dans %{dest}" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "Application QtRuby" @@ -3859,11 +3707,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "Une application C++ pour Qt (Makefiles basés sur Automake)" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "Une application C++ pour Qt4 (Makefiles basés sur QMake4)" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "Une application C++ pour Qt (Makefiles basés sur QMake)" @@ -3882,3 +3725,97 @@ msgstr "Une application C++ pour Qt (Makefiles basés sur TMake)" #: parts/appwizard/imports/ruby:3 msgid "Ruby Application" msgstr "Une application RUBY" + +#, fuzzy +#~ msgid "A KDE4 Application" +#~ msgstr "Application Qt4" + +#~ msgid "KDevQt4Importer" +#~ msgstr "KDevQtImporter" + +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "Importation PCS de Qt4 pour TDevelop" + +#, fuzzy +#~ msgid "KDE4 Application framework" +#~ msgstr "Infrastructure d'application" + +#, fuzzy +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "" +#~ "Génère une simple application KDE dans le language JAVA avec une fenêtre " +#~ "principale, des menus, et des barres d'outils." + +#, fuzzy +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "Une application TDE a été créée dans %{dest}" + +#~ msgid "Basic Qt4 Application" +#~ msgstr "Application Qt4 de base" + +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "" +#~ "Génère une application basée sur QMake / Qt4 très simple (compatible " +#~ "multi-plateforme) - Nécessite Qt4" + +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "Une application basée sur Qt4 / Qmake a été créée dans %{dest}" + +#~ msgid "Absolute Path for QMake (Qt4)." +#~ msgstr "Chemin absolu pour QMake (Qt4)." + +#~ msgid "Absolute Path for Designer (Qt4)." +#~ msgstr "Chemin absolu pour Designer (Qt4)." + +#~ msgid "Qt4/QMake Application" +#~ msgstr "Une Application Qt4 / QMake" + +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Génère une application basée sur QMake / Qt4. Ce programme est multi " +#~ "platte-forme. Nécessite Qt4." + +#~ msgid "Qt4 Application" +#~ msgstr "Application Qt4" + +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Génère une application basée sur QMake / Qt4 (compatible multi-" +#~ "plateforme) - Nécessite Qt4" + +#, fuzzy +#~ msgid "Qtopia 4 Application" +#~ msgstr "Une Application Qtopia" + +#, fuzzy +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "" +#~ "Génère une application basée sur Qt / TMake pour l'environnement Qtopia 1." +#~ "x." + +#, fuzzy +#~ msgid "QtRuby4 Application" +#~ msgstr "Application QtRuby" + +#, fuzzy +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "" +#~ "Génère une application basée sur QMake / Qt4 (compatible multi-" +#~ "plateforme) - Nécessite Qt4" + +#, fuzzy +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "Une application basée sur QtRuby a été créée dans %{dest}" + +#~ msgid "Qt4 C++ Application (QMake4 based)" +#~ msgstr "Une application C++ pour Qt4 (Makefiles basés sur QMake4)" diff --git a/translations/desktop_files/tdevelop-desktops/ga.po b/translations/desktop_files/tdevelop-desktops/ga.po index 7d88f33e..36bfa356 100644 --- a/translations/desktop_files/tdevelop-desktops/ga.po +++ b/translations/desktop_files/tdevelop-desktops/ga.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -241,7 +241,6 @@ msgstr "TacaÃocht Bash" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -284,17 +283,6 @@ msgid "Your short description about the plugin goes here" msgstr "Cuir do chur sÃos gearr ar an mbreiseán anseo" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -#, fuzzy -msgid "A KDE4 Application" -msgstr "Feidhmchlár KPart TDE" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -354,7 +342,6 @@ msgstr "Breiseán %{APPNAME}" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "Clár %{APPNAME}" @@ -485,18 +472,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "Iompórtálaà PCS TDevelop" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "Iompórtálaà PCS TDevelop" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -#, fuzzy -msgid "TDevelop Qt4 PCS Importer" -msgstr "Iompórtálaà PCS TDevelop" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 #, fuzzy msgid "KDevQtImporter" @@ -2371,31 +2346,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "CruthaÃodh breiseán Kate le leathanach cumraÃochta i %{dest}" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -#, fuzzy -msgid "KDE4 Application framework" -msgstr "Creatlach feidhmchláir" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -#, fuzzy -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "CruthaÃonn sé seo feidhmchlár simplà TDE le giuirléid amháin." - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -#, fuzzy -msgid "A KDE4 Application was created at %{dest}" -msgstr "CruthaÃodh Feidhmchlár TDE ag %{dest}" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "Freastalaà simplà DCOP" @@ -2552,9 +2502,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "Tionscadal QMake" @@ -2768,7 +2715,6 @@ msgstr "Cruthaigh feidhmchlár Opie." #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2973,86 +2919,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "CruthaÃodh rÃomhchlár \"Hello World\" bunaithe ar CMake i %{dest}" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -#, fuzzy -msgid "Basic Qt4 Application" -msgstr "Feidhmchlár Qtopia" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -#, fuzzy -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "Cruthaigh feidhmchlár bunaithe ar TMake/Qt le haghaidh Qtopia 1.x" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -#, fuzzy -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "CruthaÃodh feidhmchlár TDE bunaithe ar Qmake i %{dest}" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Feidhmchlár Qtopia" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "Cruthaigh feidhmchlár bunaithe ar TMake/Qt le haghaidh Qtopia 1.x" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -#, fuzzy -msgid "Qt4 Application" -msgstr "Feidhmchlár Qtopia" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "Cruthaigh feidhmchlár bunaithe ar TMake/Qt le haghaidh Qtopia 1.x" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -#, fuzzy -msgid "Qtopia 4 Application" -msgstr "Feidhmchlár Qtopia" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -#, fuzzy -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "Cruthaigh feidhmchlár bunaithe ar TMake/Qt le haghaidh Qtopia 1.x" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "CruthaÃodh feidhmchlár Qtopia i %{dest}" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3064,6 +2930,11 @@ msgstr "Feidhmchlár Qtopia" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "Cruthaigh feidhmchlár bunaithe ar TMake/Qt le haghaidh Qtopia 1.x" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "CruthaÃodh feidhmchlár Qtopia i %{dest}" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3553,7 +3424,6 @@ msgstr "CruthaÃonn sé seo rÃomhchlár simplà \"Hello World\" i C" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3564,26 +3434,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "CruthaÃodh feidhmchlár simplà QtRuby i %{dest}" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -#, fuzzy -msgid "QtRuby4 Application" -msgstr "Feidhmchlár QtRuby" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -#, fuzzy -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "Cruthaigh feidhmchlár bunaithe ar TMake/Qt le haghaidh Qtopia 1.x" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -#, fuzzy -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "CruthaÃodh feidhmchlár bunaithe ar QtRuby i %{dest}" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "Feidhmchlár QtRuby" @@ -3762,11 +3612,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3786,3 +3631,85 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "Feidhmchlár QtRuby" + +#, fuzzy +#~ msgid "A KDE4 Application" +#~ msgstr "Feidhmchlár KPart TDE" + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "Iompórtálaà PCS TDevelop" + +#, fuzzy +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "Iompórtálaà PCS TDevelop" + +#, fuzzy +#~ msgid "KDE4 Application framework" +#~ msgstr "Creatlach feidhmchláir" + +#, fuzzy +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "CruthaÃonn sé seo feidhmchlár simplà TDE le giuirléid amháin." + +#, fuzzy +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "CruthaÃodh Feidhmchlár TDE ag %{dest}" + +#, fuzzy +#~ msgid "Basic Qt4 Application" +#~ msgstr "Feidhmchlár Qtopia" + +#, fuzzy +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "Cruthaigh feidhmchlár bunaithe ar TMake/Qt le haghaidh Qtopia 1.x" + +#, fuzzy +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "CruthaÃodh feidhmchlár TDE bunaithe ar Qmake i %{dest}" + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Feidhmchlár Qtopia" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "Cruthaigh feidhmchlár bunaithe ar TMake/Qt le haghaidh Qtopia 1.x" + +#, fuzzy +#~ msgid "Qt4 Application" +#~ msgstr "Feidhmchlár Qtopia" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "Cruthaigh feidhmchlár bunaithe ar TMake/Qt le haghaidh Qtopia 1.x" + +#, fuzzy +#~ msgid "Qtopia 4 Application" +#~ msgstr "Feidhmchlár Qtopia" + +#, fuzzy +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "Cruthaigh feidhmchlár bunaithe ar TMake/Qt le haghaidh Qtopia 1.x" + +#, fuzzy +#~ msgid "QtRuby4 Application" +#~ msgstr "Feidhmchlár QtRuby" + +#, fuzzy +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "Cruthaigh feidhmchlár bunaithe ar TMake/Qt le haghaidh Qtopia 1.x" + +#, fuzzy +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "CruthaÃodh feidhmchlár bunaithe ar QtRuby i %{dest}" diff --git a/translations/desktop_files/tdevelop-desktops/gl.po b/translations/desktop_files/tdevelop-desktops/gl.po index 2ae110e6..ed6374df 100644 --- a/translations/desktop_files/tdevelop-desktops/gl.po +++ b/translations/desktop_files/tdevelop-desktops/gl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -240,7 +240,6 @@ msgstr "Soporte de Bash" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -283,17 +282,6 @@ msgid "Your short description about the plugin goes here" msgstr "A súa descrición breve sobre a extensión vai aquÃ." #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -#, fuzzy -msgid "A KDE4 Application" -msgstr "Unha aplicación KPart de TDE" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -352,7 +340,6 @@ msgstr "%{APPNAME} Part" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "Un programa %{APPNAME}" @@ -484,18 +471,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "Importador PCS de directorios personalizados para TDevelop" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "Importador PCS de TDevelop" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -#, fuzzy -msgid "TDevelop Qt4 PCS Importer" -msgstr "Importador PCS de TDevelop" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 #, fuzzy msgid "KDevQtImporter" @@ -2429,33 +2404,6 @@ msgstr "" "Creouse unha extensión para Kate con páxina de configuración en %{dest}" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -#, fuzzy -msgid "KDE4 Application framework" -msgstr "Entorno de traballo para aplicación" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -#, fuzzy -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" -"Xera unha aplicación sinxela KDE en Java cunha xanela principal, menús e " -"barras de ferramentas." - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -#, fuzzy -msgid "A KDE4 Application was created at %{dest}" -msgstr "Creouse unha aplicación TDE en %{dest}" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "Servidor sinxelo DCOP" @@ -2616,9 +2564,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "Proxecto QMake" @@ -2829,7 +2774,6 @@ msgstr "Xera un applet Opie." #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -3035,89 +2979,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "Creouse un programa Ola mundo baseado en CMake en %{dest}" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -#, fuzzy -msgid "Basic Qt4 Application" -msgstr "Aplicación Qtopia" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -#, fuzzy -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" -"Xera unha aplicación baseada en QtRuby (compatibilidade multiplataforma)" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -#, fuzzy -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "Creouse unha aplicación TDE baseada en QMake en %{dest}" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Aplicación Qtopia" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" -"Xera unha aplicación baseada en QtRuby (compatibilidade multiplataforma)" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -#, fuzzy -msgid "Qt4 Application" -msgstr "Aplicación Qtopia" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" -"Xera unha aplicación baseada en QtRuby (compatibilidade multiplataforma)" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -#, fuzzy -msgid "Qtopia 4 Application" -msgstr "Aplicación Qtopia" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -#, fuzzy -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "Xera unha aplicación baseada en TMake/Qt para Qtopia 1.x" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "Creouse unha aplicación Qtopia en %{dest}" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3129,6 +2990,11 @@ msgstr "Aplicación Qtopia" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "Xera unha aplicación baseada en TMake/Qt para Qtopia 1.x" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "Creouse unha aplicación Qtopia en %{dest}" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3613,7 +3479,6 @@ msgstr "Isto xera unha aplicación sinxela Ola mundo QtRuby" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3624,27 +3489,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "Creouse unha aplicación sinxela QtRuby en %{dest}" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -#, fuzzy -msgid "QtRuby4 Application" -msgstr "Aplicación QtRuby" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -#, fuzzy -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" -"Xera unha aplicación baseada en QtRuby (compatibilidade multiplataforma)" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -#, fuzzy -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "Creouse unha aplicación baseada en QtRuby en %{dest}" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "Aplicación QtRuby" @@ -3820,11 +3664,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3844,3 +3683,91 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "Aplicación QtRuby" + +#, fuzzy +#~ msgid "A KDE4 Application" +#~ msgstr "Unha aplicación KPart de TDE" + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "Importador PCS de TDevelop" + +#, fuzzy +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "Importador PCS de TDevelop" + +#, fuzzy +#~ msgid "KDE4 Application framework" +#~ msgstr "Entorno de traballo para aplicación" + +#, fuzzy +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "" +#~ "Xera unha aplicación sinxela KDE en Java cunha xanela principal, menús e " +#~ "barras de ferramentas." + +#, fuzzy +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "Creouse unha aplicación TDE en %{dest}" + +#, fuzzy +#~ msgid "Basic Qt4 Application" +#~ msgstr "Aplicación Qtopia" + +#, fuzzy +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "" +#~ "Xera unha aplicación baseada en QtRuby (compatibilidade multiplataforma)" + +#, fuzzy +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "Creouse unha aplicación TDE baseada en QMake en %{dest}" + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Aplicación Qtopia" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Xera unha aplicación baseada en QtRuby (compatibilidade multiplataforma)" + +#, fuzzy +#~ msgid "Qt4 Application" +#~ msgstr "Aplicación Qtopia" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Xera unha aplicación baseada en QtRuby (compatibilidade multiplataforma)" + +#, fuzzy +#~ msgid "Qtopia 4 Application" +#~ msgstr "Aplicación Qtopia" + +#, fuzzy +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "Xera unha aplicación baseada en TMake/Qt para Qtopia 1.x" + +#, fuzzy +#~ msgid "QtRuby4 Application" +#~ msgstr "Aplicación QtRuby" + +#, fuzzy +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "" +#~ "Xera unha aplicación baseada en QtRuby (compatibilidade multiplataforma)" + +#, fuzzy +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "Creouse unha aplicación baseada en QtRuby en %{dest}" diff --git a/translations/desktop_files/tdevelop-desktops/hi.po b/translations/desktop_files/tdevelop-desktops/hi.po index 18fd9927..4ee26975 100644 --- a/translations/desktop_files/tdevelop-desktops/hi.po +++ b/translations/desktop_files/tdevelop-desktops/hi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -232,7 +232,6 @@ msgstr "बैश समरà¥à¤¥à¤¨" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -274,17 +273,6 @@ msgid "Your short description about the plugin goes here" msgstr "पà¥à¤²à¤—इन के बारे में आपका छोटा सा वरà¥à¤£à¤¨ यहाठजाà¤à¤—ा" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -#, fuzzy -msgid "A KDE4 Application" -msgstr "à¤à¤• केडीई के-पारà¥à¤Ÿ अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -342,7 +330,6 @@ msgstr "" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "" @@ -472,18 +459,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "के-डेवलप मनपसंद डिरेकà¥à¤Ÿà¥à¤°à¥€ पीसीà¤à¤¸ आयातक" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "के-डेव-कà¥à¤¯à¥‚टी-आयातक" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -#, fuzzy -msgid "TDevelop Qt4 PCS Importer" -msgstr "के-डेवलप पीसीà¤à¤¸ आयातक" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 msgid "KDevQtImporter" msgstr "के-डेव-कà¥à¤¯à¥‚टी-आयातक" @@ -2318,29 +2293,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -#, fuzzy -msgid "KDE4 Application framework" -msgstr "अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— विज़ारà¥à¤¡" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "" @@ -2490,9 +2442,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "कà¥à¤¯à¥‚-मेक परियोजना" @@ -2693,7 +2642,6 @@ msgstr "" #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2883,80 +2831,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -#, fuzzy -msgid "Basic Qt4 Application" -msgstr "à¤à¤• सादा केडीई अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -msgid "Qt4/QMake Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -#, fuzzy -msgid "Qt4 Application" -msgstr "à¤à¤• केडीई के-पारà¥à¤Ÿ अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -#, fuzzy -msgid "Qtopia 4 Application" -msgstr "à¤à¤• सादा केडीई अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 #, fuzzy @@ -2969,6 +2843,11 @@ msgstr "à¤à¤• केडीई के-पारà¥à¤Ÿ अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤ msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3433,7 +3312,6 @@ msgstr "" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3444,24 +3322,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -#, fuzzy -msgid "QtRuby4 Application" -msgstr "à¤à¤• केडीई के-पारà¥à¤Ÿ अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 #, fuzzy msgid "QtRuby Application" @@ -3636,11 +3496,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3660,3 +3515,35 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— विज़ारà¥à¤¡" + +#, fuzzy +#~ msgid "A KDE4 Application" +#~ msgstr "à¤à¤• केडीई के-पारà¥à¤Ÿ अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—" + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "के-डेव-कà¥à¤¯à¥‚टी-आयातक" + +#, fuzzy +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "के-डेवलप पीसीà¤à¤¸ आयातक" + +#, fuzzy +#~ msgid "KDE4 Application framework" +#~ msgstr "अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— विज़ारà¥à¤¡" + +#, fuzzy +#~ msgid "Basic Qt4 Application" +#~ msgstr "à¤à¤• सादा केडीई अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—" + +#, fuzzy +#~ msgid "Qt4 Application" +#~ msgstr "à¤à¤• केडीई के-पारà¥à¤Ÿ अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—" + +#, fuzzy +#~ msgid "Qtopia 4 Application" +#~ msgstr "à¤à¤• सादा केडीई अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—" + +#, fuzzy +#~ msgid "QtRuby4 Application" +#~ msgstr "à¤à¤• केडीई के-पारà¥à¤Ÿ अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—" diff --git a/translations/desktop_files/tdevelop-desktops/hu.po b/translations/desktop_files/tdevelop-desktops/hu.po index 3f5b22e1..e573ea9b 100644 --- a/translations/desktop_files/tdevelop-desktops/hu.po +++ b/translations/desktop_files/tdevelop-desktops/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -241,7 +241,6 @@ msgstr "Bash-támogatás" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -284,16 +283,6 @@ msgid "Your short description about the plugin goes here" msgstr "Itt lehet egy rövid leÃrást adni a bÅ‘vÃtÅ‘modulról" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "KDE4-alapú alkalmazás" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -353,7 +342,6 @@ msgstr "%{APPNAME}-bÅ‘vÃtÅ‘modul" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "%{APPNAME} program" @@ -485,17 +473,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "TDevelop egyéni könyvtár PCS-importáló" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "TDevelop Qt4 PCS-importáló" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "TDevelop Qt4 PCS-importáló" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 #, fuzzy msgid "KDevQtImporter" @@ -2415,30 +2392,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "Létrejött egy Kate-bÅ‘vÃtÅ‘modul (beállÃtólappal) itt: %{dest}" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "Keretrendszer KDE4-alapú alkalmazáshoz" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" -"Létrehoz egy egyszerű KDE4-alkalmazást egy fÅ‘ablakkal, menükkel és " -"eszköztárakkal." - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "Létrejött egy KDE4-alapú alkalmazás itt: %{dest}" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "Egyszerű DCOP-kiszolgáló" @@ -2597,9 +2550,6 @@ msgstr "Létrehoz egy egyszerű TDE-s alkalmazást Qmake-alapú projektkezelÅ‘ve #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "QMake-projekt" @@ -2812,7 +2762,6 @@ msgstr "Létrehoz egy Opie-alkalmazást." #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -3011,85 +2960,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "Létrejött egy Qmake/Qt3-alapú 'Hello world' program itt: %{dest}" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "Egyszerű Qt4-alapú alkalmazás" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" -"Létrehoz egy QMake/Qt4-alapú, keresztfordÃtásra is alkalmas alkalmazást - " -"Qt4-et igényel" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "Létrejött egy Qt4/Qmake-alapú alkalmazás itt: %{dest}" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "A QMake (Qt4) teljes elérési útja." - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "A Designer (Qt4) teljes elérési útja" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Qt4-alapú alkalmazás" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" -"Létrehoz egy QMake/Qt4-alapú, keresztfordÃtásra is alkalmas alkalmazást - " -"Qt4-et igényel" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "Qt4-alapú alkalmazás" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" -"Létrehoz egy QMake/Qt4-alapú, keresztfordÃtásra is alkalmas alkalmazást - " -"Qt4-et igényel" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "Qtopia 4-alapú alkalmazás" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "Létrehoz egy QMake/Qt-alapú alkalmazást a Qtopia 4.x rendszerhez" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "Létrejött egy Qtopia-alkalmazás itt: %{dest}" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3101,6 +2971,11 @@ msgstr "Qtopia-alkalmazás" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "Létrehoz egy TMake/Qt-alapú alkalmazást a Qtopia 1.x rendszerhez" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "Létrejött egy Qtopia-alkalmazás itt: %{dest}" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3586,7 +3461,6 @@ msgstr "Létrehoz egy egyszerű QtRuby-alapú Hello world programot" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3597,25 +3471,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "Létrejött egy egyszerű QtRuby-alapú alkalmazás itt: %{dest}" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "QtRuby4-alapú alkalmazás" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" -"Létrehoz egy QtRuby4-alapú, keresztfordÃtásra is alkalmas alkalmazást - " -"QtRuby4-et igényel" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "Létrejött egy QtRuby4-alapú alkalmazás itt: %{dest}" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "QtRuby-alapú alkalmazás" @@ -3790,12 +3645,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -#, fuzzy -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "Qt4-alapú alkalmazás" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3815,3 +3664,90 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "QtRuby-alapú alkalmazás" + +#~ msgid "A KDE4 Application" +#~ msgstr "KDE4-alapú alkalmazás" + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "TDevelop Qt4 PCS-importáló" + +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "TDevelop Qt4 PCS-importáló" + +#~ msgid "KDE4 Application framework" +#~ msgstr "Keretrendszer KDE4-alapú alkalmazáshoz" + +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "" +#~ "Létrehoz egy egyszerű KDE4-alkalmazást egy fÅ‘ablakkal, menükkel és " +#~ "eszköztárakkal." + +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "Létrejött egy KDE4-alapú alkalmazás itt: %{dest}" + +#~ msgid "Basic Qt4 Application" +#~ msgstr "Egyszerű Qt4-alapú alkalmazás" + +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "" +#~ "Létrehoz egy QMake/Qt4-alapú, keresztfordÃtásra is alkalmas alkalmazást - " +#~ "Qt4-et igényel" + +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "Létrejött egy Qt4/Qmake-alapú alkalmazás itt: %{dest}" + +#~ msgid "Absolute Path for QMake (Qt4)." +#~ msgstr "A QMake (Qt4) teljes elérési útja." + +#~ msgid "Absolute Path for Designer (Qt4)." +#~ msgstr "A Designer (Qt4) teljes elérési útja" + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Qt4-alapú alkalmazás" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Létrehoz egy QMake/Qt4-alapú, keresztfordÃtásra is alkalmas alkalmazást - " +#~ "Qt4-et igényel" + +#~ msgid "Qt4 Application" +#~ msgstr "Qt4-alapú alkalmazás" + +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Létrehoz egy QMake/Qt4-alapú, keresztfordÃtásra is alkalmas alkalmazást - " +#~ "Qt4-et igényel" + +#~ msgid "Qtopia 4 Application" +#~ msgstr "Qtopia 4-alapú alkalmazás" + +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "Létrehoz egy QMake/Qt-alapú alkalmazást a Qtopia 4.x rendszerhez" + +#~ msgid "QtRuby4 Application" +#~ msgstr "QtRuby4-alapú alkalmazás" + +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "" +#~ "Létrehoz egy QtRuby4-alapú, keresztfordÃtásra is alkalmas alkalmazást - " +#~ "QtRuby4-et igényel" + +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "Létrejött egy QtRuby4-alapú alkalmazás itt: %{dest}" + +#, fuzzy +#~ msgid "Qt4 C++ Application (QMake4 based)" +#~ msgstr "Qt4-alapú alkalmazás" diff --git a/translations/desktop_files/tdevelop-desktops/is.po b/translations/desktop_files/tdevelop-desktops/is.po index 678667b1..aba057e5 100644 --- a/translations/desktop_files/tdevelop-desktops/is.po +++ b/translations/desktop_files/tdevelop-desktops/is.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -237,7 +237,6 @@ msgstr "Bash stuðnigur" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -279,17 +278,6 @@ msgid "Your short description about the plugin goes here" msgstr "Hér ætti að vera smá lýsing á viðbótinni" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -#, fuzzy -msgid "A KDE4 Application" -msgstr "TDE KPart forrit" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -347,7 +335,6 @@ msgstr "" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "" @@ -477,16 +464,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -msgid "KDevQt4Importer" -msgstr "" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 msgid "KDevQtImporter" msgstr "" @@ -2292,28 +2269,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "" @@ -2461,9 +2416,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "QMake verkefni" @@ -2664,7 +2616,6 @@ msgstr "" #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2854,80 +2805,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -#, fuzzy -msgid "Basic Qt4 Application" -msgstr "Einfalt TDE forrit" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -msgid "Qt4/QMake Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -#, fuzzy -msgid "Qt4 Application" -msgstr "TDE KPart forrit" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -#, fuzzy -msgid "Qtopia 4 Application" -msgstr "Einfalt TDE forrit" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 #, fuzzy @@ -2940,6 +2817,11 @@ msgstr "TDE KPart forrit" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3404,7 +3286,6 @@ msgstr "" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3415,24 +3296,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -#, fuzzy -msgid "QtRuby4 Application" -msgstr "TDE KPart forrit" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 #, fuzzy msgid "QtRuby Application" @@ -3606,11 +3469,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3630,3 +3488,23 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "TDE KPart forrit" + +#, fuzzy +#~ msgid "A KDE4 Application" +#~ msgstr "TDE KPart forrit" + +#, fuzzy +#~ msgid "Basic Qt4 Application" +#~ msgstr "Einfalt TDE forrit" + +#, fuzzy +#~ msgid "Qt4 Application" +#~ msgstr "TDE KPart forrit" + +#, fuzzy +#~ msgid "Qtopia 4 Application" +#~ msgstr "Einfalt TDE forrit" + +#, fuzzy +#~ msgid "QtRuby4 Application" +#~ msgstr "TDE KPart forrit" diff --git a/translations/desktop_files/tdevelop-desktops/it.po b/translations/desktop_files/tdevelop-desktops/it.po index e23f94b3..30aedafa 100644 --- a/translations/desktop_files/tdevelop-desktops/it.po +++ b/translations/desktop_files/tdevelop-desktops/it.po @@ -1,26 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" +"PO-Revision-Date: 2022-12-01 08:56+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdevelop/tdevelop-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.14.2\n" #. Name #: buildtools/ada/kdevadaproject.desktop:2 -#, fuzzy msgid "KDevAdaProject" -msgstr "Project con Ada" +msgstr "KDevAdaProject" #. GenericName #. Comment @@ -31,9 +31,8 @@ msgstr "Project con Ada" #. Name #: buildtools/ant/kdevantproject.desktop:2 -#, fuzzy msgid "KDevAntProject" -msgstr "Project con Ant" +msgstr "KDevAntProject" #. GenericName #. Comment @@ -44,9 +43,8 @@ msgstr "Project con Ant" #. Name #: buildtools/autotools/kdevautoproject.desktop:2 -#, fuzzy msgid "KDevAutoProject" -msgstr "Progetto Automake" +msgstr "KDevAutoProject" #. GenericName #. Comment @@ -57,9 +55,8 @@ msgstr "Progetto Automake" #. Name #: buildtools/autotools/kdevtdeautoproject.desktop:2 -#, fuzzy msgid "KDevTDEAutoProject" -msgstr "Progetto TDE Automake" +msgstr "KDevTDEAutoProject" #. GenericName #. Comment @@ -70,9 +67,8 @@ msgstr "Progetto TDE Automake" #. Name #: buildtools/custommakefiles/kdevcustomproject.desktop:2 -#, fuzzy msgid "KDevCustomProject" -msgstr "Progetto personalizzato" +msgstr "KDevCustomProject" #. GenericName #. Comment @@ -83,9 +79,8 @@ msgstr "Progetto personalizzato" #. Name #: buildtools/pascal/kdevpascalproject.desktop:2 -#, fuzzy msgid "KDevPascalProject" -msgstr "Progetto in Pascal" +msgstr "KDevPascalProject" #. GenericName #. Comment @@ -96,9 +91,8 @@ msgstr "Progetto in Pascal" #. Name #: buildtools/qmake/kdevtmakeproject.desktop:2 -#, fuzzy msgid "KDevTMakeProject" -msgstr "Progetto per TMake" +msgstr "KDevTMakeProject" #. GenericName #. Comment @@ -110,7 +104,7 @@ msgstr "Progetto per TMake" #. Name #: buildtools/qmake/kdevtrollproject.desktop:2 msgid "KDevTrollProject" -msgstr "" +msgstr "KDevTrollProject" #. GenericName #. Comment @@ -121,9 +115,8 @@ msgstr "Progetto per QMake" #. Name #: buildtools/script/kdevscriptproject.desktop:2 -#, fuzzy msgid "KDevScriptProject" -msgstr "Progetto con linguaggio di scripting" +msgstr "KDevScriptProject" #. GenericName #. Comment @@ -135,7 +128,7 @@ msgstr "Progetto con linguaggio di scripting" #. Name #: editors/editor-chooser/kdeveditorchooser.desktop:2 msgid "KDevEditorChooser" -msgstr "" +msgstr "KDevEditorChooser" #. GenericName #: editors/editor-chooser/kdeveditorchooser.desktop:4 @@ -149,9 +142,8 @@ msgstr "Fornisce a una finestra per la selezione dell'editor." #. Name #: embedded/visualboyadvance/kdevvisualboyadvance.desktop:2 -#, fuzzy msgid "KDevVisualBoyAdvance" -msgstr "Supporto per VisualBoyAdvance" +msgstr "KDevVisualBoyAdvance" #. GenericName #: embedded/visualboyadvance/kdevvisualboyadvance.desktop:4 @@ -167,7 +159,7 @@ msgstr "" #. Keywords #: embedded/visualboyadvance/kdevvisualboyadvance.desktop:8 msgid "GBA;" -msgstr "" +msgstr "GBA;" #. Name #. GenericName @@ -182,9 +174,8 @@ msgstr "Visualizzatore documentazione" #. Name #: kdevdesigner/designer/kdevdesigner_part.desktop:2 -#, fuzzy msgid "KDevDesignerPart" -msgstr "Designer di TDevelop" +msgstr "KDevDesignerPart" #. Name #: kdevdesigner/src/kdevdesigner.desktop:2 @@ -203,9 +194,8 @@ msgstr "Designer di GUI per Qt/TDE" #. Name #: languages/ada/kdevadasupport.desktop:2 -#, fuzzy msgid "KDevAdaSupport" -msgstr "Supporto Java" +msgstr "KDevAdaSupport" #. GenericName #. Comment @@ -216,9 +206,8 @@ msgstr "Supporto al linguaggio Ada" #. Name #: languages/bash/kdevbashsupport.desktop:2 -#, fuzzy msgid "KDevBashSupport" -msgstr "Supporto Bash" +msgstr "KDevBashSupport" #. GenericName #. Comment @@ -239,7 +228,6 @@ msgstr "Supporto Bash" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -251,9 +239,8 @@ msgstr "Supporto Bash" #: parts/appwizard/common/tde-app.desktop:2 #: languages/cpp/app_templates/noatunui/plugin.plugin:7 #: languages/cpp/app_templates/noatunvisual/plugin.plugin:7 -#, fuzzy msgid "%{APPNAME}" -msgstr "Informazioni su %{APPNAME}" +msgstr "%{APPNAME}" #. Comment #: languages/cpp/app_templates/dcopservice/dcopservice.desktop:4 @@ -282,22 +269,11 @@ msgid "Your short description about the plugin goes here" msgstr "La tua breve descrizione sui plugin va qui" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "Applicazione KDE4" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 -#, fuzzy msgid "KDev%{APPNAME}" -msgstr "Informazioni su %{APPNAME}" +msgstr "KDev%{APPNAME}" #. GenericName #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:4 @@ -323,9 +299,8 @@ msgstr "Una semplice applicazione TDE" #. Name #: languages/cpp/app_templates/kicker/applet.desktop:2 #: languages/cpp/app_templates/konqnavpanel/konqnavpanel.desktop:2 -#, fuzzy msgid "%{APPNAMELC}" -msgstr "Informazioni su %{APPNAME}" +msgstr "%{APPNAMELC}" #. Comment #: languages/cpp/app_templates/kicker/applet.desktop:4 @@ -345,32 +320,29 @@ msgstr "Un plugin per il pannello di navigazione di Konqueror chiamato $NAME$" #. Name #: languages/cpp/app_templates/kpartapp/app.desktop:2 #: parts/appwizard/common/tde-part.desktop:2 -#, fuzzy msgid "%{APPNAME}Part" -msgstr "Plugin %{APPNAME}" +msgstr "%{APPNAME}Part" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "Un programma per %{APPNAME}" #. Name #: languages/cpp/app_templates/tdecmodule/module.desktop:12 -#, fuzzy msgid "The %{APPNAME} Applet" -msgstr "Plugin %{APPNAME}" +msgstr "Applet %{APPNAME}" #. Comment #: languages/cpp/app_templates/tdecmodule/module.desktop:14 msgid "%{APPNAME} - a kcontrol module" -msgstr "" +msgstr "%{APPNAME} - un modulo kcontrol" #. Keywords #: languages/cpp/app_templates/tdecmodule/module.desktop:16 msgid "%{APPNAME};%{APPNAMELC};" -msgstr "" +msgstr "%{APPNAME};%{APPNAMELC};" #. Name #: languages/cpp/app_templates/tdefileplugin/tdefile_plugin.desktop:2 @@ -400,7 +372,7 @@ msgstr "Semplice applicazione wxWidgets" #. Name #: languages/cpp/compiler/gccoptions/kdevg77options.desktop:2 msgid "G77Options" -msgstr "" +msgstr "Opzioni G77" #. Comment #: languages/cpp/compiler/gccoptions/kdevg77options.desktop:4 @@ -410,7 +382,7 @@ msgstr "Compilatore per GNU Fortran 77" #. Name #: languages/cpp/compiler/gccoptions/kdevgccoptions.desktop:2 msgid "GccOptions" -msgstr "" +msgstr "Opzioni Gcc" #. Comment #: languages/cpp/compiler/gccoptions/kdevgccoptions.desktop:4 @@ -420,7 +392,7 @@ msgstr "Compilatore GNU C" #. Name #: languages/cpp/compiler/gccoptions/kdevgppoptions.desktop:2 msgid "GppOptions" -msgstr "" +msgstr "Opzioni Gpp" #. Comment #: languages/cpp/compiler/gccoptions/kdevgppoptions.desktop:4 @@ -430,7 +402,7 @@ msgstr "Compilatore GNU C++" #. Name #: languages/cpp/debugger/kdevdebugger.desktop:2 msgid "KDevDebugger" -msgstr "" +msgstr "KDevDebugger" #. GenericName #: languages/cpp/debugger/kdevdebugger.desktop:4 @@ -448,9 +420,8 @@ msgstr "" #. Name #: languages/cpp/kdevcppsupport.desktop:2 -#, fuzzy msgid "KDevCppSupport" -msgstr "Supporto C" +msgstr "KDevCppSupport" #. GenericName #. Comment @@ -461,9 +432,8 @@ msgstr "Supporto C++" #. Name #: languages/cpp/kdevcsupport.desktop:2 -#, fuzzy msgid "KDevCSupport" -msgstr "Supporto C" +msgstr "KDevCSupport" #. GenericName #. Comment @@ -473,9 +443,8 @@ msgstr "Supporto C" #. Name #: languages/cpp/pcsimporter/customimporter/kdevpcscustomimporter.desktop:2 -#, fuzzy msgid "KDevPCSCustomImporter" -msgstr "Importatore PCS di Qt4 di TDevelop" +msgstr "KDevPCSCustomImporter" #. Comment #: languages/cpp/pcsimporter/customimporter/kdevpcscustomimporter.desktop:4 @@ -483,21 +452,9 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "Cartella per l'importatore personalizzato PCS di TDevelop" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "Importatore PCS di Qt4 di TDevelop" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "Importatore PCS di Qt4 di TDevelop" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 -#, fuzzy msgid "KDevQtImporter" -msgstr "Importatore PCS di Qt4 di TDevelop" +msgstr "KDevQtImporter" #. Comment #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:4 @@ -506,9 +463,8 @@ msgstr "Importatore PCS di Qt3 di TDevelop" #. Name #: languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.desktop:2 -#, fuzzy msgid "KDevKDELibsImporter" -msgstr "Importatore per KDELibs PCS di TDevelop" +msgstr "KDevKDELibsImporter" #. Comment #: languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.desktop:4 @@ -517,9 +473,8 @@ msgstr "Importatore per KDELibs PCS di TDevelop" #. Name #: languages/csharp/kdevcsharpsupport.desktop:2 -#, fuzzy msgid "KDevCSharpSupport" -msgstr "Supporto CSharp" +msgstr "KDevCSharpSupport" #. GenericName #. Comment @@ -531,7 +486,7 @@ msgstr "Supporto CSharp" #. Name #: languages/fortran/compiler/pgioptions/kdevpgf77options.desktop:2 msgid "Pgf77Options" -msgstr "" +msgstr "Opzioni Pgf77" #. Comment #: languages/fortran/compiler/pgioptions/kdevpgf77options.desktop:4 @@ -541,7 +496,7 @@ msgstr "Compilatore per Portland Group Fortran77" #. Name #: languages/fortran/compiler/pgioptions/kdevpghpfoptions.desktop:2 msgid "PghpfOptions" -msgstr "" +msgstr "Opzioni Pghpf" #. Comment #: languages/fortran/compiler/pgioptions/kdevpghpfoptions.desktop:4 @@ -550,9 +505,8 @@ msgstr "Compilatore ad alte prestazioni per Fortran del Portland Group" #. Name #: languages/fortran/kdevfortransupport.desktop:2 -#, fuzzy msgid "KDevFortranSupport" -msgstr "Supporto Fortran 77" +msgstr "KDevFortranSupport" #. GenericName #. Comment @@ -568,9 +522,8 @@ msgstr "Un'applicazione Java TDE KPart" #. Name #: languages/java/kdevjavasupport.desktop:2 -#, fuzzy msgid "KDevJavaSupport" -msgstr "Supporto Java" +msgstr "KDevJavaSupport" #. GenericName #. Comment @@ -581,9 +534,8 @@ msgstr "Supporto Java" #. Name #: languages/kjssupport/kdevkjssupport.desktop:2 -#, fuzzy msgid "KDevkjsSupport" -msgstr "Supporto Doxygen" +msgstr "KDevkjsSupport" #. GenericName #: languages/kjssupport/kdevkjssupport.desktop:4 @@ -592,20 +544,18 @@ msgstr "Supporto JavaScript di TDE" #. Comment #: languages/kjssupport/kdevkjssupport.desktop:6 -#, fuzzy msgid "kjsSupport" -msgstr "Supporto C" +msgstr "Supporto kjs" #. Name #: languages/lib/interfaces/tdeveloppcsimporter.desktop:2 -#, fuzzy msgid "TDevelop PCS Importer" -msgstr "Importatore PCS di Qt4 di TDevelop" +msgstr "TDevelop PCS Importer" #. Name #: languages/pascal/compiler/dccoptions/kdevdccoptions.desktop:2 msgid "DccOptions" -msgstr "" +msgstr "Opzioni Dcc" #. Comment #: languages/pascal/compiler/dccoptions/kdevdccoptions.desktop:4 @@ -615,7 +565,7 @@ msgstr "Compilatore per Borland Delphi" #. Name #: languages/pascal/compiler/fpcoptions/kdevfpcoptions.desktop:2 msgid "FpcOptions" -msgstr "" +msgstr "Opzioni Fpc" #. Comment #: languages/pascal/compiler/fpcoptions/kdevfpcoptions.desktop:4 @@ -624,9 +574,8 @@ msgstr "Compilatore per Free Pascal" #. Name #: languages/pascal/kdevpascalsupport.desktop:2 -#, fuzzy msgid "KDevPascalSupport" -msgstr "Supporto per il linguaggio Pascal" +msgstr "KDevPascalSupport" #. GenericName #. Comment @@ -637,9 +586,8 @@ msgstr "Supporto per il linguaggio Pascal" #. Name #: languages/perl/kdevperlsupport.desktop:2 -#, fuzzy msgid "KDevPerlSupport" -msgstr "Supporto per Perl" +msgstr "KDevPerlSupport" #. GenericName #. Comment @@ -650,9 +598,8 @@ msgstr "Supporto per Perl" #. Name #: languages/php/kdevphpsupport.desktop:2 -#, fuzzy msgid "KDevPHPSupport" -msgstr "Supporto per PHP" +msgstr "KDevPHPSupport" #. GenericName #. Comment @@ -663,9 +610,8 @@ msgstr "Supporto per PHP" #. Name #: languages/python/kdevpythonsupport.desktop:2 -#, fuzzy msgid "KDevPythonSupport" -msgstr "Supporto per Python" +msgstr "KDevPythonSupport" #. GenericName #. Comment @@ -677,7 +623,7 @@ msgstr "Supporto per Python" #. Name #: languages/ruby/debugger/kdevrbdebugger.desktop:2 msgid "KDevRbDebugger" -msgstr "" +msgstr "KDevRbDebugger" #. GenericName #: languages/ruby/debugger/kdevrbdebugger.desktop:4 @@ -693,9 +639,8 @@ msgstr "" #. Name #: languages/ruby/kdevrubysupport.desktop:2 -#, fuzzy msgid "KDevRubySupport" -msgstr "Supporto a Ruby" +msgstr "KDevRubySupport" #. GenericName #. Comment @@ -706,9 +651,8 @@ msgstr "Supporto a Ruby" #. Name #: languages/sql/kdevsqlsupport.desktop:2 -#, fuzzy msgid "KDevSQLSupport" -msgstr "Supporto SQL" +msgstr "KDevSQLSupport" #. GenericName #. Comment @@ -754,9 +698,8 @@ msgstr "Interfaccia per il formattatore del codice sorgente" #. Name #: lib/interfaces/extensions/tdevelopversioncontrol.desktop:2 -#, fuzzy msgid "TDevelop Version Control Interface" -msgstr "Interfaccia TDevelop di progetto" +msgstr "Interfaccia TDevelop per il controllo di versione" #. Name #: lib/interfaces/extras/tdevelopcompileroptions.desktop:2 @@ -796,7 +739,7 @@ msgstr "File sorgente per Fortran" #. Name #: parts/abbrev/kdevabbrev.desktop:2 msgid "KDevAbbrev" -msgstr "" +msgstr "KDevAbbrev" #. GenericName #: parts/abbrev/kdevabbrev.desktop:4 @@ -815,7 +758,7 @@ msgstr "" #. Name #: parts/appwizard/kdevappwizard.desktop:2 msgid "KDevAppWizard" -msgstr "" +msgstr "KDevAppWizard" #. GenericName #. Comment @@ -827,7 +770,7 @@ msgstr "Procedura guidata applicazione" #. Name #: parts/astyle/kdevastyle.desktop:2 msgid "KDevAStyle" -msgstr "" +msgstr "KDevAStyle" #. GenericName #: parts/astyle/kdevastyle.desktop:4 @@ -845,9 +788,8 @@ msgstr "" #. Name #: parts/bookmarks/kdevbookmarks.desktop:2 -#, fuzzy msgid "KDevBookmarks" -msgstr "Segnalibri" +msgstr "KDevBookmarks" #. GenericName #: parts/bookmarks/kdevbookmarks.desktop:4 @@ -865,9 +807,8 @@ msgstr "" #. Name #: parts/classview/kdevclassview.desktop:2 -#, fuzzy msgid "KDevClassView" -msgstr "Visualizza classe" +msgstr "KDevClassView" #. GenericName #: parts/classview/kdevclassview.desktop:4 @@ -888,7 +829,7 @@ msgstr "" #. Name #: parts/ctags2/kdevctags2.desktop:2 msgid "KDevCTags2" -msgstr "" +msgstr "KDevCTags2" #. GenericName #: parts/ctags2/kdevctags2.desktop:4 @@ -910,7 +851,7 @@ msgstr "" #. Name #: parts/diff/kdevdiff.desktop:2 msgid "KDevDiff" -msgstr "" +msgstr "KDevDiff" #. GenericName #. Comment @@ -921,7 +862,7 @@ msgstr "Visualizzatore delle differenze" #. Name #: parts/distpart/kdevdistpart.desktop:2 msgid "KDevdistpart" -msgstr "" +msgstr "KDevdistpart" #. GenericName #: parts/distpart/kdevdistpart.desktop:4 @@ -944,9 +885,8 @@ msgstr "Interfaccia a plugin della documentazione di TDevelop" #. Name #: parts/documentation/kdevdocumentation.desktop:2 -#, fuzzy msgid "KDevDocumentation" -msgstr "Documentazione" +msgstr "KDevDocumentation" #. GenericName #: parts/documentation/kdevdocumentation.desktop:4 @@ -964,9 +904,8 @@ msgstr "" #. Name #: parts/documentation/plugins/chm/docchmplugin.desktop:2 -#, fuzzy msgid "DocCHMPlugin" -msgstr "Plugin TDEHTMLPart" +msgstr "DocCHMPlugin" #. Comment #: parts/documentation/plugins/chm/docchmplugin.desktop:4 @@ -976,7 +915,7 @@ msgstr "Plugin di documentazione per file CHM" #. Name #: parts/documentation/plugins/custom/doccustomplugin.desktop:2 msgid "DocCustomPlugin" -msgstr "" +msgstr "DocCustomPlugin" #. Comment #: parts/documentation/plugins/custom/doccustomplugin.desktop:4 @@ -985,9 +924,8 @@ msgstr "Plugin di documentazione per tutti i tipi di documentazione" #. Name #: parts/documentation/plugins/devhelp/docdevhelpplugin.desktop:2 -#, fuzzy msgid "DevHelpPlugin" -msgstr "Plugin di TDevelop" +msgstr "DevHelpPlugin" #. Comment #: parts/documentation/plugins/devhelp/docdevhelpplugin.desktop:4 @@ -997,7 +935,7 @@ msgstr "Plugin di documentazione per file DevHelp" #. Name #: parts/documentation/plugins/djvu/docdjvuplugin.desktop:2 msgid "DocDjvuPlugin" -msgstr "" +msgstr "DocDjvuPlugin" #. Comment #: parts/documentation/plugins/djvu/docdjvuplugin.desktop:4 @@ -1007,7 +945,7 @@ msgstr "Plugin documentazione per il formato djvu" #. Name #: parts/documentation/plugins/doxygen/docdoxygenplugin.desktop:2 msgid "DocDoxygenPlugin" -msgstr "" +msgstr "DocDoxygenPlugin" #. Comment #: parts/documentation/plugins/doxygen/docdoxygenplugin.desktop:4 @@ -1017,7 +955,7 @@ msgstr "Plugin di documentazione per file di Doxygen" #. Name #: parts/documentation/plugins/kdevtoc/dockdevtocplugin.desktop:2 msgid "DocKDevTOCPlugin" -msgstr "" +msgstr "DocKDevTOCPlugin" #. Comment #: parts/documentation/plugins/kdevtoc/dockdevtocplugin.desktop:4 @@ -1027,7 +965,7 @@ msgstr "Plugin di documentazione per file di TDevelopTOC" #. Name #: parts/documentation/plugins/pdb/docpdbplugin.desktop:2 msgid "DocPDBPlugin" -msgstr "" +msgstr "DocPDBPlugin" #. Comment #: parts/documentation/plugins/pdb/docpdbplugin.desktop:4 @@ -1037,7 +975,7 @@ msgstr "Plugin di documentazione per il formato Palmdoc" #. Name #: parts/documentation/plugins/pdf/docpdfplugin.desktop:2 msgid "DocPDFPlugin" -msgstr "" +msgstr "DocPDFPlugin" #. Comment #: parts/documentation/plugins/pdf/docpdfplugin.desktop:4 @@ -1046,9 +984,8 @@ msgstr "Plugin di documentazione per formato PDF" #. Name #: parts/documentation/plugins/qt/docqtplugin.desktop:2 -#, fuzzy msgid "DocQtPlugin" -msgstr "Plugin di TDevelop" +msgstr "DocQtPlugin" #. Comment #: parts/documentation/plugins/qt/docqtplugin.desktop:4 @@ -1058,7 +995,7 @@ msgstr "Plugin di documentazione per file di Qt DCF" #. Name #: parts/documentation/protocols/chm/kchmpart.desktop:2 msgid "KChmPart" -msgstr "" +msgstr "KChmPart" #. Comment #: parts/documentation/protocols/chm/kchmpart.desktop:4 @@ -1068,7 +1005,7 @@ msgstr "Visualizzatore integrabile per la guida HTML" #. Name #: parts/doxygen/kdevdoxygen.desktop:2 msgid "KDevDoxygen" -msgstr "" +msgstr "KDevDoxygen" #. GenericName #: parts/doxygen/kdevdoxygen.desktop:4 @@ -1090,9 +1027,8 @@ msgstr "" #. Name #: parts/filecreate/kdevfilecreate.desktop:2 -#, fuzzy msgid "KDevFileCreate" -msgstr "Crea file" +msgstr "KDevFileCreate" #. GenericName #. Comment @@ -1104,7 +1040,7 @@ msgstr "Crea file" #. Name #: parts/filelist/kdevfilelist.desktop:2 msgid "KDevfilelist" -msgstr "" +msgstr "KDevfilelist" #. GenericName #: parts/filelist/kdevfilelist.desktop:4 @@ -1122,9 +1058,8 @@ msgstr "" #. Name #: parts/fileselector/kdevfileselector.desktop:2 -#, fuzzy msgid "KDevFileSelector" -msgstr "Selettore file" +msgstr "KDevFileSelector" #. GenericName #: parts/fileselector/kdevfileselector.desktop:4 @@ -1138,9 +1073,8 @@ msgstr "Utilità per la navigazione trasparente dei file in rete." #. Name #: parts/fileview/kdevfilegroups.desktop:2 -#, fuzzy msgid "KDevFileGroups" -msgstr "Gruppi file" +msgstr "KDevFileGroups" #. GenericName #: parts/fileview/kdevfilegroups.desktop:4 @@ -1156,7 +1090,7 @@ msgstr "" #. Name #: parts/fileview/kdevfileview.desktop:2 msgid "KDevFileView" -msgstr "" +msgstr "KDevFileView" #. GenericName #: parts/fileview/kdevfileview.desktop:4 @@ -1175,7 +1109,7 @@ msgstr "" #. Name #: parts/filter/kdevfilter.desktop:2 msgid "KDevFilter" -msgstr "" +msgstr "KDevFilter" #. GenericName #: parts/filter/kdevfilter.desktop:4 @@ -1193,9 +1127,8 @@ msgstr "" #. Name #: parts/fullscreen/kdevfullscreen.desktop:2 -#, fuzzy msgid "KDevFullScreen" -msgstr "Schermo pieno" +msgstr "KDevFullScreen" #. GenericName #. Comment @@ -1207,7 +1140,7 @@ msgstr "Schermo pieno" #. Name #: parts/grepview/kdevgrepview.desktop:2 msgid "KDevGrepView" -msgstr "" +msgstr "KDevGrepView" #. GenericName #: parts/grepview/kdevgrepview.desktop:4 @@ -1226,7 +1159,7 @@ msgstr "" #. Name #: parts/konsole/kdevkonsoleview.desktop:2 msgid "KDevKonsoleView" -msgstr "" +msgstr "KDevKonsoleView" #. GenericName #: parts/konsole/kdevkonsoleview.desktop:4 @@ -1245,7 +1178,7 @@ msgstr "" #. Name #: parts/openwith/kdevopenwith.desktop:2 msgid "KDevOpenWith" -msgstr "" +msgstr "KDevOpenWith" #. GenericName #: parts/openwith/kdevopenwith.desktop:4 @@ -1263,9 +1196,8 @@ msgstr "" #. Name #: parts/outputviews/kdevappoutputview.desktop:2 -#, fuzzy msgid "KDevAppOutputView" -msgstr "Visualizza l'output dell'applicazione" +msgstr "KDevAppOutputView" #. GenericName #. Comment @@ -1277,7 +1209,7 @@ msgstr "Visualizza l'output dell'applicazione" #. Name #: parts/outputviews/kdevmakeview.desktop:2 msgid "KDevMakeView" -msgstr "" +msgstr "KDevMakeView" #. GenericName #. Comment @@ -1288,9 +1220,8 @@ msgstr "Interfaccia al compilatore" #. Name #: parts/partexplorer/kdevpartexplorer.desktop:2 -#, fuzzy msgid "KDevPartExplorer" -msgstr "Strumento per l'esplorazione di componenti" +msgstr "KDevPartExplorer" #. GenericName #: parts/partexplorer/kdevpartexplorer.desktop:4 @@ -1308,9 +1239,8 @@ msgstr "" #. Name #: parts/quickopen/kdevquickopen.desktop:2 -#, fuzzy msgid "KDevQuickOpen" -msgstr "Apertura rapida" +msgstr "KDevQuickOpen" #. GenericName #: parts/quickopen/kdevquickopen.desktop:4 @@ -1330,7 +1260,7 @@ msgstr "" #. Name #: parts/regexptest/kdevregexptest.desktop:2 msgid "KDevRegexpTest" -msgstr "" +msgstr "KDevRegexpTest" #. GenericName #: parts/regexptest/kdevregexptest.desktop:4 @@ -1347,9 +1277,8 @@ msgstr "" #. Name #: parts/replace/kdevreplace.desktop:2 -#, fuzzy msgid "KDevReplace" -msgstr "Componente per sostituire" +msgstr "KDevReplace" #. GenericName #: parts/replace/kdevreplace.desktop:4 @@ -1371,9 +1300,8 @@ msgstr "" #. Name #: parts/scripting/kdevscripting.desktop:2 -#, fuzzy msgid "KDevscripting" -msgstr "Script" +msgstr "KDevscripting" #. GenericName #: parts/scripting/kdevscripting.desktop:4 @@ -1405,7 +1333,7 @@ msgstr "" #. Name #: parts/texttools/kdevtexttools.desktop:2 msgid "KDevTextTools" -msgstr "" +msgstr "KDevTextTools" #. GenericName #: parts/texttools/kdevtexttools.desktop:4 @@ -1420,7 +1348,7 @@ msgstr "Offre un'anteprima di struttura e navigazione per file HTML e TEX" #. Name #: parts/tipofday/kdevtipofday.desktop:2 msgid "KDevTipOfDay" -msgstr "" +msgstr "KDevTipOfDay" #. GenericName #. Comment @@ -1431,7 +1359,7 @@ msgstr "Suggerimento del giorno" #. Name #: parts/tools/kdevtools.desktop:2 msgid "KDevTools" -msgstr "" +msgstr "KDevTools" #. GenericName #: parts/tools/kdevtools.desktop:4 @@ -1450,7 +1378,7 @@ msgstr "" #. Name #: parts/uimode/kdevuichooser.desktop:2 msgid "KDevUIChooser" -msgstr "" +msgstr "KDevUIChooser" #. GenericName #: parts/uimode/kdevuichooser.desktop:4 @@ -1465,7 +1393,7 @@ msgstr "Fornisce una maschera per scegliere la modalità UI." #. Name #: parts/valgrind/kdevvalgrind.desktop:2 msgid "KDevvalgrind" -msgstr "" +msgstr "KDevvalgrind" #. GenericName #: parts/valgrind/kdevvalgrind.desktop:4 @@ -1484,12 +1412,12 @@ msgstr "" #. Name #: parts/vcsmanager/kdevvcsmanager.desktop:2 msgid "KDevVCSManager" -msgstr "" +msgstr "KDevVCSManager" #. GenericName #: parts/vcsmanager/kdevvcsmanager.desktop:4 msgid "VCSManager" -msgstr "" +msgstr "VCSManager" #. Comment #: parts/vcsmanager/kdevvcsmanager.desktop:6 @@ -1504,13 +1432,12 @@ msgstr "TDevelop: multilinguaggio" #. GenericName #: tdevelop.desktop:4 msgid "IDE" -msgstr "" +msgstr "IDE" #. Name #: tdevelop_c_cpp.desktop:2 -#, fuzzy msgid "TDevelop: C/C++" -msgstr "Plugin di TDevelop" +msgstr "TDevelop: C/C++" #. GenericName #: tdevelop_c_cpp.desktop:4 @@ -1520,7 +1447,7 @@ msgstr "IDE per C/C++" #. Name #: tdevelop_kde_cpp.desktop:2 msgid "TDevelop: TDE/C++" -msgstr "" +msgstr "TDevelop: TDE/C++" #. GenericName #: tdevelop_kde_cpp.desktop:4 @@ -1529,9 +1456,8 @@ msgstr "IDE per lo sviluppo di TDE" #. Name #: tdevelop_ruby.desktop:2 -#, fuzzy msgid "TDevelop: Ruby" -msgstr "Plugin di TDevelop" +msgstr "TDevelop: Ruby" #. GenericName #: tdevelop_ruby.desktop:4 @@ -1550,9 +1476,8 @@ msgstr "IDE per linguaggi di scripting" #. Name #: vcs/clearcase/integrator/kdevclearcaseintegrator.desktop:2 -#, fuzzy msgid "KDevClearcaseIntegrator" -msgstr "Integrazione di ClearCase" +msgstr "KDevClearcaseIntegrator" #. Comment #: vcs/clearcase/integrator/kdevclearcaseintegrator.desktop:4 @@ -1562,7 +1487,7 @@ msgstr "Funzione di integrazione del progetto ClearCase" #. Name #: vcs/clearcase/kdevclearcase.desktop:2 msgid "KDevClearCase" -msgstr "" +msgstr "KDevClearCase" #. GenericName #: vcs/clearcase/kdevclearcase.desktop:4 @@ -1582,9 +1507,8 @@ msgstr "" #. Name #: vcs/cvsservice/integrator/kdevcvsserviceintegrator.desktop:2 -#, fuzzy msgid "KDevCVSIntegrator" -msgstr "Integratore VCS di TDevelop" +msgstr "KDevCVSIntegrator" #. Comment #: vcs/cvsservice/integrator/kdevcvsserviceintegrator.desktop:4 @@ -1593,9 +1517,8 @@ msgstr "Funzione di integrazione del progetto CVS Service" #. Name #: vcs/cvsservice/kdevcvsservice.desktop:2 -#, fuzzy msgid "KDevCvsService" -msgstr "Servizio DCOP" +msgstr "KDevCvsService" #. GenericName #: vcs/cvsservice/kdevcvsservice.desktop:4 @@ -1613,9 +1536,8 @@ msgstr "" #. Name #: vcs/perforce/integrator/kdevperforceintegrator.desktop:2 -#, fuzzy msgid "KDevPerforceIntegrator" -msgstr "Integrazione di Perforce" +msgstr "KDevPerforceIntegrator" #. Comment #: vcs/perforce/integrator/kdevperforceintegrator.desktop:4 @@ -1625,7 +1547,7 @@ msgstr "Funzione di integrazione del progetto Perforce" #. Name #: vcs/perforce/kdevperforce.desktop:2 msgid "KDevPerforce" -msgstr "" +msgstr "KDevPerforce" #. GenericName #: vcs/perforce/kdevperforce.desktop:4 @@ -1643,9 +1565,8 @@ msgstr "" #. Name #: vcs/subversion/integrator/kdevsubversionintegrator.desktop:2 -#, fuzzy msgid "KDevSubversionIntegrator" -msgstr "Integratore VCS di TDevelop" +msgstr "KDevSubversionIntegrator" #. Comment #: vcs/subversion/integrator/kdevsubversionintegrator.desktop:4 @@ -1654,16 +1575,15 @@ msgstr "Funzione di integrazione del progetto Subversion" #. Name #: vcs/subversion/kdevsubversion.desktop:2 -#, fuzzy msgid "KDevsubversion" -msgstr "Modulo Subversion di TDevelop" +msgstr "KDevsubversion" #. GenericName #. Comment #: vcs/subversion/kdevsubversion.desktop:4 #: vcs/subversion/kdevsubversion.desktop:6 msgid "Subversion" -msgstr "" +msgstr "Subversion" #. Name #: vcs/subversion/kdevsvnd.desktop:2 @@ -1672,9 +1592,8 @@ msgstr "Modulo Subversion di TDevelop" #. Comment #: vcs/subversion/kdevsvnd.desktop:4 -#, fuzzy msgid "Provides subversion client services with TDevelop" -msgstr "ioslave di subversion per TDevelop" +msgstr "Fornisce servizi client di subversion in TDevelop" #. Comment #: x-tdevelop.desktop:2 @@ -1703,218 +1622,208 @@ msgstr "ioslave di subversion per TDevelop" #. Name #. GenericName #: tde-development-tdevelop.directory:2 src/profiles/profile.config:3 -#, fuzzy msgid "TDevelop" -msgstr "Plugin di TDevelop" +msgstr "TDevelop" #. Comment #: languages/cpp/app_templates/noatunui/plugin.plugin:8 msgid "A UI for Noatun" -msgstr "" +msgstr "Un'interfaccia utente per Noatun" #. Comment #: languages/cpp/app_templates/noatunvisual/plugin.plugin:8 -#, fuzzy msgid "My scope visualization plugin" msgstr "Plugin di visualizzazione per noatun" #. Description #: src/profiles/IDE/CompiledLanguageIDE/AdaIDE/profile.config:8 msgid "Ada IDE profile" -msgstr "" +msgstr "Profilo IDE per Ada" #. GenericName #: src/profiles/IDE/CompiledLanguageIDE/AdaIDE/profile.config:9 msgid "Ada IDE" -msgstr "" +msgstr "IDE Ada" #. Description #: src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CIDE/profile.config:8 msgid "C IDE profile" -msgstr "" +msgstr "Profilo IDE per C" #. GenericName #: src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CIDE/profile.config:9 msgid "C IDE" -msgstr "" +msgstr "IDE C" #. Description #: src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/KDECppIDE/profile.config:8 msgid "C++ IDE for KDE profile" -msgstr "" +msgstr "Profilo IDE C++ per TDE" #. GenericName #: src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/KDECppIDE/profile.config:9 msgid "C++ IDE for KDE" -msgstr "" +msgstr "IDE C++ per TDE" #. Description #: src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/profile.config:8 msgid "C++ IDE profile" -msgstr "" +msgstr "Profilo IDE per C++" #. GenericName #: src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/profile.config:9 msgid "C++ IDE" -msgstr "" +msgstr "IDE per C++" #. Description #: src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/profile.config:8 msgid "C and C++ IDE profile" -msgstr "" +msgstr "Profilo IDE per C e C++" #. GenericName #: src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/profile.config:9 msgid "C and C++ IDE" -msgstr "" +msgstr "IDE per C e C++" #. Description #: src/profiles/IDE/CompiledLanguageIDE/FortranIDE/profile.config:8 -#, fuzzy msgid "Fortran IDE profile" -msgstr "File sorgente per Fortran" +msgstr "Profilo IDE per Fortran" #. GenericName #: src/profiles/IDE/CompiledLanguageIDE/FortranIDE/profile.config:9 msgid "Fortran IDE" -msgstr "" +msgstr "IDE per Fortran" #. Description #: src/profiles/IDE/CompiledLanguageIDE/HaskellIDE/profile.config:8 msgid "Haskell IDE profile" -msgstr "" +msgstr "Profilo IDE per Haskell" #. GenericName #: src/profiles/IDE/CompiledLanguageIDE/HaskellIDE/profile.config:9 msgid "Haskell IDE" -msgstr "" +msgstr "IDE per Haskell" #. Description #: src/profiles/IDE/CompiledLanguageIDE/JavaIDE/profile.config:8 msgid "Java IDE profile" -msgstr "" +msgstr "Profilo IDE per Java" #. GenericName #: src/profiles/IDE/CompiledLanguageIDE/JavaIDE/profile.config:9 msgid "Java IDE" -msgstr "" +msgstr "IDE per Java" #. Description #: src/profiles/IDE/CompiledLanguageIDE/PascalIDE/profile.config:8 -#, fuzzy msgid "Pascal IDE profile" -msgstr "Progetto in Pascal" +msgstr "Profilo IDE per Pascal" #. GenericName #: src/profiles/IDE/CompiledLanguageIDE/PascalIDE/profile.config:9 msgid "Pascal IDE" -msgstr "" +msgstr "IDE per Pascal" #. Description #: src/profiles/IDE/CompiledLanguageIDE/profile.config:8 msgid "Compiled Language IDE profile" -msgstr "" +msgstr "Profilo IDE per linguaggio compilato" #. GenericName #: src/profiles/IDE/CompiledLanguageIDE/profile.config:9 msgid "Compiled Language IDE" -msgstr "" +msgstr "IDE per linguaggio compilato" #. Description #: src/profiles/IDE/DatabaseIDE/profile.config:8 msgid "SQL IDE profile" -msgstr "" +msgstr "Profilo IDE per SQL" #. GenericName #: src/profiles/IDE/DatabaseIDE/profile.config:9 msgid "SQL IDE" -msgstr "" +msgstr "IDE per SQL" #. Description #: src/profiles/IDE/ScriptingLanguageIDE/PHPIDE/profile.config:8 msgid "PHP IDE profile" -msgstr "" +msgstr "Profilo IDE per PHP" #. GenericName #: src/profiles/IDE/ScriptingLanguageIDE/PHPIDE/profile.config:9 msgid "PHP IDE" -msgstr "" +msgstr "IDE per PHP" #. Description #: src/profiles/IDE/ScriptingLanguageIDE/PerlIDE/profile.config:8 msgid "Perl IDE profile" -msgstr "" +msgstr "Profilo IDE per Perl" #. GenericName #: src/profiles/IDE/ScriptingLanguageIDE/PerlIDE/profile.config:9 msgid "Perl IDE" -msgstr "" +msgstr "IDE per Perl" #. Description #: src/profiles/IDE/ScriptingLanguageIDE/PythonIDE/profile.config:8 msgid "Python IDE profile" -msgstr "" +msgstr "Profilo IDE per Python" #. GenericName #: src/profiles/IDE/ScriptingLanguageIDE/PythonIDE/profile.config:9 msgid "Python IDE" -msgstr "" +msgstr "IDE per Python" #. Description #: src/profiles/IDE/ScriptingLanguageIDE/RubyIDE/profile.config:8 msgid "Ruby IDE profile" -msgstr "" +msgstr "Profilo IDE per Ruby" #. GenericName #: src/profiles/IDE/ScriptingLanguageIDE/RubyIDE/profile.config:9 msgid "Ruby IDE" -msgstr "" +msgstr "IDE per Ruby" #. Description #: src/profiles/IDE/ScriptingLanguageIDE/ShellIDE/profile.config:8 msgid "Shell scripting IDE profile" -msgstr "" +msgstr "Profilo IDE per script shell" #. GenericName #: src/profiles/IDE/ScriptingLanguageIDE/ShellIDE/profile.config:9 -#, fuzzy msgid "Shell scripting IDE" -msgstr "Script" +msgstr "IDE per script shell" #. Description #: src/profiles/IDE/ScriptingLanguageIDE/profile.config:8 -#, fuzzy msgid "Scripting Language IDE profile" -msgstr "Progetto con linguaggio di scripting" +msgstr "Profilo IDE per linguaggio di scripting" #. GenericName #: src/profiles/IDE/ScriptingLanguageIDE/profile.config:9 -#, fuzzy msgid "Scripting Language IDE" -msgstr "Progetto con linguaggio di scripting" +msgstr "IDE per linguaggio di scripting" #. Description #: src/profiles/IDE/profile.config:8 msgid "Generic TDevelop IDE profile" -msgstr "" +msgstr "Profilo IDE per progetto TDevelop generico" #. GenericName #: src/profiles/IDE/profile.config:9 -#, fuzzy msgid "TDevelop IDE" -msgstr "Designer di TDevelop" +msgstr "IDE per progetto TDevelop generico" #. Description #: src/profiles/KDevAssistant/profile.config:8 -#, fuzzy msgid "TDevelop Assistant profile" -msgstr "Assistente di TDevelop" +msgstr "Profilo per Assistente di TDevelop" #. Description #: src/profiles/profile.config:2 -#, fuzzy msgid "Default TDevelop profile" -msgstr "File di progetto per TDevelop" +msgstr "Proflilo di default per TDevelop" #. Name #: languages/ada/app_templates/adahello/adahello:3 @@ -1938,7 +1847,7 @@ msgstr "Genera un semplice programma di \"Hello world\" in Ada" #: languages/ada/app_templates/adahello/adahello:7 #: languages/ada/app_templates/adahello/adahello.kdevtemplate:7 msgid "Ada" -msgstr "" +msgstr "Ada" #. Comment #: languages/ada/app_templates/adahello/adahello.kdevtemplate:45 @@ -1962,7 +1871,7 @@ msgstr "Questo genera un semplice programma shell di \"Hello world\" in Bash" #: languages/bash/app_templates/bashhello/bashhello:7 #: languages/bash/app_templates/bashhello/bashhello.kdevtemplate:7 msgid "Shell" -msgstr "" +msgstr "Shell" #. Comment #: languages/bash/app_templates/bashhello/bashhello.kdevtemplate:26 @@ -1981,9 +1890,8 @@ msgstr "Genera un'applicazione basata su un Automake vuoto" #. Category #: languages/cpp/app_templates/automakeempty/automakeempty.kdevtemplate:7 -#, fuzzy msgid "C++/Automake project" -msgstr "Progetto Automake" +msgstr "Progetto Automake/C++" #. Comment #: languages/cpp/app_templates/automakeempty/automakeempty.kdevtemplate:44 @@ -1999,7 +1907,7 @@ msgstr "Genera un semplice programma di \"Hello world\" in C" #: languages/cpp/app_templates/chello/chello.kdevtemplate:7 #: languages/cpp/app_templates/kmod/kmod.kdevtemplate:7 msgid "C" -msgstr "" +msgstr "C" #. Comment #: languages/cpp/app_templates/chello/chello.kdevtemplate:18 @@ -2046,7 +1954,7 @@ msgstr "" #. Category #: languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate:7 msgid "C/GBA" -msgstr "" +msgstr "C/GBA" #. Comment #: languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate:90 @@ -2074,7 +1982,7 @@ msgstr "Genera una semplice applicazione ClanLib." #: languages/cpp/app_templates/win32gui/win32gui.kdevtemplate:7 #: languages/cpp/app_templates/win32hello/win32hello.kdevtemplate:7 msgid "C++" -msgstr "" +msgstr "C++" #. Comment #: languages/cpp/app_templates/clanlib/clanlib.kdevtemplate:55 @@ -2108,9 +2016,8 @@ msgstr "" #: languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate:7 #: languages/cpp/app_templates/cmakesimplec/cmakesimplec:7 #: languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate:7 -#, fuzzy msgid "C/CMake based projects" -msgstr "Progetto per TMake" +msgstr "Progetti basati su C/CMake" #. Comment #: languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate:55 @@ -2141,7 +2048,7 @@ msgstr "" #: languages/cpp/app_templates/cmakesimple/cmakesimple:7 #: languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate:7 msgid "C++/CMake based projects" -msgstr "" +msgstr "Progetti basati su C++/CMake" #. Name #: languages/cpp/app_templates/cmakeqt3app/cmakeqt3app:3 @@ -2163,13 +2070,12 @@ msgstr "È stata creata un'applicazione Qt3 basata su CMake in %{dest}" #. Comment #: languages/cpp/app_templates/cmakesimple/cmakesimple:5 -#, fuzzy msgid "" "Generates a simple Hello world program in C++ using the CMake build tool " "instead of the automake/autoconf/libtool combination. It requires cmake 2.1 " "(available from cmake cvs) or the upcoming cmake 2.2 release." msgstr "" -"Genera un semplice programma di \"Hello world\" in C che usa CMake invece " +"Genera un semplice programma di \"Hello world\" in C++ che usa CMake invece " "della combinazione automake/autoconf/libtool. Si richiede cmake 2.1 " "(disponibile dal CVS di cmake) o la versione a venire cmake 2.2." @@ -2258,7 +2164,6 @@ msgstr "Servizio DCOP di TDE" #. Comment #: languages/cpp/app_templates/dcopservice/dcopservice:5 -#, fuzzy msgid "Generates a framework for a TDE dcop service and client access library." msgstr "" "Genera l'infrastruttura per un servizio DCOP di TDE e una libreria per " @@ -2292,7 +2197,7 @@ msgstr "" #: languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate:7 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate:7 msgid "C++/TDE" -msgstr "" +msgstr "C++/TDE" #. Comment #: languages/cpp/app_templates/dcopservice/dcopservice.kdevtemplate:5 @@ -2314,7 +2219,7 @@ msgstr "Programma C++ (sistema di compilazione con script di shell)" #. Category #: languages/cpp/app_templates/generichello/generichello.kdevtemplate:7 msgid "C++/Generic" -msgstr "" +msgstr "C++/Generico" #. Name #: languages/cpp/app_templates/gnome2mmapp/gnome2mmapp:3 @@ -2339,7 +2244,7 @@ msgstr "" #: languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate:7 #: languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate:7 msgid "C++/GTK+" -msgstr "" +msgstr "C++/GTK+" #. Comment #: languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate:103 @@ -2423,30 +2328,6 @@ msgstr "" "È stato creato un plugin per Kate con pagina di configurazione in %{dest}" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "Infrastruttura per applicazioni KDE4" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" -"Genera una semplice applicazione KDE4 con una finestra toplevel, menu e " -"barre degli strumenti." - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "È stata creata un'applicazione KDE4 in %{dest}" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "Semplice server DCOP" @@ -2485,7 +2366,7 @@ msgstr "" #: languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate:7 #: languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate:7 msgid "C++/TDevelop/" -msgstr "" +msgstr "TDevelop/C++" #. Comment #: languages/cpp/app_templates/kdevlang/kdevlang.kdevtemplate:79 @@ -2608,12 +2489,8 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 -#, fuzzy msgid "C++/QMake project" -msgstr "Progetto per QMake" +msgstr "Progetto C++/QMake" #. Comment #: languages/cpp/app_templates/kmake/kmake.kdevtemplate:68 @@ -2824,11 +2701,10 @@ msgstr "Genera un'applicazione Opie." #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" -msgstr "" +msgstr "C++/Embedded" #. Comment #: languages/cpp/app_templates/opieapp/opieapp.kdevtemplate:65 @@ -2921,7 +2797,7 @@ msgstr "Genera un modello per un'applicazione palm" #: languages/cpp/app_templates/prc-tool/prc-tool:7 #: languages/cpp/app_templates/prc-tool/prc-tool.kdevtemplate:7 msgid "C/PalmOS" -msgstr "" +msgstr "C/PalmOS" #. Comment #: languages/cpp/app_templates/prc-tool/prc-tool.kdevtemplate:56 @@ -2937,10 +2813,9 @@ msgstr "Applicazione" #. Comment #: languages/cpp/app_templates/qmakeapp/qmakeapp:5 -#, fuzzy msgid "Generate a QMake/Qt based application (crossplatform compatible)" msgstr "" -"Genera un'applicazione basata su QMake/Qt3 (compatibile multipiattaforma)" +"Genera un'applicazione basata su QMake/Qt (compatibile multipiattaforma)" #. Comment #: languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate:5 @@ -2996,13 +2871,12 @@ msgstr "Percorso assoluto per Designer." #. Comment #: languages/cpp/app_templates/qmakesimple/qmakesimple:5 -#, fuzzy msgid "" "Generates a simple Hello world program in C++ using QMake based project " "manager" msgstr "" "Genera un semplice programma di \"Hello world\" in C++ usando il gestore di " -"progetto QMake/Qt3" +"progetto QMake" #. Name #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:3 @@ -3025,85 +2899,6 @@ msgstr "" "È stato creato un programma di \"hello world\" basato su Qmake/Qt3 in %{dest}" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "Applicazione Qt4 base" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" -"Genera una semplice applicazione basata su QMake/Qt4 (compatibile " -"multipiattaforma) - serve Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "È stata creata un'applicazione basata su Qt4/Qmake in %{dest}" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "Percorso assoluto per QMake (Qt4)." - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "Percorso assoluto del Designer (Qt4)." - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Applicazione Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" -"Genera un'applicazione basata su QMake/Qt4 (compatibile multipiattaforma) - " -"serve Qt4" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "Applicazione Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" -"Genera un'applicazione basata su QMake/Qt4 (compatibile multipiattaforma) - " -"serve Qt4" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "Applicazione Qtopia 4" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "Genera un'applicazione basata su QMake/Qt per Qtopia 4.x" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "È stata creata un'applicazione Qtopia in %{dest}" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3115,6 +2910,11 @@ msgstr "Applicazione Qtopia" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "Genera un'applicazione basata su TMake/Qt per Qtopia 1.x" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "È stata creata un'applicazione Qtopia in %{dest}" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3236,7 +3036,7 @@ msgstr "Genera una semplice applicazione wxWidgets di \"Hello\"." #: languages/cpp/app_templates/wxhello/wxhello:7 #: languages/cpp/app_templates/wxhello/wxhello.kdevtemplate:7 msgid "C++/wxWidgets" -msgstr "" +msgstr "C++/wxWidgets" #. Comment #: languages/cpp/app_templates/wxhello/wxhello.kdevtemplate:114 @@ -3254,7 +3054,7 @@ msgstr "Genera un semplice programma di \"Hello world\" in Fortran" #: languages/fortran/app_templates/fortranhello/fortranhello:7 #: languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate:7 msgid "Fortran" -msgstr "" +msgstr "Fortran" #. Comment #: languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate:59 @@ -3271,9 +3071,8 @@ msgstr "Genera un'applicazione Java" #. Category #: languages/java/app_templates/javahello/javahello:7 #: languages/java/app_templates/javahello/javahello.kdevtemplate:7 -#, fuzzy msgid "Java/Ant project" -msgstr "Project con Ant" +msgstr "Project Java/Ant" #. Comment #: languages/java/app_templates/javahello/javahello.kdevtemplate:37 @@ -3294,13 +3093,13 @@ msgstr "" #: languages/java/app_templates/kappjava/kappjava:7 #: languages/java/app_templates/kappjava/kappjava.kdevtemplate:7 msgid "Java/KDE" -msgstr "" +msgstr "Java/KDE" #. Name #: languages/java/app_templates/superwaba/superwaba:3 #: languages/java/app_templates/superwaba/superwaba.kdevtemplate:3 msgid "SuperWaba" -msgstr "" +msgstr "SuperWaba" #. Comment #: languages/java/app_templates/superwaba/superwaba:5 @@ -3317,7 +3116,7 @@ msgstr "" #: languages/java/app_templates/superwaba/superwaba:7 #: languages/java/app_templates/superwaba/superwaba.kdevtemplate:7 msgid "Java" -msgstr "" +msgstr "Java" #. Comment #: languages/java/app_templates/superwaba/superwaba:17 @@ -3361,7 +3160,7 @@ msgstr "Genera un'applicazione GUI basata su GTK+ in Pascal" #: languages/pascal/app_templates/fpcsharedlib/fpcsharedlib:7 #: languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.kdevtemplate:7 msgid "Pascal/Free Pascal" -msgstr "" +msgstr "Pascal/Free Pascal" #. Comment #: languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate:34 @@ -3412,9 +3211,8 @@ msgstr "Genera un semplice programma di \"Hello world\" in Pascal" #. Category #: languages/pascal/app_templates/pascalhello/pascalhello:7 #: languages/pascal/app_templates/pascalhello/pascalhello.kdevtemplate:7 -#, fuzzy msgid "Pascal" -msgstr "Progetto in Pascal" +msgstr "Pascal" #. Comment #: languages/pascal/app_templates/pascalhello/pascalhello.kdevtemplate:35 @@ -3441,7 +3239,7 @@ msgstr "" #: languages/perl/app_templates/perlhello/perlhello:7 #: languages/perl/app_templates/perlhello/perlhello.kdevtemplate:7 msgid "Perl" -msgstr "" +msgstr "Perl" #. Comment #: languages/perl/app_templates/perlhello/perlhello.kdevtemplate:27 @@ -3466,7 +3264,7 @@ msgstr "" #: languages/php/app_templates/phphello/phphello:7 #: languages/php/app_templates/phphello/phphello.kdevtemplate:7 msgid "PHP" -msgstr "" +msgstr "PHP" #. Comment #: languages/php/app_templates/phphello/phphello:26 @@ -3493,9 +3291,8 @@ msgstr "Genera l'infrastruttura applicativa usando Python e Qt" #: languages/python/app_templates/pythonhello/pythonhello.kdevtemplate:7 #: languages/python/app_templates/pytk/pytk:7 #: languages/python/app_templates/pytk/pytk.kdevtemplate:7 -#, fuzzy msgid "Python" -msgstr "Supporto per Python" +msgstr "Python" #. Comment #: languages/python/app_templates/pyqt/pyqt.kdevtemplate:87 @@ -3553,7 +3350,7 @@ msgstr "" #: languages/ruby/app_templates/kapp/kappruby.kdevtemplate:7 #: languages/ruby/app_templates/kxt/kxtruby.kdevtemplate:7 msgid "Ruby/KDE" -msgstr "" +msgstr "Ruby/KDE" #. Comment #: languages/ruby/app_templates/dcopservice/dcopserviceruby.kdevtemplate:112 @@ -3601,10 +3398,9 @@ msgstr "Genera una semplice applicazione di \"Hello World\" con QtRuby" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" -msgstr "" +msgstr "Ruby/Qt" #. Comment #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:42 @@ -3612,25 +3408,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "È stata creata una semplice applicazione QtRuby in %{dest}" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "Applicazione QtRuby4" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" -"Genera un'applicazione basata su QtRuby4 (compatibile multipiattaforma) - " -"serve QtRuby4" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "È stata creata un'applicazione basata su QtRuby4 in %{dest}" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "Applicazione QtRuby" @@ -3648,7 +3425,7 @@ msgstr "È stata creata un'applicazione basata su QtRuby in %{dest}" #. Name #: languages/ruby/app_templates/rails/rails.kdevtemplate:3 msgid "Ruby On Rails" -msgstr "" +msgstr "Ruby On Rails" #. Comment #: languages/ruby/app_templates/rails/rails.kdevtemplate:5 @@ -3660,7 +3437,7 @@ msgstr "Genera un progetto Ruby On Rails" #: languages/ruby/app_templates/rubyhello/rubyhello:7 #: languages/ruby/app_templates/rubyhello/rubyhello.kdevtemplate:7 msgid "Ruby" -msgstr "" +msgstr "Ruby" #. Comment #: languages/ruby/app_templates/rails/rails.kdevtemplate:22 @@ -3700,7 +3477,7 @@ msgstr "Genera un semplice progetto SQL." #: languages/sql/app_templates/sqlsimple/sqlsimple:7 #: languages/sql/app_templates/sqlsimple/sqlsimple.kdevtemplate:7 msgid "Database" -msgstr "" +msgstr "Database" #. Comment #: languages/sql/app_templates/sqlsimple/sqlsimple.kdevtemplate:26 @@ -3714,119 +3491,195 @@ msgstr "Installa modelli di documentazione docbook." #. Comment #: parts/appwizard/imports/ada:3 -#, fuzzy msgid "Ada Application" -msgstr "Applicazione" +msgstr "Applicazione Ada" #. Comment #: parts/appwizard/imports/c:3 msgid "Generic C Application (Custom Buildsystem)" -msgstr "" +msgstr "Applicazione C generica (sistema di compilazione personalizzato)" #. Comment #: parts/appwizard/imports/c-auto:3 msgid "Generic C Application (Automake-based)" -msgstr "" +msgstr "Applicazione C generica (basata su Automake)" #. Comment #: parts/appwizard/imports/cpp:3 msgid "Generic C++ Application (Custom Buildsystem)" -msgstr "" +msgstr "Applicazione C++ generica (sistema di compilazione personalizzato)" #. Comment #: parts/appwizard/imports/cpp-auto:3 msgid "Generic C++ Application (Automake based)" -msgstr "" +msgstr "Applicazione C++ generica (basata su Automake)" #. Comment #: parts/appwizard/imports/fortran:3 msgid "Fortran Application (Custom Buildsystem)" -msgstr "" +msgstr "Applicazione Fortran (sistema di compilazione personalizzato)" #. Comment #: parts/appwizard/imports/fortran-auto:3 msgid "Fortran Application (Automake based)" -msgstr "" +msgstr "Applicazione Fortran (basata su Automake)" #. Comment #: parts/appwizard/imports/gnome:3 -#, fuzzy msgid "GNOME C Application (Automake based)" -msgstr "Infrastruttura per applicazioni GNOME--" +msgstr "Applicazione GNOME C (basata su Automake)" #. Comment #: parts/appwizard/imports/java:3 parts/appwizard/imports/java-auto:3 msgid "Java Application (Automake based)" -msgstr "" +msgstr "Applicazione Java (basata su Automake)" #. Comment #: parts/appwizard/imports/java-ant:3 -#, fuzzy msgid "Java Application (Ant based)" -msgstr "Procedura guidata applicazione" +msgstr "Applicazione Java (basata su Ant)" #. Comment #: parts/appwizard/imports/kde:3 msgid "KDE C++ Application (Automake based)" -msgstr "" +msgstr "Applicazione KDE C++ (basata su Automake)" #. Comment #: parts/appwizard/imports/pascal:3 -#, fuzzy msgid "Pascal Application" -msgstr "Applicazione Qt4 base" +msgstr "Applicazione Pascal" #. Comment #: parts/appwizard/imports/perl:3 -#, fuzzy msgid "Perl Application" -msgstr "Applicazione" +msgstr "Applicazione Perl" #. Comment #: parts/appwizard/imports/php:3 -#, fuzzy msgid "PHP Application" -msgstr "Applicazione" +msgstr "Applicazione PHP" #. Comment #: parts/appwizard/imports/python:3 -#, fuzzy msgid "Python Application" -msgstr "Applicazione Qt Python" +msgstr "Applicazione Python" #. Comment #: parts/appwizard/imports/qt:3 msgid "Generic C++ Application with Custom Buildsystem" -msgstr "" +msgstr "Applicazione C++ generica con sistema di build personalizzato" #. Comment #: parts/appwizard/imports/qt-auto:3 msgid "Qt C++ Application (Automake based)" -msgstr "" - -#. Comment -#: parts/appwizard/imports/qt4qmake:3 -#, fuzzy -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "Applicazione Qt4" +msgstr "Applicazione Qt C++ (basata su Automake)" #. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" -msgstr "" +msgstr "Applicazione Qt C++ (basata su QMake)" #. Comment #: parts/appwizard/imports/qtqmake:6 msgid "Attempt to generate QMake build system infrastructure" msgstr "" +"Tentativo di generare l'infrastruttura del sistema di compilazione QMake" #. Comment #: parts/appwizard/imports/qttmake:3 msgid "Qt C++ Application (TMake based)" -msgstr "" +msgstr "Applicazione Qt C++ (basata su TMake)" #. Comment #: parts/appwizard/imports/ruby:3 -#, fuzzy msgid "Ruby Application" -msgstr "Applicazione QtRuby" +msgstr "Applicazione Ruby" + +#~ msgid "KApp4" +#~ msgstr "KApp4" + +#~ msgid "A KDE4 Application" +#~ msgstr "Applicazione KDE4" + +#~ msgid "KDevQt4Importer" +#~ msgstr "KDevQt4Importer" + +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "Importatore PCS di Qt4 di TDevelop" + +#~ msgid "KDE4 Application framework" +#~ msgstr "Infrastruttura per applicazioni KDE4" + +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "" +#~ "Genera una semplice applicazione KDE4 con una finestra toplevel, menu e " +#~ "barre degli strumenti." + +#~ msgid "C++/KDE4" +#~ msgstr "C++/KDE4" + +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "È stata creata un'applicazione KDE4 in %{dest}" + +#~ msgid "Basic Qt4 Application" +#~ msgstr "Applicazione Qt4 base" + +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "" +#~ "Genera una semplice applicazione basata su QMake/Qt4 (compatibile " +#~ "multipiattaforma) - serve Qt4" + +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "È stata creata un'applicazione basata su Qt4/Qmake in %{dest}" + +#~ msgid "Absolute Path for QMake (Qt4)." +#~ msgstr "Percorso assoluto per QMake (Qt4)." + +#~ msgid "Absolute Path for Designer (Qt4)." +#~ msgstr "Percorso assoluto del Designer (Qt4)." + +#~ msgid "Qt4/QMake Application" +#~ msgstr "Applicazione Qt4/QMake" + +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Genera un'applicazione basata su QMake/Qt4 (compatibile multipiattaforma) " +#~ "- necessita Qt4" + +#~ msgid "Qt4 Application" +#~ msgstr "Applicazione Qt4" + +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Genera un'applicazione basata su QMake/Qt4 (compatibile multipiattaforma) " +#~ "- serve Qt4" + +#~ msgid "Qtopia 4 Application" +#~ msgstr "Applicazione Qtopia 4" + +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "Genera un'applicazione basata su QMake/Qt per Qtopia 4.x" + +#~ msgid "QtRuby4 Application" +#~ msgstr "Applicazione QtRuby4" + +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "" +#~ "Genera un'applicazione basata su QtRuby4 (compatibile multipiattaforma) - " +#~ "serve QtRuby4" + +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "È stata creata un'applicazione basata su QtRuby4 in %{dest}" + +#~ msgid "Qt4 C++ Application (QMake4 based)" +#~ msgstr "Applicazione Qt4 C++ (basata su QMake4)" diff --git a/translations/desktop_files/tdevelop-desktops/ja.po b/translations/desktop_files/tdevelop-desktops/ja.po index e49dbf22..5f791dc4 100644 --- a/translations/desktop_files/tdevelop-desktops/ja.po +++ b/translations/desktop_files/tdevelop-desktops/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -240,7 +240,6 @@ msgstr "Bash サãƒãƒ¼ãƒˆ" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -283,17 +282,6 @@ msgid "Your short description about the plugin goes here" msgstr "プラグインã«é–¢ã™ã‚‹çŸã„説明をã“ã“ã«è¨˜è¿°ã—ã¾ã™ã€‚" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -#, fuzzy -msgid "A KDE4 Application" -msgstr "Qt4 アプリケーション" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -353,7 +341,6 @@ msgstr "%{APPNAME} パート" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "%{APPNAME} プãƒã‚°ãƒ©ãƒ " @@ -486,17 +473,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "TDevelop カスタムディレクトリ PCS インãƒãƒ¼ã‚¿" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "KDev KDE " - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "TDevelop Qt4 PCS インãƒãƒ¼ã‚¿" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 #, fuzzy msgid "KDevQtImporter" @@ -2398,31 +2374,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "è¨å®šãƒšãƒ¼ã‚¸ã®ã‚ã‚‹ Kate プラグインを %{dest} ã«ä½œæˆã—ã¾ã—ãŸ" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -#, fuzzy -msgid "KDE4 Application framework" -msgstr "アプリケーションフレームワーク" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -#, fuzzy -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "ウィジェットを一ã¤å«ã‚“ã ç°¡å˜ãª TDE アプリケーションを作æˆã—ã¾ã™ã€‚" - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -#, fuzzy -msgid "A KDE4 Application was created at %{dest}" -msgstr "TDE アプリケーションを %{dest} ã«ä½œæˆã—ã¾ã—ãŸ" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "ç°¡å˜ãª DCOP サーãƒ" @@ -2577,9 +2528,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "QMake プãƒã‚¸ã‚§ã‚¯ãƒˆ" @@ -2790,7 +2738,6 @@ msgstr "Opie アプリケーションを作æˆ" #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2992,83 +2939,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "QMake/Qt3 ベース㮠hello world プãƒã‚°ãƒ©ãƒ ã‚’ %{dest} ã«ä½œæˆã—ã¾ã—ãŸ" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "基本的㪠Qt4 アプリケーション" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -#, fuzzy -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "QMake/Qt3 ベースã®ã‚¢ãƒ—ãƒªã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã‚’ä½œæˆ (クãƒã‚¹ãƒ—ラットフォーム)" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "Qt4/QMake ベースã®ã‚¢ãƒ—リケーションを %{dest} ã«ä½œæˆã—ã¾ã—ãŸ" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "QMake (Qt4) ã®çµ¶å¯¾ãƒ‘ス" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "Designer (Qt4) ã®çµ¶å¯¾ãƒ‘ス" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Qt4 アプリケーション" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "QMake/Qt3 ベースã®ã‚¢ãƒ—ãƒªã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã‚’ä½œæˆ (クãƒã‚¹ãƒ—ラットフォーム)" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "Qt4 アプリケーション" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "QMake/Qt3 ベースã®ã‚¢ãƒ—ãƒªã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã‚’ä½œæˆ (クãƒã‚¹ãƒ—ラットフォーム)" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -#, fuzzy -msgid "Qtopia 4 Application" -msgstr "Qtopia アプリケーション" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -#, fuzzy -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "Qtopia 1.x 用㮠TMake/Qt ベースã®ã‚¢ãƒ—リケーションを作æˆ" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "Qtopia アプリケーションを %{dest} ã«ä½œæˆã—ã¾ã—ãŸ" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3080,6 +2950,11 @@ msgstr "Qtopia アプリケーション" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "Qtopia 1.x 用㮠TMake/Qt ベースã®ã‚¢ãƒ—リケーションを作æˆ" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "Qtopia アプリケーションを %{dest} ã«ä½œæˆã—ã¾ã—ãŸ" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3558,7 +3433,6 @@ msgstr "ç°¡å˜ãª QtRuby Hello World アプリケーションを作æˆã—ã¾ã™" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3569,26 +3443,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "ç°¡å˜ãª QtRuby アプリケーションを %{dest} ã«ä½œæˆã—ã¾ã—ãŸ" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -#, fuzzy -msgid "QtRuby4 Application" -msgstr "QtRuby アプリケーション" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -#, fuzzy -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "QtRuby ベースã®ã‚¢ãƒ—ãƒªã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã‚’ä½œæˆ (クãƒã‚¹ãƒ—ラットフォーム)" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -#, fuzzy -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "QtRuby ベースã®ã‚¢ãƒ—リケーションを %{dest} ã«ä½œæˆã—ã¾ã—ãŸ" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "QtRuby アプリケーション" @@ -3763,12 +3617,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -#, fuzzy -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "Qt4 アプリケーション" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3788,3 +3636,91 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "QtRuby アプリケーション" + +#, fuzzy +#~ msgid "A KDE4 Application" +#~ msgstr "Qt4 アプリケーション" + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "KDev KDE " + +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "TDevelop Qt4 PCS インãƒãƒ¼ã‚¿" + +#, fuzzy +#~ msgid "KDE4 Application framework" +#~ msgstr "アプリケーションフレームワーク" + +#, fuzzy +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "ウィジェットを一ã¤å«ã‚“ã ç°¡å˜ãª TDE アプリケーションを作æˆã—ã¾ã™ã€‚" + +#, fuzzy +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "TDE アプリケーションを %{dest} ã«ä½œæˆã—ã¾ã—ãŸ" + +#~ msgid "Basic Qt4 Application" +#~ msgstr "基本的㪠Qt4 アプリケーション" + +#, fuzzy +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "QMake/Qt3 ベースã®ã‚¢ãƒ—ãƒªã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã‚’ä½œæˆ (クãƒã‚¹ãƒ—ラットフォーム)" + +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "Qt4/QMake ベースã®ã‚¢ãƒ—リケーションを %{dest} ã«ä½œæˆã—ã¾ã—ãŸ" + +#~ msgid "Absolute Path for QMake (Qt4)." +#~ msgstr "QMake (Qt4) ã®çµ¶å¯¾ãƒ‘ス" + +#~ msgid "Absolute Path for Designer (Qt4)." +#~ msgstr "Designer (Qt4) ã®çµ¶å¯¾ãƒ‘ス" + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Qt4 アプリケーション" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "QMake/Qt3 ベースã®ã‚¢ãƒ—ãƒªã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã‚’ä½œæˆ (クãƒã‚¹ãƒ—ラットフォーム)" + +#~ msgid "Qt4 Application" +#~ msgstr "Qt4 アプリケーション" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "QMake/Qt3 ベースã®ã‚¢ãƒ—ãƒªã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã‚’ä½œæˆ (クãƒã‚¹ãƒ—ラットフォーム)" + +#, fuzzy +#~ msgid "Qtopia 4 Application" +#~ msgstr "Qtopia アプリケーション" + +#, fuzzy +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "Qtopia 1.x 用㮠TMake/Qt ベースã®ã‚¢ãƒ—リケーションを作æˆ" + +#, fuzzy +#~ msgid "QtRuby4 Application" +#~ msgstr "QtRuby アプリケーション" + +#, fuzzy +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "QtRuby ベースã®ã‚¢ãƒ—ãƒªã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã‚’ä½œæˆ (クãƒã‚¹ãƒ—ラットフォーム)" + +#, fuzzy +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "QtRuby ベースã®ã‚¢ãƒ—リケーションを %{dest} ã«ä½œæˆã—ã¾ã—ãŸ" + +#, fuzzy +#~ msgid "Qt4 C++ Application (QMake4 based)" +#~ msgstr "Qt4 アプリケーション" diff --git a/translations/desktop_files/tdevelop-desktops/lt.po b/translations/desktop_files/tdevelop-desktops/lt.po index 761b26da..01fdbe1d 100644 --- a/translations/desktop_files/tdevelop-desktops/lt.po +++ b/translations/desktop_files/tdevelop-desktops/lt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -227,7 +227,6 @@ msgstr "" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -269,17 +268,6 @@ msgid "Your short description about the plugin goes here" msgstr "ÄŒia turÄ—tų bÅ«ti trumpas priedo apraÅ¡ymas" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -#, fuzzy -msgid "A KDE4 Application" -msgstr "TDE KPart programa" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -337,7 +325,6 @@ msgstr "" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "" @@ -464,16 +451,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -msgid "KDevQt4Importer" -msgstr "" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 msgid "KDevQtImporter" msgstr "" @@ -2254,28 +2231,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "" @@ -2422,9 +2377,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 msgid "C++/QMake project" msgstr "" @@ -2624,7 +2576,6 @@ msgstr "" #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2813,81 +2764,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -#, fuzzy -msgid "Basic Qt4 Application" -msgstr "Programa" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Programa" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -#, fuzzy -msgid "Qt4 Application" -msgstr "Programa" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -#, fuzzy -msgid "Qtopia 4 Application" -msgstr "Programa" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 #, fuzzy @@ -2900,6 +2776,11 @@ msgstr "Programa" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3359,7 +3240,6 @@ msgstr "" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3370,24 +3250,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -#, fuzzy -msgid "QtRuby4 Application" -msgstr "Programa" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 #, fuzzy msgid "QtRuby Application" @@ -3561,11 +3423,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3585,3 +3442,27 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "Programa" + +#, fuzzy +#~ msgid "A KDE4 Application" +#~ msgstr "TDE KPart programa" + +#, fuzzy +#~ msgid "Basic Qt4 Application" +#~ msgstr "Programa" + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Programa" + +#, fuzzy +#~ msgid "Qt4 Application" +#~ msgstr "Programa" + +#, fuzzy +#~ msgid "Qtopia 4 Application" +#~ msgstr "Programa" + +#, fuzzy +#~ msgid "QtRuby4 Application" +#~ msgstr "Programa" diff --git a/translations/desktop_files/tdevelop-desktops/ms.po b/translations/desktop_files/tdevelop-desktops/ms.po index f0f9177a..4cae36eb 100644 --- a/translations/desktop_files/tdevelop-desktops/ms.po +++ b/translations/desktop_files/tdevelop-desktops/ms.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -239,7 +239,6 @@ msgstr "" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -282,17 +281,6 @@ msgid "Your short description about the plugin goes here" msgstr "Huraian ringkas anda tentang plugin anda di sini" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -#, fuzzy -msgid "A KDE4 Application" -msgstr "Aplikasi" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -350,7 +338,6 @@ msgstr "" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "" @@ -481,16 +468,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -msgid "KDevQt4Importer" -msgstr "" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 msgid "KDevQtImporter" msgstr "" @@ -2411,29 +2388,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "Program \"Hello World\" mudah dalam ada telah dicipta dalam %{dest}" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -#, fuzzy -msgid "KDE4 Application framework" -msgstr "Wizard Aplikasi" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "" @@ -2585,9 +2539,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "Projek QMake" @@ -2792,7 +2743,6 @@ msgstr "" #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2994,83 +2944,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "Program \"Hello World\" mudah dalam ada telah dicipta dalam %{dest}" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -#, fuzzy -msgid "Basic Qt4 Application" -msgstr "Aplikasi" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -#, fuzzy -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "Program \"Hello World\" mudah dalam ada telah dicipta dalam %{dest}" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Aplikasi" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -#, fuzzy -msgid "Qt4 Application" -msgstr "Aplikasi" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -#, fuzzy -msgid "Qtopia 4 Application" -msgstr "Aplikasi" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -#, fuzzy -msgid "A Qtopia application was created in %{dest}" -msgstr "Program \"Hello World\" mudah dalam ada telah dicipta dalam %{dest}" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 #, fuzzy @@ -3083,6 +2956,12 @@ msgstr "Aplikasi" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +#, fuzzy +msgid "A Qtopia application was created in %{dest}" +msgstr "Program \"Hello World\" mudah dalam ada telah dicipta dalam %{dest}" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3567,7 +3446,6 @@ msgstr "Menjana program Hello World mudah dalam Ada" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3579,25 +3457,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "Program \"Hello World\" mudah dalam ada telah dicipta dalam %{dest}" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -#, fuzzy -msgid "QtRuby4 Application" -msgstr "Aplikasi" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -#, fuzzy -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "Program \"Hello World\" mudah dalam ada telah dicipta dalam %{dest}" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 #, fuzzy msgid "QtRuby Application" @@ -3777,11 +3636,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3801,3 +3655,39 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "Aplikasi" + +#, fuzzy +#~ msgid "A KDE4 Application" +#~ msgstr "Aplikasi" + +#, fuzzy +#~ msgid "KDE4 Application framework" +#~ msgstr "Wizard Aplikasi" + +#, fuzzy +#~ msgid "Basic Qt4 Application" +#~ msgstr "Aplikasi" + +#, fuzzy +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "Program \"Hello World\" mudah dalam ada telah dicipta dalam %{dest}" + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Aplikasi" + +#, fuzzy +#~ msgid "Qt4 Application" +#~ msgstr "Aplikasi" + +#, fuzzy +#~ msgid "Qtopia 4 Application" +#~ msgstr "Aplikasi" + +#, fuzzy +#~ msgid "QtRuby4 Application" +#~ msgstr "Aplikasi" + +#, fuzzy +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "Program \"Hello World\" mudah dalam ada telah dicipta dalam %{dest}" diff --git a/translations/desktop_files/tdevelop-desktops/nds.po b/translations/desktop_files/tdevelop-desktops/nds.po index 47ff1bdc..0d9b3e96 100644 --- a/translations/desktop_files/tdevelop-desktops/nds.po +++ b/translations/desktop_files/tdevelop-desktops/nds.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -227,7 +227,6 @@ msgstr "Ãœnnerstütten för Bash" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -270,16 +269,6 @@ msgid "Your short description about the plugin goes here" msgstr "Hier kannst Du en kort Moduulbeschrieven ingeven" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "KProg4" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "En KDE4-Programm" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -338,7 +327,6 @@ msgstr "KDev%{ProgNaam}" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "En %{APPNAME}-Programm" @@ -467,16 +455,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "Import för duerhaftig Klassenspieker ut Bruker-Ornern" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -msgid "KDevQt4Importer" -msgstr "Qt4-PCS-Import (TDevelop)" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "Qt4-Import för duerhaftig Klassenspieker" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 msgid "KDevQtImporter" msgstr "Qt-PCS-Import (TDevelop)" @@ -2364,30 +2342,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "In %{dest} wöör en Moduul för Kate mit Instellensiet opstellt" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "KDE4-Programmrahmenwark" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" -"Stellt en eenfach KDE4-Programm mit een böverst Finster, Menüs un " -"Warktüüchbalkens op." - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "In %{dest} wöör en KDE4-Programm opstellt" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "Eenfach DCOP-Server" @@ -2549,9 +2503,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "QMake-Projekt" @@ -2759,7 +2710,6 @@ msgstr "Stellt en Opie-Programm op." #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2961,85 +2911,6 @@ msgstr "" "In %{dest} wöör en op Qt3 un QMake opbuut \"Moin Welt\"-Programm opstellt" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "Eenfach Qt4-Programm" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" -"Stellt en op QMake un Qt4 opbuut Programm op (över Bedriefümgeven weg " -"kompatibel) - Qt4 deit noot" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "In %{dest} wöör en op Qt4 un Qmake opbuut Programm opstellt" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "Afsluut Padd för QMake (Qt4)" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "Afsluut Padd för Designer (Qt4)" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Qt4-Programm" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" -"Stellt en op QMake un Qt4 opbuut Programm op (över Bedriefümgeven weg " -"kompatibel) - Qt4 deit noot" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "Qt4-Programm" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" -"Stellt en op QMake un Qt4 opbuut Programm op (över Bedriefümgeven weg " -"kompatibel) - Qt4 deit noot" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "Qtopia 4-Programm" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "Stellt en op QMake/Qt opbuut Programm för Qtopia 4.x op" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "In %{dest} wöör en Qtopia-Programm opstellt" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3051,6 +2922,11 @@ msgstr "Qtopia-Programm" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "Stellt en op TMake/Qt opbuut Programm för Qtopia 1.x op" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "In %{dest} wöör en Qtopia-Programm opstellt" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3533,7 +3409,6 @@ msgstr "Dit stellt en eenfach \"Moin Welt\"-Programm mit QtRuby op." #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3544,25 +3419,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "In %{dest} wöör en eenfach QtRuby-Programm opstellt." #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "QtRuby4-Programm" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" -"Stellt en op QRubyt4 opbuut Programm op (över Bedriefümgeven weg kompatibel) " -"- QtRuby4 deit noot" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "In %{dest} wöör en op QtRuby4 opbuut Programm opstellt." - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "QtRuby-Programm" @@ -3738,12 +3594,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -#, fuzzy -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "Qt4-Programm" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3763,3 +3613,92 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "QtRuby-Programm" + +#~ msgid "KApp4" +#~ msgstr "KProg4" + +#~ msgid "A KDE4 Application" +#~ msgstr "En KDE4-Programm" + +#~ msgid "KDevQt4Importer" +#~ msgstr "Qt4-PCS-Import (TDevelop)" + +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "Qt4-Import för duerhaftig Klassenspieker" + +#~ msgid "KDE4 Application framework" +#~ msgstr "KDE4-Programmrahmenwark" + +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "" +#~ "Stellt en eenfach KDE4-Programm mit een böverst Finster, Menüs un " +#~ "Warktüüchbalkens op." + +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "In %{dest} wöör en KDE4-Programm opstellt" + +#~ msgid "Basic Qt4 Application" +#~ msgstr "Eenfach Qt4-Programm" + +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "" +#~ "Stellt en op QMake un Qt4 opbuut Programm op (över Bedriefümgeven weg " +#~ "kompatibel) - Qt4 deit noot" + +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "In %{dest} wöör en op Qt4 un Qmake opbuut Programm opstellt" + +#~ msgid "Absolute Path for QMake (Qt4)." +#~ msgstr "Afsluut Padd för QMake (Qt4)" + +#~ msgid "Absolute Path for Designer (Qt4)." +#~ msgstr "Afsluut Padd för Designer (Qt4)" + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Qt4-Programm" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Stellt en op QMake un Qt4 opbuut Programm op (över Bedriefümgeven weg " +#~ "kompatibel) - Qt4 deit noot" + +#~ msgid "Qt4 Application" +#~ msgstr "Qt4-Programm" + +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Stellt en op QMake un Qt4 opbuut Programm op (över Bedriefümgeven weg " +#~ "kompatibel) - Qt4 deit noot" + +#~ msgid "Qtopia 4 Application" +#~ msgstr "Qtopia 4-Programm" + +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "Stellt en op QMake/Qt opbuut Programm för Qtopia 4.x op" + +#~ msgid "QtRuby4 Application" +#~ msgstr "QtRuby4-Programm" + +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "" +#~ "Stellt en op QRubyt4 opbuut Programm op (över Bedriefümgeven weg " +#~ "kompatibel) - QtRuby4 deit noot" + +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "In %{dest} wöör en op QtRuby4 opbuut Programm opstellt." + +#, fuzzy +#~ msgid "Qt4 C++ Application (QMake4 based)" +#~ msgstr "Qt4-Programm" diff --git a/translations/desktop_files/tdevelop-desktops/ne.po b/translations/desktop_files/tdevelop-desktops/ne.po index 5d212cab..8dfe5c3e 100644 --- a/translations/desktop_files/tdevelop-desktops/ne.po +++ b/translations/desktop_files/tdevelop-desktops/ne.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -227,7 +227,6 @@ msgstr "बà¥à¤¯à¤¾à¤¸ समरà¥à¤¥à¤¨" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -270,17 +269,6 @@ msgid "Your short description about the plugin goes here" msgstr "पà¥à¤²à¤—इनका बारेमा तपाईà¤à¤•à¥‹ छोटो à¤à¤¨à¤¾à¤‡ यसà¥à¤¤à¥‹ छ" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -#, fuzzy -msgid "A KDE4 Application" -msgstr "à¤à¤‰à¤Ÿà¤¾ केडीई KPart अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -339,7 +327,6 @@ msgstr "%{APPNAME}à¤à¤¾à¤—" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "%{APPNAME} कारà¥à¤¯à¤•à¥à¤°à¤®" @@ -471,18 +458,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "केडीई विकास अनà¥à¤•à¥‚ल डाइरेकà¥à¤Ÿà¤°à¥€ PCS आयातकरà¥à¤¤à¤¾" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "केडीई विकास PCS आयातकरà¥à¤¤à¤¾" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -#, fuzzy -msgid "TDevelop Qt4 PCS Importer" -msgstr "केडीई विकास PCS आयातकरà¥à¤¤à¤¾" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 #, fuzzy msgid "KDevQtImporter" @@ -2392,32 +2367,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "कनà¥à¤«à¤¿à¤— पृषà¥à¤ सà¤à¤— केटका लागि पà¥à¤²à¤—इन %{dest} मा सिरà¥à¤œà¤¨à¤¾ गरियो" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -#, fuzzy -msgid "KDE4 Application framework" -msgstr "अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— फà¥à¤°à¥‡à¤®à¤µà¤°à¥à¤•" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -#, fuzzy -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" -"à¤à¤‰à¤Ÿà¤¾ उचà¥à¤šà¤¤à¤¹ सञà¥à¤à¥à¤¯à¤¾à¤², मेनॠर उपकरणपटà¥à¤Ÿà¥€à¤¸à¤à¤— साधारण जाà¤à¤¾ केडीई अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— उतà¥à¤ªà¤¨à¥à¤¨ गरà¥à¤¦à¤› ।" - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -#, fuzzy -msgid "A KDE4 Application was created at %{dest}" -msgstr "TDE अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— %{dest} मा सिरà¥à¤œà¤¨à¤¾ गरियो" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "साधारण DCOP सरà¥à¤à¤°" @@ -2573,9 +2522,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "QMake परियोजना" @@ -2779,7 +2725,6 @@ msgstr "ओपिइ अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— उतà¥à¤ªà¤¨à¥à¤¨ गरॠ#: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2980,86 +2925,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "CMake आधारित हेलà¥à¤²à¥‹ वोलà¥à¤¡ कारà¥à¤¯à¤•à¥à¤°à¤® %{dest} मा सिरà¥à¤œà¤¨à¤¾ गरियो" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -#, fuzzy -msgid "Basic Qt4 Application" -msgstr "Qtopia अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -#, fuzzy -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "QtRuby आधारित अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— (कà¥à¤°à¤¸à¤ªà¥à¤²à¤¾à¤Ÿà¤«à¤°à¥à¤® उपयà¥à¤•à¥à¤¤) उतà¥à¤ªà¤¨à¥à¤¨ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -#, fuzzy -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "Qmake आधारित केडीई अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— %{dest} मा सिरà¥à¤œà¤¨à¤¾ गरियो" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Qtopia अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "QtRuby आधारित अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— (कà¥à¤°à¤¸à¤ªà¥à¤²à¤¾à¤Ÿà¤«à¤°à¥à¤® उपयà¥à¤•à¥à¤¤) उतà¥à¤ªà¤¨à¥à¤¨ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -#, fuzzy -msgid "Qt4 Application" -msgstr "Qtopia अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "QtRuby आधारित अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— (कà¥à¤°à¤¸à¤ªà¥à¤²à¤¾à¤Ÿà¤«à¤°à¥à¤® उपयà¥à¤•à¥à¤¤) उतà¥à¤ªà¤¨à¥à¤¨ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -#, fuzzy -msgid "Qtopia 4 Application" -msgstr "Qtopia अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -#, fuzzy -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "Qtopia 1.x का लागि TMake/Qt आधारित अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— उतà¥à¤ªà¤¨à¥à¤¨ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "Qtopia अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— %{dest} मा सिरà¥à¤œà¤¨à¤¾ गरियो" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3071,6 +2936,11 @@ msgstr "Qtopia अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "Qtopia 1.x का लागि TMake/Qt आधारित अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— उतà¥à¤ªà¤¨à¥à¤¨ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "Qtopia अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— %{dest} मा सिरà¥à¤œà¤¨à¤¾ गरियो" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3543,7 +3413,6 @@ msgstr "यसले साधारण QtRuby हेलà¥à¤²à¥‹ वोलà¥à¤ #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3554,26 +3423,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "साधारण QtRuby अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— %{dest} मा सिरà¥à¤œà¤¨à¤¾ गरियो" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -#, fuzzy -msgid "QtRuby4 Application" -msgstr "QtRuby अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -#, fuzzy -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "QtRuby आधारित अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— (कà¥à¤°à¤¸à¤ªà¥à¤²à¤¾à¤Ÿà¤«à¤°à¥à¤® उपयà¥à¤•à¥à¤¤) उतà¥à¤ªà¤¨à¥à¤¨ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -#, fuzzy -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "QtRuby आधारित अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— %{dest} मा सिरà¥à¤œà¤¨à¤¾ गरियो" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "QtRuby अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—" @@ -3748,11 +3597,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3772,3 +3616,86 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "QtRuby अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—" + +#, fuzzy +#~ msgid "A KDE4 Application" +#~ msgstr "à¤à¤‰à¤Ÿà¤¾ केडीई KPart अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—" + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "केडीई विकास PCS आयातकरà¥à¤¤à¤¾" + +#, fuzzy +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "केडीई विकास PCS आयातकरà¥à¤¤à¤¾" + +#, fuzzy +#~ msgid "KDE4 Application framework" +#~ msgstr "अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— फà¥à¤°à¥‡à¤®à¤µà¤°à¥à¤•" + +#, fuzzy +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "" +#~ "à¤à¤‰à¤Ÿà¤¾ उचà¥à¤šà¤¤à¤¹ सञà¥à¤à¥à¤¯à¤¾à¤², मेनॠर उपकरणपटà¥à¤Ÿà¥€à¤¸à¤à¤— साधारण जाà¤à¤¾ केडीई अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— उतà¥à¤ªà¤¨à¥à¤¨ गरà¥à¤¦à¤› ।" + +#, fuzzy +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "TDE अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— %{dest} मा सिरà¥à¤œà¤¨à¤¾ गरियो" + +#, fuzzy +#~ msgid "Basic Qt4 Application" +#~ msgstr "Qtopia अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—" + +#, fuzzy +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "QtRuby आधारित अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— (कà¥à¤°à¤¸à¤ªà¥à¤²à¤¾à¤Ÿà¤«à¤°à¥à¤® उपयà¥à¤•à¥à¤¤) उतà¥à¤ªà¤¨à¥à¤¨ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥" + +#, fuzzy +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "Qmake आधारित केडीई अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— %{dest} मा सिरà¥à¤œà¤¨à¤¾ गरियो" + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Qtopia अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "QtRuby आधारित अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— (कà¥à¤°à¤¸à¤ªà¥à¤²à¤¾à¤Ÿà¤«à¤°à¥à¤® उपयà¥à¤•à¥à¤¤) उतà¥à¤ªà¤¨à¥à¤¨ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥" + +#, fuzzy +#~ msgid "Qt4 Application" +#~ msgstr "Qtopia अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "QtRuby आधारित अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— (कà¥à¤°à¤¸à¤ªà¥à¤²à¤¾à¤Ÿà¤«à¤°à¥à¤® उपयà¥à¤•à¥à¤¤) उतà¥à¤ªà¤¨à¥à¤¨ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥" + +#, fuzzy +#~ msgid "Qtopia 4 Application" +#~ msgstr "Qtopia अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—" + +#, fuzzy +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "Qtopia 1.x का लागि TMake/Qt आधारित अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— उतà¥à¤ªà¤¨à¥à¤¨ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥" + +#, fuzzy +#~ msgid "QtRuby4 Application" +#~ msgstr "QtRuby अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—" + +#, fuzzy +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "QtRuby आधारित अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— (कà¥à¤°à¤¸à¤ªà¥à¤²à¤¾à¤Ÿà¤«à¤°à¥à¤® उपयà¥à¤•à¥à¤¤) उतà¥à¤ªà¤¨à¥à¤¨ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥" + +#, fuzzy +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "QtRuby आधारित अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— %{dest} मा सिरà¥à¤œà¤¨à¤¾ गरियो" diff --git a/translations/desktop_files/tdevelop-desktops/nl.po b/translations/desktop_files/tdevelop-desktops/nl.po index 5121e854..c8f7a1c6 100644 --- a/translations/desktop_files/tdevelop-desktops/nl.po +++ b/translations/desktop_files/tdevelop-desktops/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -240,7 +240,6 @@ msgstr "Ondersteuning voor Bash" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -283,16 +282,6 @@ msgid "Your short description about the plugin goes here" msgstr "Hier kunt u een korte omschrijving opgeven" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "Een KDE4-programma" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -352,7 +341,6 @@ msgstr "%{APPNAME}-plugin" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "Een %{APPNAME} programma" @@ -486,18 +474,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "TDevelop PCS Importer voor eigen mappen" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "TDevelop PCS importeren" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -#, fuzzy -msgid "TDevelop Qt4 PCS Importer" -msgstr "TDevelop PCS importeren" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 #, fuzzy msgid "KDevQtImporter" @@ -2411,30 +2387,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "Een plugin voor Kate met een config page is aangemaakt in %{dest}" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "KDE4-programmaframewerk" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" -"Genereert een eenvoudig KDE4-programma met een topniveauvenster, menu's en " -"werkbalken." - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "Een KDE4-toepassing is aangemaakt in %{dest}" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "Eenvoudige DCOP-server" @@ -2596,9 +2548,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "QMake-project" @@ -2810,7 +2759,6 @@ msgstr "Genereert een Opie-toepassing" #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -3009,85 +2957,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "Een Qmake/Qt3-gebaseerd Hello World-programma is aangemaakt in %{dest}" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "Basis Qt4-toepassing" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" -"Genereert een heel eenvoudig Qmake/Qt4-gebaseerde toepassing (crossplatform " -"compatible) - heeft Qt4 nodig" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "Een Qt4/Qmake gebaseerde toepassing is aangemaakt in %{dest}" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "Absoluut pad naar QMake (Qt4)." - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "Absoluut pad naar Designer (Qt4)." - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Qt4-toepassing" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" -"Genereer een Qmake/Qt4-gebaseerde toepassing (crossplatform compatible) - " -"heeft Qt4 nodig" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "Qt4-toepassing" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" -"Genereer een Qmake/Qt4-gebaseerde toepassing (crossplatform compatible) - " -"heeft Qt4 nodig" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "Qtopia4-programma" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "Genereer een Qmake/Qt-gebaseerd programma voor Qtopia 4.x" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "Een Qtopia-toepassing is aangemaakt in %{dest}" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3099,6 +2968,11 @@ msgstr "Qtopia-toepassing" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "Genereert een Tmake/Qt-gebaseerde toepassing voor Qtopie 1.x" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "Een Qtopia-toepassing is aangemaakt in %{dest}" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3588,7 +3462,6 @@ msgstr "Dit genereert een eenvoudige QtRuby Hello World-toepassing" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3599,25 +3472,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "Een eenvoudige QtRuby-toepassing is aangemaakt in %{dest}" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "QtRuby4-programma" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" -"Genereer een QtRuby4-gebaseerd programma (crossplatform-compatible) - heeft " -"QtRuby4 nodig" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "Een QtRuby4-gebaseerd programma is aangemaakt in %{dest}" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "QtRuby-toepassing" @@ -3792,12 +3646,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -#, fuzzy -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "Qt4-toepassing" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3817,3 +3665,91 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "QtRuby-toepassing" + +#~ msgid "A KDE4 Application" +#~ msgstr "Een KDE4-programma" + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "TDevelop PCS importeren" + +#, fuzzy +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "TDevelop PCS importeren" + +#~ msgid "KDE4 Application framework" +#~ msgstr "KDE4-programmaframewerk" + +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "" +#~ "Genereert een eenvoudig KDE4-programma met een topniveauvenster, menu's " +#~ "en werkbalken." + +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "Een KDE4-toepassing is aangemaakt in %{dest}" + +#~ msgid "Basic Qt4 Application" +#~ msgstr "Basis Qt4-toepassing" + +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "" +#~ "Genereert een heel eenvoudig Qmake/Qt4-gebaseerde toepassing " +#~ "(crossplatform compatible) - heeft Qt4 nodig" + +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "Een Qt4/Qmake gebaseerde toepassing is aangemaakt in %{dest}" + +#~ msgid "Absolute Path for QMake (Qt4)." +#~ msgstr "Absoluut pad naar QMake (Qt4)." + +#~ msgid "Absolute Path for Designer (Qt4)." +#~ msgstr "Absoluut pad naar Designer (Qt4)." + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Qt4-toepassing" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Genereer een Qmake/Qt4-gebaseerde toepassing (crossplatform compatible) - " +#~ "heeft Qt4 nodig" + +#~ msgid "Qt4 Application" +#~ msgstr "Qt4-toepassing" + +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Genereer een Qmake/Qt4-gebaseerde toepassing (crossplatform compatible) - " +#~ "heeft Qt4 nodig" + +#~ msgid "Qtopia 4 Application" +#~ msgstr "Qtopia4-programma" + +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "Genereer een Qmake/Qt-gebaseerd programma voor Qtopia 4.x" + +#~ msgid "QtRuby4 Application" +#~ msgstr "QtRuby4-programma" + +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "" +#~ "Genereer een QtRuby4-gebaseerd programma (crossplatform-compatible) - " +#~ "heeft QtRuby4 nodig" + +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "Een QtRuby4-gebaseerd programma is aangemaakt in %{dest}" + +#, fuzzy +#~ msgid "Qt4 C++ Application (QMake4 based)" +#~ msgstr "Qt4-toepassing" diff --git a/translations/desktop_files/tdevelop-desktops/pa.po b/translations/desktop_files/tdevelop-desktops/pa.po index 58d395bf..0e76f04c 100644 --- a/translations/desktop_files/tdevelop-desktops/pa.po +++ b/translations/desktop_files/tdevelop-desktops/pa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -238,7 +238,6 @@ msgstr "C ਸਹਿਯੋਗ" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -280,16 +279,6 @@ msgid "Your short description about the plugin goes here" msgstr "" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -346,7 +335,6 @@ msgstr "" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "" @@ -474,16 +462,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -msgid "KDevQt4Importer" -msgstr "" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 msgid "KDevQtImporter" msgstr "" @@ -2276,28 +2254,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "" @@ -2443,9 +2399,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "QMake ਪà©à¨°à©‹à¨œà©ˆà¨•à¨Ÿ" @@ -2643,7 +2596,6 @@ msgstr "" #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2832,77 +2784,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -msgid "Qt4/QMake Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -2914,6 +2795,11 @@ msgstr "" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3373,7 +3259,6 @@ msgstr "" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3384,23 +3269,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "" @@ -3568,11 +3436,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" diff --git a/translations/desktop_files/tdevelop-desktops/pl.po b/translations/desktop_files/tdevelop-desktops/pl.po index 8dd54bb2..ae976740 100644 --- a/translations/desktop_files/tdevelop-desktops/pl.po +++ b/translations/desktop_files/tdevelop-desktops/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -228,7 +228,6 @@ msgstr "ObsÅ‚uga bash-a" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -271,16 +270,6 @@ msgid "Your short description about the plugin goes here" msgstr "Tu powinien siÄ™ pojawić krótki opis wtyczki" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "Program dla KDE4" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -340,7 +329,6 @@ msgstr "Wtyczka %{APPNAME}" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "Program %{APPNAME}" @@ -469,17 +457,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "WÅ‚asny program do importowania PCS dla TDevelopa" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "KDevImportQt" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "TDevelop: importowanie PCS Qt4" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 msgid "KDevQtImporter" msgstr "KDevImportQt" @@ -2382,29 +2359,6 @@ msgstr "" "Wtyczka do Kate wraz ze stronÄ… konfiguracyjnÄ… zostaÅ‚a utworzona w %{dest}" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "Szablon programu dla KDE4" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" -"Generuje prosty program dla KDE4 posiadajÄ…cy okno, menu i paski narzÄ™dzi." - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "Program dla KDE4 zostaÅ‚ utworzony w %{dest}" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "Prosty serwer DCOP" @@ -2557,9 +2511,6 @@ msgstr "Generuje prosty program TDE używajÄ…cy menedżera projektów QMake" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "Projekt: QMake" @@ -2762,7 +2713,6 @@ msgstr "Generuje program Opie." #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2958,83 +2908,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "Prosty program używajÄ…cy Qmake/Qt3 zostaÅ‚ utworzony w %{dest}" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "Prosty program w Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "Generuje program używajÄ…cy QMake i Qt4 (wieloplatformowy)" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "Program używajÄ…cy QMake i Qt4 zostaÅ‚ utworzony w %{dest}" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "Åšcieżka bezwzglÄ™dna do QMake (Qt4)." - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "Åšcieżka bezwzglÄ™dna do Designera (Qt4)." - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Program Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" -"Generuje program używajÄ…cy QMake i Qt4 (wieloplatformowy) - wymaga " -"biblioteki Qt4" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "Program Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" -"Generuje program używajÄ…cy QMake i Qt4 (wieloplatformowy) - wymaga " -"biblioteki Qt4" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "Program wykorzystujÄ…cy QtopiÄ™ 4" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "Generuje program wykorzystujÄ…cy QMake/Qt dla Qtopii 4.x" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "Program wykorzystujÄ…cy QtopiÄ™ zostaÅ‚ utworzony w %{dest}" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3046,6 +2919,11 @@ msgstr "Program wykorzystujÄ…cy QtopiÄ™" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "Generuje program wykorzystujÄ…cy TMake i Qt dla Qtopii 1.x" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "Program wykorzystujÄ…cy QtopiÄ™ zostaÅ‚ utworzony w %{dest}" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3524,7 +3402,6 @@ msgstr "Generuje prosty program \"Witaj Å›wiecie\" w QtRuby" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3535,23 +3412,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "Prosty program w QtRuby zostaÅ‚ utworzony w %{dest}" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "Program w QtRuby" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "Generuje program używajÄ…cy QtRuby4 (wieloplatformowy) - wymaga QtRuby4" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "Program używajÄ…cy QtRuby4 zostaÅ‚ utworzony w %{dest}" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "Program w QtRuby" @@ -3726,12 +3586,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -#, fuzzy -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "Program Qt4" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3751,3 +3605,86 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "Program w QtRuby" + +#~ msgid "A KDE4 Application" +#~ msgstr "Program dla KDE4" + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "KDevImportQt" + +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "TDevelop: importowanie PCS Qt4" + +#~ msgid "KDE4 Application framework" +#~ msgstr "Szablon programu dla KDE4" + +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "" +#~ "Generuje prosty program dla KDE4 posiadajÄ…cy okno, menu i paski narzÄ™dzi." + +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "Program dla KDE4 zostaÅ‚ utworzony w %{dest}" + +#~ msgid "Basic Qt4 Application" +#~ msgstr "Prosty program w Qt4" + +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "Generuje program używajÄ…cy QMake i Qt4 (wieloplatformowy)" + +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "Program używajÄ…cy QMake i Qt4 zostaÅ‚ utworzony w %{dest}" + +#~ msgid "Absolute Path for QMake (Qt4)." +#~ msgstr "Åšcieżka bezwzglÄ™dna do QMake (Qt4)." + +#~ msgid "Absolute Path for Designer (Qt4)." +#~ msgstr "Åšcieżka bezwzglÄ™dna do Designera (Qt4)." + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Program Qt4" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Generuje program używajÄ…cy QMake i Qt4 (wieloplatformowy) - wymaga " +#~ "biblioteki Qt4" + +#~ msgid "Qt4 Application" +#~ msgstr "Program Qt4" + +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Generuje program używajÄ…cy QMake i Qt4 (wieloplatformowy) - wymaga " +#~ "biblioteki Qt4" + +#~ msgid "Qtopia 4 Application" +#~ msgstr "Program wykorzystujÄ…cy QtopiÄ™ 4" + +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "Generuje program wykorzystujÄ…cy QMake/Qt dla Qtopii 4.x" + +#~ msgid "QtRuby4 Application" +#~ msgstr "Program w QtRuby" + +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "" +#~ "Generuje program używajÄ…cy QtRuby4 (wieloplatformowy) - wymaga QtRuby4" + +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "Program używajÄ…cy QtRuby4 zostaÅ‚ utworzony w %{dest}" + +#, fuzzy +#~ msgid "Qt4 C++ Application (QMake4 based)" +#~ msgstr "Program Qt4" diff --git a/translations/desktop_files/tdevelop-desktops/pt.po b/translations/desktop_files/tdevelop-desktops/pt.po index 58dd5f23..a64296fb 100644 --- a/translations/desktop_files/tdevelop-desktops/pt.po +++ b/translations/desktop_files/tdevelop-desktops/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -239,7 +239,6 @@ msgstr "Suporte de Bash" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -281,16 +280,6 @@ msgid "Your short description about the plugin goes here" msgstr "Aqui deverá colocar uma descrição do 'plugin'" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "Uma Aplicação do KDE4" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -350,7 +339,6 @@ msgstr "%{APPNAME}" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "Um Programa %{APPNAME}" @@ -482,17 +470,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "Importador de PCS com Directoria Personalizada do TDevelop" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "Importador de PCS para Qt4 do TDevelop" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "Importador de PCS para Qt4 do TDevelop" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 #, fuzzy msgid "KDevQtImporter" @@ -2420,30 +2397,6 @@ msgstr "" "%{dest}" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "Plataforma de aplicações do KDE4" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" -"Gera uma aplicação para KDE4 simples, com uma janela de topo, menus e barras " -"de ferramentas." - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "Foi criada uma aplicação do KDE4 em %{dest}" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "Servidor de DCOP simples" @@ -2601,9 +2554,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "Projecto QMake" @@ -2813,7 +2763,6 @@ msgstr "Gera uma aplicação do Opie." #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -3012,85 +2961,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "Foi criado um programa Olá Mundo, baseado no Qmake/Qt3, em %{dest}" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "Aplicação Básica em Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" -"Gera uma aplicação baseada no QMake/Qt4 (compatÃvel com várias plataformas) " -"- Necessita do Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "Foi criada uma aplicação baseada no Qt4/Qmake em %{dest}" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "Localização Absoluta do QMake (Qt4)." - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "Localização Absoluta do Designer (Qt4)." - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Aplicação do Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" -"Gera uma aplicação baseada no QMake/Qt4 (compatÃvel com várias plataformas) " -"- Necessita do Qt4" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "Aplicação do Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" -"Gera uma aplicação baseada no QMake/Qt4 (compatÃvel com várias plataformas) " -"- Necessita do Qt4" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "Aplicação do Qtopia 4" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "Gera uma aplicação, baseada no QMake/Qt, para o Qtopia 4.x" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "Foi criada uma aplicação do Qtopia em %{dest}" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3102,6 +2972,11 @@ msgstr "Aplicação do Qtopia" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "Gera uma aplicação, baseada no TMake/Qt, para o Qtopia 1.x" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "Foi criada uma aplicação do Qtopia em %{dest}" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3584,7 +3459,6 @@ msgstr "Isto gera uma aplicação Olá Mundo simples em QtRuby" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3595,25 +3469,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "Foi criada uma aplicação simples de QtRuby em %{dest}" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "Aplicação em QtRuby4" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" -"Gera uma aplicação baseada no QtRuby4 (compatÃvel com várias plataformas) - " -"Necessita do QtRuby4" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "Foi criada uma aplicação baseada em QtRuby4 em %{dest}" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "Aplicação em QtRuby" @@ -3789,12 +3644,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -#, fuzzy -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "Aplicação do Qt4" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3814,3 +3663,90 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "Aplicação em QtRuby" + +#~ msgid "A KDE4 Application" +#~ msgstr "Uma Aplicação do KDE4" + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "Importador de PCS para Qt4 do TDevelop" + +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "Importador de PCS para Qt4 do TDevelop" + +#~ msgid "KDE4 Application framework" +#~ msgstr "Plataforma de aplicações do KDE4" + +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "" +#~ "Gera uma aplicação para KDE4 simples, com uma janela de topo, menus e " +#~ "barras de ferramentas." + +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "Foi criada uma aplicação do KDE4 em %{dest}" + +#~ msgid "Basic Qt4 Application" +#~ msgstr "Aplicação Básica em Qt4" + +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "" +#~ "Gera uma aplicação baseada no QMake/Qt4 (compatÃvel com várias " +#~ "plataformas) - Necessita do Qt4" + +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "Foi criada uma aplicação baseada no Qt4/Qmake em %{dest}" + +#~ msgid "Absolute Path for QMake (Qt4)." +#~ msgstr "Localização Absoluta do QMake (Qt4)." + +#~ msgid "Absolute Path for Designer (Qt4)." +#~ msgstr "Localização Absoluta do Designer (Qt4)." + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Aplicação do Qt4" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Gera uma aplicação baseada no QMake/Qt4 (compatÃvel com várias " +#~ "plataformas) - Necessita do Qt4" + +#~ msgid "Qt4 Application" +#~ msgstr "Aplicação do Qt4" + +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Gera uma aplicação baseada no QMake/Qt4 (compatÃvel com várias " +#~ "plataformas) - Necessita do Qt4" + +#~ msgid "Qtopia 4 Application" +#~ msgstr "Aplicação do Qtopia 4" + +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "Gera uma aplicação, baseada no QMake/Qt, para o Qtopia 4.x" + +#~ msgid "QtRuby4 Application" +#~ msgstr "Aplicação em QtRuby4" + +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "" +#~ "Gera uma aplicação baseada no QtRuby4 (compatÃvel com várias plataformas) " +#~ "- Necessita do QtRuby4" + +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "Foi criada uma aplicação baseada em QtRuby4 em %{dest}" + +#, fuzzy +#~ msgid "Qt4 C++ Application (QMake4 based)" +#~ msgstr "Aplicação do Qt4" diff --git a/translations/desktop_files/tdevelop-desktops/pt_BR.po b/translations/desktop_files/tdevelop-desktops/pt_BR.po index 33ec9b5c..9671a766 100644 --- a/translations/desktop_files/tdevelop-desktops/pt_BR.po +++ b/translations/desktop_files/tdevelop-desktops/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -238,7 +238,6 @@ msgstr "Suporte ao Bash" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -281,16 +280,6 @@ msgid "Your short description about the plugin goes here" msgstr "Sua descrição sumária sobre o plug-in vai aqui" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "Uma Aplicação do KDE4" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -349,7 +338,6 @@ msgstr "Parte %{APPNAME}" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "Um Programa %{APPNAME}" @@ -481,17 +469,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "Importador de Diretório PCS Personalizado para o TDevelop" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "Importador de PCS para Qt4 do TDevelop" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "Importador de PCS para Qt4 do TDevelop" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 #, fuzzy msgid "KDevQtImporter" @@ -2418,30 +2395,6 @@ msgstr "" "%{dest}" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "Plataforma de aplicações do KDE4" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" -"Gera uma aplicação para KDE4 simples, com uma janela de topo, menus e barras " -"de ferramentas." - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "Foi criada uma aplicação do KDE4 em %{dest}" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "Servidor de DCOP simples" @@ -2599,9 +2552,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "Projeto QMake" @@ -2811,7 +2761,6 @@ msgstr "Gera uma aplicação do Opie." #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -3010,85 +2959,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "Foi criado um programa Olá Mundo, baseado no Qmake/Qt3, em %{dest}" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "Aplicação Básica em Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" -"Gera uma aplicação baseada no QMake/Qt4 (compatÃvel com várias plataformas) " -"- Necessita do Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "Foi criada uma aplicação baseada no Qt4/Qmake em %{dest}" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "Localização Absoluta do QMake (Qt4)." - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "Localização Absoluta do Designer (Qt4)." - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Aplicação do Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" -"Gera uma aplicação baseada no QMake/Qt4 (compatÃvel com várias plataformas) " -"- Necessita do Qt4" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "Aplicação do Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" -"Gera uma aplicação baseada no QMake/Qt4 (compatÃvel com várias plataformas) " -"- Necessita do Qt4" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "Aplicação do Qtopia 4" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "Gera uma aplicação, baseada no QMake/Qt, para o Qtopia 4.x" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "Foi criada uma aplicação do Qtopia em %{dest}" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3100,6 +2970,11 @@ msgstr "Aplicação do Qtopia" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "Gera uma aplicação, baseada no TMake/Qt, para o Qtopia 1.x" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "Foi criada uma aplicação do Qtopia em %{dest}" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3582,7 +3457,6 @@ msgstr "Isto gera uma aplicação Olá Mundo simples em QtRuby" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3593,25 +3467,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "Foi criada uma aplicação simples de QtRuby em %{dest}" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "Aplicativo QtRuby4" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" -"Gera uma aplicação baseada no QtRuby4 (compatÃvel com várias plataformas) - " -"Necessita do QtRuby4" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "Foi criada uma aplicação baseada em QtRuby4 em %{dest}" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "Aplicativo QtRuby" @@ -3787,12 +3642,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -#, fuzzy -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "Aplicação do Qt4" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3812,3 +3661,90 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "Aplicativo QtRuby" + +#~ msgid "A KDE4 Application" +#~ msgstr "Uma Aplicação do KDE4" + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "Importador de PCS para Qt4 do TDevelop" + +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "Importador de PCS para Qt4 do TDevelop" + +#~ msgid "KDE4 Application framework" +#~ msgstr "Plataforma de aplicações do KDE4" + +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "" +#~ "Gera uma aplicação para KDE4 simples, com uma janela de topo, menus e " +#~ "barras de ferramentas." + +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "Foi criada uma aplicação do KDE4 em %{dest}" + +#~ msgid "Basic Qt4 Application" +#~ msgstr "Aplicação Básica em Qt4" + +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "" +#~ "Gera uma aplicação baseada no QMake/Qt4 (compatÃvel com várias " +#~ "plataformas) - Necessita do Qt4" + +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "Foi criada uma aplicação baseada no Qt4/Qmake em %{dest}" + +#~ msgid "Absolute Path for QMake (Qt4)." +#~ msgstr "Localização Absoluta do QMake (Qt4)." + +#~ msgid "Absolute Path for Designer (Qt4)." +#~ msgstr "Localização Absoluta do Designer (Qt4)." + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Aplicação do Qt4" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Gera uma aplicação baseada no QMake/Qt4 (compatÃvel com várias " +#~ "plataformas) - Necessita do Qt4" + +#~ msgid "Qt4 Application" +#~ msgstr "Aplicação do Qt4" + +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Gera uma aplicação baseada no QMake/Qt4 (compatÃvel com várias " +#~ "plataformas) - Necessita do Qt4" + +#~ msgid "Qtopia 4 Application" +#~ msgstr "Aplicação do Qtopia 4" + +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "Gera uma aplicação, baseada no QMake/Qt, para o Qtopia 4.x" + +#~ msgid "QtRuby4 Application" +#~ msgstr "Aplicativo QtRuby4" + +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "" +#~ "Gera uma aplicação baseada no QtRuby4 (compatÃvel com várias plataformas) " +#~ "- Necessita do QtRuby4" + +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "Foi criada uma aplicação baseada em QtRuby4 em %{dest}" + +#, fuzzy +#~ msgid "Qt4 C++ Application (QMake4 based)" +#~ msgstr "Aplicação do Qt4" diff --git a/translations/desktop_files/tdevelop-desktops/ro.po b/translations/desktop_files/tdevelop-desktops/ro.po index 688660de..ba16ba60 100644 --- a/translations/desktop_files/tdevelop-desktops/ro.po +++ b/translations/desktop_files/tdevelop-desktops/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -236,7 +236,6 @@ msgstr "" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -278,16 +277,6 @@ msgid "Your short description about the plugin goes here" msgstr "" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -344,7 +333,6 @@ msgstr "" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "" @@ -470,16 +458,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -msgid "KDevQt4Importer" -msgstr "" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 msgid "KDevQtImporter" msgstr "" @@ -2254,28 +2232,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "" @@ -2421,9 +2377,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 msgid "C++/QMake project" msgstr "" @@ -2620,7 +2573,6 @@ msgstr "" #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2809,77 +2761,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -msgid "Qt4/QMake Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -2891,6 +2772,11 @@ msgstr "" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3348,7 +3234,6 @@ msgstr "" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3359,23 +3244,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "" @@ -3543,11 +3411,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" diff --git a/translations/desktop_files/tdevelop-desktops/ru.po b/translations/desktop_files/tdevelop-desktops/ru.po index 11674f0c..e0f5cb8a 100644 --- a/translations/desktop_files/tdevelop-desktops/ru.po +++ b/translations/desktop_files/tdevelop-desktops/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -239,7 +239,6 @@ msgstr "Поддержка Ñзыка Bash" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -282,16 +281,6 @@ msgid "Your short description about the plugin goes here" msgstr "ЗдеÑÑŒ раÑполагаетÑÑ ÐºÑ€Ð°Ñ‚ÐºÐ¾Ðµ опиÑание модулÑ" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "Приложение KDE 4" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -351,7 +340,6 @@ msgstr "Модуль %{APPNAME}" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "Программа %{APPNAME}" @@ -483,16 +471,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "Загрузка Ñимволов из любого каталога в хранилище клаÑÑов" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -msgid "KDevQt4Importer" -msgstr "KDevQt 4Importer" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "Импорт Qt 4 PCS в TDevelop" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 #, fuzzy msgid "KDevQtImporter" @@ -2397,30 +2375,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "Модуль Kate Ñ Ð´Ð¸Ð°Ð»Ð¾Ð³Ð¾Ð¼ наÑтройки Ñоздан в %{dest}" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "ИнÑтрументарий Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹ KDE 4" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" -"Создание проÑтого Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ KDE 4 Ñ Ð¾Ð´Ð½Ð¸Ð¼ окном верхнего уровнÑ, меню и " -"панелÑми инÑтрументов." - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "Приложение KDE 4 Ñоздано в %{dest}" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "Сервер DCOP" @@ -2572,9 +2526,6 @@ msgstr "Создание проÑтого Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ TDE как про #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "Проект QMake" @@ -2776,7 +2727,6 @@ msgstr "Создание приложение Opie." #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2968,80 +2918,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "Программа на Qt 3, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑŽÑ‰Ð°Ñ QMake, Ñоздана в %{dest}" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "ПроÑтое приложение Qt 4" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" -"Создание проÑтого кроÑÑплатформенного Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt 4, иÑпользующего QMake." - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "Приложение Qt 4, иÑпользующее Qmake, Ñоздано в %{dest}" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "Полный путь к QMake (Qt 4)." - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "Полный путь к Designer (Qt 4)." - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Приложение Qt 4" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "Создание кроÑÑплатформенного Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt 4, иÑпользующего QMake" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "Приложение Qt 4" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "Создание кроÑÑплатформенного Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt 4, иÑпользующего QMake" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "Приложение Qtopia 4" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "Создание Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt, иÑпользующего QMake, Ð´Ð»Ñ Qtopia 4.x" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "Приложение Qtopia Ñоздано в %{dest}" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3053,6 +2929,11 @@ msgstr "Приложение Qtopia" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "Создание Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt Ñо Ñборкой поÑредÑтвом TMake Ð´Ð»Ñ Qtopia 1.x" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "Приложение Qtopia Ñоздано в %{dest}" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3521,7 +3402,6 @@ msgstr "Создание проÑтого Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Hello World на #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3532,23 +3412,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "ПроÑтое приложение QtRuby Ñоздано в %{dest}" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "Приложение QtRuby4" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "Создание кроÑÑплатформенного Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt 4 на Ruby. Требует QtRuby4." - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "Приложение QtRuby4 Ñоздано в %{dest}" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "Приложение QtRuby" @@ -3723,12 +3586,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -#, fuzzy -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "Приложение Qt 4" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3748,3 +3605,84 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "Приложение QtRuby" + +#~ msgid "A KDE4 Application" +#~ msgstr "Приложение KDE 4" + +#~ msgid "KDevQt4Importer" +#~ msgstr "KDevQt 4Importer" + +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "Импорт Qt 4 PCS в TDevelop" + +#~ msgid "KDE4 Application framework" +#~ msgstr "ИнÑтрументарий Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹ KDE 4" + +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "" +#~ "Создание проÑтого Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ KDE 4 Ñ Ð¾Ð´Ð½Ð¸Ð¼ окном верхнего уровнÑ, меню и " +#~ "панелÑми инÑтрументов." + +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "Приложение KDE 4 Ñоздано в %{dest}" + +#~ msgid "Basic Qt4 Application" +#~ msgstr "ПроÑтое приложение Qt 4" + +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "" +#~ "Создание проÑтого кроÑÑплатформенного Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt 4, иÑпользующего " +#~ "QMake." + +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "Приложение Qt 4, иÑпользующее Qmake, Ñоздано в %{dest}" + +#~ msgid "Absolute Path for QMake (Qt4)." +#~ msgstr "Полный путь к QMake (Qt 4)." + +#~ msgid "Absolute Path for Designer (Qt4)." +#~ msgstr "Полный путь к Designer (Qt 4)." + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Приложение Qt 4" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "Создание кроÑÑплатформенного Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt 4, иÑпользующего QMake" + +#~ msgid "Qt4 Application" +#~ msgstr "Приложение Qt 4" + +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "Создание кроÑÑплатформенного Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt 4, иÑпользующего QMake" + +#~ msgid "Qtopia 4 Application" +#~ msgstr "Приложение Qtopia 4" + +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "Создание Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt, иÑпользующего QMake, Ð´Ð»Ñ Qtopia 4.x" + +#~ msgid "QtRuby4 Application" +#~ msgstr "Приложение QtRuby4" + +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "" +#~ "Создание кроÑÑплатформенного Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt 4 на Ruby. Требует QtRuby4." + +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "Приложение QtRuby4 Ñоздано в %{dest}" + +#, fuzzy +#~ msgid "Qt4 C++ Application (QMake4 based)" +#~ msgstr "Приложение Qt 4" diff --git a/translations/desktop_files/tdevelop-desktops/rw.po b/translations/desktop_files/tdevelop-desktops/rw.po index 335e2473..ad27bc3e 100644 --- a/translations/desktop_files/tdevelop-desktops/rw.po +++ b/translations/desktop_files/tdevelop-desktops/rw.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -227,7 +227,6 @@ msgstr "" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -270,17 +269,6 @@ msgid "Your short description about the plugin goes here" msgstr "" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -#, fuzzy -msgid "A KDE4 Application" -msgstr "Porogaramu" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -338,7 +326,6 @@ msgstr "" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "" @@ -464,16 +451,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -msgid "KDevQt4Importer" -msgstr "" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 msgid "KDevQtImporter" msgstr "" @@ -2253,28 +2230,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "" @@ -2421,9 +2376,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 msgid "C++/QMake project" msgstr "" @@ -2621,7 +2573,6 @@ msgstr "" #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2810,81 +2761,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -#, fuzzy -msgid "Basic Qt4 Application" -msgstr "Porogaramu" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Porogaramu" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -#, fuzzy -msgid "Qt4 Application" -msgstr "Porogaramu" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -#, fuzzy -msgid "Qtopia 4 Application" -msgstr "Porogaramu" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 #, fuzzy @@ -2897,6 +2773,11 @@ msgstr "Porogaramu" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3356,7 +3237,6 @@ msgstr "" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3367,24 +3247,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -#, fuzzy -msgid "QtRuby4 Application" -msgstr "Porogaramu" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 #, fuzzy msgid "QtRuby Application" @@ -3558,11 +3420,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3582,3 +3439,27 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "Porogaramu" + +#, fuzzy +#~ msgid "A KDE4 Application" +#~ msgstr "Porogaramu" + +#, fuzzy +#~ msgid "Basic Qt4 Application" +#~ msgstr "Porogaramu" + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Porogaramu" + +#, fuzzy +#~ msgid "Qt4 Application" +#~ msgstr "Porogaramu" + +#, fuzzy +#~ msgid "Qtopia 4 Application" +#~ msgstr "Porogaramu" + +#, fuzzy +#~ msgid "QtRuby4 Application" +#~ msgstr "Porogaramu" diff --git a/translations/desktop_files/tdevelop-desktops/sk.po b/translations/desktop_files/tdevelop-desktops/sk.po index 09edb6ec..79d1fd36 100644 --- a/translations/desktop_files/tdevelop-desktops/sk.po +++ b/translations/desktop_files/tdevelop-desktops/sk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -228,7 +228,6 @@ msgstr "Podpora Bash" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -271,16 +270,6 @@ msgid "Your short description about the plugin goes here" msgstr "Sem vložte krátky popis modulu" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "KDE4 aplikácia" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -340,7 +329,6 @@ msgstr "%{APPNAME} modul" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "%{APPNAME} program" @@ -469,17 +457,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "TDevelop vlastný PCS import prieÄinkov" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "KDev PCS vlastný import" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "TDevelop Qt4 PCS import" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 #, fuzzy msgid "KDevQtImporter" @@ -2348,30 +2325,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "Modul pre Kate s konfiguraÄnou stránkou bol vytvorený v %{dest}" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "KDE4 aplikaÄný framework" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" -"Vygeneruje jednoduchú KDE4 aplikáciu s jedným oknom, menu a panelom " -"nástrojov." - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "KDE4 aplikácia bola vytvorená v %{dest}" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "Jednoduchý DCOP server" @@ -2527,9 +2480,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "QMake projekt" @@ -2736,7 +2686,6 @@ msgstr "Vygeneruje Opie aplikáciu." #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2935,85 +2884,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "Ahoj svet program založený na Qmake/Qt3 bol vytvorený v %{dest}" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "Základná Qt4 aplikácia" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" -"Vygeneruje veľmi jednoduchú aplikáciu založenú na QMake/Qt4 " -"(multiplatformovo kompatibilnú) - vyžaduje Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "Aplikácia založená na Qt4/Qmake bola vytvorená v %{dest}" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "Absolútna cesta ku QMake (Qt4)." - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "Absolútna cesta ku Designer (Qt4)." - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Qt4 aplikácia" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" -"Vygeneruje aplikáciu založenú na QMake/Qt4 (multiplatformovo kompatibilnú) - " -"vyžaduje Qt4" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "Qt4 aplikácia" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" -"Vygeneruje aplikáciu založenú na QMake/Qt4 (multiplatformovo kompatibilnú) - " -"vyžaduje Qt4" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "Qtopia 4 aplikácia" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "Vygeneruje aplikáciu založenú na QMake/Qt pre Qtopia 4.x" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "Qtopia aplikácia bola vytvorená v %{dest}" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3025,6 +2895,11 @@ msgstr "Qtopia aplikácia" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "Vygeneruje aplikáciu založenú na TMake/Qt pre Qtopia 1.x" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "Qtopia aplikácia bola vytvorená v %{dest}" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3499,7 +3374,6 @@ msgstr "Vygeneruje jednoduchú QtRuby Ahoj svet aplikáciu" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3510,25 +3384,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "Jednoduchá QtRuby aplikácia bola vytvorená v %{dest}" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "QtRuby4 Aplikácia" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" -"Vygeneruje aplikáciu založenú na QtRuby4 (multiplatformovo kompatibilnú) - " -"vyžaduje QtRuby4" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "QtRuby4 aplikácia bola vytvorená v %{dest}" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "QtRuby Aplikácia" @@ -3703,12 +3558,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -#, fuzzy -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "Qt4 aplikácia" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3728,3 +3577,90 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "QtRuby Aplikácia" + +#~ msgid "A KDE4 Application" +#~ msgstr "KDE4 aplikácia" + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "KDev PCS vlastný import" + +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "TDevelop Qt4 PCS import" + +#~ msgid "KDE4 Application framework" +#~ msgstr "KDE4 aplikaÄný framework" + +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "" +#~ "Vygeneruje jednoduchú KDE4 aplikáciu s jedným oknom, menu a panelom " +#~ "nástrojov." + +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "KDE4 aplikácia bola vytvorená v %{dest}" + +#~ msgid "Basic Qt4 Application" +#~ msgstr "Základná Qt4 aplikácia" + +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "" +#~ "Vygeneruje veľmi jednoduchú aplikáciu založenú na QMake/Qt4 " +#~ "(multiplatformovo kompatibilnú) - vyžaduje Qt4" + +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "Aplikácia založená na Qt4/Qmake bola vytvorená v %{dest}" + +#~ msgid "Absolute Path for QMake (Qt4)." +#~ msgstr "Absolútna cesta ku QMake (Qt4)." + +#~ msgid "Absolute Path for Designer (Qt4)." +#~ msgstr "Absolútna cesta ku Designer (Qt4)." + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Qt4 aplikácia" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Vygeneruje aplikáciu založenú na QMake/Qt4 (multiplatformovo " +#~ "kompatibilnú) - vyžaduje Qt4" + +#~ msgid "Qt4 Application" +#~ msgstr "Qt4 aplikácia" + +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Vygeneruje aplikáciu založenú na QMake/Qt4 (multiplatformovo " +#~ "kompatibilnú) - vyžaduje Qt4" + +#~ msgid "Qtopia 4 Application" +#~ msgstr "Qtopia 4 aplikácia" + +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "Vygeneruje aplikáciu založenú na QMake/Qt pre Qtopia 4.x" + +#~ msgid "QtRuby4 Application" +#~ msgstr "QtRuby4 Aplikácia" + +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "" +#~ "Vygeneruje aplikáciu založenú na QtRuby4 (multiplatformovo kompatibilnú) " +#~ "- vyžaduje QtRuby4" + +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "QtRuby4 aplikácia bola vytvorená v %{dest}" + +#, fuzzy +#~ msgid "Qt4 C++ Application (QMake4 based)" +#~ msgstr "Qt4 aplikácia" diff --git a/translations/desktop_files/tdevelop-desktops/sl.po b/translations/desktop_files/tdevelop-desktops/sl.po index 3fa1b4c9..3dc9b8a0 100644 --- a/translations/desktop_files/tdevelop-desktops/sl.po +++ b/translations/desktop_files/tdevelop-desktops/sl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -238,7 +238,6 @@ msgstr "Podpora bash" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -281,17 +280,6 @@ msgid "Your short description about the plugin goes here" msgstr "Tukaj je kratek opis o vstavku" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -#, fuzzy -msgid "A KDE4 Application" -msgstr "Program KPart za TDE" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -351,7 +339,6 @@ msgstr "Vstavek za %{APPNAME}" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "Program %{APPNAME}" @@ -484,18 +471,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "Uvažanje PCS za TDevelop" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "Uvažanje PCS za TDevelop" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -#, fuzzy -msgid "TDevelop Qt4 PCS Importer" -msgstr "Uvažanje PCS za TDevelop" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 #, fuzzy msgid "KDevQtImporter" @@ -2375,31 +2350,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "Vstavek z nastavitveno stranjo za Kate je bil ustvarjen v %{dest}" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -#, fuzzy -msgid "KDE4 Application framework" -msgstr "Ogrodje programa" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -#, fuzzy -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "Ustvari preprost program za TDE z enim gradnikom." - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -#, fuzzy -msgid "A KDE4 Application was created at %{dest}" -msgstr "Program za TDE je bil ustvarjen v %{dest}" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "Preprost strežnik DCOP" @@ -2554,9 +2504,6 @@ msgstr "Ustvari preprost program za TDE z enim gradnikom." #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "Projekt QMake" @@ -2776,7 +2723,6 @@ msgstr "Ustvari program za Opie" #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2983,84 +2929,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "Program hello world na osnovi CMake je bil ustvarjen v %{dest}" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -#, fuzzy -msgid "Basic Qt4 Application" -msgstr "Program za Qtopio" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -#, fuzzy -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "Program za opie je bil ustvarjen v %{dest}" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Program za Qtopio" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -#, fuzzy -msgid "Qt4 Application" -msgstr "Program za Qtopio" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -#, fuzzy -msgid "Qtopia 4 Application" -msgstr "Program za Qtopio" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -#, fuzzy -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "Ustvari program za Opie" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -#, fuzzy -msgid "A Qtopia application was created in %{dest}" -msgstr "Program za opie je bil ustvarjen v %{dest}" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3073,6 +2941,12 @@ msgstr "Program za Qtopio" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "Ustvari program za Opie" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +#, fuzzy +msgid "A Qtopia application was created in %{dest}" +msgstr "Program za opie je bil ustvarjen v %{dest}" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3577,7 +3451,6 @@ msgstr "Ustvari preprost program Hello world v C-ju" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3589,25 +3462,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "Preprost program clanlib je bil ustvarjen v %{dest}" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -#, fuzzy -msgid "QtRuby4 Application" -msgstr "Program za Qtopio" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -#, fuzzy -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "Program za opie je bil ustvarjen v %{dest}" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 #, fuzzy msgid "QtRuby Application" @@ -3791,11 +3645,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3815,3 +3664,61 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "Program" + +#, fuzzy +#~ msgid "A KDE4 Application" +#~ msgstr "Program KPart za TDE" + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "Uvažanje PCS za TDevelop" + +#, fuzzy +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "Uvažanje PCS za TDevelop" + +#, fuzzy +#~ msgid "KDE4 Application framework" +#~ msgstr "Ogrodje programa" + +#, fuzzy +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "Ustvari preprost program za TDE z enim gradnikom." + +#, fuzzy +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "Program za TDE je bil ustvarjen v %{dest}" + +#, fuzzy +#~ msgid "Basic Qt4 Application" +#~ msgstr "Program za Qtopio" + +#, fuzzy +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "Program za opie je bil ustvarjen v %{dest}" + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Program za Qtopio" + +#, fuzzy +#~ msgid "Qt4 Application" +#~ msgstr "Program za Qtopio" + +#, fuzzy +#~ msgid "Qtopia 4 Application" +#~ msgstr "Program za Qtopio" + +#, fuzzy +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "Ustvari program za Opie" + +#, fuzzy +#~ msgid "QtRuby4 Application" +#~ msgstr "Program za Qtopio" + +#, fuzzy +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "Program za opie je bil ustvarjen v %{dest}" diff --git a/translations/desktop_files/tdevelop-desktops/sr.po b/translations/desktop_files/tdevelop-desktops/sr.po index ab63279d..89d0f0bd 100644 --- a/translations/desktop_files/tdevelop-desktops/sr.po +++ b/translations/desktop_files/tdevelop-desktops/sr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -238,7 +238,6 @@ msgstr "Bash подршка" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -281,16 +280,6 @@ msgid "Your short description about the plugin goes here" msgstr "Овде иде ваш кратак Ð¾Ð¿Ð¸Ñ Ð¿Ñ€Ð¸ÐºÑ™ÑƒÑ‡ÐºÐ°" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "KDE4 програм" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -350,7 +339,6 @@ msgstr "%{APPNAME} прикључак" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "%{APPNAME} програм" @@ -482,17 +470,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "TDevelop-ов PCS увозник прилагођеног директоријума" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "TDevelop-ов Qt4 PCS увозник" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "TDevelop-ов Qt4 PCS увозник" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 #, fuzzy msgid "KDevQtImporter" @@ -2405,30 +2382,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "Прикључак за Kate Ñа Ñтраном за подешавања направљен је у %{dest}" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "Радни оквир KDE4 програма" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" -"Прави једноÑтаван KDE4 програм Ñа једним прозором највишег нивоа, менијима и " -"тракама Ñа алатом." - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "KDE4 програм је направљен у %{dest}" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "ЈедноÑтаван DCOP Ñервер" @@ -2584,9 +2537,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "QMake пројекат" @@ -2791,7 +2741,6 @@ msgstr "Прави Opie програм." #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2988,85 +2937,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "„Здраво Ñвете“ на оÑнову Qmake/Qt3 направљен је у %{dest}" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "ОÑновни Qt4 програм" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" -"Прави једноÑтаван програм на оÑнови QMake/Qt4 (прекоплатформÑки " -"компатибилан) — захтева Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "Програм на оÑнову Qt4/Qmake направљен је у %{dest}" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "ÐпÑолутна путања до QMake-а (Qt4)." - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "ÐпÑолутна путања до Designer-а (Qt4)." - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Qt4 програм" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" -"Прави програм на оÑнови QMake/Qt4 (прекоплатформÑки компатибилан) — захтева " -"Qt4" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "Qt4 програм" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" -"Прави програм на оÑнови QMake/Qt4 (прекоплатформÑки компатибилан) — захтева " -"Qt4" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "Qtopia 4 програм" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "Прави програм за Qtopia-у 4.x на оÑнову QMake-а/Qt-а" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "Qtopia програм је направљен у %{dest}" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3078,6 +2948,11 @@ msgstr "Qtopia програм" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "Прави програм за Qtopia-у 1.x на оÑновуTMake-а/Qt-а" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "Qtopia програм је направљен у %{dest}" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3558,7 +3433,6 @@ msgstr "Ово прави једноÑтаван „Здраво Ñвете“ Ñ #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3569,25 +3443,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "ЈедноÑтаван QtRuby програм направљен је у %{dest}" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "QtRuby4 програм" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" -"Прави програм на оÑнови QtRuby4 (прекоплатформÑки компатибилан) — захтева " -"QtRuby4" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "QtRuby4 програм је направљен у %{dest}" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "QtRuby програм" @@ -3762,12 +3617,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -#, fuzzy -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "Qt4 програм" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3787,3 +3636,90 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "QtRuby програм" + +#~ msgid "A KDE4 Application" +#~ msgstr "KDE4 програм" + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "TDevelop-ов Qt4 PCS увозник" + +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "TDevelop-ов Qt4 PCS увозник" + +#~ msgid "KDE4 Application framework" +#~ msgstr "Радни оквир KDE4 програма" + +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "" +#~ "Прави једноÑтаван KDE4 програм Ñа једним прозором највишег нивоа, " +#~ "менијима и тракама Ñа алатом." + +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "KDE4 програм је направљен у %{dest}" + +#~ msgid "Basic Qt4 Application" +#~ msgstr "ОÑновни Qt4 програм" + +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "" +#~ "Прави једноÑтаван програм на оÑнови QMake/Qt4 (прекоплатформÑки " +#~ "компатибилан) — захтева Qt4" + +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "Програм на оÑнову Qt4/Qmake направљен је у %{dest}" + +#~ msgid "Absolute Path for QMake (Qt4)." +#~ msgstr "ÐпÑолутна путања до QMake-а (Qt4)." + +#~ msgid "Absolute Path for Designer (Qt4)." +#~ msgstr "ÐпÑолутна путања до Designer-а (Qt4)." + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Qt4 програм" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Прави програм на оÑнови QMake/Qt4 (прекоплатформÑки компатибилан) — " +#~ "захтева Qt4" + +#~ msgid "Qt4 Application" +#~ msgstr "Qt4 програм" + +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Прави програм на оÑнови QMake/Qt4 (прекоплатформÑки компатибилан) — " +#~ "захтева Qt4" + +#~ msgid "Qtopia 4 Application" +#~ msgstr "Qtopia 4 програм" + +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "Прави програм за Qtopia-у 4.x на оÑнову QMake-а/Qt-а" + +#~ msgid "QtRuby4 Application" +#~ msgstr "QtRuby4 програм" + +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "" +#~ "Прави програм на оÑнови QtRuby4 (прекоплатформÑки компатибилан) — захтева " +#~ "QtRuby4" + +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "QtRuby4 програм је направљен у %{dest}" + +#, fuzzy +#~ msgid "Qt4 C++ Application (QMake4 based)" +#~ msgstr "Qt4 програм" diff --git a/translations/desktop_files/tdevelop-desktops/sr@Latn.po b/translations/desktop_files/tdevelop-desktops/sr@Latn.po index ec57e16c..d46fd39c 100644 --- a/translations/desktop_files/tdevelop-desktops/sr@Latn.po +++ b/translations/desktop_files/tdevelop-desktops/sr@Latn.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -238,7 +238,6 @@ msgstr "Bash podrÅ¡ka" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -281,16 +280,6 @@ msgid "Your short description about the plugin goes here" msgstr "Ovde ide vaÅ¡ kratak opis prikljuÄka" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "KDE4 program" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -350,7 +339,6 @@ msgstr "%{APPNAME} prikljuÄak" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "%{APPNAME} program" @@ -482,17 +470,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "TDevelop-ov PCS uvoznik prilagoÄ‘enog direktorijuma" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "TDevelop-ov Qt4 PCS uvoznik" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "TDevelop-ov Qt4 PCS uvoznik" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 #, fuzzy msgid "KDevQtImporter" @@ -2407,30 +2384,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "PrikljuÄak za Kate sa stranom za podeÅ¡avanja napravljen je u %{dest}" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "Radni okvir KDE4 programa" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" -"Pravi jednostavan KDE4 program sa jednim prozorom najviÅ¡eg nivoa, menijima i " -"trakama sa alatom." - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "KDE4 program je napravljen u %{dest}" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "Jednostavan DCOP server" @@ -2586,9 +2539,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "QMake projekat" @@ -2794,7 +2744,6 @@ msgstr "Pravi Opie program." #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2991,85 +2940,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "„Zdravo svete“ na osnovu Qmake/Qt3 napravljen je u %{dest}" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "Osnovni Qt4 program" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" -"Pravi jednostavan program na osnovi QMake/Qt4 (prekoplatformski " -"kompatibilan) — zahteva Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "Program na osnovu Qt4/Qmake napravljen je u %{dest}" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "Apsolutna putanja do QMake-a (Qt4)." - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "Apsolutna putanja do Designer-a (Qt4)." - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Qt4 program" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" -"Pravi program na osnovi QMake/Qt4 (prekoplatformski kompatibilan) — zahteva " -"Qt4" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "Qt4 program" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" -"Pravi program na osnovi QMake/Qt4 (prekoplatformski kompatibilan) — zahteva " -"Qt4" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "Qtopia 4 program" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "Pravi program za Qtopia-u 4.x na osnovu QMake-a/Qt-a" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "Qtopia program je napravljen u %{dest}" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3081,6 +2951,11 @@ msgstr "Qtopia program" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "Pravi program za Qtopia-u 1.x na osnovuTMake-a/Qt-a" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "Qtopia program je napravljen u %{dest}" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3561,7 +3436,6 @@ msgstr "Ovo pravi jednostavan „Zdravo svete“ u QtRuby-ju" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3572,25 +3446,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "Jednostavan QtRuby program napravljen je u %{dest}" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "QtRuby4 program" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" -"Pravi program na osnovi QtRuby4 (prekoplatformski kompatibilan) — zahteva " -"QtRuby4" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "QtRuby4 program je napravljen u %{dest}" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "QtRuby program" @@ -3765,12 +3620,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -#, fuzzy -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "Qt4 program" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3790,3 +3639,90 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "QtRuby program" + +#~ msgid "A KDE4 Application" +#~ msgstr "KDE4 program" + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "TDevelop-ov Qt4 PCS uvoznik" + +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "TDevelop-ov Qt4 PCS uvoznik" + +#~ msgid "KDE4 Application framework" +#~ msgstr "Radni okvir KDE4 programa" + +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "" +#~ "Pravi jednostavan KDE4 program sa jednim prozorom najviÅ¡eg nivoa, " +#~ "menijima i trakama sa alatom." + +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "KDE4 program je napravljen u %{dest}" + +#~ msgid "Basic Qt4 Application" +#~ msgstr "Osnovni Qt4 program" + +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "" +#~ "Pravi jednostavan program na osnovi QMake/Qt4 (prekoplatformski " +#~ "kompatibilan) — zahteva Qt4" + +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "Program na osnovu Qt4/Qmake napravljen je u %{dest}" + +#~ msgid "Absolute Path for QMake (Qt4)." +#~ msgstr "Apsolutna putanja do QMake-a (Qt4)." + +#~ msgid "Absolute Path for Designer (Qt4)." +#~ msgstr "Apsolutna putanja do Designer-a (Qt4)." + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Qt4 program" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Pravi program na osnovi QMake/Qt4 (prekoplatformski kompatibilan) — " +#~ "zahteva Qt4" + +#~ msgid "Qt4 Application" +#~ msgstr "Qt4 program" + +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Pravi program na osnovi QMake/Qt4 (prekoplatformski kompatibilan) — " +#~ "zahteva Qt4" + +#~ msgid "Qtopia 4 Application" +#~ msgstr "Qtopia 4 program" + +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "Pravi program za Qtopia-u 4.x na osnovu QMake-a/Qt-a" + +#~ msgid "QtRuby4 Application" +#~ msgstr "QtRuby4 program" + +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "" +#~ "Pravi program na osnovi QtRuby4 (prekoplatformski kompatibilan) — zahteva " +#~ "QtRuby4" + +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "QtRuby4 program je napravljen u %{dest}" + +#, fuzzy +#~ msgid "Qt4 C++ Application (QMake4 based)" +#~ msgstr "Qt4 program" diff --git a/translations/desktop_files/tdevelop-desktops/sv.po b/translations/desktop_files/tdevelop-desktops/sv.po index 3b7f59fe..43b7021b 100644 --- a/translations/desktop_files/tdevelop-desktops/sv.po +++ b/translations/desktop_files/tdevelop-desktops/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -227,7 +227,6 @@ msgstr "Bash-stöd" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -270,16 +269,6 @@ msgid "Your short description about the plugin goes here" msgstr "En kort beskrivningen av vad insticksprogrammet gör" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "KDE 4-program" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "Ett KDE 4-program" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -337,7 +326,6 @@ msgstr "%{APPNAME}-del" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "Ett %{APPNAME}-program" @@ -466,16 +454,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "TDevelop PCS-import för egen katalog" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -msgid "KDevQt4Importer" -msgstr "TDevelop QT4-import" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "TDevelop QT4 PCS-import" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 msgid "KDevQtImporter" msgstr "TDevelop QT-import" @@ -2365,30 +2343,6 @@ msgstr "" "Ett insticksprogram för Kate med en inställningssida skapades i %{dest}" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "KDE 4-programramverk" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" -"Skapar ett enkelt KDE 4-program med ett toppnivÃ¥fönster, menyer och " -"verktygsrader." - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "Ett KDE 4-program skapades i %{dest}" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "Enkel DCOP-server" @@ -2546,9 +2500,6 @@ msgstr "Skapar ett enkelt TDE-program baserat pÃ¥ QMake projekthantering" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "Qmake-projekt" @@ -2757,7 +2708,6 @@ msgstr "Skapa ett Opie-program." #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2954,85 +2904,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "Ett Qmake/Qt3-baserat Hello world-program skapades i %{dest}" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "Grundläggande Qt4-program" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" -"Skapar ett mycket enkelt QMake/Qt4-baserat program (fungerar pÃ¥ andra " -"plattformar). Kräver Qt4." - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "Ett QMake/Qt4-baserat program skapades i %{dest}" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "Absolut sökväg till QMake (Qt4)." - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "Absolut sökväg till Designer (Qt4)." - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Qt4-program" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" -"Skapar ett QMake/Qt4-baserat program (fungerar pÃ¥ andra plattformar). Kräver " -"Qt4." - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "Qt4-program" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" -"Skapar ett QMake/Qt4-baserat program (fungerar pÃ¥ andra plattformar). Kräver " -"Qt4." - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "Qtopia 4-program" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "Skapa ett Qmake/Qt-baserat program för Qtopia 4.x" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "Ett Qtopia-program skapades i %{dest}" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3044,6 +2915,11 @@ msgstr "Qtopia-program" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "Skapa ett TMake/Qt-baserat program för Qtopia 1.x" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "Ett Qtopia-program skapades i %{dest}" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3525,7 +3401,6 @@ msgstr "Detta skapar ett enkelt Hello World-program i QtRuby" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3536,25 +3411,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "Ett enkelt QtRuby-program skapades i %{dest}" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "QtRuby 4-program" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" -"Skapar ett QtRuby 4-baserat program (fungerar pÃ¥ andra plattformar). Kräver " -"QtRuby 4." - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "Ett program baserat pÃ¥ QtRuby 4 skapades i %{dest}" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "QtRuby-program" @@ -3729,12 +3585,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -#, fuzzy -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "Qt4-program" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3754,3 +3604,92 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "QtRuby-program" + +#~ msgid "KApp4" +#~ msgstr "KDE 4-program" + +#~ msgid "A KDE4 Application" +#~ msgstr "Ett KDE 4-program" + +#~ msgid "KDevQt4Importer" +#~ msgstr "TDevelop QT4-import" + +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "TDevelop QT4 PCS-import" + +#~ msgid "KDE4 Application framework" +#~ msgstr "KDE 4-programramverk" + +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "" +#~ "Skapar ett enkelt KDE 4-program med ett toppnivÃ¥fönster, menyer och " +#~ "verktygsrader." + +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "Ett KDE 4-program skapades i %{dest}" + +#~ msgid "Basic Qt4 Application" +#~ msgstr "Grundläggande Qt4-program" + +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "" +#~ "Skapar ett mycket enkelt QMake/Qt4-baserat program (fungerar pÃ¥ andra " +#~ "plattformar). Kräver Qt4." + +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "Ett QMake/Qt4-baserat program skapades i %{dest}" + +#~ msgid "Absolute Path for QMake (Qt4)." +#~ msgstr "Absolut sökväg till QMake (Qt4)." + +#~ msgid "Absolute Path for Designer (Qt4)." +#~ msgstr "Absolut sökväg till Designer (Qt4)." + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Qt4-program" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Skapar ett QMake/Qt4-baserat program (fungerar pÃ¥ andra plattformar). " +#~ "Kräver Qt4." + +#~ msgid "Qt4 Application" +#~ msgstr "Qt4-program" + +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "" +#~ "Skapar ett QMake/Qt4-baserat program (fungerar pÃ¥ andra plattformar). " +#~ "Kräver Qt4." + +#~ msgid "Qtopia 4 Application" +#~ msgstr "Qtopia 4-program" + +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "Skapa ett Qmake/Qt-baserat program för Qtopia 4.x" + +#~ msgid "QtRuby4 Application" +#~ msgstr "QtRuby 4-program" + +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "" +#~ "Skapar ett QtRuby 4-baserat program (fungerar pÃ¥ andra plattformar). " +#~ "Kräver QtRuby 4." + +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "Ett program baserat pÃ¥ QtRuby 4 skapades i %{dest}" + +#, fuzzy +#~ msgid "Qt4 C++ Application (QMake4 based)" +#~ msgstr "Qt4-program" diff --git a/translations/desktop_files/tdevelop-desktops/ta.po b/translations/desktop_files/tdevelop-desktops/ta.po index 0d3d30c2..74edbd70 100644 --- a/translations/desktop_files/tdevelop-desktops/ta.po +++ b/translations/desktop_files/tdevelop-desktops/ta.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -227,7 +227,6 @@ msgstr "பாஷ௠ஆதரவà¯" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -270,17 +269,6 @@ msgid "Your short description about the plugin goes here" msgstr "உஙà¯à®•à®³à¯ சொரà¯à®•à®¿à®©à¯ சிற௠விவரம௠இஙà¯à®•à®¿à®°à¯à®•à¯à®•à¯à®®à¯" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -#, fuzzy -msgid "A KDE4 Application" -msgstr "கெடி கெபாரà¯à®Ÿà¯ பயனà¯à®ªà®¾à®Ÿà¯ " - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -341,7 +329,6 @@ msgstr "%{APPNAME}பாகமà¯" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "ஒர௠%{APPNAME} நிரல௠" @@ -472,18 +459,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "கெடெவலப௠கஸà¯à®Ÿà®®à¯ டைரகà¯à®Ÿà¯à®°à®¿ இறகà¯à®•à¯à®®à®¤à®¿à®¯à®¾à®³à®°à¯" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "கெடெவ௠கà¯à®¯à¯ இறகà¯à®•à¯à®®à®¤à®¿à®¯à®¾à®³à®°à¯" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -#, fuzzy -msgid "TDevelop Qt4 PCS Importer" -msgstr "TDevelop pcs à®à®±à¯à®±à¯à®®à®¤à®¿à®¯à®¾à®³à®°à¯" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 msgid "KDevQtImporter" msgstr "கெடெவ௠கà¯à®¯à¯ இறகà¯à®•à¯à®®à®¤à®¿à®¯à®¾à®³à®°à¯" @@ -2354,29 +2329,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -#, fuzzy -msgid "KDE4 Application framework" -msgstr "பயனà¯à®ªà®¾à®Ÿà¯ வழிகாடà¯à®Ÿà®¿ " - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "" @@ -2526,9 +2478,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "கà¯à®¯à¯à®®à¯‡à®•à¯ பிராஜகà¯à®Ÿà¯" @@ -2730,7 +2679,6 @@ msgstr "" #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2920,80 +2868,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -#, fuzzy -msgid "Basic Qt4 Application" -msgstr "ஒர௠சாதாரண கெடிஇ பயனà¯à®ªà®¾à®Ÿà¯" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -msgid "Qt4/QMake Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -#, fuzzy -msgid "Qt4 Application" -msgstr "கெடி கெபாரà¯à®Ÿà¯ பயனà¯à®ªà®¾à®Ÿà¯ " - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -#, fuzzy -msgid "Qtopia 4 Application" -msgstr "ஒர௠சாதாரண கெடிஇ பயனà¯à®ªà®¾à®Ÿà¯" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 #, fuzzy @@ -3006,6 +2880,11 @@ msgstr "கெடி கெபாரà¯à®Ÿà¯ பயனà¯à®ªà®¾à®Ÿà¯ " msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3470,7 +3349,6 @@ msgstr "" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3481,24 +3359,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -#, fuzzy -msgid "QtRuby4 Application" -msgstr "கெடி கெபாரà¯à®Ÿà¯ பயனà¯à®ªà®¾à®Ÿà¯ " - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 #, fuzzy msgid "QtRuby Application" @@ -3673,11 +3533,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3697,3 +3552,35 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "பயனà¯à®ªà®¾à®Ÿà¯ வழிகாடà¯à®Ÿà®¿ " + +#, fuzzy +#~ msgid "A KDE4 Application" +#~ msgstr "கெடி கெபாரà¯à®Ÿà¯ பயனà¯à®ªà®¾à®Ÿà¯ " + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "கெடெவ௠கà¯à®¯à¯ இறகà¯à®•à¯à®®à®¤à®¿à®¯à®¾à®³à®°à¯" + +#, fuzzy +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "TDevelop pcs à®à®±à¯à®±à¯à®®à®¤à®¿à®¯à®¾à®³à®°à¯" + +#, fuzzy +#~ msgid "KDE4 Application framework" +#~ msgstr "பயனà¯à®ªà®¾à®Ÿà¯ வழிகாடà¯à®Ÿà®¿ " + +#, fuzzy +#~ msgid "Basic Qt4 Application" +#~ msgstr "ஒர௠சாதாரண கெடிஇ பயனà¯à®ªà®¾à®Ÿà¯" + +#, fuzzy +#~ msgid "Qt4 Application" +#~ msgstr "கெடி கெபாரà¯à®Ÿà¯ பயனà¯à®ªà®¾à®Ÿà¯ " + +#, fuzzy +#~ msgid "Qtopia 4 Application" +#~ msgstr "ஒர௠சாதாரண கெடிஇ பயனà¯à®ªà®¾à®Ÿà¯" + +#, fuzzy +#~ msgid "QtRuby4 Application" +#~ msgstr "கெடி கெபாரà¯à®Ÿà¯ பயனà¯à®ªà®¾à®Ÿà¯ " diff --git a/translations/desktop_files/tdevelop-desktops/tdevelop-desktops.pot b/translations/desktop_files/tdevelop-desktops/tdevelop-desktops.pot index 7829bb97..b2d40151 100644 --- a/translations/desktop_files/tdevelop-desktops/tdevelop-desktops.pot +++ b/translations/desktop_files/tdevelop-desktops/tdevelop-desktops.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -161,8 +161,7 @@ msgstr "" #. Name #. GenericName -#: kdevassistant.desktop:2 -#: src/profiles/KDevAssistant/profile.config:9 +#: kdevassistant.desktop:2 src/profiles/KDevAssistant/profile.config:9 msgid "TDevelop Assistant" msgstr "" @@ -227,7 +226,6 @@ msgstr "" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -269,16 +267,6 @@ msgid "Your short description about the plugin goes here" msgstr "" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -335,7 +323,6 @@ msgstr "" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "" @@ -446,8 +433,7 @@ msgstr "" #. GenericName #. Comment -#: languages/cpp/kdevcsupport.desktop:4 -#: languages/cpp/kdevcsupport.desktop:6 +#: languages/cpp/kdevcsupport.desktop:4 languages/cpp/kdevcsupport.desktop:6 msgid "C Support" msgstr "" @@ -462,16 +448,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -msgid "KDevQt4Importer" -msgstr "" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 msgid "KDevQtImporter" msgstr "" @@ -860,8 +836,7 @@ msgstr "" #. GenericName #. Comment -#: parts/diff/kdevdiff.desktop:4 -#: parts/diff/kdevdiff.desktop:6 +#: parts/diff/kdevdiff.desktop:4 parts/diff/kdevdiff.desktop:6 msgid "Difference Viewer" msgstr "" @@ -1291,8 +1266,7 @@ msgstr "" #. Name #. GenericName -#: parts/snippet/kdevsnippet.desktop:2 -#: parts/snippet/kdevsnippet.desktop:4 +#: parts/snippet/kdevsnippet.desktop:2 parts/snippet/kdevsnippet.desktop:4 msgid "Code Snippets" msgstr "" @@ -1323,8 +1297,7 @@ msgstr "" #. GenericName #. Comment -#: parts/tipofday/kdevtipofday.desktop:4 -#: parts/tipofday/kdevtipofday.desktop:6 +#: parts/tipofday/kdevtipofday.desktop:4 parts/tipofday/kdevtipofday.desktop:6 msgid "Tip of the Day" msgstr "" @@ -1582,8 +1555,7 @@ msgstr "" #. Name #. GenericName -#: tde-development-tdevelop.directory:2 -#: src/profiles/profile.config:3 +#: tde-development-tdevelop.directory:2 src/profiles/profile.config:3 msgid "TDevelop" msgstr "" @@ -2250,28 +2222,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "" @@ -2417,9 +2367,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 msgid "C++/QMake project" msgstr "" @@ -2616,7 +2563,6 @@ msgstr "" #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2805,77 +2751,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -msgid "Qt4/QMake Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -2887,6 +2762,11 @@ msgstr "" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3344,7 +3224,6 @@ msgstr "" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3355,23 +3234,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "" @@ -3494,8 +3356,7 @@ msgid "GNOME C Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/java:3 -#: parts/appwizard/imports/java-auto:3 +#: parts/appwizard/imports/java:3 parts/appwizard/imports/java-auto:3 msgid "Java Application (Automake based)" msgstr "" @@ -3540,11 +3401,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" diff --git a/translations/desktop_files/tdevelop-desktops/tg.po b/translations/desktop_files/tdevelop-desktops/tg.po index 03849dac..25fb0a6e 100644 --- a/translations/desktop_files/tdevelop-desktops/tg.po +++ b/translations/desktop_files/tdevelop-desktops/tg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -232,7 +232,6 @@ msgstr "Ðри намудани забони Bash " #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -275,17 +274,6 @@ msgid "Your short description about the plugin goes here" msgstr "Дар инҷо таÑвири кӯтоҳи модул ҷойгир аÑÑ‚" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -#, fuzzy -msgid "A KDE4 Application" -msgstr "Ба кор андохтани KPart барои TDE" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -348,7 +336,6 @@ msgstr "Маълумот дар бораи %{APPNAME} " #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "Барномаи %{APPNAME} " @@ -483,18 +470,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "Пурборкунии нишонаҳо аз анбори Ñинфҳои каталог" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "Пурборкунанда дар анбори Ñинфӣ" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -#, fuzzy -msgid "TDevelop Qt4 PCS Importer" -msgstr "Пурборкунанда дар анбори Ñинфӣ" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 #, fuzzy msgid "KDevQtImporter" @@ -2385,29 +2360,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -#, fuzzy -msgid "KDE4 Application framework" -msgstr "УÑтои Ñохтани гузориш" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 #, fuzzy msgid "Simple DCOP server" @@ -2558,9 +2510,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "Лоиҳаи QMake" @@ -2761,7 +2710,6 @@ msgstr "" #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2951,80 +2899,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -#, fuzzy -msgid "Basic Qt4 Application" -msgstr "Гузориши оддиTDE " - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -msgid "Qt4/QMake Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -#, fuzzy -msgid "Qt4 Application" -msgstr "Ба кор андохтани KPart барои TDE" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -#, fuzzy -msgid "Qtopia 4 Application" -msgstr "Гузориши оддиTDE " - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 #, fuzzy @@ -3037,6 +2911,11 @@ msgstr "Ба кор андохтани KPart барои TDE" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3507,7 +3386,6 @@ msgstr "" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3518,24 +3396,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -#, fuzzy -msgid "QtRuby4 Application" -msgstr "Ба кор андохтани KPart барои TDE" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 #, fuzzy msgid "QtRuby Application" @@ -3711,11 +3571,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3735,3 +3590,35 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "УÑтои Ñохтани гузориш" + +#, fuzzy +#~ msgid "A KDE4 Application" +#~ msgstr "Ба кор андохтани KPart барои TDE" + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "Пурборкунанда дар анбори Ñинфӣ" + +#, fuzzy +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "Пурборкунанда дар анбори Ñинфӣ" + +#, fuzzy +#~ msgid "KDE4 Application framework" +#~ msgstr "УÑтои Ñохтани гузориш" + +#, fuzzy +#~ msgid "Basic Qt4 Application" +#~ msgstr "Гузориши оддиTDE " + +#, fuzzy +#~ msgid "Qt4 Application" +#~ msgstr "Ба кор андохтани KPart барои TDE" + +#, fuzzy +#~ msgid "Qtopia 4 Application" +#~ msgstr "Гузориши оддиTDE " + +#, fuzzy +#~ msgid "QtRuby4 Application" +#~ msgstr "Ба кор андохтани KPart барои TDE" diff --git a/translations/desktop_files/tdevelop-desktops/tr.po b/translations/desktop_files/tdevelop-desktops/tr.po index 7d80d8a9..e335f781 100644 --- a/translations/desktop_files/tdevelop-desktops/tr.po +++ b/translations/desktop_files/tdevelop-desktops/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -240,7 +240,6 @@ msgstr "Bash DesteÄŸi" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -283,17 +282,6 @@ msgid "Your short description about the plugin goes here" msgstr "Eklenti hakkında kısa bir tanımı buraya yazın." #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -#, fuzzy -msgid "A KDE4 Application" -msgstr "Bir TDE KPart Uygulaması" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -352,7 +340,6 @@ msgstr "%{APPNAME} BileÅŸeni" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "Bir %{APPNAME} Programı" @@ -486,18 +473,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "TDevelop Özel Dizin PCS Aktarıcısı" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "TDevelop PCS Aktarıcısı" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -#, fuzzy -msgid "TDevelop Qt4 PCS Importer" -msgstr "TDevelop PCS Aktarıcısı" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 #, fuzzy msgid "KDevQtImporter" @@ -2423,33 +2398,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "Kate için ayar sayfası olan bir eklenti %{dest} içinde yaratıldı." #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -#, fuzzy -msgid "KDE4 Application framework" -msgstr "Uygulama Çatısı" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -#, fuzzy -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" -"Bir üst seviye penceresi, menüleri ve araç çubukları olan basit bir Java KDE " -"uygulaması yaratır." - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -#, fuzzy -msgid "A KDE4 Application was created at %{dest}" -msgstr "Bir TDE Uygulaması %{dest} içinde yaratıldı." - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "Basit DCOP Sunucusu" @@ -2605,9 +2553,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "QMake Projesi" @@ -2816,7 +2761,6 @@ msgstr "Bir Opie uygulaması yarat" #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -3018,86 +2962,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "Bir CMake tabanlı Merhaba Dünya programı %{dest} içinde yaratıldı." #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -#, fuzzy -msgid "Basic Qt4 Application" -msgstr "Qtopia Uygulaması" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -#, fuzzy -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "QtRuby tabanlı bir uygulama yarat (platformlararası geçimli)" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -#, fuzzy -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "Bir QMake tabanlı TDE uygulaması %{dest} içinde yaratıldı." - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Qtopia Uygulaması" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "QtRuby tabanlı bir uygulama yarat (platformlararası geçimli)" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -#, fuzzy -msgid "Qt4 Application" -msgstr "Qtopia Uygulaması" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "QtRuby tabanlı bir uygulama yarat (platformlararası geçimli)" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -#, fuzzy -msgid "Qtopia 4 Application" -msgstr "Qtopia Uygulaması" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -#, fuzzy -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "Qtopia 1.x için TMake/Qt tabanlı bir uygulama yarat" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "Bir Qtopia uygulaması %{dest} içinde yaratıldı." - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3109,6 +2973,11 @@ msgstr "Qtopia Uygulaması" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "Qtopia 1.x için TMake/Qt tabanlı bir uygulama yarat" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "Bir Qtopia uygulaması %{dest} içinde yaratıldı." + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3591,7 +3460,6 @@ msgstr "Bu basit bir QtRuby Merhaba Dünya uygulaması yaratır." #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3602,26 +3470,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "Basit bir QtRuby uygulaması %{dest} içinde yaratıldı." #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -#, fuzzy -msgid "QtRuby4 Application" -msgstr "QtRuby Uygulaması" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -#, fuzzy -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "QtRuby tabanlı bir uygulama yarat (platformlararası geçimli)" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -#, fuzzy -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "Bir QtRuby tabanlı uygulama %{dest} içinde yaratıldı." - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "QtRuby Uygulaması" @@ -3798,11 +3646,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3822,3 +3665,87 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "QtRuby Uygulaması" + +#, fuzzy +#~ msgid "A KDE4 Application" +#~ msgstr "Bir TDE KPart Uygulaması" + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "TDevelop PCS Aktarıcısı" + +#, fuzzy +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "TDevelop PCS Aktarıcısı" + +#, fuzzy +#~ msgid "KDE4 Application framework" +#~ msgstr "Uygulama Çatısı" + +#, fuzzy +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "" +#~ "Bir üst seviye penceresi, menüleri ve araç çubukları olan basit bir Java " +#~ "KDE uygulaması yaratır." + +#, fuzzy +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "Bir TDE Uygulaması %{dest} içinde yaratıldı." + +#, fuzzy +#~ msgid "Basic Qt4 Application" +#~ msgstr "Qtopia Uygulaması" + +#, fuzzy +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "QtRuby tabanlı bir uygulama yarat (platformlararası geçimli)" + +#, fuzzy +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "Bir QMake tabanlı TDE uygulaması %{dest} içinde yaratıldı." + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Qtopia Uygulaması" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "QtRuby tabanlı bir uygulama yarat (platformlararası geçimli)" + +#, fuzzy +#~ msgid "Qt4 Application" +#~ msgstr "Qtopia Uygulaması" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "QtRuby tabanlı bir uygulama yarat (platformlararası geçimli)" + +#, fuzzy +#~ msgid "Qtopia 4 Application" +#~ msgstr "Qtopia Uygulaması" + +#, fuzzy +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "Qtopia 1.x için TMake/Qt tabanlı bir uygulama yarat" + +#, fuzzy +#~ msgid "QtRuby4 Application" +#~ msgstr "QtRuby Uygulaması" + +#, fuzzy +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "QtRuby tabanlı bir uygulama yarat (platformlararası geçimli)" + +#, fuzzy +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "Bir QtRuby tabanlı uygulama %{dest} içinde yaratıldı." diff --git a/translations/desktop_files/tdevelop-desktops/uz.po b/translations/desktop_files/tdevelop-desktops/uz.po index 152cb548..311007ef 100644 --- a/translations/desktop_files/tdevelop-desktops/uz.po +++ b/translations/desktop_files/tdevelop-desktops/uz.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -236,7 +236,6 @@ msgstr "" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -278,16 +277,6 @@ msgid "Your short description about the plugin goes here" msgstr "" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -344,7 +333,6 @@ msgstr "" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "" @@ -470,16 +458,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -msgid "KDevQt4Importer" -msgstr "" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 msgid "KDevQtImporter" msgstr "" @@ -2257,28 +2235,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "" @@ -2424,9 +2380,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "QMake loyihasi" @@ -2624,7 +2577,6 @@ msgstr "" #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2813,77 +2765,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -msgid "Qt4/QMake Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -2895,6 +2776,11 @@ msgstr "" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3354,7 +3240,6 @@ msgstr "" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3365,23 +3250,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "" @@ -3549,11 +3417,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" diff --git a/translations/desktop_files/tdevelop-desktops/uz@cyrillic.po b/translations/desktop_files/tdevelop-desktops/uz@cyrillic.po index 0a0385b6..26c382c9 100644 --- a/translations/desktop_files/tdevelop-desktops/uz@cyrillic.po +++ b/translations/desktop_files/tdevelop-desktops/uz@cyrillic.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -236,7 +236,6 @@ msgstr "" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -278,16 +277,6 @@ msgid "Your short description about the plugin goes here" msgstr "" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -344,7 +333,6 @@ msgstr "" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "" @@ -470,16 +458,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -msgid "KDevQt4Importer" -msgstr "" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 msgid "KDevQtImporter" msgstr "" @@ -2257,28 +2235,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "" - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "" @@ -2424,9 +2380,6 @@ msgstr "" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "QMake лойиҳаÑи" @@ -2624,7 +2577,6 @@ msgstr "" #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2813,77 +2765,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -msgid "Qt4/QMake Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -2895,6 +2776,11 @@ msgstr "" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3354,7 +3240,6 @@ msgstr "" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3365,23 +3250,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "" @@ -3549,11 +3417,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" diff --git a/translations/desktop_files/tdevelop-desktops/zh_CN.po b/translations/desktop_files/tdevelop-desktops/zh_CN.po index 28c7310c..d4eb5a95 100644 --- a/translations/desktop_files/tdevelop-desktops/zh_CN.po +++ b/translations/desktop_files/tdevelop-desktops/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -238,7 +238,6 @@ msgstr "Bash 支æŒ" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -281,17 +280,6 @@ msgid "Your short description about the plugin goes here" msgstr "关于这个æ’件的简çŸæè¿°" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -#, fuzzy -msgid "A KDE4 Application" -msgstr "一个 TDE KPart 应用程åº" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -351,7 +339,6 @@ msgstr "%{APPNAME} æ’件" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "一个 %{APPNAME} 程åº" @@ -483,18 +470,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "TDevelop 自定义目录的 PCS 导入器" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "TDevelop PCS导入器" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -#, fuzzy -msgid "TDevelop Qt4 PCS Importer" -msgstr "TDevelop PCS导入器" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 #, fuzzy msgid "KDevQtImporter" @@ -2365,31 +2340,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "在 %{dest} ä¸åˆ›å»ºäº†ä¸€ä¸ªå¸¦é…置页的 Kate æ’件" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -#, fuzzy -msgid "KDE4 Application framework" -msgstr "应用程åºæ¡†æž¶" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -#, fuzzy -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "生æˆä¸€ä¸ªç®€å•çš„带有顶级窗å£ã€èœå•å’Œå·¥å…·æ çš„ Java KDE 应用程åºã€‚" - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -#, fuzzy -msgid "A KDE4 Application was created at %{dest}" -msgstr "在 %{dest} ä¸åˆ›å»ºäº†ä¸€ä¸ª TDE 应用程åº" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "简å•çš„ DCOP æœåŠ¡å™¨" @@ -2537,9 +2487,6 @@ msgstr "使用基于 QMake的工程管ç†å™¨ç”Ÿæˆä¸€ä¸ªç®€å•çš„ TDE 应用程å #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "QMake 工程" @@ -2742,7 +2689,6 @@ msgstr "生æˆä¸€ä¸ª Opie 应用程åºã€‚" #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2941,86 +2887,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "在 %{dest} ä¸åˆ›å»ºäº†ä¸€ä¸ªåŸºäºŽ CMake çš„ hello world 程åº" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -#, fuzzy -msgid "Basic Qt4 Application" -msgstr "Qtopia 应用程åº" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -#, fuzzy -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "生æˆé€‚用于 Qtopia 1.x 基于 TMake/Qt 的应用程åº" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -#, fuzzy -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "在 %{dest} ä¸åˆ›å»ºäº†åŸºäºŽ QMake çš„ TDE 应用程åº" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Qtopia 应用程åº" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "生æˆé€‚用于 Qtopia 1.x 基于 TMake/Qt 的应用程åº" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -#, fuzzy -msgid "Qt4 Application" -msgstr "Qtopia 应用程åº" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "生æˆé€‚用于 Qtopia 1.x 基于 TMake/Qt 的应用程åº" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -#, fuzzy -msgid "Qtopia 4 Application" -msgstr "Qtopia 应用程åº" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -#, fuzzy -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "生æˆé€‚用于 Qtopia 1.x 基于 TMake/Qt 的应用程åº" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "在 %{dest} 创建了 Qtopia 应用程åº" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -3032,6 +2898,11 @@ msgstr "Qtopia 应用程åº" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "生æˆé€‚用于 Qtopia 1.x 基于 TMake/Qt 的应用程åº" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "在 %{dest} 创建了 Qtopia 应用程åº" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3502,7 +3373,6 @@ msgstr "生æˆä¸€ä¸ªç®€å•çš„ wxWidgets Hello 应用程åºã€‚" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3513,26 +3383,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "在 %{dest} 创建了一个简å•çš„ QtRuby 应用程åº" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -#, fuzzy -msgid "QtRuby4 Application" -msgstr "QtRuby 应用程åº" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -#, fuzzy -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "生æˆé€‚用于 Qtopia 1.x 基于 TMake/Qt 的应用程åº" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -#, fuzzy -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "在 %{dest} ä¸åˆ›å»ºäº†åŸºäºŽ QMake çš„ TDE 应用程åº" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "QtRuby 应用程åº" @@ -3713,11 +3563,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3737,3 +3582,85 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "QtRuby 应用程åº" + +#, fuzzy +#~ msgid "A KDE4 Application" +#~ msgstr "一个 TDE KPart 应用程åº" + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "TDevelop PCS导入器" + +#, fuzzy +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "TDevelop PCS导入器" + +#, fuzzy +#~ msgid "KDE4 Application framework" +#~ msgstr "应用程åºæ¡†æž¶" + +#, fuzzy +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "生æˆä¸€ä¸ªç®€å•çš„带有顶级窗å£ã€èœå•å’Œå·¥å…·æ çš„ Java KDE 应用程åºã€‚" + +#, fuzzy +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "在 %{dest} ä¸åˆ›å»ºäº†ä¸€ä¸ª TDE 应用程åº" + +#, fuzzy +#~ msgid "Basic Qt4 Application" +#~ msgstr "Qtopia 应用程åº" + +#, fuzzy +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "生æˆé€‚用于 Qtopia 1.x 基于 TMake/Qt 的应用程åº" + +#, fuzzy +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "在 %{dest} ä¸åˆ›å»ºäº†åŸºäºŽ QMake çš„ TDE 应用程åº" + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Qtopia 应用程åº" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "生æˆé€‚用于 Qtopia 1.x 基于 TMake/Qt 的应用程åº" + +#, fuzzy +#~ msgid "Qt4 Application" +#~ msgstr "Qtopia 应用程åº" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "生æˆé€‚用于 Qtopia 1.x 基于 TMake/Qt 的应用程åº" + +#, fuzzy +#~ msgid "Qtopia 4 Application" +#~ msgstr "Qtopia 应用程åº" + +#, fuzzy +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "生æˆé€‚用于 Qtopia 1.x 基于 TMake/Qt 的应用程åº" + +#, fuzzy +#~ msgid "QtRuby4 Application" +#~ msgstr "QtRuby 应用程åº" + +#, fuzzy +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "生æˆé€‚用于 Qtopia 1.x 基于 TMake/Qt 的应用程åº" + +#, fuzzy +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "在 %{dest} ä¸åˆ›å»ºäº†åŸºäºŽ QMake çš„ TDE 应用程åº" diff --git a/translations/desktop_files/tdevelop-desktops/zh_TW.po b/translations/desktop_files/tdevelop-desktops/zh_TW.po index 62ed43df..1119b332 100644 --- a/translations/desktop_files/tdevelop-desktops/zh_TW.po +++ b/translations/desktop_files/tdevelop-desktops/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2023-07-13 21:37+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -226,7 +226,6 @@ msgstr "Bash 支æ´" #: languages/cpp/app_templates/kofficepart/kopart.desktop:2 #: languages/cpp/app_templates/kxt/app.desktop:2 #: languages/cpp/app_templates/opieapp/example.desktop:2 -#: languages/cpp/app_templates/qtopia4app/example.desktop:2 #: languages/cpp/app_templates/qtopiaapp/example.desktop:2 #: languages/cpp/app_templates/tdeconfig35/app.desktop:2 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop:2 @@ -269,16 +268,6 @@ msgid "Your short description about the plugin goes here" msgstr "您å°æ¤å¤–掛程å¼çš„æ述寫在這裡" #. Name -#: languages/cpp/app_templates/kde4app/kapp4.desktop:2 -msgid "KApp4" -msgstr "KApp4 程å¼" - -#. GenericName -#: languages/cpp/app_templates/kde4app/kapp4.desktop:4 -msgid "A KDE4 Application" -msgstr "KDE4 應用程å¼" - -#. Name #: languages/cpp/app_templates/kdevlang/kdevlang.desktop:2 #: languages/cpp/app_templates/kdevpart/kdevpart.desktop:2 #: languages/cpp/app_templates/kdevpart2/kdevpart.desktop:2 @@ -338,7 +327,6 @@ msgstr "%{APPNAME} 外掛程å¼" #. Comment #: languages/cpp/app_templates/opieapp/example.desktop:4 -#: languages/cpp/app_templates/qtopia4app/example.desktop:4 #: languages/cpp/app_templates/qtopiaapp/example.desktop:4 msgid "An %{APPNAME} Program" msgstr "一個 %{APPNAME} 程å¼" @@ -467,17 +455,6 @@ msgid "TDevelop Custom Directory PCS Importer" msgstr "TDevelop 自訂目錄 PCS 匯入器" #. Name -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:2 -#, fuzzy -msgid "KDevQt4Importer" -msgstr "KDev Qt 匯入器" - -#. Comment -#: languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop:4 -msgid "TDevelop Qt4 PCS Importer" -msgstr "TDevelop Qt4 PCS 匯入器" - -#. Name #: languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop:2 msgid "KDevQtImporter" msgstr "KDev Qt 匯入器" @@ -2304,28 +2281,6 @@ msgid "A plugin for Kate with a config page was created in %{dest}" msgstr "一個內å«è¨å®šé é¢çš„ Kate 外掛程å¼å·²å»ºç«‹æ–¼ %{dest}" #. Name -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:3 -msgid "KDE4 Application framework" -msgstr "KDE4 應用程å¼æ¡†æž¶" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:5 -msgid "" -"Generates a simple KDE4 application with one toplevel window, menus and " -"toolbars." -msgstr "產生一個簡單的 KDE4 應用程å¼ï¼Œå…§å«é ‚層視窗ã€é¸å–®èˆ‡å·¥å…·åˆ—。" - -#. Category -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:7 -msgid "C++/KDE4" -msgstr "" - -#. Comment -#: languages/cpp/app_templates/kde4app/kde4app.kdevtemplate:95 -msgid "A KDE4 Application was created at %{dest}" -msgstr "一個 KDE4 應用程å¼å·²å»ºç«‹æ–¼ %{dest}" - -#. Name #: languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate:3 msgid "Simple DCOP server" msgstr "簡單的 DCOP 伺æœå™¨" @@ -2474,9 +2429,6 @@ msgstr "產生一個使用 QMake 專案管ç†å“¡çš„ç°¡å–® TDE 應用程å¼" #: languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple:7 #: languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate:7 -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:7 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:7 #, fuzzy msgid "C++/QMake project" msgstr "QMake 專案" @@ -2676,7 +2628,6 @@ msgstr "產生一個 Opie 應用程å¼" #: languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate:7 #: languages/cpp/app_templates/opienet/opienet.kdevtemplate:7 #: languages/cpp/app_templates/opietoday/opietoday.kdevtemplate:7 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:7 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:7 msgid "C++/Embedded" @@ -2867,79 +2818,6 @@ msgid "A Qmake/Qt3 based hello world program was created in %{dest}" msgstr "一個 Qmake/Qt3 為基礎的 hello world 程å¼å·²å»ºç«‹æ–¼ %{dest}" #. Name -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:3 -msgid "Basic Qt4 Application" -msgstr "基本 Qt4 應用程å¼" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:5 -msgid "" -"Generate a very simple QMake/Qt4 based application (crossplatform " -"compatible) - Needs Qt4" -msgstr "產生一個以 QMake/Qt4 為基礎的簡單應用程å¼ï¼ˆè·¨å¹³å°ç›¸å®¹ï¼‰â”€éœ€è¦ä½¿ç”¨ Qt4" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:45 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:90 -msgid "A Qt4/Qmake based application was created in %{dest}" -msgstr "一個 QMake/Qt4 為基礎的應用程å¼å·²å»ºç«‹æ–¼ %{dest}" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:51 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:96 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:79 -msgid "Absolute Path for QMake (Qt4)." -msgstr "QMake（Qt4）的絕å°è·¯å¾‘" - -#. Comment -#: languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate:58 -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:103 -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:86 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:87 -msgid "Absolute Path for Designer (Qt4)." -msgstr "è¨è¨ˆå®¶ï¼ˆQt4）的絕å°è·¯å¾‘" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:3 -#, fuzzy -msgid "Qt4/QMake Application" -msgstr "Qt4 應用程å¼" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp:5 -#, fuzzy -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible)- Needs Qt4" -msgstr "產生一個 QMake/Qt4 為基礎的應用程å¼ï¼ˆè·¨å¹³å°ç›¸å®¹ï¼‰â”€éœ€è¦ Qt4" - -#. Name -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:3 -msgid "Qt4 Application" -msgstr "Qt4 應用程å¼" - -#. Comment -#: languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate:5 -msgid "" -"Generate a QMake/Qt4 based application (crossplatform compatible) - Needs Qt4" -msgstr "產生一個 QMake/Qt4 為基礎的應用程å¼ï¼ˆè·¨å¹³å°ç›¸å®¹ï¼‰â”€éœ€è¦ Qt4" - -#. Name -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:3 -msgid "Qtopia 4 Application" -msgstr "Qtopia 4 應用程å¼" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:5 -msgid "Generate a Qmake/Qt based application for Qtopia 4.x" -msgstr "產生一個以 Qmake/Qt 為基礎的 Qtopia 4.x 應用程å¼" - -#. Comment -#: languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate:73 -#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 -msgid "A Qtopia application was created in %{dest}" -msgstr "一個 Qtopia 應用程å¼å·²å»ºç«‹æ–¼ %{dest}" - -#. Name #: languages/cpp/app_templates/qtopiaapp/qtopiaapp:3 #: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:3 msgid "Qtopia Application" @@ -2951,6 +2829,11 @@ msgstr "Qtopia 應用程å¼" msgid "Generate a TMake/Qt based application for Qtopia 1.x" msgstr "產生一個 Qtopia 1.x çš„ TMake/Qt 應用程å¼" +#. Comment +#: languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate:70 +msgid "A Qtopia application was created in %{dest}" +msgstr "一個 Qtopia 應用程å¼å·²å»ºç«‹æ–¼ %{dest}" + #. Name #: languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate:3 msgid "Control Center module" @@ -3416,7 +3299,6 @@ msgstr "產生一個簡單的 QtRuby Hello World 應用程å¼" #. Category #: languages/ruby/app_templates/qtruby/qtruby.kdevtemplate:7 -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:7 #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:7 msgid "Ruby/Qt" msgstr "" @@ -3427,23 +3309,6 @@ msgid "A simple QtRuby application was created in %{dest}" msgstr "一個簡單的 QtRuby 應用程å¼æ¡†æž¶å·²å»ºç«‹æ–¼ %{dest}" #. Name -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:3 -msgid "QtRuby4 Application" -msgstr "QtRuby4 應用程å¼" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:5 -msgid "" -"Generate a QtRuby4 based application (crossplatform compatible) - Needs " -"QtRuby4" -msgstr "產生一個 QtRuby4 為基礎的應用程å¼ï¼ˆè·¨å¹³å°ç›¸å®¹ï¼‰â”€éœ€è¦ QtRuby4" - -#. Comment -#: languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate:81 -msgid "A QtRuby4 based application was created in %{dest}" -msgstr "一個 QtRuby4 為基礎的應用程å¼æ¡†æž¶å·²å»ºç«‹æ–¼ %{dest}" - -#. Name #: languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate:3 msgid "QtRuby Application" msgstr "QtRuby 應用程å¼" @@ -3618,12 +3483,6 @@ msgid "Qt C++ Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/qt4qmake:3 -#, fuzzy -msgid "Qt4 C++ Application (QMake4 based)" -msgstr "Qt4 應用程å¼" - -#. Comment #: parts/appwizard/imports/qtqmake:3 msgid "Qt C++ Application (QMake based)" msgstr "" @@ -3643,3 +3502,84 @@ msgstr "" #, fuzzy msgid "Ruby Application" msgstr "QtRuby 應用程å¼" + +#~ msgid "KApp4" +#~ msgstr "KApp4 程å¼" + +#~ msgid "A KDE4 Application" +#~ msgstr "KDE4 應用程å¼" + +#, fuzzy +#~ msgid "KDevQt4Importer" +#~ msgstr "KDev Qt 匯入器" + +#~ msgid "TDevelop Qt4 PCS Importer" +#~ msgstr "TDevelop Qt4 PCS 匯入器" + +#~ msgid "KDE4 Application framework" +#~ msgstr "KDE4 應用程å¼æ¡†æž¶" + +#~ msgid "" +#~ "Generates a simple KDE4 application with one toplevel window, menus and " +#~ "toolbars." +#~ msgstr "產生一個簡單的 KDE4 應用程å¼ï¼Œå…§å«é ‚層視窗ã€é¸å–®èˆ‡å·¥å…·åˆ—。" + +#~ msgid "A KDE4 Application was created at %{dest}" +#~ msgstr "一個 KDE4 應用程å¼å·²å»ºç«‹æ–¼ %{dest}" + +#~ msgid "Basic Qt4 Application" +#~ msgstr "基本 Qt4 應用程å¼" + +#~ msgid "" +#~ "Generate a very simple QMake/Qt4 based application (crossplatform " +#~ "compatible) - Needs Qt4" +#~ msgstr "" +#~ "產生一個以 QMake/Qt4 為基礎的簡單應用程å¼ï¼ˆè·¨å¹³å°ç›¸å®¹ï¼‰â”€éœ€è¦ä½¿ç”¨ Qt4" + +#~ msgid "A Qt4/Qmake based application was created in %{dest}" +#~ msgstr "一個 QMake/Qt4 為基礎的應用程å¼å·²å»ºç«‹æ–¼ %{dest}" + +#~ msgid "Absolute Path for QMake (Qt4)." +#~ msgstr "QMake（Qt4）的絕å°è·¯å¾‘" + +#~ msgid "Absolute Path for Designer (Qt4)." +#~ msgstr "è¨è¨ˆå®¶ï¼ˆQt4）的絕å°è·¯å¾‘" + +#, fuzzy +#~ msgid "Qt4/QMake Application" +#~ msgstr "Qt4 應用程å¼" + +#, fuzzy +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible)- Needs " +#~ "Qt4" +#~ msgstr "產生一個 QMake/Qt4 為基礎的應用程å¼ï¼ˆè·¨å¹³å°ç›¸å®¹ï¼‰â”€éœ€è¦ Qt4" + +#~ msgid "Qt4 Application" +#~ msgstr "Qt4 應用程å¼" + +#~ msgid "" +#~ "Generate a QMake/Qt4 based application (crossplatform compatible) - Needs " +#~ "Qt4" +#~ msgstr "產生一個 QMake/Qt4 為基礎的應用程å¼ï¼ˆè·¨å¹³å°ç›¸å®¹ï¼‰â”€éœ€è¦ Qt4" + +#~ msgid "Qtopia 4 Application" +#~ msgstr "Qtopia 4 應用程å¼" + +#~ msgid "Generate a Qmake/Qt based application for Qtopia 4.x" +#~ msgstr "產生一個以 Qmake/Qt 為基礎的 Qtopia 4.x 應用程å¼" + +#~ msgid "QtRuby4 Application" +#~ msgstr "QtRuby4 應用程å¼" + +#~ msgid "" +#~ "Generate a QtRuby4 based application (crossplatform compatible) - Needs " +#~ "QtRuby4" +#~ msgstr "產生一個 QtRuby4 為基礎的應用程å¼ï¼ˆè·¨å¹³å°ç›¸å®¹ï¼‰â”€éœ€è¦ QtRuby4" + +#~ msgid "A QtRuby4 based application was created in %{dest}" +#~ msgstr "一個 QtRuby4 為基礎的應用程å¼æ¡†æž¶å·²å»ºç«‹æ–¼ %{dest}" + +#, fuzzy +#~ msgid "Qt4 C++ Application (QMake4 based)" +#~ msgstr "Qt4 應用程å¼" diff --git a/translations/desktop_files/tdevelop-eventsrc/ru.po b/translations/desktop_files/tdevelop-eventsrc/ru.po index d2160798..77a344c4 100644 --- a/translations/desktop_files/tdevelop-eventsrc/ru.po +++ b/translations/desktop_files/tdevelop-eventsrc/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-22 04:04+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-03-29 02:45+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdevelop/tdevelop-events/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Comment #: src/eventsrc:3 msgid "KDevelop" -msgstr "" +msgstr "KDevelop" #. Name #: src/eventsrc:6 diff --git a/vcs/clearcase/clearcasefileinfoprovider.cpp b/vcs/clearcase/clearcasefileinfoprovider.cpp index 1e18f8e1..dceb9b9e 100644 --- a/vcs/clearcase/clearcasefileinfoprovider.cpp +++ b/vcs/clearcase/clearcasefileinfoprovider.cpp @@ -21,7 +21,7 @@ ClearcaseFileinfoProvider::ClearcaseFileinfoProvider(ClearcasePart *parent) { vcsInfo_ = NULL; - connect(parent, TQT_SIGNAL(statusReady(const VCSFileInfoMap&, void*)), TQT_SIGNAL(triggerUpdate(const VCSFileInfoMap&, void*))); + connect(parent, TQ_SIGNAL(statusReady(const VCSFileInfoMap&, void*)), TQ_SIGNAL(triggerUpdate(const VCSFileInfoMap&, void*))); kdevVCS_ = parent; } diff --git a/vcs/clearcase/clearcasefileinfoprovider.h b/vcs/clearcase/clearcasefileinfoprovider.h index 0f6f7d06..848f7704 100644 --- a/vcs/clearcase/clearcasefileinfoprovider.h +++ b/vcs/clearcase/clearcasefileinfoprovider.h @@ -21,7 +21,7 @@ */ class ClearcaseFileinfoProvider : public KDevVCSFileInfoProvider { - Q_OBJECT + TQ_OBJECT public: ClearcaseFileinfoProvider(ClearcasePart *parent); diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp index 8f05fbad..700de36b 100644 --- a/vcs/clearcase/clearcasepart.cpp +++ b/vcs/clearcase/clearcasepart.cpp @@ -60,8 +60,8 @@ ClearcasePart::ClearcasePart( TQObject *parent, const char *name, const TQString fileInfoProvider_ = new ClearcaseFileinfoProvider(this); setInstance(ClearcaseFactory::instance()); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); } ClearcasePart::~ClearcasePart() @@ -88,26 +88,26 @@ void ClearcasePart::contextMenu(TQPopupMenu *popup, const Context *context) TQString name = fi.fileName(); sub->insertTitle( i18n("Actions for %1").arg(name) ); sub->insertItem( i18n("Checkin"), - this, TQT_SLOT(slotCheckin()) ); + this, TQ_SLOT(slotCheckin()) ); sub->insertItem( i18n("Checkout"), - this, TQT_SLOT(slotCheckout()) ); + this, TQ_SLOT(slotCheckout()) ); sub->insertItem( i18n("Uncheckout"), - this, TQT_SLOT(slotUncheckout()) ); + this, TQ_SLOT(slotUncheckout()) ); sub->insertSeparator(); sub->insertItem( i18n("Create Element"), - this, TQT_SLOT(slotCreate()) ); + this, TQ_SLOT(slotCreate()) ); sub->insertItem( i18n("Remove Element"), - this, TQT_SLOT(slotRemove()) ); + this, TQ_SLOT(slotRemove()) ); sub->insertSeparator(); sub->insertItem( i18n("History"), - this, TQT_SLOT(slotListHistory()) ); + this, TQ_SLOT(slotListHistory()) ); sub->insertSeparator(); sub->insertItem( i18n("Diff"), - this, TQT_SLOT(slotDiff()) ); + this, TQ_SLOT(slotDiff()) ); sub->insertSeparator(); sub->insertItem( i18n("List Checkouts"), - this, TQT_SLOT(slotListCheckouts()) ); + this, TQ_SLOT(slotListCheckouts()) ); popup->insertItem(i18n("Clearcase"), sub); @@ -304,8 +304,8 @@ void ClearcasePart::slotDiff() args << name; ExecCommand* cmv = new ExecCommand( "cleartool", args, dir, env, this ); - connect( cmv, TQT_SIGNAL(finished( const TQString&, const TQString& )), - this, TQT_SLOT(slotDiffFinished( const TQString&, const TQString& )) ); + connect( cmv, TQ_SIGNAL(finished( const TQString&, const TQString& )), + this, TQ_SLOT(slotDiffFinished( const TQString&, const TQString& )) ); } diff --git a/vcs/clearcase/clearcasepart.h b/vcs/clearcase/clearcasepart.h index be63e674..866e312c 100644 --- a/vcs/clearcase/clearcasepart.h +++ b/vcs/clearcase/clearcasepart.h @@ -18,7 +18,7 @@ class Context; class TQPopupMenu; class ClearcasePart : public KDevVersionControl { - Q_OBJECT + TQ_OBJECT public: diff --git a/vcs/clearcase/commentdlg.cpp b/vcs/clearcase/commentdlg.cpp index 2f93ab49..f940b77c 100644 --- a/vcs/clearcase/commentdlg.cpp +++ b/vcs/clearcase/commentdlg.cpp @@ -46,8 +46,8 @@ CcaseCommentDlg::CcaseCommentDlg(bool bCheckin) buttonbox->addStretch(); TQPushButton *ok = buttonbox->addButton(KStdGuiItem::ok()); TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); - connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); ok->setDefault(true); buttonbox->layout(); layout2->addWidget(buttonbox, 0); diff --git a/vcs/clearcase/commentdlg.h b/vcs/clearcase/commentdlg.h index 0ce9d5ce..1967dfb8 100644 --- a/vcs/clearcase/commentdlg.h +++ b/vcs/clearcase/commentdlg.h @@ -18,7 +18,7 @@ class CcaseCommentDlg : public TQDialog { -Q_OBJECT +TQ_OBJECT public: CcaseCommentDlg(bool = FALSE); diff --git a/vcs/clearcase/integrator/ccintegratordlg.h b/vcs/clearcase/integrator/ccintegratordlg.h index f427b2b3..3242d5d4 100644 --- a/vcs/clearcase/integrator/ccintegratordlg.h +++ b/vcs/clearcase/integrator/ccintegratordlg.h @@ -24,7 +24,7 @@ #include <kdevvcsintegrator.h> class CCIntegratorDlg: public CCIntegratorDlgBase, public VCSDialog { -Q_OBJECT +TQ_OBJECT public: CCIntegratorDlg(TQWidget *parent = 0, const char *name = 0); diff --git a/vcs/clearcase/integrator/clearcaseintegrator.h b/vcs/clearcase/integrator/clearcaseintegrator.h index 3859c1f9..ea8616a6 100644 --- a/vcs/clearcase/integrator/clearcaseintegrator.h +++ b/vcs/clearcase/integrator/clearcaseintegrator.h @@ -26,7 +26,7 @@ class ClearcaseIntegrator : public KDevVCSIntegrator { -Q_OBJECT +TQ_OBJECT public: ClearcaseIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList()); diff --git a/vcs/cvsservice/README.dox b/vcs/cvsservice/README.dox index 9887fac9..4a4c5b8c 100644 --- a/vcs/cvsservice/README.dox +++ b/vcs/cvsservice/README.dox @@ -23,7 +23,7 @@ mailing list. Contributions are always welcome :-) Implementation of this component is done by: - class CvsServicePart, which does provide integration within tdevelop, set-up GUI integration, forward cvs commands to the implementation (m_impl). It does also - intercepts Q_SIGNALS like "new files added to project" and "... removed from ...". + intercepts signals like "new files added to project" and "... removed from ...". - class CvsServicePartImpl implements the actual feature: more general speaking functions (like checking for whether files are in repository, provide checks on file lists, ...). @@ -73,7 +73,7 @@ Implementation of this component is done by: \todo Test with SSH repositories! \todo Share a common outputview between VCS: CvsProcessWidget should be reworked :-/ -\todo Additional Q_SLOTS for more complex stuff as status, revert, patch creation, ... +\todo Additional slots for more complex stuff as status, revert, patch creation, ... \faq <b>Does cvsservicepart support login with :pserver: or :ext: ?</b> Well, I dunno ;-) I have no ssh repositories to test so feel free to provide feedback on the subject :-) diff --git a/vcs/cvsservice/annotatedialog.cpp b/vcs/cvsservice/annotatedialog.cpp index ac9f293d..b7cbb749 100644 --- a/vcs/cvsservice/annotatedialog.cpp +++ b/vcs/cvsservice/annotatedialog.cpp @@ -33,8 +33,8 @@ AnnotateDialog::AnnotateDialog( CvsService_stub *cvsService, TQWidget *parent, c TQVBox *vbox = addVBoxPage( i18n("Annotate") ); m_cvsAnnotatePage = new AnnotatePage( m_cvsService, vbox ); - connect( m_cvsAnnotatePage, TQT_SIGNAL(requestAnnotate(const TQString)), - this, TQT_SLOT(slotAnnotate(const TQString)) ); + connect( m_cvsAnnotatePage, TQ_SIGNAL(requestAnnotate(const TQString)), + this, TQ_SLOT(slotAnnotate(const TQString)) ); } AnnotateDialog::~AnnotateDialog() @@ -61,8 +61,8 @@ void AnnotateDialog::slotAnnotate(const TQString rev) AnnotatePage * page = new AnnotatePage( m_cvsService, vbox ); page->startAnnotate(m_pathName, rev); - connect( page, TQT_SIGNAL(requestAnnotate(const TQString)), - this, TQT_SLOT(slotAnnotate(const TQString)) ); + connect( page, TQ_SIGNAL(requestAnnotate(const TQString)), + this, TQ_SLOT(slotAnnotate(const TQString)) ); } #include "annotatedialog.moc" diff --git a/vcs/cvsservice/annotatedialog.h b/vcs/cvsservice/annotatedialog.h index 67218dea..4d6b7f18 100644 --- a/vcs/cvsservice/annotatedialog.h +++ b/vcs/cvsservice/annotatedialog.h @@ -29,7 +29,7 @@ class AnnotatePage; */ class AnnotateDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: AnnotateDialog( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); diff --git a/vcs/cvsservice/annotatepage.cpp b/vcs/cvsservice/annotatepage.cpp index e044db54..9ecf8279 100644 --- a/vcs/cvsservice/annotatepage.cpp +++ b/vcs/cvsservice/annotatepage.cpp @@ -59,10 +59,10 @@ AnnotatePage::AnnotatePage( CvsService_stub *cvsService, TQWidget *parent, const dialogLayout->add( LayoutWidget ); - connect( m_btnAnnotate, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNewAnnotate()) ); - connect( m_leRevision, TQT_SIGNAL( returnPressed() ), - m_btnAnnotate, TQT_SLOT( setFocus() ) ); + connect( m_btnAnnotate, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNewAnnotate()) ); + connect( m_leRevision, TQ_SIGNAL( returnPressed() ), + m_btnAnnotate, TQ_SLOT( setFocus() ) ); //Nest create the AnnotateView; it will do the actual displaying m_annotateView = new AnnotateView(this, "annotateview"); @@ -227,7 +227,7 @@ void AnnotatePage::parseAnnotateOutput(TQStringList& lines) //so we pass it as TQDateTime to the AnnotateView below TQString dateString = line.mid(23, 9); if( !dateString.isEmpty() ) - logDate.setTime_t(KRFCDate::parseDate(dateString), Qt::UTC); + logDate.setTime_t(KRFCDate::parseDate(dateString), TQt::UTC); rev = line.left(13).stripWhiteSpace(); author = line.mid(14, 8).stripWhiteSpace(); diff --git a/vcs/cvsservice/annotatepage.h b/vcs/cvsservice/annotatepage.h index 569ed935..932587f9 100644 --- a/vcs/cvsservice/annotatepage.h +++ b/vcs/cvsservice/annotatepage.h @@ -36,7 +36,7 @@ class KPushButton; */ class AnnotatePage : public TQWidget, virtual public CVSServiceDCOPIface { - Q_OBJECT + TQ_OBJECT friend class AnnotateDialog; diff --git a/vcs/cvsservice/annotateview.cpp b/vcs/cvsservice/annotateview.cpp index 89aa7f01..55f9b8fd 100644 --- a/vcs/cvsservice/annotateview.cpp +++ b/vcs/cvsservice/annotateview.cpp @@ -157,8 +157,8 @@ AnnotateView::AnnotateView(AnnotatePage *parent, const char *name) setSorting(AnnotateViewItem::LineNumberColumn); setColumnAlignment(AnnotateViewItem::LineNumberColumn, TQt::AlignRight); - connect( this, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(itemClicked(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(itemClicked(TQListViewItem*)) ); } diff --git a/vcs/cvsservice/annotateview.h b/vcs/cvsservice/annotateview.h index 6bc97bf2..82741b2e 100644 --- a/vcs/cvsservice/annotateview.h +++ b/vcs/cvsservice/annotateview.h @@ -32,7 +32,7 @@ class AnnotatePage; */ class AnnotateView : public TDEListView, public TQToolTip { - Q_OBJECT + TQ_OBJECT public: diff --git a/vcs/cvsservice/checkoutdialog.cpp b/vcs/cvsservice/checkoutdialog.cpp index e6bcbd05..c91f8309 100644 --- a/vcs/cvsservice/checkoutdialog.cpp +++ b/vcs/cvsservice/checkoutdialog.cpp @@ -77,10 +77,10 @@ CheckoutDialog::CheckoutDialog( CvsService_stub *cvsService, m_base = new CheckoutDialogBase( this, "checkoutdialogbase" ); setMainWidget( m_base ); - connect( m_base->fetchModulesButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotFetchModulesList()) ); - connect( m_base->modulesListView, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotModuleSelected(TQListViewItem*)) ); + connect( m_base->fetchModulesButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotFetchModulesList()) ); + connect( m_base->modulesListView, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotModuleSelected(TQListViewItem*)) ); // Avoid displaying 'file:/' when displaying the file m_base->workURLRequester->setShowLocalProtocol( false ); diff --git a/vcs/cvsservice/checkoutdialog.h b/vcs/cvsservice/checkoutdialog.h index 51388bc5..9aef6483 100644 --- a/vcs/cvsservice/checkoutdialog.h +++ b/vcs/cvsservice/checkoutdialog.h @@ -29,7 +29,7 @@ class TQListViewItem; */ class CheckoutDialog : public KDialogBase, virtual public CVSServiceDCOPIface { - Q_OBJECT + TQ_OBJECT public: CheckoutDialog( CvsService_stub *cvsService, TQWidget *parent = 0, diff --git a/vcs/cvsservice/commitdialogbase.ui b/vcs/cvsservice/commitdialogbase.ui index 12844638..667176f2 100644 --- a/vcs/cvsservice/commitdialogbase.ui +++ b/vcs/cvsservice/commitdialogbase.ui @@ -132,9 +132,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/vcs/cvsservice/commitdlg.cpp b/vcs/cvsservice/commitdlg.cpp index f47516ed..206fe754 100644 --- a/vcs/cvsservice/commitdlg.cpp +++ b/vcs/cvsservice/commitdlg.cpp @@ -33,8 +33,8 @@ CommitDialog::CommitDialog( const TQString &changeLogfileNamePath, TQWidget *parent ) : CommitDialogBase( parent, "commitdialog", true ) { - connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( buttonOk, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( buttonCancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); setChangeLogFileName( changeLogfileNamePath ); } diff --git a/vcs/cvsservice/commitdlg.h b/vcs/cvsservice/commitdlg.h index c955836f..5d01ff20 100644 --- a/vcs/cvsservice/commitdlg.h +++ b/vcs/cvsservice/commitdlg.h @@ -23,7 +23,7 @@ class TQCheckBox; class CommitDialog : public CommitDialogBase { - Q_OBJECT + TQ_OBJECT public: CommitDialog( const TQString &changeLogfileNamePath, TQWidget *parent = 0 ); diff --git a/vcs/cvsservice/cvsdiffpage.h b/vcs/cvsservice/cvsdiffpage.h index ec3e4f36..4adfbb9c 100644 --- a/vcs/cvsservice/cvsdiffpage.h +++ b/vcs/cvsservice/cvsdiffpage.h @@ -28,7 +28,7 @@ Implementation for the form displaying 'cvs diff' output. */ class CVSDiffPage : public TQWidget, virtual public CVSServiceDCOPIface { - Q_OBJECT + TQ_OBJECT public: CVSDiffPage( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); diff --git a/vcs/cvsservice/cvsentry.cpp b/vcs/cvsservice/cvsentry.cpp index 79f83deb..c30e15a8 100644 --- a/vcs/cvsservice/cvsentry.cpp +++ b/vcs/cvsservice/cvsentry.cpp @@ -97,7 +97,7 @@ void CVSEntry::parse( const TQString &aLine, const CVSDir& dir ) { TQDateTime date( TQDateTime::fromString( timeStamp() ) ); TQDateTime fileDateUTC; - fileDateUTC.setTime_t( TQFileInfo(dir, fileName()).lastModified().toTime_t(), Qt::UTC ); + fileDateUTC.setTime_t( TQFileInfo(dir, fileName()).lastModified().toTime_t(), TQt::UTC ); if ( date != fileDateUTC ) m_state = Modified; } diff --git a/vcs/cvsservice/cvsfileinfoprovider.cpp b/vcs/cvsservice/cvsfileinfoprovider.cpp index 8eb77b71..e71e8a28 100644 --- a/vcs/cvsservice/cvsfileinfoprovider.cpp +++ b/vcs/cvsservice/cvsfileinfoprovider.cpp @@ -35,7 +35,7 @@ CVSFileInfoProvider::CVSFileInfoProvider( CvsServicePart *parent, CvsService_stu : KDevVCSFileInfoProvider( parent, "cvsfileinfoprovider" ), m_requestStatusJob( 0 ), m_cvsService( cvsService ), m_cachedDirEntries( 0 ) { - connect( this, TQT_SIGNAL(needStatusUpdate(const CVSDir&)), this, TQT_SLOT(updateStatusFor(const CVSDir&))); + connect( this, TQ_SIGNAL(needStatusUpdate(const CVSDir&)), this, TQ_SLOT(updateStatusFor(const CVSDir&))); } /////////////////////////////////////////////////////////////////////////////// @@ -146,7 +146,7 @@ void CVSFileInfoProvider::updateStatusFor(const CVSDir& dir) * item conains any childs. Therefor we need to give FileTree some time * to update the directory item before we give the status infos. */ - TQTimer::singleShot( 1000, this, TQT_SLOT(propagateUpdate()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(propagateUpdate()) ); } /////////////////////////////////////////////////////////////////////////////// diff --git a/vcs/cvsservice/cvsfileinfoprovider.h b/vcs/cvsservice/cvsfileinfoprovider.h index 4cc9f4f2..be2ff803 100644 --- a/vcs/cvsservice/cvsfileinfoprovider.h +++ b/vcs/cvsservice/cvsfileinfoprovider.h @@ -30,7 +30,7 @@ Provider for CVS file information */ class CVSFileInfoProvider : public KDevVCSFileInfoProvider, virtual public CVSServiceDCOPIface { - Q_OBJECT + TQ_OBJECT public: CVSFileInfoProvider( CvsServicePart *parent, CvsService_stub *cvsService ); diff --git a/vcs/cvsservice/cvsform.h b/vcs/cvsservice/cvsform.h index b8fe6acd..280565cf 100644 --- a/vcs/cvsservice/cvsform.h +++ b/vcs/cvsservice/cvsform.h @@ -20,7 +20,7 @@ information about setting up the cvs repository. */ class CvsForm : public CvsFormBase { - Q_OBJECT + TQ_OBJECT public: CvsForm( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); diff --git a/vcs/cvsservice/cvslogdialog.cpp b/vcs/cvsservice/cvslogdialog.cpp index 21169346..fb189234 100644 --- a/vcs/cvsservice/cvslogdialog.cpp +++ b/vcs/cvsservice/cvslogdialog.cpp @@ -42,8 +42,8 @@ CVSLogDialog::CVSLogDialog( CvsService_stub *cvsService, TQWidget *parent, const TQVBox *vbox = addVBoxPage( i18n("Log From CVS") ); m_cvsLogPage = new CVSLogPage( m_cvsService, vbox ); - connect( m_cvsLogPage, TQT_SIGNAL(diffRequested(const TQString&, const TQString&, const TQString&)), - this, TQT_SLOT(slotDiffRequested(const TQString&, const TQString&, const TQString&)) ); + connect( m_cvsLogPage, TQ_SIGNAL(diffRequested(const TQString&, const TQString&, const TQString&)), + this, TQ_SLOT(slotDiffRequested(const TQString&, const TQString&, const TQString&)) ); } /////////////////////////////////////////////////////////////////////////////// @@ -66,8 +66,8 @@ void CVSLogDialog::startLog( const TQString &workDir, const TQString &pathName ) m_cvsLogPage = new CVSLogPage( m_cvsService, vbox ); this->resize( m_cvsLogPage->size() ); - connect( m_cvsLogPage, TQT_SIGNAL(linkClicked(const TQString&, const TQString&)), - this, TQT_SLOT(slotDiffRequested(const TQString&, const TQString&)) ); + connect( m_cvsLogPage, TQ_SIGNAL(linkClicked(const TQString&, const TQString&)), + this, TQ_SLOT(slotDiffRequested(const TQString&, const TQString&)) ); */ m_cvsLogPage->startLog( workDir, pathName ); } diff --git a/vcs/cvsservice/cvslogdialog.h b/vcs/cvsservice/cvslogdialog.h index e3d3614e..6faf8f59 100644 --- a/vcs/cvsservice/cvslogdialog.h +++ b/vcs/cvsservice/cvslogdialog.h @@ -25,7 +25,7 @@ Implementation for the form displaying 'cvs log' output. */ class CVSLogDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: CVSLogDialog( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); diff --git a/vcs/cvsservice/cvslogpage.cpp b/vcs/cvsservice/cvslogpage.cpp index 4b2d7fb4..756d28d1 100644 --- a/vcs/cvsservice/cvslogpage.cpp +++ b/vcs/cvsservice/cvslogpage.cpp @@ -46,7 +46,7 @@ CVSLogPage::CVSLogPage( CvsService_stub *cvsService, TQWidget *parent, const cha m_textBrowser->setMinimumWidth(fontMetrics().width('X')*50); m_textBrowser->setMinimumHeight(fontMetrics().width('X')*43); - connect( m_textBrowser, TQT_SIGNAL(linkClicked( const TQString& )), this, TQT_SLOT(slotLinkClicked( const TQString& )) ); + connect( m_textBrowser, TQ_SIGNAL(linkClicked( const TQString& )), this, TQ_SLOT(slotLinkClicked( const TQString& )) ); } /////////////////////////////////////////////////////////////////////////////// diff --git a/vcs/cvsservice/cvslogpage.h b/vcs/cvsservice/cvslogpage.h index badfcfd6..63c63a14 100644 --- a/vcs/cvsservice/cvslogpage.h +++ b/vcs/cvsservice/cvslogpage.h @@ -27,7 +27,7 @@ Implementation for the form displaying 'cvs log' output. */ class CVSLogPage : public TQWidget, virtual public CVSServiceDCOPIface { - Q_OBJECT + TQ_OBJECT public: CVSLogPage( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); diff --git a/vcs/cvsservice/cvsoptionswidget.h b/vcs/cvsservice/cvsoptionswidget.h index dd58797a..5794d22e 100644 --- a/vcs/cvsservice/cvsoptionswidget.h +++ b/vcs/cvsservice/cvsoptionswidget.h @@ -22,7 +22,7 @@ class TQVBoxLayout; class CvsOptionsWidget : public CvsOptionsWidgetBase { - Q_OBJECT + TQ_OBJECT public: CvsOptionsWidget( TQWidget *parent, const char *name=0 ); diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp index 6ded6ecb..ca7c26ab 100644 --- a/vcs/cvsservice/cvspart.cpp +++ b/vcs/cvsservice/cvspart.cpp @@ -96,10 +96,10 @@ CvsServicePart::CvsServicePart( TQObject *parent, const char *name, const TQStri m_impl = new CvsServicePartImpl( this ); // Load / store project configuration every time project is opened/closed - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotProjectClosed()) ); - TQTimer::singleShot(0, this, TQT_SLOT(init())); + TQTimer::singleShot(0, this, TQ_SLOT(init())); } /////////////////////////////////////////////////////////////////////////////// @@ -119,15 +119,15 @@ void CvsServicePart::init() setupActions(); // Re-route our implementation signal for when check-out finishes to the standard signal - connect( m_impl, TQT_SIGNAL(checkoutFinished(TQString)), TQT_SIGNAL(finishedFetching(TQString)) ); + connect( m_impl, TQ_SIGNAL(checkoutFinished(TQString)), TQ_SIGNAL(finishedFetching(TQString)) ); // Context menu - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(slotStopButtonClicked(KDevPlugin*)) ); m_impl->m_widget->setIcon( UserIcon( "kdev_cvs", TDEIcon::DefaultState, CvsFactory::instance()) ); TQWhatsThis::add( m_impl->processWidget(), i18n("<b>CVS</b><p>Concurrent Versions System operations window. Shows output of Cervisia CVS Service.") ); @@ -144,92 +144,92 @@ void CvsServicePart::setupActions() // context at runtime. See CvsServicePart::contextMenu(). actionCommit = new TDEAction( i18n("&Commit to Repository"), 0, this, - TQT_SLOT(slotActionCommit()), actionCollection(), "cvsservice_commit" ); + TQ_SLOT(slotActionCommit()), actionCollection(), "cvsservice_commit" ); actionCommit->setToolTip( i18n("Commit file(s)") ); actionCommit->setWhatsThis( i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.") ); - actionDiff = new TDEAction( i18n("&Difference Between Revisions"), 0, this, TQT_SLOT(slotActionDiff()), + actionDiff = new TDEAction( i18n("&Difference Between Revisions"), 0, this, TQ_SLOT(slotActionDiff()), actionCollection(), "cvsservice_diff" ); actionDiff->setToolTip( i18n("Build difference") ); actionDiff->setWhatsThis( i18n("<b>Build difference</b><p>Builds difference between releases.") ); - actionLog = new TDEAction( i18n("Generate &Log"), 0, this, TQT_SLOT(slotActionLog()), + actionLog = new TDEAction( i18n("Generate &Log"), 0, this, TQ_SLOT(slotActionLog()), actionCollection(), "cvsservice_log" ); actionLog->setToolTip( i18n("Generate log") ); actionLog->setWhatsThis( i18n("<b>Generate log</b><p>Produces log for this file.") ); - actionAnnotate = new TDEAction( i18n("&Annotate"), 0, this, TQT_SLOT(slotActionAnnotate()), + actionAnnotate = new TDEAction( i18n("&Annotate"), 0, this, TQ_SLOT(slotActionAnnotate()), actionCollection(), "cvsservice_annotate" ); actionAnnotate->setToolTip( i18n("Generate annotations") ); actionAnnotate->setWhatsThis( i18n("<b>Annotate</b><p>Produces annotations for this file.") ); - actionAdd = new TDEAction( i18n("&Add to Repository"), 0, this, TQT_SLOT(slotActionAdd()), + actionAdd = new TDEAction( i18n("&Add to Repository"), 0, this, TQ_SLOT(slotActionAdd()), actionCollection(), "cvsservice_add" ); actionAdd->setToolTip( i18n("Add file to repository") ); actionAdd->setWhatsThis( i18n("<b>Add to repository</b><p>Adds file to repository.") ); - actionEdit = new TDEAction( i18n("&Edit Files"), 0, this, TQT_SLOT(slotActionEdit()), + actionEdit = new TDEAction( i18n("&Edit Files"), 0, this, TQ_SLOT(slotActionEdit()), actionCollection(), "cvsservice_edit" ); actionEdit->setToolTip( i18n("Mark as being edited") ); actionEdit->setWhatsThis( i18n("<b>Mark as being edited</b><p>Mark the files as being edited.") ); - actionUnEdit = new TDEAction( i18n("&Unedit Files"), 0, this, TQT_SLOT(slotActionUnEdit()), + actionUnEdit = new TDEAction( i18n("&Unedit Files"), 0, this, TQ_SLOT(slotActionUnEdit()), actionCollection(), "cvsservice_unedit" ); actionUnEdit->setToolTip( i18n("Remove editing mark from files") ); actionUnEdit->setWhatsThis( i18n("<b>Remove editing mark</b><p>Remove the editing mark from the files.") ); - actionEditors = new TDEAction( i18n("&Show Editors"), 0, this, TQT_SLOT(slotActionEditors()), + actionEditors = new TDEAction( i18n("&Show Editors"), 0, this, TQ_SLOT(slotActionEditors()), actionCollection(), "cvsservice_editors" ); actionEditors->setToolTip( i18n("Show editors") ); actionEditors->setWhatsThis( i18n("<b>Show editors</b><p>Shows the list of users who are editing files.") ); actionAddBinary = new TDEAction( i18n("Add to Repository as &Binary"), 0, this, - TQT_SLOT(slotActionAddBinary()), actionCollection(), "cvsservice_add_bin" ); + TQ_SLOT(slotActionAddBinary()), actionCollection(), "cvsservice_add_bin" ); actionAddBinary->setToolTip( i18n("Add file to repository as binary") ); actionAddBinary->setWhatsThis( i18n("<b>Add to repository as binary</b><p>Adds file to repository as binary (-kb option).") ); actionRemove = new TDEAction( i18n("&Remove From Repository"), 0, this, - TQT_SLOT(slotActionRemove()), actionCollection(), "cvsservice_remove" ); + TQ_SLOT(slotActionRemove()), actionCollection(), "cvsservice_remove" ); actionRemove->setToolTip( i18n("Remove from repository") ); actionRemove->setWhatsThis( i18n("<b>Remove from repository</b><p>Removes file(s) from repository.") ); actionUpdate = new TDEAction( i18n("&Update/Revert to Another Release"), 0, this, - TQT_SLOT(slotActionUpdate()), actionCollection(), "cvsservice_update" ); + TQ_SLOT(slotActionUpdate()), actionCollection(), "cvsservice_update" ); actionUpdate->setToolTip( i18n("Update/revert") ); actionUpdate->setWhatsThis( i18n("<b>Update/revert to another release</b><p>Updates/reverts file(s) to another release.") ); actionRemoveSticky = new TDEAction( i18n("R&emove Sticky Flag"), 0, - this, TQT_SLOT(slotActionRemoveSticky()), actionCollection(), "cvsservice_removesticky" ); + this, TQ_SLOT(slotActionRemoveSticky()), actionCollection(), "cvsservice_removesticky" ); actionRemoveSticky->setToolTip( i18n("Remove sticky flag") ); actionRemoveSticky->setWhatsThis( i18n("<b>Remove sticky flag</b><p>Removes sticky flag from file(s).") ); actionTag = new TDEAction( i18n("Make &Tag/Branch"), 0, - this, TQT_SLOT(slotActionTag()), actionCollection(), "cvsservice_tag" ); + this, TQ_SLOT(slotActionTag()), actionCollection(), "cvsservice_tag" ); actionTag->setToolTip( i18n("Make tag/branch") ); actionTag->setWhatsThis( i18n("<b>Make tag/branch</b><p>Tags/branches selected file(s).") ); actionUnTag = new TDEAction( i18n("&Delete Tag"), 0, - this, TQT_SLOT(slotActionUnTag()), actionCollection(), "cvsservice_untag" ); + this, TQ_SLOT(slotActionUnTag()), actionCollection(), "cvsservice_untag" ); actionUnTag->setToolTip( i18n("Delete tag") ); actionUnTag->setWhatsThis( i18n("<b>Delete tag</b><p>Delete tag from selected file(s).") ); actionAddToIgnoreList = new TDEAction( i18n("&Ignore in CVS Operations"), 0, - this, TQT_SLOT(slotActionAddToIgnoreList()), actionCollection(), "cvsservice_ignore" ); + this, TQ_SLOT(slotActionAddToIgnoreList()), actionCollection(), "cvsservice_ignore" ); actionAddToIgnoreList->setToolTip( i18n("Ignore in CVS operations") ); actionAddToIgnoreList->setWhatsThis( i18n("<b>Ignore in CVS operations</b><p>Ignore file(s) by adding it to .cvsignore file.") ); actionRemoveFromIgnoreList = new TDEAction( i18n("Do &Not Ignore in CVS Operations"), 0, - this, TQT_SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "cvsservice_donot_ignore" ); + this, TQ_SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "cvsservice_donot_ignore" ); actionRemoveFromIgnoreList->setToolTip( i18n("Do not ignore in CVS operations") ); actionRemoveFromIgnoreList->setWhatsThis( i18n("<b>Do not ignore in CVS operations</b><p>Do not ignore file(s) by removing\nit from .cvsignore file.") ); actionLogin = new TDEAction( i18n("&Log to Server"), 0, this, - TQT_SLOT(slotActionLogin()), actionCollection(), "cvsservice_login" ); + TQ_SLOT(slotActionLogin()), actionCollection(), "cvsservice_login" ); actionLogin->setToolTip( i18n("Login to server") ); actionLogin->setWhatsThis( i18n("<b>Login to server</b><p>Logs in to the CVS server.") ); actionLogout = new TDEAction( i18n("L&ogout From Server"), 0, this, - TQT_SLOT(slotActionLogout()), actionCollection(), "cvsservice_logout" ); + TQ_SLOT(slotActionLogout()), actionCollection(), "cvsservice_logout" ); actionLogout->setToolTip( i18n("Logout from server") ); actionLogout->setWhatsThis( i18n("<b>Logout from server</b><p>Logs out from the CVS server.") ); } @@ -278,7 +278,7 @@ void CvsServicePart::projectConfigWidget( KDialogBase *dlg ) { TQVBox *vbox = dlg->addVBoxPage( i18n("CvsService"), i18n("CvsService"), BarIcon( info()->icon(), TDEIcon::SizeMedium) ); CvsOptionsWidget *w = new CvsOptionsWidget( (TQWidget *)vbox, "cvs config widget" ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } /////////////////////////////////////////////////////////////////////////////// @@ -320,45 +320,45 @@ void CvsServicePart::contextMenu( TQPopupMenu *popup, const Context *context ) if (context->hasType( Context::FileContext )) popup->insertSeparator(); - int id = subMenu->insertItem( actionCommit->text(), this, TQT_SLOT(slotCommit()) ); + int id = subMenu->insertItem( actionCommit->text(), this, TQ_SLOT(slotCommit()) ); subMenu->setWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.")); // CvsService let to do log and diff operations only on one file (or directory) at time if (m_urls.count() == 1) { - id = subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) ); + id = subMenu->insertItem( actionDiff->text(), this, TQ_SLOT(slotDiff()) ); subMenu->setWhatsThis(id, i18n("<b>Build difference</b><p>Builds difference between releases.")); - id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) ); + id = subMenu->insertItem( actionLog->text(), this, TQ_SLOT(slotLog()) ); subMenu->setWhatsThis(id, i18n("<b>Generate log</b><p>Produces log for this file.")); - id = subMenu->insertItem( actionAnnotate->text(), this, TQT_SLOT(slotAnnotate()) ); + id = subMenu->insertItem( actionAnnotate->text(), this, TQ_SLOT(slotAnnotate()) ); subMenu->setWhatsThis(id, i18n("<b>Generate Annotate</b><p>Produces annotation output for this file.")); } - id = subMenu->insertItem( actionEditors->text(), this, TQT_SLOT(slotEditors()) ); + id = subMenu->insertItem( actionEditors->text(), this, TQ_SLOT(slotEditors()) ); subMenu->setWhatsThis(id, i18n("<b>Show editors</b><p>Shows the list of users who are editing files.")); - id = subMenu->insertItem( actionEdit->text(), this, TQT_SLOT(slotEdit()) ); + id = subMenu->insertItem( actionEdit->text(), this, TQ_SLOT(slotEdit()) ); subMenu->setWhatsThis(id, i18n("<b>Mark as beeing edited</b><p>Mark the files as beeing edited.")); - id = subMenu->insertItem( actionUnEdit->text(), this, TQT_SLOT(slotUnEdit()) ); + id = subMenu->insertItem( actionUnEdit->text(), this, TQ_SLOT(slotUnEdit()) ); subMenu->setWhatsThis(id, i18n("<b>Remove editing mark</b><p>Remove the editing mark from the files.")); - id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) ); + id = subMenu->insertItem( actionAdd->text(), this, TQ_SLOT(slotAdd()) ); subMenu->setWhatsThis(id, i18n("<b>Add to repository</b><p>Adds file to repository.")); - id = subMenu->insertItem( actionAddBinary->text(), this, TQT_SLOT(slotAddBinary()) ); + id = subMenu->insertItem( actionAddBinary->text(), this, TQ_SLOT(slotAddBinary()) ); subMenu->setWhatsThis(id, i18n("<b>Add to repository as binary</b><p>Adds file to repository as binary (-kb option).")); - id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotRemove()) ); + id = subMenu->insertItem( actionRemove->text(), this, TQ_SLOT(slotRemove()) ); subMenu->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository.")); subMenu->insertSeparator(); - id = subMenu->insertItem( actionTag->text(), this, TQT_SLOT(slotTag()) ); + id = subMenu->insertItem( actionTag->text(), this, TQ_SLOT(slotTag()) ); subMenu->setWhatsThis(id, i18n("<b>Make tag/branch</b><p>Tags/branches selected file(s).")); - id = subMenu->insertItem( actionUnTag->text(), this, TQT_SLOT(slotUnTag()) ); + id = subMenu->insertItem( actionUnTag->text(), this, TQ_SLOT(slotUnTag()) ); subMenu->setWhatsThis(id, i18n("<b>Delete tag</b><p>Delete tag from selected file(s).")); - id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) ); + id = subMenu->insertItem( actionUpdate->text(), this, TQ_SLOT(slotUpdate()) ); subMenu->setWhatsThis(id, i18n("<b>Update/revert to another release</b><p>Updates/reverts file(s) to another release.")); - id = subMenu->insertItem( actionRemoveSticky->text(), this, TQT_SLOT(slotRemoveSticky()) ); + id = subMenu->insertItem( actionRemoveSticky->text(), this, TQ_SLOT(slotRemoveSticky()) ); subMenu->setWhatsThis(id, i18n("<b>Remove sticky flag</b><p>Removes sticky flag from file(s).")); subMenu->insertSeparator(); - id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) ); + id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQ_SLOT(slotAddToIgnoreList()) ); subMenu->setWhatsThis(id, i18n("<b>Ignore in CVS operations</b><p>Ignore file(s) by adding it to .cvsignore file.")); - id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) ); + id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQ_SLOT(slotRemoveFromIgnoreList()) ); subMenu->setWhatsThis(id, i18n("<b>Do not ignore in CVS operations</b><p>Do not ignore file(s) by removing\nit from .cvsignore file.")); // Now insert in parent menu @@ -750,8 +750,8 @@ void CvsServicePart::slotProjectOpened() options->load( project() ); // When files are added to project they may be added to/removed from repository too - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQ_SLOT(slotAddFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQ_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); } /////////////////////////////////////////////////////////////////////////////// @@ -772,8 +772,8 @@ void CvsServicePart::slotProjectClosed() delete options; // We don't have a project anymore ... - disconnect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) ); - disconnect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); + disconnect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQ_SLOT(slotAddFilesToProject(const TQStringList &)) ); + disconnect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQ_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); } #include "cvspart.moc" diff --git a/vcs/cvsservice/cvspart.h b/vcs/cvsservice/cvspart.h index e2df8ce0..99008dc8 100644 --- a/vcs/cvsservice/cvspart.h +++ b/vcs/cvsservice/cvspart.h @@ -36,7 +36,7 @@ class CvsServicePartImpl; class CvsServicePart : public KDevVersionControl { - Q_OBJECT + TQ_OBJECT friend class CvsServicePartImpl; diff --git a/vcs/cvsservice/cvspartimpl.cpp b/vcs/cvsservice/cvspartimpl.cpp index 01c85df3..28203e91 100644 --- a/vcs/cvsservice/cvspartimpl.cpp +++ b/vcs/cvsservice/cvspartimpl.cpp @@ -80,7 +80,7 @@ CvsServicePartImpl::CvsServicePartImpl( CvsServicePart *part, const char *name ) m_scheduler = new DirectScheduler( m_widget ); m_fileInfoProvider = new CVSFileInfoProvider( part, m_cvsService ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); } else { @@ -374,7 +374,7 @@ bool CvsServicePartImpl::checkout() modulePath = dlg.workDir() + dlg.module(); m_scheduler->schedule( job ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotCheckoutFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotCheckoutFinished(bool,int)) ); return true; } } @@ -406,7 +406,7 @@ void CvsServicePartImpl::commit( const KURL::List& urlList ) } m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotJobFinished(bool,int)) ); // 2. if requested to do so, add an entry to the Changelog too if (dlg.mustAddToChangeLog()) @@ -448,7 +448,7 @@ void CvsServicePartImpl::update( const KURL::List& urlList ) additionalOptions ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -465,7 +465,7 @@ void CvsServicePartImpl::add( const KURL::List& urlList, bool binary ) DCOPRef cvsJob = m_cvsService->add( fileList(), binary ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -531,7 +531,7 @@ void CvsServicePartImpl::unedit( const KURL::List& urlList) DCOPRef cvsJob = m_cvsService->unedit( fileList() ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -548,7 +548,7 @@ void CvsServicePartImpl::edit( const KURL::List& urlList) DCOPRef cvsJob = m_cvsService->edit( fileList() ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -582,8 +582,8 @@ void CvsServicePartImpl::remove( const KURL::List& urlList ) DCOPRef cvsJob = m_cvsService->remove( fileList(), true ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), - this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), + this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -606,8 +606,8 @@ void CvsServicePartImpl::removeStickyFlag( const KURL::List& urlList ) "-A" ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), - this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), + this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -656,8 +656,8 @@ void CvsServicePartImpl::diff( const KURL::List& urlList ) } m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), - this, TQT_SLOT(slotDiffFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), + this, TQ_SLOT(slotDiffFinished(bool,int)) ); doneOperation(); } @@ -680,8 +680,8 @@ void CvsServicePartImpl::tag( const KURL::List& urlList ) dlg.isBranch(), dlg.force() ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), - this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), + this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -705,8 +705,8 @@ void CvsServicePartImpl::unTag( const KURL::List& urlList ) dlg.isBranch(), dlg.force() ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), - this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), + this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -747,7 +747,7 @@ void CvsServicePartImpl::createNewProject( const TQString &dirName, DCOPRef cvsJob = m_cvsService->import( dirName, location, module, filesToIgnore, message, vendor, release, false ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotCheckoutFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotCheckoutFinished(bool,int)) ); */ TQString rsh_preamble; if ( !options->cvsRshEnvVar().isEmpty() ) diff --git a/vcs/cvsservice/cvspartimpl.h b/vcs/cvsservice/cvspartimpl.h index ade7ffe4..d64ad625 100644 --- a/vcs/cvsservice/cvspartimpl.h +++ b/vcs/cvsservice/cvspartimpl.h @@ -45,7 +45,7 @@ class CvsServicePartImpl : public TQObject { friend class CvsServicePart; - Q_OBJECT + TQ_OBJECT public: //! Available Cvs operations diff --git a/vcs/cvsservice/cvsprocesswidget.cpp b/vcs/cvsservice/cvsprocesswidget.cpp index bb8fb459..87e917a5 100644 --- a/vcs/cvsservice/cvsprocesswidget.cpp +++ b/vcs/cvsservice/cvsprocesswidget.cpp @@ -140,7 +140,7 @@ bool CvsProcessWidget::startJob( const DCOPRef &aJob ) kdDebug(9006) << "Running: " << cmdLine << endl; // disconnect 3rd party slots from our signals - disconnect( TQT_SIGNAL(jobFinished(bool, int)) ); + disconnect( TQ_SIGNAL(jobFinished(bool, int)) ); showInfo( i18n("Started job: %1").arg( cmdLine ) ); diff --git a/vcs/cvsservice/cvsprocesswidget.h b/vcs/cvsservice/cvsprocesswidget.h index c8f9c8af..7a9337f8 100644 --- a/vcs/cvsservice/cvsprocesswidget.h +++ b/vcs/cvsservice/cvsprocesswidget.h @@ -26,7 +26,7 @@ class TQStyleSheetItem; class CvsProcessWidget : public TQTextEdit, virtual public CVSServiceDCOPIface { - Q_OBJECT + TQ_OBJECT public: CvsProcessWidget( CvsService_stub *service, CvsServicePart *part, diff --git a/vcs/cvsservice/diffdialog.h b/vcs/cvsservice/diffdialog.h index 28b0c181..b1e630f3 100644 --- a/vcs/cvsservice/diffdialog.h +++ b/vcs/cvsservice/diffdialog.h @@ -22,7 +22,7 @@ */ class DiffDialog : public DiffDialogBase { - Q_OBJECT + TQ_OBJECT public: DiffDialog(const CVSEntry &entry, TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); diff --git a/vcs/cvsservice/diffdialogbase.ui b/vcs/cvsservice/diffdialogbase.ui index 97bbd918..06c9b11c 100644 --- a/vcs/cvsservice/diffdialogbase.ui +++ b/vcs/cvsservice/diffdialogbase.ui @@ -201,9 +201,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -218,9 +215,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp index 008dc867..1119c6ff 100644 --- a/vcs/cvsservice/diffwidget.cpp +++ b/vcs/cvsservice/diffwidget.cpp @@ -75,14 +75,14 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p ) } if ( !extPartsTranslated.isEmpty() ) popup->insertSeparator( i ); - connect( popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupActivated(int)) ); + connect( popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(popupActivated(int)) ); - popup->insertItem( SmallIconSet( "document-save-as" ), i18n( "&Save As..." ), this, TQT_SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 ); + popup->insertItem( SmallIconSet( "document-save-as" ), i18n( "&Save As..." ), this, TQ_SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 ); popup->setItemEnabled( POPUP_BASE - 2, length() > 0 ); popup->insertSeparator( 1 ); - popup->insertItem( i18n( "Highlight Syntax" ), this, TQT_SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 ); + popup->insertItem( i18n( "Highlight Syntax" ), this, TQ_SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 ); popup->setItemChecked( POPUP_BASE - 1, _highlight ); popup->insertSeparator( 3 ); @@ -184,7 +184,7 @@ DiffWidget::DiffWidget( TQWidget *parent, const char *name, WFlags f ): te->setReadOnly( true ); te->setTextFormat( TQTextEdit::PlainText ); // te->setMinimumSize( 300, 200 ); - connect( te, TQT_SIGNAL(externalPartRequested(const TQString&)), this, TQT_SLOT(loadExtPart(const TQString&)) ); + connect( te, TQ_SIGNAL(externalPartRequested(const TQString&)), this, TQ_SLOT(loadExtPart(const TQString&)) ); TQVBoxLayout* layout = new TQVBoxLayout( this ); layout->addWidget( te ); @@ -222,7 +222,7 @@ void DiffWidget::loadExtPart( const TQString& partName ) if ( !extService ) return; - extPart = KParts::ComponentFactory::createPartInstanceFromService<KParts::ReadOnlyPart>( extService, this, 0, TQT_TQOBJECT(this), 0 ); + extPart = KParts::ComponentFactory::createPartInstanceFromService<KParts::ReadOnlyPart>( extService, this, 0, this, 0 ); if ( !extPart || !extPart->widget() ) return; @@ -301,10 +301,10 @@ void DiffWidget::openURL( const KURL& url ) if ( !job ) return; - connect( job, TQT_SIGNAL(data( TDEIO::Job *, const TQByteArray & )), - this, TQT_SLOT(slotAppend( TDEIO::Job*, const TQByteArray& )) ); - connect( job, TQT_SIGNAL(result( TDEIO::Job * )), - this, TQT_SLOT(slotFinished()) ); + connect( job, TQ_SIGNAL(data( TDEIO::Job *, const TQByteArray & )), + this, TQ_SLOT(slotAppend( TDEIO::Job*, const TQByteArray& )) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job * )), + this, TQ_SLOT(slotFinished()) ); } void DiffWidget::contextMenuEvent( TQContextMenuEvent* /* e */ ) @@ -312,7 +312,7 @@ void DiffWidget::contextMenuEvent( TQContextMenuEvent* /* e */ ) TQPopupMenu* popup = new TQPopupMenu( this ); if ( !te->isVisible() ) - popup->insertItem( i18n("Display &Raw Output"), this, TQT_SLOT(showTextEdit()) ); + popup->insertItem( i18n("Display &Raw Output"), this, TQ_SLOT(showTextEdit()) ); popup->exec( TQCursor::pos() ); delete popup; diff --git a/vcs/cvsservice/diffwidget.h b/vcs/cvsservice/diffwidget.h index 9142aa8a..b14f5860 100644 --- a/vcs/cvsservice/diffwidget.h +++ b/vcs/cvsservice/diffwidget.h @@ -31,7 +31,7 @@ namespace KParts { // Helper class that displays a modified RMB popup menu class KDiffTextEdit: public TQTextEdit { - Q_OBJECT + TQ_OBJECT public: KDiffTextEdit( TQWidget* parent = 0, const char* name = 0 ); @@ -60,7 +60,7 @@ private: class DiffWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/vcs/cvsservice/editorsdialog.h b/vcs/cvsservice/editorsdialog.h index 5bf19b65..86030c14 100644 --- a/vcs/cvsservice/editorsdialog.h +++ b/vcs/cvsservice/editorsdialog.h @@ -21,7 +21,7 @@ class TQStringList; class EditorsDialog: public EditorsDialogBase, virtual public CVSServiceDCOPIface { -Q_OBJECT +TQ_OBJECT public: EditorsDialog(CvsService_stub *cvsService, TQWidget *parent = 0, const char *name = 0); diff --git a/vcs/cvsservice/editorsdialogbase.ui b/vcs/cvsservice/editorsdialogbase.ui index 37af7c1b..7e1fa65f 100644 --- a/vcs/cvsservice/editorsdialogbase.ui +++ b/vcs/cvsservice/editorsdialogbase.ui @@ -60,9 +60,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/vcs/cvsservice/integrator/cvsserviceintegrator.h b/vcs/cvsservice/integrator/cvsserviceintegrator.h index ebf4224e..70b18751 100644 --- a/vcs/cvsservice/integrator/cvsserviceintegrator.h +++ b/vcs/cvsservice/integrator/cvsserviceintegrator.h @@ -25,7 +25,7 @@ #include <tqstringlist.h> class CVSServiceIntegrator: public KDevVCSIntegrator { -Q_OBJECT +TQ_OBJECT public: CVSServiceIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList()); diff --git a/vcs/cvsservice/integrator/integratordlg.h b/vcs/cvsservice/integrator/integratordlg.h index ac6d7f9d..817fc622 100644 --- a/vcs/cvsservice/integrator/integratordlg.h +++ b/vcs/cvsservice/integrator/integratordlg.h @@ -26,7 +26,7 @@ class TQDomDocument; class IntegratorDlg: public IntegratorDlgBase, public VCSDialog { -Q_OBJECT +TQ_OBJECT public: IntegratorDlg(CVSServiceIntegrator *integrator, TQWidget *parent = 0, const char *name = 0); diff --git a/vcs/cvsservice/integrator/integratordlgbase.ui b/vcs/cvsservice/integrator/integratordlgbase.ui index 6660faab..5dc8ae11 100644 --- a/vcs/cvsservice/integrator/integratordlgbase.ui +++ b/vcs/cvsservice/integrator/integratordlgbase.ui @@ -389,11 +389,11 @@ <tabstop>login</tabstop> <tabstop>init</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>init_clicked()</slot> <slot>login_clicked()</slot> <slot>createModule_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/vcs/cvsservice/releaseinputdialog.h b/vcs/cvsservice/releaseinputdialog.h index dc5597af..7e4befd2 100644 --- a/vcs/cvsservice/releaseinputdialog.h +++ b/vcs/cvsservice/releaseinputdialog.h @@ -20,7 +20,7 @@ */ class ReleaseInputDialog : public ReleaseInputDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/vcs/cvsservice/releaseinputdialogbase.ui b/vcs/cvsservice/releaseinputdialogbase.ui index 92687fb8..1132e928 100644 --- a/vcs/cvsservice/releaseinputdialogbase.ui +++ b/vcs/cvsservice/releaseinputdialogbase.ui @@ -188,9 +188,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -205,9 +202,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/vcs/cvsservice/tagdialog.h b/vcs/cvsservice/tagdialog.h index d912c7ff..f20ab853 100644 --- a/vcs/cvsservice/tagdialog.h +++ b/vcs/cvsservice/tagdialog.h @@ -22,7 +22,7 @@ */ class TagDialog : public TagDialogBase { - Q_OBJECT + TQ_OBJECT public: TagDialog( const TQString &caption, TQWidget *parent = 0, const char *name = 0 ); diff --git a/vcs/cvsservice/tagdialogbase.ui b/vcs/cvsservice/tagdialogbase.ui index dc12e6bc..e5e52848 100644 --- a/vcs/cvsservice/tagdialogbase.ui +++ b/vcs/cvsservice/tagdialogbase.ui @@ -113,9 +113,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -130,9 +127,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/vcs/perforce/commitdlg.cpp b/vcs/perforce/commitdlg.cpp index c5706903..f343d9a8 100644 --- a/vcs/perforce/commitdlg.cpp +++ b/vcs/perforce/commitdlg.cpp @@ -103,9 +103,9 @@ void CommitDialog::setDepotFiles( const TQStringList& lst ) args << (*it); } - ExecCommand* cmd = new ExecCommand( "p4", args, TQString(), TQStringList(), TQT_TQOBJECT(this) ); - connect( cmd, TQT_SIGNAL(finished( const TQString&, const TQString& )), - this, TQT_SLOT(getFilesFinished( const TQString&, const TQString& )) ); + ExecCommand* cmd = new ExecCommand( "p4", args, TQString(), TQStringList(), this ); + connect( cmd, TQ_SIGNAL(finished( const TQString&, const TQString& )), + this, TQ_SLOT(getFilesFinished( const TQString&, const TQString& )) ); } void CommitDialog::getFilesFinished( const TQString& out, const TQString& /* err */ ) diff --git a/vcs/perforce/commitdlg.h b/vcs/perforce/commitdlg.h index 7fa70404..a2dbf2fd 100644 --- a/vcs/perforce/commitdlg.h +++ b/vcs/perforce/commitdlg.h @@ -23,7 +23,7 @@ class TDEProcess; class CommitDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: CommitDialog( TQWidget *parent = 0, const char *name = 0 ); diff --git a/vcs/perforce/integrator/perforceintegrator.h b/vcs/perforce/integrator/perforceintegrator.h index 2b82046f..4384d583 100644 --- a/vcs/perforce/integrator/perforceintegrator.h +++ b/vcs/perforce/integrator/perforceintegrator.h @@ -26,7 +26,7 @@ class PerforceIntegrator : public KDevVCSIntegrator { -Q_OBJECT +TQ_OBJECT public: PerforceIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList()); diff --git a/vcs/perforce/integrator/pfintegratordlg.h b/vcs/perforce/integrator/pfintegratordlg.h index 3e7bf4de..71a48b11 100644 --- a/vcs/perforce/integrator/pfintegratordlg.h +++ b/vcs/perforce/integrator/pfintegratordlg.h @@ -24,7 +24,7 @@ #include <kdevvcsintegrator.h> class PFIntegratorDlg: public PFIntegratorDlgBase, public VCSDialog { -Q_OBJECT +TQ_OBJECT public: PFIntegratorDlg(TQWidget *parent = 0, const char *name = 0); diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp index 76a4456a..8d7975e8 100644 --- a/vcs/perforce/perforcepart.cpp +++ b/vcs/perforce/perforcepart.cpp @@ -44,8 +44,8 @@ PerforcePart::PerforcePart( TQObject *parent, const char *name, const TQStringLi setInstance(PerforceFactory::instance()); setupActions(); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); } @@ -54,31 +54,31 @@ PerforcePart::~PerforcePart() void PerforcePart::setupActions() { - actionEdit = new TDEAction( i18n("Edit"), 0, this, TQT_SLOT(slotActionEdit()), + actionEdit = new TDEAction( i18n("Edit"), 0, this, TQ_SLOT(slotActionEdit()), actionCollection(), "perforce_edit" ); actionEdit->setToolTip(i18n("Edit")); actionEdit->setWhatsThis(i18n("<b>Edit</b><p>Opens file(s) in a client workspace for edit.")); - actionRevert = new TDEAction( i18n("Revert"), 0, this, TQT_SLOT(slotActionRevert()), + actionRevert = new TDEAction( i18n("Revert"), 0, this, TQ_SLOT(slotActionRevert()), actionCollection(), "perforce_revert" ); actionRevert->setToolTip(i18n("Revert")); actionRevert->setWhatsThis(i18n("<b>Revert</b><p>Discards changes made to open files.")); - actionSubmit = new TDEAction( i18n("Submit"), 0, this, TQT_SLOT(slotActionCommit()), + actionSubmit = new TDEAction( i18n("Submit"), 0, this, TQ_SLOT(slotActionCommit()), actionCollection(), "perforce_submit" ); actionSubmit->setToolTip(i18n("Submit")); actionSubmit->setWhatsThis(i18n("<b>Submit</b><p>Sends changes made to open files to the depot.")); - actionSync = new TDEAction( i18n("Sync"), 0, this, TQT_SLOT(slotActionUpdate()), + actionSync = new TDEAction( i18n("Sync"), 0, this, TQ_SLOT(slotActionUpdate()), actionCollection(), "perforce_sync" ); actionSync->setToolTip(i18n("Sync")); actionSync->setWhatsThis(i18n("<b>Sync</b><p>Copies files from the depot into the workspace.")); - actionDiff = new TDEAction( i18n("Diff Against Repository"), 0, this, TQT_SLOT(slotActionDiff()), + actionDiff = new TDEAction( i18n("Diff Against Repository"), 0, this, TQ_SLOT(slotActionDiff()), actionCollection(), "perforce_diff" ); actionDiff->setToolTip(i18n("Diff against repository")); actionDiff->setWhatsThis(i18n("<b>Diff against repository</b><p>Compares a client workspace file to a revision in the depot.")); - actionAdd = new TDEAction( i18n("Add to Repository"), 0, this, TQT_SLOT(slotActionAdd()), + actionAdd = new TDEAction( i18n("Add to Repository"), 0, this, TQ_SLOT(slotActionAdd()), actionCollection(), "perforce_add" ); actionAdd->setToolTip(i18n("Add to repository")); actionAdd->setWhatsThis(i18n("<b>Add to repository</b><p>Open file(s) in a client workspace for addition to the depot.")); - actionRemove = new TDEAction( i18n("Remove From Repository"), 0, this, TQT_SLOT(slotActionRemove()), + actionRemove = new TDEAction( i18n("Remove From Repository"), 0, this, TQ_SLOT(slotActionRemove()), actionCollection(), "perforce_remove" ); actionRemove->setToolTip(i18n("Remove from repository")); actionRemove->setWhatsThis(i18n("<b>Remove from repository</b><p>Open file(s) in a client workspace for deletion from the depot.")); @@ -97,26 +97,26 @@ void PerforcePart::contextMenu(TQPopupMenu *popup, const Context *context) sub->insertTitle( i18n("Actions for %1").arg(name) ); int id = sub->insertItem( i18n("Edit"), - this, TQT_SLOT(slotEdit()) ); + this, TQ_SLOT(slotEdit()) ); sub->setWhatsThis(id, i18n("<b>Edit</b><p>Opens file(s) in a client workspace for edit.")); id = sub->insertItem( i18n("Revert"), - this, TQT_SLOT(slotRevert()) ); + this, TQ_SLOT(slotRevert()) ); sub->setWhatsThis(id, i18n("<b>Revert</b><p>Discards changes made to open files.")); id = sub->insertItem( i18n("Submit"), - this, TQT_SLOT(slotCommit()) ); + this, TQ_SLOT(slotCommit()) ); sub->setWhatsThis(id, i18n("<b>Submit</b><p>Sends changes made to open files to the depot.")); id = sub->insertItem( i18n("Sync"), - this, TQT_SLOT(slotUpdate()) ); + this, TQ_SLOT(slotUpdate()) ); sub->setWhatsThis(id, i18n("<b>Sync</b><p>Copies files from the depot into the workspace.")); sub->insertSeparator(); id = sub->insertItem( i18n("Diff Against Repository"), - this, TQT_SLOT(slotDiff()) ); + this, TQ_SLOT(slotDiff()) ); sub->setWhatsThis(id, i18n("<b>Diff against repository</b><p>Compares a client workspace file to a revision in the depot.")); id = sub->insertItem( i18n("Add to Repository"), - this, TQT_SLOT(slotAdd()) ); + this, TQ_SLOT(slotAdd()) ); sub->setWhatsThis(id, i18n("<b>Add to repository</b><p>Open file(s) in a client workspace for addition to the depot.")); id = sub->insertItem( i18n("Remove From Repository"), - this, TQT_SLOT(slotRemove()) ); + this, TQ_SLOT(slotRemove()) ); sub->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Open file(s) in a client workspace for deletion from the depot.")); id = popup->insertItem(i18n("Perforce"), sub); } @@ -243,8 +243,8 @@ void PerforcePart::diff( const TQString& filename ) args << "-du"; args << name; ExecCommand* cmv = new ExecCommand( "p4", args, TQString(), TQStringList(), this ); - connect( cmv, TQT_SIGNAL(finished( const TQString&, const TQString& )), - this, TQT_SLOT(slotDiffFinished( const TQString&, const TQString& )) ); + connect( cmv, TQ_SIGNAL(finished( const TQString&, const TQString& )), + this, TQ_SLOT(slotDiffFinished( const TQString&, const TQString& )) ); } void PerforcePart::slotDiffFinished( const TQString& diff, const TQString& err ) diff --git a/vcs/perforce/perforcepart.h b/vcs/perforce/perforcepart.h index 7c034424..6980eaab 100644 --- a/vcs/perforce/perforcepart.h +++ b/vcs/perforce/perforcepart.h @@ -22,7 +22,7 @@ class TDEAction; class PerforcePart : public KDevVersionControl { - Q_OBJECT + TQ_OBJECT public: diff --git a/vcs/subversion/commitdlg.cpp b/vcs/subversion/commitdlg.cpp index b342da09..f1987250 100644 --- a/vcs/subversion/commitdlg.cpp +++ b/vcs/subversion/commitdlg.cpp @@ -32,7 +32,7 @@ bool CommitDlg::eventFilter( TQObject* obj, TQEvent* ev ) { if( ev->type() == TQEvent::KeyPress ) { - TQKeyEvent* k = TQT_TQKEYEVENT(ev); + TQKeyEvent* k = static_cast<TQKeyEvent*>(ev); if( ( k->key() == TQt::Key_Return || k->key() == TQt::Key_Enter ) && k->state() == TQt::ControlButton ) { accept(); diff --git a/vcs/subversion/commitdlg.h b/vcs/subversion/commitdlg.h index 4636c198..f4fc320e 100644 --- a/vcs/subversion/commitdlg.h +++ b/vcs/subversion/commitdlg.h @@ -25,7 +25,7 @@ class CommitDlg : public CommitDlgBase { - Q_OBJECT + TQ_OBJECT public: CommitDlg( TQWidget* = 0 ); diff --git a/vcs/subversion/integrator/subversionintegrator.h b/vcs/subversion/integrator/subversionintegrator.h index 01c43516..b7fa9731 100644 --- a/vcs/subversion/integrator/subversionintegrator.h +++ b/vcs/subversion/integrator/subversionintegrator.h @@ -26,7 +26,7 @@ class SubversionIntegrator : public KDevVCSIntegrator { -Q_OBJECT +TQ_OBJECT public: SubversionIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList()); diff --git a/vcs/subversion/integrator/svnintegratordlg.h b/vcs/subversion/integrator/svnintegratordlg.h index ccf1686f..dfdb7aa6 100644 --- a/vcs/subversion/integrator/svnintegratordlg.h +++ b/vcs/subversion/integrator/svnintegratordlg.h @@ -24,7 +24,7 @@ #include <kdevvcsintegrator.h> class SvnIntegratorDlg: public SvnIntegratorDlgBase, public VCSDialog { -Q_OBJECT +TQ_OBJECT public: SvnIntegratorDlg(TQWidget *parent = 0, const char *name = 0); diff --git a/vcs/subversion/kdevsvnd.h b/vcs/subversion/kdevsvnd.h index a3a1c2f6..2066b5f3 100644 --- a/vcs/subversion/kdevsvnd.h +++ b/vcs/subversion/kdevsvnd.h @@ -28,7 +28,7 @@ class KDevSvnd : public KDEDModule { -Q_OBJECT +TQ_OBJECT // K_DCOP diff --git a/vcs/subversion/kdevsvnd_widgets.cpp b/vcs/subversion/kdevsvnd_widgets.cpp index 0fd2c20b..9f3eb3f9 100644 --- a/vcs/subversion/kdevsvnd_widgets.cpp +++ b/vcs/subversion/kdevsvnd_widgets.cpp @@ -27,9 +27,9 @@ SvnSSLTrustPrompt::SvnSSLTrustPrompt( TQWidget* parent, const char* name, bool m btnPermanent->setText(i18n("Accept Permanently")); btnTemporary->setText(i18n("Accept Temporarily")); btnReject->setText(i18n("Reject")); - connect( btnPermanent, TQT_SIGNAL(clicked()), this, TQT_SLOT(setPermanent()) ); - connect( btnTemporary, TQT_SIGNAL(clicked()), this, TQT_SLOT(setTemporary()) ); - connect( btnReject, TQT_SIGNAL(clicked()), this, TQT_SLOT(setRejected ()) ); + connect( btnPermanent, TQ_SIGNAL(clicked()), this, TQ_SLOT(setPermanent()) ); + connect( btnTemporary, TQ_SIGNAL(clicked()), this, TQ_SLOT(setTemporary()) ); + connect( btnReject, TQ_SIGNAL(clicked()), this, TQ_SLOT(setRejected ()) ); } SvnSSLTrustPrompt::~SvnSSLTrustPrompt() {} diff --git a/vcs/subversion/kdevsvnd_widgets.h b/vcs/subversion/kdevsvnd_widgets.h index 3967cb35..48a11372 100644 --- a/vcs/subversion/kdevsvnd_widgets.h +++ b/vcs/subversion/kdevsvnd_widgets.h @@ -18,7 +18,7 @@ #include "svnssltrustpromptbase.h" class SvnSSLTrustPrompt : public SvnSSLTrustPromptBase{ -Q_OBJECT +TQ_OBJECT public: SvnSSLTrustPrompt( TQWidget* parent=0, const char* name=0, bool modal=true, WFlags f=0 ); diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp index e9c89ece..c0a97129 100644 --- a/vcs/subversion/subversion_core.cpp +++ b/vcs/subversion/subversion_core.cpp @@ -127,7 +127,7 @@ void subversionCore::resolve( const KURL::List& list ) { s << cmd << *it << recurse; SimpleJob * job = TDEIO::special(servURL, parms, true); job->setWindow( m_part->mainWindow()->main() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } } @@ -142,7 +142,7 @@ void subversionCore::update( const KURL::List& list ) { s << cmd << list << rev << TQString( "HEAD" ); SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, i18n("Subversion Update") , i18n("Subversion Update") ); } @@ -160,7 +160,7 @@ void subversionCore::diff( const KURL::List& list, const TQString& where){ TQString revkind2 = "WORKING"; s << cmd << *it << *it << rev1 << revkind1 << rev2 << revkind2 << true ; TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); TDEIO::NetAccess::synchronousRun( job, 0 ); if ( diffresult.count() > 0 ) { //check kompare is available @@ -241,7 +241,7 @@ void subversionCore::diffAsync( const KURL &pathOrUrl1, const KURL &pathOrUrl2, s << cmd << pathOrUrl1 << pathOrUrl2 << rev1 << revKind1 << rev2 << revKind2 << recurse; s << pegdiff; TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotDiffResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotDiffResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, pathOrUrl1.prettyURL(), pathOrUrl2.prettyURL() ); } @@ -261,7 +261,7 @@ void subversionCore::commit( const KURL::List& list, bool recurse, bool keeplock s << *it; } SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); if( list.count() == 1 ) initProcessDlg( (TDEIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Commit to remote repository") ); else if( list.count() > 1 ) @@ -295,7 +295,7 @@ void subversionCore::svnLog( const KURL::List& list, s << *it; } SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotLogResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotLogResult( TDEIO::Job * ) ) ); // progress info. LogView is allowed and meaninful only for one url in KDev3.4 initProcessDlg( (TDEIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Subversion Log View") ); } @@ -316,7 +316,7 @@ void subversionCore::blame( const KURL &url, UrlMode mode, int revstart, TQStrin s << revstart << revKindStart << revend << revKindEnd ; SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotBlameResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotBlameResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, url.prettyURL() , i18n("Subversion Blame") ); } @@ -332,7 +332,7 @@ void subversionCore::add( const KURL::List& list ) { // add/delete/revert works on local copy. Don't need to show progress dialog SimpleJob * job = TDEIO::special(servURL, parms, false); job->setWindow( m_part->mainWindow()->main() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void subversionCore::del( const KURL::List& list ) { @@ -346,7 +346,7 @@ void subversionCore::del( const KURL::List& list ) { // add/delete/revert works on local copy. Don't need to show progress dialog SimpleJob * job = TDEIO::special(servURL, parms, false); job->setWindow( m_part->mainWindow()->main() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void subversionCore::revert( const KURL::List& list ) { @@ -359,7 +359,7 @@ void subversionCore::revert( const KURL::List& list ) { s << cmd << list; SimpleJob * job = TDEIO::special(servURL, parms, false); job->setWindow( m_part->mainWindow()->main() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void subversionCore::checkout() { @@ -377,7 +377,7 @@ void subversionCore::checkout() { servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" SimpleJob * job = TDEIO::special(servURL,parms, true); job->setWindow( m_part->mainWindow()->main() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotEndCheckout( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotEndCheckout( TDEIO::Job * ) ) ); } } @@ -393,7 +393,7 @@ void subversionCore::switchTree( const KURL &path, const KURL &repositUrl, s << recurse << revNum << revKind; SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, repositUrl.prettyURL() , path.prettyURL() ); } @@ -408,7 +408,7 @@ void subversionCore::switchRelocate( const KURL &path, s << cmd << path << currentUrl << newUrl << recurse; SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); // this doesn't contact repository } @@ -423,7 +423,7 @@ void subversionCore::svnCopy( const KURL &src, int srcRev, const TQString &srcRe s << cmd << src << srcRev << srcRevKind << dest; SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, src.prettyURL(), dest.prettyURL() ); } @@ -440,7 +440,7 @@ void subversionCore::merge( const KURL &src1, int rev1, TQString revKind1, s << recurse << ignore_ancestry << force << dry_run; SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, src1.prettyURL() + "\n" + src2.prettyURL() , wc_path.prettyURL() ); } @@ -722,10 +722,10 @@ void subversionCore::initProcessDlg( TDEIO::Job *job, const TQString &src, const progress->setSourceUrl( src ); progress->setDestUrl( dest ); progress->setJob( job ); - connect( job, TQT_SIGNAL( totalSize(TDEIO::Job*, TDEIO::filesize_t) ), - progress, TQT_SLOT( slotTotalSize (TDEIO::Job*, TDEIO::filesize_t) ) ); - connect( job, TQT_SIGNAL( processedSize(TDEIO::Job*, TDEIO::filesize_t) ), - progress, TQT_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t) ) ); + connect( job, TQ_SIGNAL( totalSize(TDEIO::Job*, TDEIO::filesize_t) ), + progress, TQ_SLOT( slotTotalSize (TDEIO::Job*, TDEIO::filesize_t) ) ); + connect( job, TQ_SIGNAL( processedSize(TDEIO::Job*, TDEIO::filesize_t) ), + progress, TQ_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t) ) ); } void subversionCore::createNewProject( const TQString& // dirName diff --git a/vcs/subversion/subversion_core.h b/vcs/subversion/subversion_core.h index f2f3f6da..e67f845f 100644 --- a/vcs/subversion/subversion_core.h +++ b/vcs/subversion/subversion_core.h @@ -39,7 +39,7 @@ class SvnLogViewWidget; // class subversionCore : public TQObject, public DCOPObject class subversionCore : public TQObject { - Q_OBJECT + TQ_OBJECT // K_DCOP diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp index 45d44d1e..f845c035 100644 --- a/vcs/subversion/subversion_fileinfo.cpp +++ b/vcs/subversion/subversion_fileinfo.cpp @@ -155,7 +155,7 @@ bool SVNFileInfoProvider::requestStatus( const TQString &dirPath, void *callerDa s << cmd << KURL( TQFileInfo( rPath ).absFilePath() ) << checkRepos << recursive; KURL servURL = "kdevsvn+http://fakeserver_this_is_normal_behavior/"; job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); if( checkRepos ) m_part->svncore()->initProcessDlg( job, dirPath, i18n("Subversion File/Directory Status") ); return true; diff --git a/vcs/subversion/subversion_fileinfo.h b/vcs/subversion/subversion_fileinfo.h index 9b322463..b41bb0b1 100644 --- a/vcs/subversion/subversion_fileinfo.h +++ b/vcs/subversion/subversion_fileinfo.h @@ -36,7 +36,7 @@ Provider for SVN file information */ class SVNFileInfoProvider : public KDevVCSFileInfoProvider, public DCOPObject/*, virtual public DCOPClient*/ { - Q_OBJECT + TQ_OBJECT // K_DCOP diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp index 98b44848..be5f2b24 100644 --- a/vcs/subversion/subversion_part.cpp +++ b/vcs/subversion/subversion_part.cpp @@ -74,14 +74,14 @@ subversionPart::subversionPart(TQObject *parent, const char *name, const TQStrin setupActions(); - connect( m_impl, TQT_SIGNAL(checkoutFinished(TQString)), TQT_SIGNAL(finishedFetching(TQString)) ); + connect( m_impl, TQ_SIGNAL(checkoutFinished(TQString)), TQ_SIGNAL(finishedFetching(TQString)) ); // Context menu - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), this, TQ_SLOT(slotStopButtonClicked(KDevPlugin*)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotProjectClosed()) ); m_impl->processWidget()->setCaption(i18n( "Subversion Output" )); mainWindow()->embedOutputView( (TQWidget*)m_impl->processWidget(), i18n( "Subversion" ), i18n( "Subversion messages" ) ); @@ -98,65 +98,65 @@ subversionPart::~subversionPart() { } void subversionPart::setupActions() { - actionCommit = new TDEAction( i18n("&Commit to Repository..."), 0, this, TQT_SLOT(slotActionCommit()), actionCollection(), "subversion_commit" ); + actionCommit = new TDEAction( i18n("&Commit to Repository..."), 0, this, TQ_SLOT(slotActionCommit()), actionCollection(), "subversion_commit" ); actionCommit->setToolTip( i18n("Commit file(s)") ); actionCommit->setWhatsThis( i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.") ); - /* actionDiff = new TDEAction( i18n("&Difference Between Revisions"), 0, this, TQT_SLOT(slotActionDiff()), + /* actionDiff = new TDEAction( i18n("&Difference Between Revisions"), 0, this, TQ_SLOT(slotActionDiff()), actionCollection(), "subversion_diff" ); actionDiff->setToolTip( i18n("Build difference") ); actionDiff->setWhatsThis( i18n("<b>Build difference</b><p>Builds difference between releases.") ); */ - actionAdd = new TDEAction( i18n("&Add to Repository"), 0, this, TQT_SLOT(slotActionAdd()), actionCollection(), "subversion_add" ); + actionAdd = new TDEAction( i18n("&Add to Repository"), 0, this, TQ_SLOT(slotActionAdd()), actionCollection(), "subversion_add" ); actionAdd->setToolTip( i18n("Add file to repository") ); actionAdd->setWhatsThis( i18n("<b>Add file to repository</b><p>Adds file to repository.") ); - actionLog = new TDEAction( i18n("Show logs..."), 0, this, TQT_SLOT(slotLog()), actionCollection(), "subversion_log" ); - actionBlame = new TDEAction( i18n("Blame..."), 0, this, TQT_SLOT(slotBlame()), actionCollection(), "subversion_blame"); + actionLog = new TDEAction( i18n("Show logs..."), 0, this, TQ_SLOT(slotLog()), actionCollection(), "subversion_log" ); + actionBlame = new TDEAction( i18n("Blame..."), 0, this, TQ_SLOT(slotBlame()), actionCollection(), "subversion_blame"); - actionRemove = new TDEAction( i18n("&Remove From Repository"), 0, this, TQT_SLOT(slotActionDel()), actionCollection(), "subversion_remove" ); + actionRemove = new TDEAction( i18n("&Remove From Repository"), 0, this, TQ_SLOT(slotActionDel()), actionCollection(), "subversion_remove" ); actionRemove->setToolTip( i18n("Remove from repository") ); actionRemove->setWhatsThis( i18n("<b>Remove from repository</b><p>Removes file(s) from repository.") ); - actionUpdate = new TDEAction( i18n("&Update"), 0, this, TQT_SLOT(slotActionUpdate()), actionCollection(), "subversion_update" ); + actionUpdate = new TDEAction( i18n("&Update"), 0, this, TQ_SLOT(slotActionUpdate()), actionCollection(), "subversion_update" ); actionUpdate->setToolTip( i18n("Update") ); actionUpdate->setWhatsThis( i18n("<b>Update</b><p>Updates file(s) from repository.") ); - actionDiffLocal = new TDEAction( i18n("&Diff to BASE"), 0, this, TQT_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_local" ); + actionDiffLocal = new TDEAction( i18n("&Diff to BASE"), 0, this, TQ_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_local" ); actionDiffLocal->setToolTip( i18n("Diff to BASE") ); actionDiffLocal->setWhatsThis( i18n("<b>Diff to disk</b><p>Diff current file to the BASE checked out copy.") ); - actionDiffHead = new TDEAction( i18n("&Diff to HEAD"), 0, this, TQT_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_head" ); + actionDiffHead = new TDEAction( i18n("&Diff to HEAD"), 0, this, TQ_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_head" ); actionDiffHead->setToolTip( i18n("Diff to HEAD") ); actionDiffHead->setWhatsThis( i18n("<b>Diff HEAD</b><p>Diff the current file to HEAD in svn.") ); - actionRevert = new TDEAction( i18n("&Revert"), 0, this, TQT_SLOT(slotActionRevert()), actionCollection(), "subversion_revert" ); + actionRevert = new TDEAction( i18n("&Revert"), 0, this, TQ_SLOT(slotActionRevert()), actionCollection(), "subversion_revert" ); actionRevert->setToolTip( i18n("Revert") ); actionRevert->setWhatsThis( i18n("<b>Revert</b><p>Undo local changes.") ); /* actionAddToIgnoreList = new TDEAction( i18n("&Ignore in Subversion Operations"), 0, - this, TQT_SLOT(slotActionAddToIgnoreList()), actionCollection(), "subversion_ignore" ); + this, TQ_SLOT(slotActionAddToIgnoreList()), actionCollection(), "subversion_ignore" ); actionAddToIgnoreList->setToolTip( i18n("Ignore in Subversion operations") ); actionAddToIgnoreList->setWhatsThis( i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s).") ); actionRemoveFromIgnoreList = new TDEAction( i18n("Do &Not Ignore in Subversion Operations"), 0, - this, TQT_SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "subversion_donot_ignore" ); + this, TQ_SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "subversion_donot_ignore" ); actionRemoveFromIgnoreList->setToolTip( i18n("Do not ignore in Subversion operations") ); actionRemoveFromIgnoreList->setWhatsThis( i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s).") ); */ actionResolve = new TDEAction( i18n("Re&solve Conflicting State"), 0, - this, TQT_SLOT(slotActionResolve()), actionCollection(), "subversion_resolve" ); + this, TQ_SLOT(slotActionResolve()), actionCollection(), "subversion_resolve" ); actionResolve->setToolTip( i18n("Resolve the conflicting state of a file after a merge") ); actionResolve->setWhatsThis( i18n("<b>Resolve the conflicting state</b><p>Remove the conflict state that can be set on a file after a merge failed.") ); actionSwitch = new TDEAction( i18n("Switch this working copy to URL.."), 0, - this, TQT_SLOT(slotSwitch()), actionCollection(), "subversion_switch" ); + this, TQ_SLOT(slotSwitch()), actionCollection(), "subversion_switch" ); // warn slogCopy(), slotMerge only works on context menu. There is no main-menu action actionCopy = new TDEAction( i18n("Copy this working copy to URL.."), 0, - this, TQT_SLOT(slotCopy()), actionCollection(), "subversion_copy" ); + this, TQ_SLOT(slotCopy()), actionCollection(), "subversion_copy" ); actionMerge = new TDEAction( i18n("Merge difference to working copy"), 0, - this, TQT_SLOT(slotMerge()), actionCollection(), "subversion_merge" ); + this, TQ_SLOT(slotMerge()), actionCollection(), "subversion_merge" ); } TQWidget* subversionPart::newProjectWidget( TQWidget* parent ) { @@ -213,48 +213,48 @@ if(!project()) if (context->hasType( Context::FileContext )) popup->insertSeparator(); - int id = subMenu->insertItem( actionCommit->text(), this, TQT_SLOT(slotCommit()) ); + int id = subMenu->insertItem( actionCommit->text(), this, TQ_SLOT(slotCommit()) ); // CvsService let to do log and diff operations only on one file (or directory) at time /* if (m_urls.count() == 1) { - subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) ); - subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) ); + subMenu->insertItem( actionDiff->text(), this, TQ_SLOT(slotDiff()) ); + subMenu->insertItem( actionLog->text(), this, TQ_SLOT(slotLog()) ); }*/ subMenu->setWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.")); - id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) ); + id = subMenu->insertItem( actionAdd->text(), this, TQ_SLOT(slotAdd()) ); subMenu->setWhatsThis(id, i18n("<b>Add file to repository</b><p>Adds file to repository.")); - id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotDel()) ); + id = subMenu->insertItem( actionRemove->text(), this, TQ_SLOT(slotDel()) ); subMenu->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository.")); - id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) ); + id = subMenu->insertItem( actionLog->text(), this, TQ_SLOT(slotLog()) ); subMenu->setWhatsThis(id, i18n("<b>Show logs..</b><p>View Logs")); - id = subMenu->insertItem( actionBlame->text(), this, TQT_SLOT(slotBlame()) ); + id = subMenu->insertItem( actionBlame->text(), this, TQ_SLOT(slotBlame()) ); subMenu->setWhatsThis(id, i18n("<b>Blame 0:HEAD </b><p>Show Annotate")); subMenu->insertSeparator(); - id = subMenu->insertItem( actionDiffLocal->text(), this, TQT_SLOT(slotDiffLocal()) ); + id = subMenu->insertItem( actionDiffLocal->text(), this, TQ_SLOT(slotDiffLocal()) ); subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to local disk.")); - id = subMenu->insertItem( actionDiffHead->text(), this, TQT_SLOT(slotDiffHead()) ); + id = subMenu->insertItem( actionDiffHead->text(), this, TQ_SLOT(slotDiffHead()) ); subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to repository.")); - id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) ); + id = subMenu->insertItem( actionUpdate->text(), this, TQ_SLOT(slotUpdate()) ); subMenu->setWhatsThis(id, i18n("<b>Update</b><p>Updates file(s) from repository.")); - id = subMenu->insertItem( actionRevert->text(), this, TQT_SLOT(slotRevert()) ); + id = subMenu->insertItem( actionRevert->text(), this, TQ_SLOT(slotRevert()) ); subMenu->setWhatsThis(id, i18n("<b>Revert</b><p>Undo local changes.") ); - id = subMenu->insertItem( actionResolve->text(), this, TQT_SLOT(slotResolve()) ); + id = subMenu->insertItem( actionResolve->text(), this, TQ_SLOT(slotResolve()) ); subMenu->setWhatsThis(id, i18n("<b>Resolve</b><p>Resolve conflicting state.") ); - id = subMenu->insertItem( actionSwitch->text(), this, TQT_SLOT(slotSwitch()) ); + id = subMenu->insertItem( actionSwitch->text(), this, TQ_SLOT(slotSwitch()) ); subMenu->setWhatsThis(id, i18n("<b>Switch</b><p>Switch working tree.") ); - id = subMenu->insertItem( actionCopy->text(), this, TQT_SLOT(slotCopy()) ); + id = subMenu->insertItem( actionCopy->text(), this, TQ_SLOT(slotCopy()) ); subMenu->setWhatsThis(id, i18n("<b>Copy</b><p>Copy from/between path/URLs") ); - id = subMenu->insertItem( actionMerge->text(), this, TQT_SLOT(slotMerge()) ); + id = subMenu->insertItem( actionMerge->text(), this, TQ_SLOT(slotMerge()) ); subMenu->setWhatsThis(id, i18n("<b>Merge</b><p>Merge difference to working copy") ); /* subMenu->insertSeparator(); - id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) ); + id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQ_SLOT(slotAddToIgnoreList()) ); subMenu->setWhatsThis(id, i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s).")); - id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) ); + id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQ_SLOT(slotRemoveFromIgnoreList()) ); subMenu->setWhatsThis(id, i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s).")); */ // Now insert in parent menu @@ -529,16 +529,16 @@ void subversionPart::slotProjectOpened() { } */ //loadOptions(); /// \FIXME slots - //connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) ); - //connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); + //connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQ_SLOT(slotAddFilesToProject(const TQStringList &)) ); + //connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQ_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); } void subversionPart::slotProjectClosed() { kdDebug(9036) << "subversion :projectClosed" << endl; //saveOptions(); /// \FIXME slots - //disconnect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) ); - //disconnect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); + //disconnect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQ_SLOT(slotAddFilesToProject(const TQStringList &)) ); + //disconnect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQ_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); } void subversionPart::savePartialProjectSession(TQDomElement* dom) { diff --git a/vcs/subversion/subversion_part.h b/vcs/subversion/subversion_part.h index 1847567d..12289623 100644 --- a/vcs/subversion/subversion_part.h +++ b/vcs/subversion/subversion_part.h @@ -38,7 +38,7 @@ class SvnInfoHolder; class subversionPart : public KDevVersionControl { - Q_OBJECT + TQ_OBJECT public: diff --git a/vcs/subversion/subversion_widget.cpp b/vcs/subversion/subversion_widget.cpp index 95b31f6b..8cedf78f 100644 --- a/vcs/subversion/subversion_widget.cpp +++ b/vcs/subversion/subversion_widget.cpp @@ -39,7 +39,7 @@ subversionWidget::subversionWidget( subversionPart *part, TQWidget *parent, cons m_closeButton = new TQPushButton( tab() ); m_closeButton->setText( i18n("Close") ); tab()->setCornerWidget(m_closeButton); - connect( m_closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeCurrentTab()) ); + connect( m_closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(closeCurrentTab()) ); } subversionWidget::~subversionWidget() diff --git a/vcs/subversion/subversion_widget.h b/vcs/subversion/subversion_widget.h index d59f8394..a987dc84 100644 --- a/vcs/subversion/subversion_widget.h +++ b/vcs/subversion/subversion_widget.h @@ -40,7 +40,7 @@ class TQPushButton; // class subversionWidget : public SvnOutputWidgetBase class subversionWidget : public KTabWidget { - Q_OBJECT + TQ_OBJECT public: subversionWidget(subversionPart *part, TQWidget *parent, const char* name); diff --git a/vcs/subversion/subversiondiff.ui b/vcs/subversion/subversiondiff.ui index a624e6bb..5d92a4bb 100644 --- a/vcs/subversion/subversiondiff.ui +++ b/vcs/subversion/subversiondiff.ui @@ -74,9 +74,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/vcs/subversion/svn_blamewidget.cpp b/vcs/subversion/svn_blamewidget.cpp index 87647525..78f09102 100644 --- a/vcs/subversion/svn_blamewidget.cpp +++ b/vcs/subversion/svn_blamewidget.cpp @@ -99,8 +99,8 @@ SvnBlameFileSelectDlg::SvnBlameFileSelectDlg( TQWidget *parent ) m_layout->addWidget( m_okBtn, 1, 0 ); m_layout->addWidget( m_cancelBtn, 1, 1 ); - connect( m_okBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); - connect( m_cancelBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); + connect( m_okBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); + connect( m_cancelBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) ); } SvnBlameFileSelectDlg::~SvnBlameFileSelectDlg() {} diff --git a/vcs/subversion/svn_blamewidget.h b/vcs/subversion/svn_blamewidget.h index c0ea42af..19f14238 100644 --- a/vcs/subversion/svn_blamewidget.h +++ b/vcs/subversion/svn_blamewidget.h @@ -39,7 +39,7 @@ public: class TQListView; class SvnBlameWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SvnBlameWidget( TQWidget * parent = 0, const char * name = 0, bool modal = FALSE, WFlags f = 0 ); @@ -55,7 +55,7 @@ protected: }; class SvnBlameFileSelectDlg : public TQDialog { - Q_OBJECT + TQ_OBJECT public: SvnBlameFileSelectDlg( TQWidget *parent = 0L ); diff --git a/vcs/subversion/svn_commitdlgbase.ui b/vcs/subversion/svn_commitdlgbase.ui index 75937324..465f171b 100644 --- a/vcs/subversion/svn_commitdlgbase.ui +++ b/vcs/subversion/svn_commitdlgbase.ui @@ -70,9 +70,6 @@ <property name="text"> <string>Keep Locks</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQLayoutWidget" row="2" column="2"> <property name="name"> @@ -107,9 +104,6 @@ <property name="text"> <string>Recursive</string> </property> - <property name="accel"> - <string></string> - </property> </widget> </grid> </widget> diff --git a/vcs/subversion/svn_copywidget.cpp b/vcs/subversion/svn_copywidget.cpp index 30b25fd7..094b9684 100644 --- a/vcs/subversion/svn_copywidget.cpp +++ b/vcs/subversion/svn_copywidget.cpp @@ -13,10 +13,10 @@ SvnCopyDialog::SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder { reqEdit->setText( reqPath ); - connect( urlRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(setSourceAsUrl()) ); - connect( pathRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(setSourceAsLocalPath()) ); - connect( revnumRadio, TQT_SIGNAL(toggled(bool)), revnumInput, TQT_SLOT(setEnabled(bool)) ); - connect( revnumRadio, TQT_SIGNAL(toggled(bool)), revkindCombo, TQT_SLOT(setDisabled(bool)) ); + connect( urlRadio, TQ_SIGNAL(clicked()), this, TQ_SLOT(setSourceAsUrl()) ); + connect( pathRadio, TQ_SIGNAL(clicked()), this, TQ_SLOT(setSourceAsLocalPath()) ); + connect( revnumRadio, TQ_SIGNAL(toggled(bool)), revnumInput, TQ_SLOT(setEnabled(bool)) ); + connect( revnumRadio, TQ_SIGNAL(toggled(bool)), revkindCombo, TQ_SLOT(setDisabled(bool)) ); // In many cases, users copy from reository to repository. This is for making tag/branche. // The case where copying from local path to repository may be lesser than the above one. diff --git a/vcs/subversion/svn_copywidget.h b/vcs/subversion/svn_copywidget.h index 8dd9826f..1d03fa99 100644 --- a/vcs/subversion/svn_copywidget.h +++ b/vcs/subversion/svn_copywidget.h @@ -11,7 +11,7 @@ class KURL; class SvnCopyDialog : public SvnCopyDialogBase { - Q_OBJECT + TQ_OBJECT public: SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder *holder, TQWidget *parent ); diff --git a/vcs/subversion/svn_fileselectdlg_commit.h b/vcs/subversion/svn_fileselectdlg_commit.h index a2cf07e7..94ed2a54 100644 --- a/vcs/subversion/svn_fileselectdlg_commit.h +++ b/vcs/subversion/svn_fileselectdlg_commit.h @@ -32,7 +32,7 @@ class subversionPart; class SVNFileSelectDlgCommit : public SvnCommitDlgBase{ -Q_OBJECT +TQ_OBJECT public: diff --git a/vcs/subversion/svn_logviewoptiondlgbase.ui b/vcs/subversion/svn_logviewoptiondlgbase.ui index 25ed4987..45b34a95 100644 --- a/vcs/subversion/svn_logviewoptiondlgbase.ui +++ b/vcs/subversion/svn_logviewoptiondlgbase.ui @@ -34,9 +34,6 @@ <property name="text"> <string>Do not show logs before branching point</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp index 10e55a9f..ac9b982b 100644 --- a/vcs/subversion/svn_logviewwidget.cpp +++ b/vcs/subversion/svn_logviewwidget.cpp @@ -44,7 +44,7 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent) m_layout = new TQGridLayout( this, 1, 1, 11, 6, "SvnLogViewWidgetBaseLayout"); splitter1 = new TQSplitter( this, "splitter1" ); - splitter1->setOrientation( Qt::Horizontal ); + splitter1->setOrientation( TQt::Horizontal ); splitter1->setMargin(1); listView1 = new TQListView( splitter1, "listView1" ); @@ -64,7 +64,7 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent) TQFont textEdit1_font( textEdit1->font() ); textEdit1_font.setPointSize( 9 ); textEdit1->setFont( textEdit1_font ); - textEdit1->setFocusPolicy( TQ_WheelFocus ); + textEdit1->setFocusPolicy( TQWidget::WheelFocus ); textEdit1->setReadOnly( TRUE ); m_layout->addWidget( splitter1, 0, 0 ); @@ -73,9 +73,9 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent) resize( TQSize(692, 343).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); - connect( listView1, TQT_SIGNAL(clicked( TQListViewItem *)), this, TQT_SLOT(slotClicked(TQListViewItem*)) ); - connect( listView1, TQT_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int)) ); + connect( listView1, TQ_SIGNAL(clicked( TQListViewItem *)), this, TQ_SLOT(slotClicked(TQListViewItem*)) ); + connect( listView1, TQ_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int)) ); } SvnLogViewWidget::~SvnLogViewWidget() { @@ -128,8 +128,8 @@ void SvnLogViewWidget::contextMenuRequested( TQListViewItem *item, const TQPoint if( !m_ctxLogItem ) return; TQPopupMenu *menu = new TQPopupMenu(this); - menu->insertItem( i18n("Blame this revision"), this, TQT_SLOT(blameThis()) ); - menu->insertItem( i18n("Difference to previous revision"), this, TQT_SLOT(diffToPrevious()) ); + menu->insertItem( i18n("Blame this revision"), this, TQ_SLOT(blameThis()) ); + menu->insertItem( i18n("Difference to previous revision"), this, TQ_SLOT(diffToPrevious()) ); menu->exec( pos ); } void SvnLogViewWidget::blameThis() @@ -195,10 +195,10 @@ SvnLogViewOptionDlg::SvnLogViewOptionDlg( TQWidget *parent, const char* name, bo radio4->setChecked(true); //start revistion by revision keyword radio5->setChecked(true); //end revision by revision number reinstallRevisionSpecifiers(); - connect( intInput1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setStartRevnumRadio()) ); - connect( comboBox1, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(setStartRevkindRadio()) ); - connect( intInput2, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setEndRevnumRadio()) ); - connect( comboBox2, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(setEndRevkindRadio()) ); + connect( intInput1, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setStartRevnumRadio()) ); + connect( comboBox1, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(setStartRevkindRadio()) ); + connect( intInput2, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setEndRevnumRadio()) ); + connect( comboBox2, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(setEndRevkindRadio()) ); } SvnLogViewOptionDlg::~SvnLogViewOptionDlg() {} diff --git a/vcs/subversion/svn_logviewwidget.h b/vcs/subversion/svn_logviewwidget.h index acd9b1f0..c3f94bec 100644 --- a/vcs/subversion/svn_logviewwidget.h +++ b/vcs/subversion/svn_logviewwidget.h @@ -46,7 +46,7 @@ class SvnLogHolder{ }; class SvnLogViewWidget : public /*SvnLogViewWidgetBase*/ TQWidget { - Q_OBJECT + TQ_OBJECT public: SvnLogViewWidget(subversionPart *part, TQWidget *parent); @@ -73,7 +73,7 @@ private: }; class SvnLogViewOptionDlg : public SvnLogViewOptionDlgBase { - Q_OBJECT + TQ_OBJECT public: SvnLogViewOptionDlg(TQWidget *parent=0, const char* name=0, bool modal=TRUE, WFlags f=0); diff --git a/vcs/subversion/svn_mergewidget.cpp b/vcs/subversion/svn_mergewidget.cpp index 50731690..5885e6b7 100644 --- a/vcs/subversion/svn_mergewidget.cpp +++ b/vcs/subversion/svn_mergewidget.cpp @@ -33,10 +33,10 @@ SvnMergeDialog::SvnMergeDialog( const KURL &wcTarget, TQWidget *parent ) { dest->setURL( wcTarget.prettyURL() ); - connect( revnumbtn1, TQT_SIGNAL(toggled(bool)), revnum1, TQT_SLOT(setEnabled(bool)) ); - connect( revnumbtn1, TQT_SIGNAL(toggled(bool)), revkind1, TQT_SLOT(setDisabled(bool)) ); - connect( revnumbtn2, TQT_SIGNAL(toggled(bool)), revnum2, TQT_SLOT(setEnabled(bool)) ); - connect( revnumbtn2, TQT_SIGNAL(toggled(bool)), revkind2, TQT_SLOT(setDisabled(bool)) ); + connect( revnumbtn1, TQ_SIGNAL(toggled(bool)), revnum1, TQ_SLOT(setEnabled(bool)) ); + connect( revnumbtn1, TQ_SIGNAL(toggled(bool)), revkind1, TQ_SLOT(setDisabled(bool)) ); + connect( revnumbtn2, TQ_SIGNAL(toggled(bool)), revnum2, TQ_SLOT(setEnabled(bool)) ); + connect( revnumbtn2, TQ_SIGNAL(toggled(bool)), revkind2, TQ_SLOT(setDisabled(bool)) ); revkind1->setDisabled(true); revnum2->setDisabled(true); } diff --git a/vcs/subversion/svn_mergewidget.h b/vcs/subversion/svn_mergewidget.h index 34439e58..8513beac 100644 --- a/vcs/subversion/svn_mergewidget.h +++ b/vcs/subversion/svn_mergewidget.h @@ -31,7 +31,7 @@ class KURL; class SvnMergeDialog : public SvnMergeOptionDialogBase { - Q_OBJECT + TQ_OBJECT public: SvnMergeDialog( const KURL &wcTarget, TQWidget *parent = NULL ); diff --git a/vcs/subversion/svn_switchdlgbase.ui b/vcs/subversion/svn_switchdlgbase.ui index b1811858..9a4e9c38 100644 --- a/vcs/subversion/svn_switchdlgbase.ui +++ b/vcs/subversion/svn_switchdlgbase.ui @@ -196,9 +196,9 @@ <slot>accept()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>Form1_destroyed( TQObject * )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/vcs/subversion/svn_switchwidget.cpp b/vcs/subversion/svn_switchwidget.cpp index 7149cce2..490d20b7 100644 --- a/vcs/subversion/svn_switchwidget.cpp +++ b/vcs/subversion/svn_switchwidget.cpp @@ -11,8 +11,8 @@ SvnSwitchDlg::SvnSwitchDlg( const SvnGlobal::SvnInfoHolder *holder, : SvnSwitchDlgBase( parent ) , m_info( holder ) { - connect( switchOnlyRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetCurrentRepositoryUrlEdit()) ); - connect( relocationRadio , TQT_SIGNAL(clicked()), this, TQT_SLOT(resetCurrentRepositoryUrlEdit()) ); + connect( switchOnlyRadio, TQ_SIGNAL(clicked()), this, TQ_SLOT(resetCurrentRepositoryUrlEdit()) ); + connect( relocationRadio , TQ_SIGNAL(clicked()), this, TQ_SLOT(resetCurrentRepositoryUrlEdit()) ); // set switch only switchOnlyRadio->setChecked( true ); wcUrlEdit->setText( wcPath ); diff --git a/vcs/subversion/svn_switchwidget.h b/vcs/subversion/svn_switchwidget.h index 4aec67db..0d207657 100644 --- a/vcs/subversion/svn_switchwidget.h +++ b/vcs/subversion/svn_switchwidget.h @@ -10,7 +10,7 @@ namespace SvnGlobal class SvnSwitchDlg : public SvnSwitchDlgBase { - Q_OBJECT + TQ_OBJECT public: SvnSwitchDlg( const SvnGlobal::SvnInfoHolder *holder, diff --git a/vcs/subversion/svn_tdeio.cpp b/vcs/subversion/svn_tdeio.cpp index 80343d8c..d1eb8337 100644 --- a/vcs/subversion/svn_tdeio.cpp +++ b/vcs/subversion/svn_tdeio.cpp @@ -1801,7 +1801,7 @@ svn_error_t *tdeio_svnProtocol::clientCertSSLPrompt( // kdWarning()<<" Communication with dcop failed - fail to get certfile "<<endl; // return SVN_NO_ERROR; // } -// if (replyType != TQSTRING_OBJECT_NAME_STRING) { +// if (replyType != "TQString") { // kdWarning()<<" unexpected reply type "<<endl; // return SVN_NO_ERROR; // } @@ -1918,7 +1918,7 @@ svn_error_t *tdeio_svnProtocol::commitLogPrompt( const char **log_msg, const cha return err; } - if ( replyType != TQSTRING_OBJECT_NAME_STRING ) { + if ( replyType != "TQString" ) { kdWarning() << "Unexpected reply type" << endl; svn_error_t *err = svn_error_create( SVN_ERR_EXTERNAL_PROGRAM, NULL, apr_pstrdup( pool, "Fail to call kded_kdevsvnd via DCOP." ) ); diff --git a/vcs/subversion/svnssltrustpromptbase.ui b/vcs/subversion/svnssltrustpromptbase.ui index fc72c0d5..26e70c41 100644 --- a/vcs/subversion/svnssltrustpromptbase.ui +++ b/vcs/subversion/svnssltrustpromptbase.ui @@ -26,9 +26,6 @@ <property name="text"> <string></string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQListView" row="1" column="0" rowspan="1" colspan="3"> <column> @@ -64,9 +61,6 @@ <property name="text"> <string></string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQPushButton" row="2" column="1"> <property name="name"> @@ -75,9 +69,6 @@ <property name="text"> <string></string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> |
