diff options
Diffstat (limited to 'quanta/dialogs')
48 files changed, 140 insertions, 119 deletions
diff --git a/quanta/dialogs/CMakeLists.txt b/quanta/dialogs/CMakeLists.txt index 22debbf3..69d43876 100644 --- a/quanta/dialogs/CMakeLists.txt +++ b/quanta/dialogs/CMakeLists.txt @@ -19,6 +19,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/quanta/dialogs ${CMAKE_SOURCE_DIR}/quanta/src ${CMAKE_SOURCE_DIR}/quanta/parsers +) + +include_directories( SYSTEM ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp index a1a53eab..b93e9bcd 100644 --- a/quanta/dialogs/actionconfigdialog.cpp +++ b/quanta/dialogs/actionconfigdialog.cpp @@ -63,18 +63,18 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, currentAction = 0L; m_toolbarItem = 0L; - connect(actionTreeView, TQT_SIGNAL(contextMenu(TDEListView *,TQListViewItem *,const TQPoint &)), - TQT_SLOT(slotContextMenu(TDEListView *,TQListViewItem *,const TQPoint &))); - connect(actionTreeView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - TQT_SLOT(slotSelectionChanged(TQListViewItem *))); - connect(shortcutKeyButton, TQT_SIGNAL(capturedShortcut(const TDEShortcut &)), - TQT_SLOT(slotShortcutCaptured(const TDEShortcut &))); - connect(scriptPath, TQT_SIGNAL(activated(const TQString&)), - TQT_SLOT(slotTextChanged(const TQString&))); - connect(this, TQT_SIGNAL(addToolbar()), m_mainWindow, TQT_SLOT(slotAddToolbar())); - connect(this, TQT_SIGNAL(removeToolbar(const TQString&)), m_mainWindow, TQT_SLOT(slotRemoveToolbar(const TQString&))); - connect(this, TQT_SIGNAL(deleteUserAction(TDEAction*)), m_mainWindow, TQT_SLOT(slotDeleteAction(TDEAction*))); - connect(this, TQT_SIGNAL(configureToolbars(const TQString&)), m_mainWindow, TQT_SLOT(slotConfigureToolbars(const TQString&))); + connect(actionTreeView, TQ_SIGNAL(contextMenu(TDEListView *,TQListViewItem *,const TQPoint &)), + TQ_SLOT(slotContextMenu(TDEListView *,TQListViewItem *,const TQPoint &))); + connect(actionTreeView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + TQ_SLOT(slotSelectionChanged(TQListViewItem *))); + connect(shortcutKeyButton, TQ_SIGNAL(capturedShortcut(const TDEShortcut &)), + TQ_SLOT(slotShortcutCaptured(const TDEShortcut &))); + connect(scriptPath, TQ_SIGNAL(activated(const TQString&)), + TQ_SLOT(slotTextChanged(const TQString&))); + connect(this, TQ_SIGNAL(addToolbar()), m_mainWindow, TQ_SLOT(slotAddToolbar())); + connect(this, TQ_SIGNAL(removeToolbar(const TQString&)), m_mainWindow, TQ_SLOT(slotRemoveToolbar(const TQString&))); + connect(this, TQ_SIGNAL(deleteUserAction(TDEAction*)), m_mainWindow, TQ_SLOT(slotDeleteAction(TDEAction*))); + connect(this, TQ_SIGNAL(configureToolbars(const TQString&)), m_mainWindow, TQ_SLOT(slotConfigureToolbars(const TQString&))); //fill up the tree view with the toolbars and actions actionTreeView->setSorting(-1); allActionsItem = new TDEListViewItem(actionTreeView, i18n("All")); @@ -148,9 +148,9 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, allActionsItem->sortChildItems(0, true); treeMenu = new TDEPopupMenu(actionTreeView); - treeMenu->insertItem(i18n("&Add New Toolbar"), this, TQT_SLOT(slotAddToolbar())); - treeMenu->insertItem(i18n("&Remove Toolbar"), this, TQT_SLOT(slotRemoveToolbar())); - treeMenu->insertItem(i18n("&Edit Toolbar"), this, TQT_SLOT(slotEditToolbar())); + treeMenu->insertItem(i18n("&Add New Toolbar"), this, TQ_SLOT(slotAddToolbar())); + treeMenu->insertItem(i18n("&Remove Toolbar"), this, TQ_SLOT(slotRemoveToolbar())); + treeMenu->insertItem(i18n("&Edit Toolbar"), this, TQ_SLOT(slotEditToolbar())); globalShortcuts = TDEGlobal::config()->entryMap( "Global Shortcuts" ); } @@ -193,7 +193,7 @@ void ActionConfigDialog::slotRemoveToolbar() if ( KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the \"%1\" toolbar?").arg(s),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) { m_toolbarItem = item; - connect(m_mainWindow, TQT_SIGNAL(toolbarRemoved(const TQString&)), TQT_SLOT(slotToolbarRemoved(const TQString&))); + connect(m_mainWindow, TQ_SIGNAL(toolbarRemoved(const TQString&)), TQ_SLOT(slotToolbarRemoved(const TQString&))); emit removeToolbar(s.lower()); } } @@ -204,7 +204,7 @@ void ActionConfigDialog::slotToolbarRemoved(const TQString &/*name*/) actionTreeView->setCurrentItem(allActionsItem); delete m_toolbarItem; m_toolbarItem = 0L; - disconnect(m_mainWindow, TQT_SIGNAL(toolbarRemoved(const TQString&)), this, TQT_SLOT(slotToolbarRemoved(const TQString&))); + disconnect(m_mainWindow, TQ_SIGNAL(toolbarRemoved(const TQString&)), this, TQ_SLOT(slotToolbarRemoved(const TQString&))); } void ActionConfigDialog::slotEditToolbar() diff --git a/quanta/dialogs/actionconfigdialog.h b/quanta/dialogs/actionconfigdialog.h index 853d839a..bd13c11b 100644 --- a/quanta/dialogs/actionconfigdialog.h +++ b/quanta/dialogs/actionconfigdialog.h @@ -41,7 +41,7 @@ struct ToolbarEntry { class ActionConfigDialog: public ActionConfigDialogS { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/dialogs/actionconfigdialogs.ui b/quanta/dialogs/actionconfigdialogs.ui index fae092c2..1a56c42b 100644 --- a/quanta/dialogs/actionconfigdialogs.ui +++ b/quanta/dialogs/actionconfigdialogs.ui @@ -972,11 +972,7 @@ <tabstop>buttonApply</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kkeybutton.h</include> - <include location="global" impldecl="in implementation">kpushbutton.h</include> -</includes> -<Q_SLOTS> +<slots> <slot>buttonOk_clicked()</slot> <slot>slotNewAction()</slot> <slot>slotDeleteAction()</slot> @@ -989,13 +985,14 @@ <slot>shortcutKeyButton_toggled(bool)</slot> <slot>slotToggled(bool)</slot> <slot>slotTextChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>kicondialog.h</includehint> - <includehint>kkeybutton.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>filecombo.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kkeybutton.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="global" impldecl="in implementation">kicondialog.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> + <include location="global" impldecl="in implementation">filecombo.h</include> +</includes> </UI> diff --git a/quanta/dialogs/copyto.cpp b/quanta/dialogs/copyto.cpp index b5c53356..a7d5a55b 100644 --- a/quanta/dialogs/copyto.cpp +++ b/quanta/dialogs/copyto.cpp @@ -63,8 +63,8 @@ KURL CopyTo::copy(const KURL& urlToCopy, const KURL& destination) destURL.adjustPath(1); TDEIO::CopyJob *job = TDEIO::copy(urlToCopy, destURL, true); - connect( job, TQT_SIGNAL(result( TDEIO::Job *)), - TQT_SLOT (slotResult( TDEIO::Job *))); + connect( job, TQ_SIGNAL(result( TDEIO::Job *)), + TQ_SLOT (slotResult( TDEIO::Job *))); TQString path = destURL.path(); if (path != "." && path != "..") @@ -117,8 +117,8 @@ KURL::List CopyTo::copy(const KURL::List& sourceList, const KURL& destination ) } TDEIO::CopyJob *job = TDEIO::copy(sourceList, targetDirURL, true); - connect( job, TQT_SIGNAL(result( TDEIO::Job *)), - TQT_SLOT (slotResult( TDEIO::Job *))); + connect( job, TQ_SIGNAL(result( TDEIO::Job *)), + TQ_SLOT (slotResult( TDEIO::Job *))); } return m_destList; diff --git a/quanta/dialogs/copyto.h b/quanta/dialogs/copyto.h index 3e021e0a..212bd014 100644 --- a/quanta/dialogs/copyto.h +++ b/quanta/dialogs/copyto.h @@ -29,7 +29,7 @@ class KURL; class CopyTo : public TQObject{ -Q_OBJECT +TQ_OBJECT public: CopyTo(const KURL& dirURL); diff --git a/quanta/dialogs/dirtydlg.cpp b/quanta/dialogs/dirtydlg.cpp index 720c3d8a..6f8f2b6c 100644 --- a/quanta/dialogs/dirtydlg.cpp +++ b/quanta/dialogs/dirtydlg.cpp @@ -56,7 +56,7 @@ void DirtyDlg::slotOk() TDEProcess *proc = new TDEProcess(); *proc << "kompare" << m_src.path() << m_dest.path(); proc->start(); - connect(proc, TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotCompareDone(TDEProcess*))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess*)),TQ_SLOT(slotCompareDone(TDEProcess*))); enableButton(KDialogBase::Ok, false); enableButton(KDialogBase::Cancel, false); } else @@ -88,8 +88,8 @@ void DirtyDlg::slotCompareDone(TDEProcess* proc) //TODO: Replace with TDEIO::NetAccess::file_move, when KDE 3.1 support //is dropped TDEIO::FileCopyJob *job = TDEIO::file_move(m_dest, m_src, m_permissions, true, false,false ); - connect( job, TQT_SIGNAL(result( TDEIO::Job *)), - TQT_SLOT (slotResult( TDEIO::Job *))); + connect( job, TQ_SIGNAL(result( TDEIO::Job *)), + TQ_SLOT (slotResult( TDEIO::Job *))); } diff --git a/quanta/dialogs/dirtydlg.h b/quanta/dialogs/dirtydlg.h index 5fd14e36..f8264a1c 100644 --- a/quanta/dialogs/dirtydlg.h +++ b/quanta/dialogs/dirtydlg.h @@ -27,7 +27,7 @@ class TDEProcess; class TQCloseEvent; class DirtyDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/dialogs/donationdialog.ui b/quanta/dialogs/donationdialog.ui index 2914bef2..0d632baf 100644 --- a/quanta/dialogs/donationdialog.ui +++ b/quanta/dialogs/donationdialog.ui @@ -143,13 +143,12 @@ is the future of software, but it is no guarantee of success. How many open sour <tabstop>KTextBrowser2</tabstop> <tabstop>closeButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>init()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>ktextbrowser.h</includehint> - <includehint>ktextbrowser.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">ktextbrowser.h</include> +</includes> </UI> diff --git a/quanta/dialogs/dtdselectdialog.ui b/quanta/dialogs/dtdselectdialog.ui index cd6a079b..21b08abf 100644 --- a/quanta/dialogs/dtdselectdialog.ui +++ b/quanta/dialogs/dtdselectdialog.ui @@ -105,8 +105,8 @@ Dialog message2:</string> <includes> <include location="local" impldecl="in implementation">dtdselectdialog.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>init()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/dialogs/dtepeditdlg.h b/quanta/dialogs/dtepeditdlg.h index a570881d..e53a2988 100644 --- a/quanta/dialogs/dtepeditdlg.h +++ b/quanta/dialogs/dtepeditdlg.h @@ -55,7 +55,7 @@ struct StructGroup { class DTEPEditDlg : public DTEPEditDlgS { - Q_OBJECT + TQ_OBJECT public: DTEPEditDlg(const TQString& descriptionFile, TQWidget *parent = 0, const char *name = 0); diff --git a/quanta/dialogs/dtepeditdlgs.ui b/quanta/dialogs/dtepeditdlgs.ui index 32e6c8f7..ca68fcff 100644 --- a/quanta/dialogs/dtepeditdlgs.ui +++ b/quanta/dialogs/dtepeditdlgs.ui @@ -1957,11 +1957,16 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b></string> <tabstop>editStructButton</tabstop> <tabstop>deleteStructButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">slotEditStructGroup()</slot> <slot>slotAddStructGroup()</slot> <slot>slotDeleteStructGroup()</slot> <slot>slotFamilyChanged(int)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/quanta/dialogs/dtepstructureeditdlgs.ui b/quanta/dialogs/dtepstructureeditdlgs.ui index ce90582b..0a8de386 100644 --- a/quanta/dialogs/dtepstructureeditdlgs.ui +++ b/quanta/dialogs/dtepstructureeditdlgs.ui @@ -640,7 +640,9 @@ The first captured area (between "<b>(</b>" and "<b>)</b> <tabstop>classGroup</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kicondialog.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kicondialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/quanta/dialogs/filecombo.cpp b/quanta/dialogs/filecombo.cpp index 1293d8b4..2f5938f1 100644 --- a/quanta/dialogs/filecombo.cpp +++ b/quanta/dialogs/filecombo.cpp @@ -47,9 +47,9 @@ FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name ) layout ->addWidget( combo ); layout ->addWidget( button ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); - connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); - connect( combo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFileSelect()) ); + connect( combo, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotComboActivated(const TQString&))); + connect( combo, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotComboActivated(const TQString&))); setFocusProxy(combo); } @@ -69,9 +69,9 @@ FileCombo::FileCombo( TQWidget *parent, const char *name ) layout ->addWidget( combo ); layout ->addWidget( button ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); - connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); - connect( combo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFileSelect()) ); + connect( combo, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotComboActivated(const TQString&))); + connect( combo, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotComboActivated(const TQString&))); setFocusProxy(combo); } diff --git a/quanta/dialogs/filecombo.h b/quanta/dialogs/filecombo.h index 3288cd85..ebeef6fe 100644 --- a/quanta/dialogs/filecombo.h +++ b/quanta/dialogs/filecombo.h @@ -30,7 +30,7 @@ class TQPushButton; class KURL; class FileCombo : public TQWidget { - Q_OBJECT + TQ_OBJECT public: FileCombo(const KURL& a_baseURL, TQWidget *parent=0, const char *name=0); diff --git a/quanta/dialogs/fourbuttonmessagebox.ui b/quanta/dialogs/fourbuttonmessagebox.ui index ec85fa91..924eb83e 100644 --- a/quanta/dialogs/fourbuttonmessagebox.ui +++ b/quanta/dialogs/fourbuttonmessagebox.ui @@ -147,16 +147,17 @@ </connections> <includes> <include location="local" impldecl="in implementation">fourbuttonmessagebox.ui.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> </includes> <variables> <variable>int m_status;</variable> </variables> -<Q_SLOTS> +<slots> <slot>cancelButton_clicked()</slot> <slot>user1Button_clicked()</slot> <slot>user2Button_clicked()</slot> <slot>user3Button_clicked()</slot> -</Q_SLOTS> +</slots> <functions> <function specifier="non virtual" returnType="int">status()</function> </functions> diff --git a/quanta/dialogs/loadentitydlgs.ui b/quanta/dialogs/loadentitydlgs.ui index 10950ae7..d6adcd29 100644 --- a/quanta/dialogs/loadentitydlgs.ui +++ b/quanta/dialogs/loadentitydlgs.ui @@ -69,4 +69,8 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/quanta/dialogs/settings/CMakeLists.txt b/quanta/dialogs/settings/CMakeLists.txt index c5d96b02..74396c31 100644 --- a/quanta/dialogs/settings/CMakeLists.txt +++ b/quanta/dialogs/settings/CMakeLists.txt @@ -14,6 +14,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/quanta/utility ${CMAKE_SOURCE_DIR}/quanta/parsers ${CMAKE_SOURCE_DIR}/quanta/src +) + +include_directories( SYSTEM ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp index 85d3065b..8d3aa45c 100644 --- a/quanta/dialogs/settings/abbreviation.cpp +++ b/quanta/dialogs/settings/abbreviation.cpp @@ -98,7 +98,7 @@ void AbbreviationDlg::slotNewGroup() if (qConfig.abbreviations.contains(groupName)) { KMessageBox::error(this, i18n("<qt>There is already an abbreviation group called <b>%1</b>. Choose an unique name for the new group.</qt>").arg(groupName), i18n("Group already exists")); - TQTimer::singleShot(0, this, TQT_SLOT(slotNewGroup())); + TQTimer::singleShot(0, this, TQ_SLOT(slotNewGroup())); } else { groupCombo->insertItem(groupName); diff --git a/quanta/dialogs/settings/abbreviation.h b/quanta/dialogs/settings/abbreviation.h index 39f49ff3..35120764 100644 --- a/quanta/dialogs/settings/abbreviation.h +++ b/quanta/dialogs/settings/abbreviation.h @@ -26,7 +26,7 @@ struct DTDStruct; class AbbreviationDlg : public AbbreviationDlgS { - Q_OBJECT + TQ_OBJECT public: AbbreviationDlg(TQWidget *parent, const char *name = 0); diff --git a/quanta/dialogs/settings/abbreviations.ui b/quanta/dialogs/settings/abbreviations.ui index fc53fe16..7782617d 100644 --- a/quanta/dialogs/settings/abbreviations.ui +++ b/quanta/dialogs/settings/abbreviations.ui @@ -337,7 +337,7 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>slotTemplateSelectionChanged(TQListViewItem*)</slot> <slot>dtdCombo_activated(const TQString&)</slot> <slot>slotGroupChanged(const TQString&)</slot> @@ -348,10 +348,12 @@ <slot>slotAddDTEP()</slot> <slot>slotRemoveDTEP()</slot> <slot>slotNewGroup()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>tdelistbox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/quanta/dialogs/settings/codetemplatedlgs.ui b/quanta/dialogs/settings/codetemplatedlgs.ui index 7a1367b9..d7e28e55 100644 --- a/quanta/dialogs/settings/codetemplatedlgs.ui +++ b/quanta/dialogs/settings/codetemplatedlgs.ui @@ -72,10 +72,10 @@ <tabstop>templateEdit</tabstop> <tabstop>descriptionEdit</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>accept()</slot> <slot>reject()</slot> <slot>pushButton4_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/dialogs/settings/filemasks.cpp b/quanta/dialogs/settings/filemasks.cpp index fee135f8..5688b920 100644 --- a/quanta/dialogs/settings/filemasks.cpp +++ b/quanta/dialogs/settings/filemasks.cpp @@ -26,7 +26,7 @@ FileMasks::FileMasks(TQWidget *parent, const char *name) :FileMasksS(parent,name) { - connect(buttonDefault, TQT_SIGNAL(clicked()), this, TQT_SLOT(setToDefault())); + connect(buttonDefault, TQ_SIGNAL(clicked()), this, TQ_SLOT(setToDefault())); } FileMasks::~FileMasks(){ diff --git a/quanta/dialogs/settings/filemasks.h b/quanta/dialogs/settings/filemasks.h index 1a76334e..08f49cb1 100644 --- a/quanta/dialogs/settings/filemasks.h +++ b/quanta/dialogs/settings/filemasks.h @@ -23,7 +23,7 @@ class FileMasks : public FileMasksS { - Q_OBJECT + TQ_OBJECT public: FileMasks(TQWidget *parent=0, const char *name=0); diff --git a/quanta/dialogs/settings/parseroptions.h b/quanta/dialogs/settings/parseroptions.h index 89058786..bd37836b 100644 --- a/quanta/dialogs/settings/parseroptions.h +++ b/quanta/dialogs/settings/parseroptions.h @@ -22,7 +22,7 @@ class TDEConfig; class ParserOptions : public ParserOptionsUI { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/dialogs/settings/previewoptions.h b/quanta/dialogs/settings/previewoptions.h index f688d02d..d92315ed 100644 --- a/quanta/dialogs/settings/previewoptions.h +++ b/quanta/dialogs/settings/previewoptions.h @@ -23,7 +23,7 @@ class TDEConfig; class PreviewOptions : public PreviewOptionsS { - Q_OBJECT + TQ_OBJECT public: PreviewOptions(TQWidget *parent=0, const char *name=0); diff --git a/quanta/dialogs/specialchardialog.cpp b/quanta/dialogs/specialchardialog.cpp index b9f90264..378c0c22 100644 --- a/quanta/dialogs/specialchardialog.cpp +++ b/quanta/dialogs/specialchardialog.cpp @@ -31,13 +31,13 @@ SpecialCharDialog::SpecialCharDialog( TQWidget* parent, const char* name, bool modal, WFlags fl) :SpecialCharDialogS( parent, name, modal, fl ) { - connect ( FilterLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(filterChars(const TQString&)) ); - connect ( CharsListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), - TQT_SLOT(insertCode()) ); - connect (buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(insertCode())); - connect (buttonChar, TQT_SIGNAL(clicked()), TQT_SLOT(insertChar())); - connect (buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(cancel())); + connect ( FilterLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(filterChars(const TQString&)) ); + connect ( CharsListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), + TQ_SLOT(insertCode()) ); + connect (buttonOk, TQ_SIGNAL(clicked()), TQ_SLOT(insertCode())); + connect (buttonChar, TQ_SIGNAL(clicked()), TQ_SLOT(insertChar())); + connect (buttonCancel, TQ_SIGNAL(clicked()), TQ_SLOT(cancel())); filterChars(""); } diff --git a/quanta/dialogs/specialchardialog.h b/quanta/dialogs/specialchardialog.h index 807ece8f..75cc935b 100644 --- a/quanta/dialogs/specialchardialog.h +++ b/quanta/dialogs/specialchardialog.h @@ -23,7 +23,7 @@ class SpecialCharDialog : public SpecialCharDialogS { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/dialogs/specialchardialogs.ui b/quanta/dialogs/specialchardialogs.ui index c10bc62e..136e181b 100644 --- a/quanta/dialogs/specialchardialogs.ui +++ b/quanta/dialogs/specialchardialogs.ui @@ -94,9 +94,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -146,8 +143,8 @@ <tabstop>buttonCancel</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>tdelistbox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> +</includes> </UI> diff --git a/quanta/dialogs/tagdialogs/CMakeLists.txt b/quanta/dialogs/tagdialogs/CMakeLists.txt index 7d478f6d..7a53c140 100644 --- a/quanta/dialogs/tagdialogs/CMakeLists.txt +++ b/quanta/dialogs/tagdialogs/CMakeLists.txt @@ -18,6 +18,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/quanta/src ${CMAKE_SOURCE_DIR}/quanta/parts/kafka ${CMAKE_SOURCE_DIR}/quanta/components/csseditor +) + +include_directories( SYSTEM ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -33,4 +36,6 @@ tde_add_library( tagdialogs STATIC_PIC AUTOMOC tagimgdlg.cpp tagxml.cpp tagwidget.cpp colorcombo.cpp tagimgdlgdata.cpp tagmiscdlg.cpp tagmail.ui + LINK + tdeabc-shared ) diff --git a/quanta/dialogs/tagdialogs/colorcombo.cpp b/quanta/dialogs/tagdialogs/colorcombo.cpp index 5b735fcf..c12f2136 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.cpp +++ b/quanta/dialogs/tagdialogs/colorcombo.cpp @@ -78,8 +78,8 @@ ColorCombo::ColorCombo( TQWidget *parent, const char *name ) addColors(); - connect( this, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotActivated(int) ) ); - connect( this, TQT_SIGNAL( highlighted(int) ), TQT_SLOT( slotHighlighted(int) ) ); + connect( this, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotActivated(int) ) ); + connect( this, TQ_SIGNAL( highlighted(int) ), TQ_SLOT( slotHighlighted(int) ) ); } ColorCombo::~ColorCombo() diff --git a/quanta/dialogs/tagdialogs/colorcombo.h b/quanta/dialogs/tagdialogs/colorcombo.h index 0c05dc5a..ad6209d1 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.h +++ b/quanta/dialogs/tagdialogs/colorcombo.h @@ -39,7 +39,7 @@ */ class ColorCombo : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: ColorCombo( TQWidget *parent = 0L, const char *name = 0L ); diff --git a/quanta/dialogs/tagdialogs/listdlg.cpp b/quanta/dialogs/tagdialogs/listdlg.cpp index eeb6bfc2..413add61 100644 --- a/quanta/dialogs/tagdialogs/listdlg.cpp +++ b/quanta/dialogs/tagdialogs/listdlg.cpp @@ -42,7 +42,7 @@ ListDlg::ListDlg(TQStringList &entryList,TQWidget* parent, const char *name ) adjustSize(); resize(sizeHint()); - connect(listbox,TQT_SIGNAL(doubleClicked( TQListBoxItem * )), TQT_SLOT(slotOk())); + connect(listbox,TQ_SIGNAL(doubleClicked( TQListBoxItem * )), TQ_SLOT(slotOk())); } ListDlg::~ListDlg(){ diff --git a/quanta/dialogs/tagdialogs/listdlg.h b/quanta/dialogs/tagdialogs/listdlg.h index 3d190ae7..74663c1f 100644 --- a/quanta/dialogs/tagdialogs/listdlg.h +++ b/quanta/dialogs/tagdialogs/listdlg.h @@ -31,7 +31,7 @@ selected item with the getEntry() method. */ class ListDlg : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: ListDlg(TQStringList &entryList,TQWidget* parent=0, const char *name =0); diff --git a/quanta/dialogs/tagdialogs/pictureview.h b/quanta/dialogs/tagdialogs/pictureview.h index 2ee4cfd0..759ee335 100644 --- a/quanta/dialogs/tagdialogs/pictureview.h +++ b/quanta/dialogs/tagdialogs/pictureview.h @@ -28,7 +28,7 @@ used by TagImgDlg */ class PictureView : public TQFrame { - Q_OBJECT + TQ_OBJECT public: PictureView(TQWidget *parent=0, char *file=0, const char *name=0); diff --git a/quanta/dialogs/tagdialogs/tagdialog.cpp b/quanta/dialogs/tagdialogs/tagdialog.cpp index 7db3c307..b788bb3a 100644 --- a/quanta/dialogs/tagdialogs/tagdialog.cpp +++ b/quanta/dialogs/tagdialogs/tagdialog.cpp @@ -118,8 +118,8 @@ void TagDialog::init(TQTag *a_dtdTag, KURL a_baseURL) setOkButton(KStdGuiItem::ok().text()); setCancelButton(KStdGuiItem::cancel().text()); - connect( this, TQT_SIGNAL(applyButtonPressed()), TQT_SLOT(slotAccept()) ); - connect( this, TQT_SIGNAL(cancelButtonPressed()), TQT_SLOT(reject()) ); + connect( this, TQ_SIGNAL(applyButtonPressed()), TQ_SLOT(slotAccept()) ); + connect( this, TQ_SIGNAL(cancelButtonPressed()), TQ_SLOT(reject()) ); if (!a_dtdTag) //the tag is invalid, let's create a default one { diff --git a/quanta/dialogs/tagdialogs/tagdialog.h b/quanta/dialogs/tagdialogs/tagdialog.h index 21ad7b0f..4d9c3fb5 100644 --- a/quanta/dialogs/tagdialogs/tagdialog.h +++ b/quanta/dialogs/tagdialogs/tagdialog.h @@ -38,7 +38,7 @@ class KURL; class TQShowEvent; class TagDialog : public TQTabDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.cpp b/quanta/dialogs/tagdialogs/tagimgdlg.cpp index 4c9531ee..02e61726 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagimgdlg.cpp @@ -36,7 +36,7 @@ TagImgDlg::TagImgDlg(const DTDStruct *dtd, TQWidget *parent, const char *name) - : TQWidget(parent,name), TagWidget(TQT_TQOBJECT(parent),name) + : TQWidget(parent,name), TagWidget(parent,name) { m_dtd = dtd; img = 0L; @@ -45,9 +45,9 @@ TagImgDlg::TagImgDlg(const DTDStruct *dtd, TQWidget *parent, const char *name) initDialog(); - connect( buttonImgSource, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); - connect( buttonRecalcImgSize, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRecalcImgSize()) ); - connect( lineImgSource, TQT_SIGNAL( returnPressed()), this, TQT_SLOT(slotLineFileSelect()) ); + connect( buttonImgSource, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFileSelect()) ); + connect( buttonRecalcImgSize, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRecalcImgSize()) ); + connect( lineImgSource, TQ_SIGNAL( returnPressed()), this, TQ_SLOT(slotLineFileSelect()) ); } TagImgDlg::~TagImgDlg() diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.h b/quanta/dialogs/tagdialogs/tagimgdlg.h index 09d3a3ee..e09634ff 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlg.h +++ b/quanta/dialogs/tagdialogs/tagimgdlg.h @@ -39,7 +39,7 @@ class TQImage; */ class TagImgDlg : public TQWidget, TagWidget { - Q_OBJECT + TQ_OBJECT public: TagImgDlg(const DTDStruct *dtd, TQWidget *parent=0, const char *name=0); diff --git a/quanta/dialogs/tagdialogs/tagmail.ui b/quanta/dialogs/tagdialogs/tagmail.ui index e7a71fa1..4072c177 100644 --- a/quanta/dialogs/tagdialogs/tagmail.ui +++ b/quanta/dialogs/tagdialogs/tagmail.ui @@ -127,4 +127,7 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/quanta/dialogs/tagdialogs/tagmaildlg.cpp b/quanta/dialogs/tagdialogs/tagmaildlg.cpp index ff91277d..925d79c0 100644 --- a/quanta/dialogs/tagdialogs/tagmaildlg.cpp +++ b/quanta/dialogs/tagdialogs/tagmaildlg.cpp @@ -40,9 +40,9 @@ TagMailDlg::TagMailDlg(TQWidget *parent, const char *name) setCaption(name); setModal(true); - connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); - connect( buttonAddressSelect, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectAddress()) ); + connect( buttonOk, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( buttonCancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); + connect( buttonAddressSelect, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectAddress()) ); buttonOk->setIconSet(SmallIconSet("button_ok")); buttonCancel->setIconSet(SmallIconSet("button_cancel")); lineEmail->setFocus(); diff --git a/quanta/dialogs/tagdialogs/tagmaildlg.h b/quanta/dialogs/tagdialogs/tagmaildlg.h index 9cb82e5d..8a1a6e21 100644 --- a/quanta/dialogs/tagdialogs/tagmaildlg.h +++ b/quanta/dialogs/tagdialogs/tagmaildlg.h @@ -23,7 +23,7 @@ */ class TagMailDlg : public TagMail { -Q_OBJECT +TQ_OBJECT public: TagMailDlg(TQWidget *parent=0, const char *name=0); diff --git a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp index bea9a81f..b95fe0e9 100644 --- a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp @@ -23,7 +23,7 @@ TagMiscDlg::TagMiscDlg( TQWidget* parent, const char* name, bool addClosingTag, :KDialogBase( parent, name, true, i18n("Misc. Tag"), KDialogBase::Ok | KDialogBase::Cancel ) { miscWidget = new TagMisc(this); - connect( miscWidget->elementName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotMiscTagChanged(const TQString & ) ) ); + connect( miscWidget->elementName, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotMiscTagChanged(const TQString & ) ) ); setMainWidget(miscWidget); miscWidget->addClosingTag->setChecked(addClosingTag); miscWidget->elementName->setText(element); diff --git a/quanta/dialogs/tagdialogs/tagmiscdlg.h b/quanta/dialogs/tagdialogs/tagmiscdlg.h index 222d6bab..3c56ec07 100644 --- a/quanta/dialogs/tagdialogs/tagmiscdlg.h +++ b/quanta/dialogs/tagdialogs/tagmiscdlg.h @@ -23,7 +23,7 @@ class TagMisc; class TagMiscDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp b/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp index 7a9edbdb..f070eeaf 100644 --- a/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp @@ -33,8 +33,8 @@ TagQuickListDlg::TagQuickListDlg(TQWidget *parent, const char *name) groupBox->insert(radioOrdered); groupBox->insert(radioUnordered); - 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()) ); } TagQuickListDlg::~TagQuickListDlg(){ diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlg.h b/quanta/dialogs/tagdialogs/tagquicklistdlg.h index 946efb67..c0f0f310 100644 --- a/quanta/dialogs/tagdialogs/tagquicklistdlg.h +++ b/quanta/dialogs/tagdialogs/tagquicklistdlg.h @@ -32,7 +32,7 @@ class TQButtonGroup; */ class TagQuickListDlg : public TQDialog { - Q_OBJECT + TQ_OBJECT public: TagQuickListDlg(TQWidget *parent=0, const char *name=0); diff --git a/quanta/dialogs/tagdialogs/tagxml.cpp b/quanta/dialogs/tagdialogs/tagxml.cpp index 2db18a3e..c94146bb 100644 --- a/quanta/dialogs/tagdialogs/tagxml.cpp +++ b/quanta/dialogs/tagdialogs/tagxml.cpp @@ -30,13 +30,13 @@ #include "styleeditor.h" Tagxml::Tagxml( TQDomNode &d, TQTag *dtdTag, TQWidget *parent, const char *name) - :TQWidget(parent,name), TagWidget(TQT_TQOBJECT(parent),name), doc(d) + :TQWidget(parent,name), TagWidget(parent,name), doc(d) { initialize(d, dtdTag); } Tagxml::Tagxml( TQDomNode &d, TQTag *dtdTag, const TQString& selection, TQWidget *parent, const char *name) - : TQWidget(parent,name), TagWidget(TQT_TQOBJECT(parent),name), doc(d), m_selection(selection) + : TQWidget(parent,name), TagWidget(parent,name), doc(d), m_selection(selection) { initialize(d, dtdTag); } diff --git a/quanta/dialogs/tagdialogs/tagxml.h b/quanta/dialogs/tagdialogs/tagxml.h index ec25e7ed..13013056 100644 --- a/quanta/dialogs/tagdialogs/tagxml.h +++ b/quanta/dialogs/tagdialogs/tagxml.h @@ -27,7 +27,7 @@ #include "qtag.h" class Tagxml : public TQWidget, TagWidget { - Q_OBJECT + TQ_OBJECT public: /** construtor */ |