From 9771f17f8cc5252b12ec5f3edf47ff9bffdf997f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:16:01 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- quanta/project/eventconfigurationdlg.cpp | 2 +- quanta/project/eventconfigurationdlg.h | 6 +++--- quanta/project/eventconfigurationdlgs.ui | 2 +- quanta/project/eventeditordlg.cpp | 4 ++-- quanta/project/eventeditordlg.h | 6 +++--- quanta/project/project.cpp | 2 +- quanta/project/project.h | 6 +++--- quanta/project/projectprivate.cpp | 30 +++++++++++++++--------------- quanta/project/projectprivate.h | 18 +++++++++--------- quanta/project/teammembersdlgs.ui | 2 +- 10 files changed, 39 insertions(+), 39 deletions(-) (limited to 'quanta/project') diff --git a/quanta/project/eventconfigurationdlg.cpp b/quanta/project/eventconfigurationdlg.cpp index 29d23964..d3c84d26 100644 --- a/quanta/project/eventconfigurationdlg.cpp +++ b/quanta/project/eventconfigurationdlg.cpp @@ -29,7 +29,7 @@ #include "eventeditordlg.h" #include "qpevents.h" -EventConfigurationDlg::EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* parent, const char* name, WFlags fl) +EventConfigurationDlg::EventConfigurationDlg(TDEActionCollection *actionCollection, TQWidget* parent, const char* name, WFlags fl) : EventConfigurationDlgS(parent,name,fl) { m_actionCollection = actionCollection; diff --git a/quanta/project/eventconfigurationdlg.h b/quanta/project/eventconfigurationdlg.h index 9841d009..b7c64779 100644 --- a/quanta/project/eventconfigurationdlg.h +++ b/quanta/project/eventconfigurationdlg.h @@ -20,7 +20,7 @@ #include "eventconfigurationdlgs.h" class TQDomDocument; -class KActionCollection; +class TDEActionCollection; struct EventAction; typedef TQMap > EventActions; @@ -30,7 +30,7 @@ class EventConfigurationDlg : public EventConfigurationDlgS public: - EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + EventConfigurationDlg(TDEActionCollection *actionCollection, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~EventConfigurationDlg(); void initEvents(EventActions *events); void saveEvents(TQDomDocument dom); @@ -41,7 +41,7 @@ public slots: void slotDeleteEvent(); protected: - KActionCollection *m_actionCollection; + TDEActionCollection *m_actionCollection; protected slots: diff --git a/quanta/project/eventconfigurationdlgs.ui b/quanta/project/eventconfigurationdlgs.ui index 2c9b133f..f60d8f6d 100644 --- a/quanta/project/eventconfigurationdlgs.ui +++ b/quanta/project/eventconfigurationdlgs.ui @@ -71,7 +71,7 @@ - + Event diff --git a/quanta/project/eventeditordlg.cpp b/quanta/project/eventeditordlg.cpp index ddd22837..d98c5ce3 100644 --- a/quanta/project/eventeditordlg.cpp +++ b/quanta/project/eventeditordlg.cpp @@ -35,7 +35,7 @@ extern TQString taskLeaderStr; extern TQString teamLeaderStr; extern TQString subprojectLeaderStr; -EventEditorDlg::EventEditorDlg(KActionCollection *actionCollection, TQWidget* parent, const char* name, WFlags fl) +EventEditorDlg::EventEditorDlg(TDEActionCollection *actionCollection, TQWidget* parent, const char* name, WFlags fl) : EventEditorDlgS(parent,name,fl) { m_actionCollection = actionCollection; @@ -388,7 +388,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name) TQStringList items; for (uint i = 0; i < m_actionCollection->count(); i++) { - KAction *a = m_actionCollection->action(i); + TDEAction *a = m_actionCollection->action(i); action = dynamic_cast(a); if (!action || action->type() != "script") { diff --git a/quanta/project/eventeditordlg.h b/quanta/project/eventeditordlg.h index 697821c6..45b94a95 100644 --- a/quanta/project/eventeditordlg.h +++ b/quanta/project/eventeditordlg.h @@ -21,7 +21,7 @@ #include "eventeditordlgs.h" class TQLabel; -class KActionCollection; +class TDEActionCollection; class KComboBox; class EventEditorDlg : public EventEditorDlgS @@ -30,7 +30,7 @@ class EventEditorDlg : public EventEditorDlgS public: - EventEditorDlg(KActionCollection *actionCollection, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + EventEditorDlg(TDEActionCollection *actionCollection, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~EventEditorDlg(); void setEvent(const TQString &name); void setAction(const TQString &name); @@ -48,7 +48,7 @@ protected: TQMap m_scriptActions; TQMap m_otherActions; - KActionCollection *m_actionCollection; + TDEActionCollection *m_actionCollection; protected slots: diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp index d3786e3b..c4da3a3c 100644 --- a/quanta/project/project.cpp +++ b/quanta/project/project.cpp @@ -68,7 +68,7 @@ extern TQString taskLeaderStr; extern TQString teamLeaderStr; extern TQString subprojectLeaderStr; -Project::Project(KMainWindow *parent) +Project::Project(TDEMainWindow *parent) : TQObject() { d = new ProjectPrivate(this); diff --git a/quanta/project/project.h b/quanta/project/project.h index 42d18fef..e1487ad7 100644 --- a/quanta/project/project.h +++ b/quanta/project/project.h @@ -37,7 +37,7 @@ typedef TQMap > EventActions; */ class TDEConfig; -class KMainWindow; +class TDEMainWindow; struct TeamMember { TQString name; @@ -64,7 +64,7 @@ public: * the parameter is only used at the first call to create the class * */ - static Project* const ref(KMainWindow *parent = 0L) + static Project* const ref(TDEMainWindow *parent = 0L) { static Project *m_ref; if (!m_ref) m_ref = new Project(parent); @@ -212,7 +212,7 @@ private: * If you need the class use Project::ref() for * construction and reference */ - Project(KMainWindow *parent); + Project(TDEMainWindow *parent); ProjectPrivate *d; bool m_projectToolbarVisible; diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp index 7e676e2b..1df99466 100644 --- a/quanta/project/projectprivate.cpp +++ b/quanta/project/projectprivate.cpp @@ -80,13 +80,13 @@ ProjectPrivate::~ProjectPrivate() } /** setup of the actions */ -void ProjectPrivate::initActions(KActionCollection *ac) +void ProjectPrivate::initActions(TDEActionCollection *ac) { - (void) new KAction( i18n( "&New Project..." ), "window_new", 0, + (void) new TDEAction( i18n( "&New Project..." ), "window_new", 0, this, TQT_SLOT( slotNewProject() ), ac, "project_new" ); - (void) new KAction( i18n( "&Open Project..." ), "project_open", 0, + (void) new TDEAction( i18n( "&Open Project..." ), "project_open", 0, this, TQT_SLOT( slotOpenProject() ), ac, "project_open" ); m_projectRecent = @@ -97,24 +97,24 @@ void ProjectPrivate::initActions(KActionCollection *ac) m_projectRecent->setToolTip(i18n("Open/Open recent project")); connect(m_projectRecent, TQT_SIGNAL(activated()), this, TQT_SLOT(slotOpenProject())); - closeprjAction = new KAction( i18n( "&Close Project" ), "fileclose", 0, + closeprjAction = new TDEAction( i18n( "&Close Project" ), "fileclose", 0, this, TQT_SLOT( slotCloseProject() ), ac, "project_close" ); - openPrjViewAction = new KSelectAction( i18n( "Open Project &View..." ), 0, + 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 &))); openPrjViewAction->setToolTip(i18n("Open project view")); - savePrjViewAction = new KAction( i18n( "&Save Project View" ), "filesave", 0, + savePrjViewAction = new TDEAction( i18n( "&Save Project View" ), "filesave", 0, this, TQT_SLOT( slotSaveProjectView() ), ac, "project_view_save" ); - saveAsPrjViewAction = new KAction( i18n( "Save Project View &As..." ), "filesaveas", 0, + saveAsPrjViewAction = new TDEAction( i18n( "Save Project View &As..." ), "filesaveas", 0, this, TQT_SLOT( slotSaveAsProjectView() ), ac, "project_view_save_as" ); - deletePrjViewAction = new KSelectAction( i18n( "&Delete Project View" ), "editdelete", 0, + deletePrjViewAction = new TDESelectAction( i18n( "&Delete Project View" ), "editdelete", 0, ac, "project_view_delete" ); connect(deletePrjViewAction, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotDeleteProjectView(const TQString &))); @@ -122,33 +122,33 @@ void ProjectPrivate::initActions(KActionCollection *ac) - insertFileAction = new KAction( i18n( "&Insert Files..." ), 0, + insertFileAction = new TDEAction( i18n( "&Insert Files..." ), 0, this, TQT_SLOT( slotAddFiles() ), ac, "project_insert_file" ); - insertDirAction = new KAction( i18n( "Inser&t Folder..." ), 0, + insertDirAction = new TDEAction( i18n( "Inser&t Folder..." ), 0, this, TQT_SLOT( slotAddDirectory() ), ac, "project_insert_directory" ); - rescanPrjDirAction = new KAction( i18n( "&Rescan Project Folder..." ), "reload", 0, + rescanPrjDirAction = new TDEAction( i18n( "&Rescan Project Folder..." ), "reload", 0, parent, TQT_SLOT( slotRescanPrjDir() ), ac, "project_rescan" ); - uploadProjectAction = new KAction( i18n( "&Upload Project..." ), "up", Key_F8, + uploadProjectAction = new TDEAction( i18n( "&Upload Project..." ), "up", Key_F8, parent, TQT_SLOT( slotUpload() ), ac, "project_upload" ); - projectOptionAction = new KAction( i18n( "&Project Properties" ), "configure", SHIFT + Key_F7, + projectOptionAction = new TDEAction( i18n( "&Project Properties" ), "configure", SHIFT + Key_F7, parent, TQT_SLOT( slotOptions() ), ac, "project_options" ); saveAsProjectTemplateAction = - new KAction( i18n( "Save as Project Template..." ), 0, + new TDEAction( i18n( "Save as Project Template..." ), 0, TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotFileSaveAsProjectTemplate() ), ac, "save_project_template" ); saveSelectionAsProjectTemplateAction = - new KAction( i18n( "Save Selection to Project Template File..." ), 0, + new TDEAction( i18n( "Save Selection to Project Template File..." ), 0, TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotFileSaveSelectionAsProjectTemplate() ), ac, "save_selection_project_template" ); adjustActions(); diff --git a/quanta/project/projectprivate.h b/quanta/project/projectprivate.h index 0b0a14df..d67d27d3 100644 --- a/quanta/project/projectprivate.h +++ b/quanta/project/projectprivate.h @@ -30,12 +30,12 @@ class TQWidgetStack; -class KAction; -class KActionCollection; +class TDEAction; +class TDEActionCollection; class TDEConfig; class KDirWatch; -class KRecentFilesAction; -class KSelectAction; +class TDERecentFilesAction; +class TDESelectAction; class KTempFile; class CopyTo; @@ -73,7 +73,7 @@ upload.*/ bool usePreviewPrefix; bool m_persistentBookmarks; TQString author; - KRecentFilesAction *m_projectRecent; + TDERecentFilesAction *m_projectRecent; ProjectNewGeneral *png; ProjectNewLocal *pnl; @@ -91,7 +91,7 @@ upload.*/ TQString m_defaultEncoding; TQRegExp excludeRx; TQStringList excludeList; - KMainWindow *m_mainWindow; + TDEMainWindow *m_mainWindow; TQString m_debuggerClientEdit; TQMap m_passwdList; ProjectList m_projectFiles; ///< the list with the _absolute_ URL's of the project @@ -116,14 +116,14 @@ upload.*/ bool m_showUploadTreeviews; bool m_eventsEnabled; - KAction + TDEAction *closeprjAction, *insertFileAction, *insertDirAction, *uploadProjectAction, *rescanPrjDirAction, *projectOptionAction, *saveAsProjectTemplateAction, *saveSelectionAsProjectTemplateAction, *savePrjViewAction, *saveAsPrjViewAction; - KSelectAction *openPrjViewAction, *deletePrjViewAction; + TDESelectAction *openPrjViewAction, *deletePrjViewAction; /** the filename of the local webprj file after download */ TQString m_tmpProjectFile; TQString m_tmpSessionFile; @@ -133,7 +133,7 @@ upload.*/ EventActions *m_events; /** setup of the actions */ - void initActions(KActionCollection *ac); + void initActions(TDEActionCollection *ac); void adjustActions(); diff --git a/quanta/project/teammembersdlgs.ui b/quanta/project/teammembersdlgs.ui index aa1c42f6..dc8f0328 100644 --- a/quanta/project/teammembersdlgs.ui +++ b/quanta/project/teammembersdlgs.ui @@ -83,7 +83,7 @@ &Edit... - + Name -- cgit v1.2.3