diff options
Diffstat (limited to 'quanta/project')
32 files changed, 214 insertions, 206 deletions
diff --git a/quanta/project/CMakeLists.txt b/quanta/project/CMakeLists.txt index 6f3c6f8f..ba5015ad 100644 --- a/quanta/project/CMakeLists.txt +++ b/quanta/project/CMakeLists.txt @@ -22,6 +22,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/quanta/dialogs/tagdialogs ${CMAKE_SOURCE_DIR}/quanta/components/debugger ${CMAKE_SOURCE_DIR}/quanta/components/debugger/interfaces +) + +include_directories( SYSTEM ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/quanta/project/eventconfigurationdlg.h b/quanta/project/eventconfigurationdlg.h index b7c64779..9f44580e 100644 --- a/quanta/project/eventconfigurationdlg.h +++ b/quanta/project/eventconfigurationdlg.h @@ -26,7 +26,7 @@ typedef TQMap<TQString, TQValueList<EventAction> > EventActions; class EventConfigurationDlg : public EventConfigurationDlgS { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/project/eventconfigurationdlgs.ui b/quanta/project/eventconfigurationdlgs.ui index 73bb8666..06247c75 100644 --- a/quanta/project/eventconfigurationdlgs.ui +++ b/quanta/project/eventconfigurationdlgs.ui @@ -211,13 +211,14 @@ <tabstop>editButton</tabstop> <tabstop>deleteButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotEditEvent()</slot> <slot>slotAddEvent()</slot> <slot>slotDeleteEvent()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/quanta/project/eventeditordlg.h b/quanta/project/eventeditordlg.h index 45b94a95..7dbcea90 100644 --- a/quanta/project/eventeditordlg.h +++ b/quanta/project/eventeditordlg.h @@ -26,7 +26,7 @@ class KComboBox; class EventEditorDlg : public EventEditorDlgS { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/project/eventeditordlgs.ui b/quanta/project/eventeditordlgs.ui index 995aa1d4..0cc9a0cd 100644 --- a/quanta/project/eventeditordlgs.ui +++ b/quanta/project/eventeditordlgs.ui @@ -229,8 +229,11 @@ <slot>slotActionChanged(const TQString&)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotActionChanged(const TQString &name)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/quanta/project/membereditdlg.h b/quanta/project/membereditdlg.h index 32d26633..2e1b5a51 100644 --- a/quanta/project/membereditdlg.h +++ b/quanta/project/membereditdlg.h @@ -24,7 +24,7 @@ */ class MemberEditDlg : public MemberEditDlgS { -Q_OBJECT +TQ_OBJECT public: MemberEditDlg(TQWidget *parent = 0, const char *name = 0); diff --git a/quanta/project/membereditdlgs.ui b/quanta/project/membereditdlgs.ui index 1d972b7b..ab625a5e 100644 --- a/quanta/project/membereditdlgs.ui +++ b/quanta/project/membereditdlgs.ui @@ -175,22 +175,16 @@ <tabstop>subprojectCombo</tabstop> <tabstop>editSubprojectsButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotRoleSelected(const TQString& roleName)</slot> <slot>slotEditSubprojects()</slot> <slot>slotMemberSelected()</slot> <slot>slotSelectFromAddrBook()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<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/project/project.cpp b/quanta/project/project.cpp index 107ba14a..32db4b11 100644 --- a/quanta/project/project.cpp +++ b/quanta/project/project.cpp @@ -72,7 +72,7 @@ Project::Project(TDEMainWindow *parent) : TQObject() { d = new ProjectPrivate(this); - connect(d, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); + connect(d, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); d->m_mainWindow = parent; d->m_uploadDialog = 0L; keepPasswd = true; @@ -131,8 +131,8 @@ void Project::insertFile(const KURL& nameURL, bool repaint ) if ( !destination.isEmpty() ) { CopyTo *dlg = new CopyTo(d->baseURL); - connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo*)), d, - TQT_SLOT(slotDeleteCopytoDlg(CopyTo*))); + connect(dlg, TQ_SIGNAL(deleteDialog(CopyTo*)), d, + TQ_SLOT(slotDeleteCopytoDlg(CopyTo*))); url = dlg->copy( nameURL, destination ); } else // Copy canceled, addition aborted @@ -307,10 +307,10 @@ void Project::slotAddDirectory(const KURL& p_dirURL, bool showDlg) (!destination.isEmpty()) ) { CopyTo *dlg = new CopyTo(d->baseURL); - connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), - TQT_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); - connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo *)), d, - TQT_SLOT (slotDeleteCopytoDlg(CopyTo *))); + connect(dlg, TQ_SIGNAL(addFilesToProject(const KURL::List&)), + TQ_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); + connect(dlg, TQ_SIGNAL(deleteDialog(CopyTo *)), d, + TQ_SLOT (slotDeleteCopytoDlg(CopyTo *))); //if ( rdir.right(1) == "/" ) rdir.remove( rdir.length()-1,1); dirURL = dlg->copy(dirURL, destination); return; @@ -477,10 +477,10 @@ void Project::slotOptions() optionsPage.lineEmail->setText( d->email ); // Signals to handle debugger settings - connect(optionsPage.buttonDebuggerOptions, TQT_SIGNAL(clicked()), - d, TQT_SLOT(slotDebuggerOptions())); - connect(optionsPage.comboDebuggerClient, TQT_SIGNAL(activated(const TQString &)), - d, TQT_SLOT(slotDebuggerChanged(const TQString &))); + connect(optionsPage.buttonDebuggerOptions, TQ_SIGNAL(clicked()), + d, TQ_SLOT(slotDebuggerOptions())); + connect(optionsPage.comboDebuggerClient, TQ_SIGNAL(activated(const TQString &)), + d, TQ_SLOT(slotDebuggerChanged(const TQString &))); // Debuggers Combo @@ -863,7 +863,7 @@ void Project::slotUpload() if (!d->m_uploadDialog) { d->m_uploadDialog = new ProjectUpload(KURL(), "", false, false, false, i18n("Upload project items...").ascii()); - connect(d->m_uploadDialog, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); + connect(d->m_uploadDialog, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); d->m_uploadDialog->show(); } else d->m_uploadDialog->raise(); @@ -878,7 +878,7 @@ void Project::slotUploadURL(const KURL& urlToUpload, const TQString& profileName if (!d->m_uploadDialog) { d->m_uploadDialog = new ProjectUpload(url, profileName, false, quickUpload, markOnly, i18n("Upload project items...").ascii()); - connect(d->m_uploadDialog, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); + connect(d->m_uploadDialog, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); d->m_uploadDialog->show(); } else d->m_uploadDialog->raise(); @@ -997,7 +997,7 @@ KURL Project::projectBaseURL() void Project::savePassword(const TQString &entry, const TQString &passwd, bool store) { d->m_passwdList[entry] = passwd; - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Projects"); if (store) { @@ -1017,7 +1017,7 @@ TQString Project::password(const TQString &entry) return d->m_passwdList[entry]; else { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Projects"); TQString passwd = KStringHandler::obscure(config->readEntry(d->projectName + " | " + entry,"")); // TQString passwd = config->readEntry(d->projectName + " | " + entry,""); @@ -1027,7 +1027,7 @@ TQString Project::password(const TQString &entry) bool Project::passwordSaved(const TQString &entry) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Projects"); TQString passwd = KStringHandler::obscure(config->readEntry(d->projectName + " | " + entry,"")); // TQString passwd = config->readEntry(d->projectName + " | " + entry,""); @@ -1052,8 +1052,8 @@ void Project::slotReloadProjectDocs() { delete d->m_dirWatch; d->m_dirWatch = new KDirWatch(this); - connect(d->m_dirWatch, TQT_SIGNAL(dirty(const TQString &)), TQT_SIGNAL(reloadProjectDocs())); - connect(d->m_dirWatch, TQT_SIGNAL(deleted(const TQString &)), TQT_SIGNAL(reloadProjectDocs())); + connect(d->m_dirWatch, TQ_SIGNAL(dirty(const TQString &)), TQ_SIGNAL(reloadProjectDocs())); + connect(d->m_dirWatch, TQ_SIGNAL(deleted(const TQString &)), TQ_SIGNAL(reloadProjectDocs())); if (d->baseURL.isLocalFile()) d->m_dirWatch->addDir(d->baseURL.path() + "/doc"); KURL url; @@ -1281,7 +1281,7 @@ bool Project::queryClose() d->adjustActions(); d->m_projectRecent->setCurrentItem(-1); newStatus(); -// kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); +// tdeApp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); } } return canExit; diff --git a/quanta/project/project.h b/quanta/project/project.h index e1487ad7..7c55cfef 100644 --- a/quanta/project/project.h +++ b/quanta/project/project.h @@ -52,7 +52,7 @@ struct SubProject { }; class Project : public TQObject { - Q_OBJECT + TQ_OBJECT friend class ProjectPrivate; // need this because I use the signals diff --git a/quanta/project/projectnewfinal.h b/quanta/project/projectnewfinal.h index 654af85a..2b3304ce 100644 --- a/quanta/project/projectnewfinal.h +++ b/quanta/project/projectnewfinal.h @@ -25,7 +25,7 @@ */ class ProjectNewFinal : public ProjectNewFinalS { - Q_OBJECT + TQ_OBJECT public: ProjectNewFinal(TQWidget *parent=0, const char *name=0); diff --git a/quanta/project/projectnewgeneral.cpp b/quanta/project/projectnewgeneral.cpp index ce9faf08..1503b951 100644 --- a/quanta/project/projectnewgeneral.cpp +++ b/quanta/project/projectnewgeneral.cpp @@ -67,21 +67,21 @@ ProjectNewGeneral::ProjectNewGeneral(TQWidget *parent, const char *name ) linePrjTmpl->setText("templates"); linePrjToolbar->setText("toolbars"); - connect(comboProtocol, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotProtocolChanged(const TQString &))); - connect( linePrjFile, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotLinePrjFile(const TQString &))); - connect( linePrjName, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotLinePrjFile(const TQString &))); - connect( linePrjDir, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotLinePrjFile(const TQString &))); - connect( buttonDir, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotButtonDir())); - connect( linePrjName, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotChangeNames(const TQString &))); - connect( linePrjTmpl, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotLinePrjFile(const TQString &))); - connect( buttonTmpl, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonTmpl())); - connect( linePrjToolbar, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotLinePrjFile(const TQString &))); - connect( buttonToolbar, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonToolbar())); + connect(comboProtocol, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotProtocolChanged(const TQString &))); + connect( linePrjFile, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotLinePrjFile(const TQString &))); + connect( linePrjName, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotLinePrjFile(const TQString &))); + connect( linePrjDir, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotLinePrjFile(const TQString &))); + connect( buttonDir, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotButtonDir())); + connect( linePrjName, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotChangeNames(const TQString &))); + connect( linePrjTmpl, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotLinePrjFile(const TQString &))); + connect( buttonTmpl, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonTmpl())); + connect( linePrjToolbar, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotLinePrjFile(const TQString &))); + connect( buttonToolbar, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonToolbar())); linePrjTmpl->installEventFilter(this); linePrjToolbar->installEventFilter(this); @@ -218,7 +218,7 @@ bool ProjectNewGeneral::eventFilter ( TQObject * watched, TQEvent * e ) { if (e->type() == TQEvent::FocusOut) { - if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(linePrjTmpl)) + if (watched == linePrjTmpl) { KURL url = baseUrl; QuantaCommon::setUrl(url, linePrjTmpl->text()); @@ -231,7 +231,7 @@ bool ProjectNewGeneral::eventFilter ( TQObject * watched, TQEvent * e ) } else emit enableNextButton(this, true); } else - if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(linePrjToolbar)) + if (watched == linePrjToolbar) { KURL url = baseUrl; QuantaCommon::setUrl(url, linePrjToolbar->text()); diff --git a/quanta/project/projectnewgeneral.h b/quanta/project/projectnewgeneral.h index 6a1839b7..ea475989 100644 --- a/quanta/project/projectnewgeneral.h +++ b/quanta/project/projectnewgeneral.h @@ -27,7 +27,7 @@ class KURL; class ProjectNewGeneral : public ProjectNewGeneralS { - Q_OBJECT + TQ_OBJECT public: ProjectNewGeneral(TQWidget *parent=0, const char *name=0); diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp index 1f4750b1..6964b030 100644 --- a/quanta/project/projectnewlocal.cpp +++ b/quanta/project/projectnewlocal.cpp @@ -59,13 +59,13 @@ ProjectNewLocal::ProjectNewLocal(TQWidget *parent, const char *name ) checkInsertWeb->setChecked( true ); - connect( checkInsert, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetFiles(bool))); - connect( checkInsertWeb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetFiles(bool))); - connect( checkInsertWithMask, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetFiles(bool))); + connect( checkInsert, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetFiles(bool))); + connect( checkInsertWeb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetFiles(bool))); + connect( checkInsertWithMask, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetFiles(bool))); - connect(addFiles, TQT_SIGNAL(clicked()),this,TQT_SLOT(slotAddFiles())); - connect(addFolder, TQT_SIGNAL(clicked()),this,TQT_SLOT(slotAddFolder())); - connect(clearList, TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClearList())); + connect(addFiles, TQ_SIGNAL(clicked()),this,TQ_SLOT(slotAddFiles())); + connect(addFolder, TQ_SIGNAL(clicked()),this,TQ_SLOT(slotAddFolder())); + connect(clearList, TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClearList())); } ProjectNewLocal::~ProjectNewLocal(){ @@ -202,10 +202,10 @@ void ProjectNewLocal::slotAddFiles() if ( !destination.isEmpty()) { CopyTo *dlg = new CopyTo( baseURL); - connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), - TQT_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); - connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo *)), - TQT_SLOT (slotDeleteCopyToDialog(CopyTo *))); + connect(dlg, TQ_SIGNAL(addFilesToProject(const KURL::List&)), + TQ_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); + connect(dlg, TQ_SIGNAL(deleteDialog(CopyTo *)), + TQ_SLOT (slotDeleteCopyToDialog(CopyTo *))); list = dlg->copy( list, destination ); return; } else @@ -263,10 +263,10 @@ void ProjectNewLocal::slotAddFolder() if ( !destination.isEmpty()) { CopyTo *dlg = new CopyTo( baseURL); - connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), - TQT_SLOT (slotInsertFolderAfterCopying(const KURL::List&))); - connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo *)), - TQT_SLOT (slotDeleteCopyToDialog(CopyTo *))); + connect(dlg, TQ_SIGNAL(addFilesToProject(const KURL::List&)), + TQ_SLOT (slotInsertFolderAfterCopying(const KURL::List&))); + connect(dlg, TQ_SIGNAL(deleteDialog(CopyTo *)), + TQ_SLOT (slotDeleteCopyToDialog(CopyTo *))); dirURL = dlg->copy(dirURL, destination); return; } else diff --git a/quanta/project/projectnewlocal.h b/quanta/project/projectnewlocal.h index 84952553..2663eaeb 100644 --- a/quanta/project/projectnewlocal.h +++ b/quanta/project/projectnewlocal.h @@ -29,7 +29,7 @@ class CopyTo; class ProjectNewLocal : public ProjectNewLocalS { - Q_OBJECT + TQ_OBJECT public: ProjectNewLocal(TQWidget *parent=0, const char *name=0); diff --git a/quanta/project/projectnewlocals.ui b/quanta/project/projectnewlocals.ui index a23e8de7..4da60b9d 100644 --- a/quanta/project/projectnewlocals.ui +++ b/quanta/project/projectnewlocals.ui @@ -338,7 +338,7 @@ <tabstop>clearList</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>uploadtreeview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">uploadtreeview.h</include> +</includes> </UI> diff --git a/quanta/project/projectnewweb.cpp b/quanta/project/projectnewweb.cpp index d1692ab6..ad5a9207 100644 --- a/quanta/project/projectnewweb.cpp +++ b/quanta/project/projectnewweb.cpp @@ -26,7 +26,7 @@ // kde includes #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kiconloader.h> #include <tdeio/job.h> #include <tdemessagebox.h> @@ -49,14 +49,14 @@ ProjectNewWeb::ProjectNewWeb(TQWidget *parent, const char *name ) listView->removeColumn(1); listView->removeColumn(1); - connect( commandLine, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT (enableStart(const TQString&))); - connect( siteUrl, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT (setCommandL(const TQString&))); - connect( button, TQT_SIGNAL(clicked()), - this, TQT_SLOT (slotStart())); - connect( protocolCombo,TQT_SIGNAL(highlighted(const TQString&)), - this, TQT_SLOT (setProtocol(const TQString&))); + connect( commandLine, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT (enableStart(const TQString&))); + connect( siteUrl, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT (setCommandL(const TQString&))); + connect( button, TQ_SIGNAL(clicked()), + this, TQ_SLOT (slotStart())); + connect( protocolCombo,TQ_SIGNAL(highlighted(const TQString&)), + this, TQ_SLOT (setProtocol(const TQString&))); start = false; KLed1->setState(KLed::Off); @@ -115,12 +115,12 @@ void ProjectNewWeb::slotStart() *proc << *it; } - connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetWgetOutput(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetWgetOutput(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(processExited( TDEProcess *)), this, - TQT_SLOT( slotGetWgetExited(TDEProcess *))); + connect( proc, TQ_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetWgetOutput(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetWgetOutput(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(processExited( TDEProcess *)), this, + TQ_SLOT( slotGetWgetExited(TDEProcess *))); if (proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput)) { diff --git a/quanta/project/projectnewweb.h b/quanta/project/projectnewweb.h index 5c6e2b5e..50681b09 100644 --- a/quanta/project/projectnewweb.h +++ b/quanta/project/projectnewweb.h @@ -33,7 +33,7 @@ class TDEProcess; class KURL; class ProjectNewWeb : public ProjectNewWebS { - Q_OBJECT + TQ_OBJECT public: ProjectNewWeb(TQWidget *parent=0, const char *name=0); diff --git a/quanta/project/projectnewwebs.ui b/quanta/project/projectnewwebs.ui index df0d8539..c499d194 100644 --- a/quanta/project/projectnewwebs.ui +++ b/quanta/project/projectnewwebs.ui @@ -284,9 +284,8 @@ <tabstop>button</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kled.h</includehint> - <includehint>uploadtreeview.h</includehint> - <includehint>kled.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">uploadtreeview.h</include> + <include location="global" impldecl="in implementation">kled.h</include> +</includes> </UI> diff --git a/quanta/project/projectoptions.ui b/quanta/project/projectoptions.ui index 5d2e8cc8..ba95e7e2 100644 --- a/quanta/project/projectoptions.ui +++ b/quanta/project/projectoptions.ui @@ -435,9 +435,6 @@ <property name="text"> <string>Remember watches across sessions</string> </property> - <property name="accel"> - <string></string> - </property> </widget> </grid> </widget> @@ -531,10 +528,10 @@ <includes> <include location="local" impldecl="in implementation">projectoptions.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>buttonTemplate_clicked()</slot> <slot>buttonToolbar_clicked()</slot> <slot>comboDebuggerClient_activated( int idx )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp index 21040079..d4d523dc 100644 --- a/quanta/project/projectprivate.cpp +++ b/quanta/project/projectprivate.cpp @@ -41,7 +41,7 @@ #include <tdemessagebox.h> #include <tdeparts/componentfactory.h> #include <kprogress.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdetempfile.h> #include <kurl.h> #include <kurlrequester.h> @@ -83,73 +83,73 @@ ProjectPrivate::~ProjectPrivate() void ProjectPrivate::initActions(TDEActionCollection *ac) { (void) new TDEAction( i18n( "&New Project..." ), "window-new", 0, - this, TQT_SLOT( slotNewProject() ), + this, TQ_SLOT( slotNewProject() ), ac, "project_new" ); (void) new TDEAction( i18n( "&Open Project..." ), "project_open", 0, - this, TQT_SLOT( slotOpenProject() ), + this, TQ_SLOT( slotOpenProject() ), ac, "project_open" ); m_projectRecent = - KStdAction::openRecent(parent, TQT_SLOT(slotOpenProject(const KURL&)), + KStdAction::openRecent(parent, TQ_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent"); m_projectRecent->setText(i18n("Open Recent Project")); m_projectRecent->setIcon("project_open"); m_projectRecent->setToolTip(i18n("Open/Open recent project")); - connect(m_projectRecent, TQT_SIGNAL(activated()), this, TQT_SLOT(slotOpenProject())); + connect(m_projectRecent, TQ_SIGNAL(activated()), this, TQ_SLOT(slotOpenProject())); closeprjAction = new TDEAction( i18n( "&Close Project" ), "window-close", 0, - this, TQT_SLOT( slotCloseProject() ), + this, TQ_SLOT( slotCloseProject() ), ac, "project_close" ); openPrjViewAction = new TDESelectAction( i18n( "Open Project &View..." ), 0, ac, "project_view_open" ); - connect(openPrjViewAction, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotOpenProjectView(const TQString &))); + connect(openPrjViewAction, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotOpenProjectView(const TQString &))); openPrjViewAction->setToolTip(i18n("Open project view")); savePrjViewAction = new TDEAction( i18n( "&Save Project View" ), "document-save", 0, - this, TQT_SLOT( slotSaveProjectView() ), + this, TQ_SLOT( slotSaveProjectView() ), ac, "project_view_save" ); saveAsPrjViewAction = new TDEAction( i18n( "Save Project View &As..." ), "document-save-as", 0, - this, TQT_SLOT( slotSaveAsProjectView() ), + this, TQ_SLOT( slotSaveAsProjectView() ), ac, "project_view_save_as" ); deletePrjViewAction = new TDESelectAction( i18n( "&Delete Project View" ), "edit-delete", 0, ac, "project_view_delete" ); - connect(deletePrjViewAction, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotDeleteProjectView(const TQString &))); + connect(deletePrjViewAction, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotDeleteProjectView(const TQString &))); deletePrjViewAction->setToolTip(i18n("Close project view")); insertFileAction = new TDEAction( i18n( "&Insert Files..." ), 0, - this, TQT_SLOT( slotAddFiles() ), + this, TQ_SLOT( slotAddFiles() ), ac, "project_insert_file" ); insertDirAction = new TDEAction( i18n( "Inser&t Folder..." ), 0, - this, TQT_SLOT( slotAddDirectory() ), + this, TQ_SLOT( slotAddDirectory() ), ac, "project_insert_directory" ); rescanPrjDirAction = new TDEAction( i18n( "&Rescan Project Folder..." ), "reload", 0, - parent, TQT_SLOT( slotRescanPrjDir() ), + parent, TQ_SLOT( slotRescanPrjDir() ), ac, "project_rescan" ); uploadProjectAction = new TDEAction( i18n( "&Upload Project..." ), "go-up", Key_F8, - parent, TQT_SLOT( slotUpload() ), + parent, TQ_SLOT( slotUpload() ), ac, "project_upload" ); projectOptionAction = new TDEAction( i18n( "&Project Properties" ), "configure", SHIFT + Key_F7, - parent, TQT_SLOT( slotOptions() ), + parent, TQ_SLOT( slotOptions() ), ac, "project_options" ); saveAsProjectTemplateAction = new TDEAction( i18n( "Save as Project Template..." ), 0, - TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotFileSaveAsProjectTemplate() ), + m_mainWindow, TQ_SLOT( slotFileSaveAsProjectTemplate() ), ac, "save_project_template" ); saveSelectionAsProjectTemplateAction = new TDEAction( i18n( "Save Selection to Project Template File..." ), 0, - TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotFileSaveSelectionAsProjectTemplate() ), + m_mainWindow, TQ_SLOT( slotFileSaveSelectionAsProjectTemplate() ), ac, "save_selection_project_template" ); adjustActions(); } @@ -1145,27 +1145,27 @@ void ProjectPrivate::slotNewProject() wiz->setNextEnabled ( pnf, false ); wiz->setFinishEnabled( pnf, true ); - connect( png, TQT_SIGNAL(enableNextButton(TQWidget *,bool)), - wiz, TQT_SLOT(setNextEnabled(TQWidget*,bool))); - connect( png, TQT_SIGNAL(setBaseURL(const KURL&)), - pnl, TQT_SLOT( setBaseURL(const KURL&))); - connect( png, TQT_SIGNAL(setBaseURL(const KURL&)), - pnw, TQT_SLOT( setBaseURL(const KURL&))); - connect( this,TQT_SIGNAL(setLocalFiles(bool)), - pnl, TQT_SLOT(slotSetFiles(bool))); + connect( png, TQ_SIGNAL(enableNextButton(TQWidget *,bool)), + wiz, TQ_SLOT(setNextEnabled(TQWidget*,bool))); + connect( png, TQ_SIGNAL(setBaseURL(const KURL&)), + pnl, TQ_SLOT( setBaseURL(const KURL&))); + connect( png, TQ_SIGNAL(setBaseURL(const KURL&)), + pnw, TQ_SLOT( setBaseURL(const KURL&))); + connect( this,TQ_SIGNAL(setLocalFiles(bool)), + pnl, TQ_SLOT(slotSetFiles(bool))); - connect(wiz, TQT_SIGNAL(selected(const TQString &)), - this, TQT_SLOT (slotSelectProjectType(const TQString &))); - connect(wiz, TQT_SIGNAL(helpClicked()), TQT_SLOT(slotNewProjectHelpClicked())); - - connect( pnw, TQT_SIGNAL(enableMessagesWidget()), - parent, TQT_SIGNAL(enableMessageWidget())); - connect( pnw, TQT_SIGNAL(messages(const TQString&)), - parent, TQT_SLOT (slotGetMessages(const TQString&))); - connect( pnw, TQT_SIGNAL(enableNextButton(TQWidget *,bool)), - wiz, TQT_SLOT(setNextEnabled(TQWidget*,bool))); - connect( pnw, TQT_SIGNAL(enableNextButton(TQWidget *,bool)), - wiz, TQT_SLOT(setBackEnabled(TQWidget*,bool))); + connect(wiz, TQ_SIGNAL(selected(const TQString &)), + this, TQ_SLOT (slotSelectProjectType(const TQString &))); + connect(wiz, TQ_SIGNAL(helpClicked()), TQ_SLOT(slotNewProjectHelpClicked())); + + connect( pnw, TQ_SIGNAL(enableMessagesWidget()), + parent, TQ_SIGNAL(enableMessageWidget())); + connect( pnw, TQ_SIGNAL(messages(const TQString&)), + parent, TQ_SLOT (slotGetMessages(const TQString&))); + connect( pnw, TQ_SIGNAL(enableNextButton(TQWidget *,bool)), + wiz, TQ_SLOT(setNextEnabled(TQWidget*,bool))); + connect( pnw, TQ_SIGNAL(enableNextButton(TQWidget *,bool)), + wiz, TQ_SLOT(setBackEnabled(TQWidget*,bool))); TQStringList lst = DTDs::ref()->nickNameList(true); pnf->dtdCombo->insertStringList(lst); @@ -1204,13 +1204,13 @@ void ProjectPrivate::slotNewProject() void ProjectPrivate::slotCloseProject() { if (!parent->hasProject()) return; - connect(ViewManager::ref(), TQT_SIGNAL(filesClosed(bool)), this, TQT_SLOT(slotProceedWithCloseProject(bool))); + connect(ViewManager::ref(), TQ_SIGNAL(filesClosed(bool)), this, TQ_SLOT(slotProceedWithCloseProject(bool))); parent->closeFiles(); } void ProjectPrivate::slotProceedWithCloseProject(bool success) { - disconnect(ViewManager::ref(), TQT_SIGNAL(filesClosed(bool)), this, TQT_SLOT(slotProceedWithCloseProject(bool))); + disconnect(ViewManager::ref(), TQ_SIGNAL(filesClosed(bool)), this, TQ_SLOT(slotProceedWithCloseProject(bool))); if (!success) return; emit eventHappened("before_project_close", baseURL.url(), TQString()); if (!uploadProjectFile()) @@ -1231,7 +1231,7 @@ void ProjectPrivate::slotProceedWithCloseProject(bool success) adjustActions(); m_projectRecent->setCurrentItem(-1); parent->newStatus(); - kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); + tdeApp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); } @@ -1446,10 +1446,10 @@ void ProjectPrivate::slotAddFiles() if ( !destination.isEmpty()) { CopyTo *dlg = new CopyTo( baseURL); - connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo*)), - TQT_SLOT (slotDeleteCopytoDlg(CopyTo*))); - connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), parent, - TQT_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); + connect(dlg, TQ_SIGNAL(deleteDialog(CopyTo*)), + TQ_SLOT (slotDeleteCopytoDlg(CopyTo*))); + connect(dlg, TQ_SIGNAL(addFilesToProject(const KURL::List&)), parent, + TQ_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); list = dlg->copy( list, destination ); return; } @@ -1669,7 +1669,7 @@ bool ProjectPrivate::uploadProjectFile() void ProjectPrivate::slotNewProjectHelpClicked() { - kapp->invokeHelp("create-new-project-3-2", "quanta"); + tdeApp->invokeHelp("create-new-project-3-2", "quanta"); } #include "projectprivate.moc" diff --git a/quanta/project/projectprivate.h b/quanta/project/projectprivate.h index d67d27d3..f7421e8e 100644 --- a/quanta/project/projectprivate.h +++ b/quanta/project/projectprivate.h @@ -50,7 +50,7 @@ typedef TQMap<TQString, TQValueList<EventAction> > EventActions; class ProjectPrivate : public TQObject { - Q_OBJECT + TQ_OBJECT public: ProjectPrivate(Project *p); diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp index 481ea134..8c949951 100644 --- a/quanta/project/projectupload.cpp +++ b/quanta/project/projectupload.cpp @@ -83,7 +83,7 @@ ProjectUpload::ProjectUpload(const KURL& url, const TQString& profileName, bool { if (markOnly) markAsUploaded->setChecked(true); - TQTimer::singleShot(10, this, TQT_SLOT(slotBuildTree())); + TQTimer::singleShot(10, this, TQ_SLOT(slotBuildTree())); currentItem = 0L; } } @@ -149,7 +149,7 @@ void ProjectUpload::initProjectInfo(const TQString& defaultProfile) buttonRemoveProfile->setEnabled(comboProfile->count() > 1); keepPasswords->setChecked(m_project->keepPasswd); uploadInProgress = false; - connect( this, TQT_SIGNAL( uploadNext() ), TQT_SLOT( slotUploadNext() ) ); + connect( this, TQ_SIGNAL( uploadNext() ), TQ_SLOT( slotUploadNext() ) ); setProfileTooltip(); } @@ -456,12 +456,12 @@ void ProjectUpload::upload() emit eventHappened("before_upload", from.url(), to.url()); TDEIO::FileCopyJob *job = TDEIO::file_copy( from, to, fileItem->permissions(), true, false, false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),this, - TQT_SLOT( uploadFinished( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( percent( TDEIO::Job *,unsigned long ) ), - this, TQT_SLOT( uploadProgress( TDEIO::Job *,unsigned long ) ) ); - connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *,const TQString& ) ), - this, TQT_SLOT( uploadMessage( TDEIO::Job *,const TQString& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),this, + TQ_SLOT( uploadFinished( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( percent( TDEIO::Job *,unsigned long ) ), + this, TQ_SLOT( uploadProgress( TDEIO::Job *,unsigned long ) ) ); + connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job *,const TQString& ) ), + this, TQ_SLOT( uploadMessage( TDEIO::Job *,const TQString& ) ) ); labelCurFile->setText(i18n("Current: %1").arg(currentURL.fileName())); currentProgress->setProgress( 0 ); diff --git a/quanta/project/projectupload.h b/quanta/project/projectupload.h index c3071899..2e99c615 100644 --- a/quanta/project/projectupload.h +++ b/quanta/project/projectupload.h @@ -37,7 +37,7 @@ class UploadProfileDlgS; class ProjectUpload : public ProjectUploadS { - Q_OBJECT + TQ_OBJECT public: /** Initializes the dialog. If showOnlyProfiles is true, the dialog diff --git a/quanta/project/projectuploads.ui b/quanta/project/projectuploads.ui index 5c91636f..2c8cf68c 100644 --- a/quanta/project/projectuploads.ui +++ b/quanta/project/projectuploads.ui @@ -476,7 +476,7 @@ <includes> <include location="global" impldecl="in declaration">../treeviews/uploadtreeview.h</include> </includes> -<Q_SLOTS> +<slots> <slot>clearSelection()</slot> <slot>startUpload()</slot> <slot>selectAll()</slot> @@ -489,9 +489,12 @@ <slot>slotEditProfile()</slot> <slot>slotRemoveProfile()</slot> <slot>slotNewProfileSelected(const TQString&)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>uploadtreeview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">uploadtreeview.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">kprogress.h</include> +</includes> </UI> diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp index e78eb438..89c65e86 100644 --- a/quanta/project/rescanprj.cpp +++ b/quanta/project/rescanprj.cpp @@ -56,22 +56,22 @@ RescanPrj::RescanPrj(const ProjectList &p_prjFileList, const KURL& p_baseURL, co TDEIO::ListJob *job = TDEIO::listRecursive( baseURL, false ); m_listJobCount = 1; - connect( job, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), - this,TQT_SLOT (addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - this,TQT_SLOT (slotListDone(TDEIO::Job *))); - - - connect( buttonSelect, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelect())); - connect( buttonDeselect, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDeselect())); - connect( buttonInvert, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotInvert())); - connect( buttonExpand, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotExpand())); - connect( buttonCollapse, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCollapse())); + connect( job, TQ_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), + this,TQ_SLOT (addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + this,TQ_SLOT (slotListDone(TDEIO::Job *))); + + + connect( buttonSelect, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelect())); + connect( buttonDeselect, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDeselect())); + connect( buttonInvert, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotInvert())); + connect( buttonExpand, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotExpand())); + connect( buttonCollapse, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCollapse())); } RescanPrj::~RescanPrj() @@ -151,10 +151,10 @@ void RescanPrj::addEntries(TDEIO::Job *job,const TDEIO::UDSEntryList &list) TDEIO::ListJob *ljob = TDEIO::listRecursive( (*it)->url(), false ); m_listJobCount++; - connect( ljob, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), - this,TQT_SLOT (addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); - connect( ljob, TQT_SIGNAL(result(TDEIO::Job *)), - this,TQT_SLOT (slotListDone(TDEIO::Job *))); + connect( ljob, TQ_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), + this,TQ_SLOT (addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); + connect( ljob, TQ_SIGNAL(result(TDEIO::Job *)), + this,TQ_SLOT (slotListDone(TDEIO::Job *))); } } diff --git a/quanta/project/rescanprj.h b/quanta/project/rescanprj.h index 5c36efb9..d985ecfd 100644 --- a/quanta/project/rescanprj.h +++ b/quanta/project/rescanprj.h @@ -33,7 +33,7 @@ struct URLListEntry{ }; class RescanPrj : public RescanPrjDir { - Q_OBJECT + TQ_OBJECT public: RescanPrj(const ProjectList &p_prjFileList, const KURL& p_baseURL, const TQRegExp &p_excludeRx, diff --git a/quanta/project/rescanprjdir.ui b/quanta/project/rescanprjdir.ui index 8fb4b774..f35469e1 100644 --- a/quanta/project/rescanprjdir.ui +++ b/quanta/project/rescanprjdir.ui @@ -248,8 +248,8 @@ <tabstop>buttonHelp</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kprogress.h</includehint> - <includehint>uploadtreeview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kprogress.h</include> + <include location="global" impldecl="in implementation">uploadtreeview.h</include> +</includes> </UI> diff --git a/quanta/project/subprojecteditdlgs.ui b/quanta/project/subprojecteditdlgs.ui index d1a0a168..dd60b002 100644 --- a/quanta/project/subprojecteditdlgs.ui +++ b/quanta/project/subprojecteditdlgs.ui @@ -70,4 +70,7 @@ <tabstop>createNew</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/quanta/project/teammembersdlg.h b/quanta/project/teammembersdlg.h index 2e7d900e..f01ed28b 100644 --- a/quanta/project/teammembersdlg.h +++ b/quanta/project/teammembersdlg.h @@ -24,7 +24,7 @@ */ class TeamMembersDlg : public TeamMembersDlgS { -Q_OBJECT +TQ_OBJECT public: TeamMembersDlg(TQWidget *parent = 0, const char *name = 0); diff --git a/quanta/project/teammembersdlgs.ui b/quanta/project/teammembersdlgs.ui index 512c02ca..4a72e738 100644 --- a/quanta/project/teammembersdlgs.ui +++ b/quanta/project/teammembersdlgs.ui @@ -231,19 +231,16 @@ <tabstop>deleteMemberButton</tabstop> <tabstop>setToYourselfButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotAddMember()</slot> <slot>slotEditMember()</slot> <slot>slotDeleteMember()</slot> <slot>slotSetToYourself()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistview.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<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">tdelistview.h</include> +</includes> </UI> diff --git a/quanta/project/uploadprofiledlgs.ui b/quanta/project/uploadprofiledlgs.ui index de6521e6..9830013f 100644 --- a/quanta/project/uploadprofiledlgs.ui +++ b/quanta/project/uploadprofiledlgs.ui @@ -307,4 +307,9 @@ is obscured, saving the password in any file is a security risk. Use this option <tabstop>cancelButton</tabstop> </tabstops> <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">kpassdlg.h</include> +</includes> </UI> diff --git a/quanta/project/uploadprofilespage.ui b/quanta/project/uploadprofilespage.ui index a5a87110..6806dfab 100644 --- a/quanta/project/uploadprofilespage.ui +++ b/quanta/project/uploadprofilespage.ui @@ -118,8 +118,11 @@ <includes> <include location="local" impldecl="in implementation">uploadprofilespage.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>buttonEditProfiles_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> |