From 1fffbdafa12271a1a635caf46777fb8acfb6f31b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 10:00:36 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 2b0e1de2ffcca7bb93f1fd8ddd32f74041d0d076. --- quanta/project/eventconfigurationdlg.cpp | 2 +- quanta/project/eventconfigurationdlgs.ui | 4 ++-- quanta/project/eventeditordlgs.ui | 2 +- quanta/project/project.cpp | 36 ++++++++++++++++---------------- quanta/project/project.h | 8 +++---- quanta/project/projectlist.cpp | 4 ++-- quanta/project/projectnewfinal.cpp | 4 ++-- quanta/project/projectnewfinals.ui | 20 +++++++++--------- quanta/project/projectnewgeneral.cpp | 12 +++++------ quanta/project/projectnewgenerals.ui | 36 ++++++++++++++++---------------- quanta/project/projectnewlocal.cpp | 4 ++-- quanta/project/projectnewlocals.ui | 22 +++++++++---------- quanta/project/projectnewwebs.ui | 18 ++++++++-------- quanta/project/projectoptions.ui | 14 ++++++------- quanta/project/projectprivate.cpp | 34 +++++++++++++++--------------- quanta/project/projectupload.cpp | 22 +++++++++---------- quanta/project/projectuploads.ui | 10 ++++----- quanta/project/projecturl.h | 12 +++++------ quanta/project/rescanprj.cpp | 6 +++--- quanta/project/rescanprjdir.ui | 8 +++---- quanta/project/teammembersdlg.cpp | 8 +++---- quanta/project/teammembersdlgs.ui | 4 ++-- quanta/project/uploadprofiledlgs.ui | 8 +++---- quanta/project/uploadprofilespage.ui | 4 ++-- 24 files changed, 151 insertions(+), 151 deletions(-) (limited to 'quanta/project') diff --git a/quanta/project/eventconfigurationdlg.cpp b/quanta/project/eventconfigurationdlg.cpp index 29d23964..3c4e0024 100644 --- a/quanta/project/eventconfigurationdlg.cpp +++ b/quanta/project/eventconfigurationdlg.cpp @@ -141,7 +141,7 @@ void EventConfigurationDlg::slotDeleteEvent() { TQListViewItem *item = eventsListView->currentItem(); if (!item) return; - if (KMessageBox::warningContinueCancel(this, i18n("Are you sure that you want to remove the configuration of the %1 event?").arg(item->text(0)), i18n("Delete Event Configuration"),KStdGuiItem::del()) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("Are you sure that you want to remove the configuration of the %1 event?").tqarg(item->text(0)), i18n("Delete Event Configuration"),KStdGuiItem::del()) == KMessageBox::Continue) { delete item; } diff --git a/quanta/project/eventconfigurationdlgs.ui b/quanta/project/eventconfigurationdlgs.ui index 82dbc51c..98aadf20 100644 --- a/quanta/project/eventconfigurationdlgs.ui +++ b/quanta/project/eventconfigurationdlgs.ui @@ -64,7 +64,7 @@ Expanding - + 172 20 @@ -152,7 +152,7 @@ Expanding - + 150 20 diff --git a/quanta/project/eventeditordlgs.ui b/quanta/project/eventeditordlgs.ui index ac6efe68..d93b1336 100644 --- a/quanta/project/eventeditordlgs.ui +++ b/quanta/project/eventeditordlgs.ui @@ -20,7 +20,7 @@ 0 - + 350 0 diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp index 3bee7146..ebc16264 100644 --- a/quanta/project/project.cpp +++ b/quanta/project/project.cpp @@ -24,7 +24,7 @@ // include QT files #include #include -#include +#include // include files for KDE #include @@ -109,7 +109,7 @@ KURL::List Project::files() return list; } -void Project::insertFile(const KURL& nameURL, bool repaint ) +void Project::insertFile(const KURL& nameURL, bool tqrepaint ) { if (d->excludeRx.exactMatch(nameURL.path())) return; @@ -118,7 +118,7 @@ void Project::insertFile(const KURL& nameURL, bool repaint ) if ( !d->baseURL.isParentOf(url) ) { KURLRequesterDlg *urlRequesterDlg = new KURLRequesterDlg( d->baseURL.prettyURL(), d->m_mainWindow, ""); - urlRequesterDlg->setCaption(i18n("%1: Copy to Project").arg(nameURL.prettyURL(0, KURL::StripFileProtocol))); + urlRequesterDlg->setCaption(i18n("%1: Copy to Project").tqarg(nameURL.prettyURL(0, KURL::StripFileProtocol))); urlRequesterDlg->urlRequester()->setMode( KFile::Directory | KFile::ExistingOnly); urlRequesterDlg->exec(); KURL destination = urlRequesterDlg->selectedURL(); @@ -150,19 +150,19 @@ void Project::insertFile(const KURL& nameURL, bool repaint ) d->dom.firstChild().firstChild().appendChild( el ); KURL u = url.upURL(); ProjectURL *parentURL = d->m_projectFiles.find(u); - int uploadStatus = 1; + int uploadtqStatus = 1; if (parentURL) - uploadStatus = parentURL->uploadStatus; - d->m_projectFiles.insert( new ProjectURL(url, "", uploadStatus, false, el) ); + uploadtqStatus = parentURL->uploadtqStatus; + d->m_projectFiles.insert( new ProjectURL(url, "", uploadtqStatus, false, el) ); } url.setPath(url.directory(false)); } emit eventHappened("after_project_add", url.url(), TQString()); setModified(); - if ( repaint ) + if ( tqrepaint ) { emit reloadTree( &(d->m_projectFiles), false, TQStringList()); - emit newStatus(); + emit newtqStatus(); } } @@ -213,7 +213,7 @@ void Project::loadLastProject(bool reload) { KURL tempURL = KURL().fromPathOrURL(tempPath); if (KIO::NetAccess::exists(tempURL, false, d->m_mainWindow) && - KMessageBox::questionYesNo(d->m_mainWindow, i18n("Found a backup for project %1.
Do you want to open it?").arg(url.prettyURL()), i18n("Open Project Backup"), KStdGuiItem::open(), i18n("Do Not Open") ) + KMessageBox::questionYesNo(d->m_mainWindow, i18n("Found a backup for project %1.
Do you want to open it?").tqarg(url.prettyURL()), i18n("Open Project Backup"), KStdGuiItem::open(), i18n("Do Not Open") ) == KMessageBox::Yes) { d->m_tmpProjectFile = tempPath; @@ -262,7 +262,7 @@ void Project::slotOpenProject(const KURL &url) { emit hideSplash(); if (KMessageBox::questionYesNo(d->m_mainWindow, - i18n("The file %1 does not exist.
Do you want to remove it from the list?").arg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::del(), i18n("Keep") ) + i18n("The file %1 does not exist.
Do you want to remove it from the list?").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::del(), i18n("Keep") ) == KMessageBox::Yes) { d->m_projectRecent->removeURL(url); @@ -297,7 +297,7 @@ void Project::slotAddDirectory(const KURL& p_dirURL, bool showDlg) if (showDlg) { KURLRequesterDlg *urlRequesterDlg = new KURLRequesterDlg( d->baseURL.prettyURL(), d->m_mainWindow, ""); - urlRequesterDlg->setCaption(i18n("%1: Copy to Project").arg(dirURL.prettyURL(0, KURL::StripFileProtocol))); + urlRequesterDlg->setCaption(i18n("%1: Copy to Project").tqarg(dirURL.prettyURL(0, KURL::StripFileProtocol))); urlRequesterDlg->urlRequester()->setMode( KFile::Directory | KFile::ExistingOnly); urlRequesterDlg->exec(); destination = urlRequesterDlg->selectedURL(); @@ -384,7 +384,7 @@ void Project::slotRenamed(const KURL& oldURL, const KURL& newURL) setModified(); // there happens more than setting the flag ! emit reloadTree(&(d->m_projectFiles), false, TQStringList()); - emit newStatus(); + emit newtqStatus(); } @@ -422,12 +422,12 @@ void Project::slotRemove(const KURL& urlToRemove) if (d->m_modified) setModified(); // there happens more than setting the flag ! emit reloadTree( &(d->m_projectFiles), false, TQStringList() ); - emit newStatus(); + emit newtqStatus(); TQString urlPath = QExtFileInfo::toRelative(urlToRemove, d->baseURL).path(); TQString nice = urlPath; nice = KStringHandler::lsqueeze(nice, 60); - if (KMessageBox::warningContinueCancel(d->m_mainWindow, i18n("Do you want to remove
%1
from the server(s) as well?").arg(nice), i18n("Remove From Server"), KStdGuiItem::remove(), "RemoveFromServer") == KMessageBox::Continue ) + if (KMessageBox::warningContinueCancel(d->m_mainWindow, i18n("Do you want to remove
%1
from the server(s) as well?").tqarg(nice), i18n("Remove From Server"), KStdGuiItem::remove(), "RemoveFromServer") == KMessageBox::Continue ) { TQDomNode profilesNode = d->m_sessionDom.firstChild().firstChild().namedItem("uploadprofiles"); TQDomNodeList profileList = profilesNode.toElement().elementsByTagName("profile"); @@ -952,7 +952,7 @@ void Project::slotUploadStatusChanged(const KURL& url, int status) { if ( it.currentKey().startsWith(urlStr) || it.currentKey() + "/" == urlStr) { - it.current()->uploadStatus = status; + it.current()->uploadtqStatus = status; el = it.current()->domElement; el.setAttribute("uploadstatus", status); } @@ -960,7 +960,7 @@ void Project::slotUploadStatusChanged(const KURL& url, int status) setModified(); } -void Project::slotChangeDocumentFolderStatus(const KURL &url, bool status) +void Project::slotChangeDocumentFoldertqStatus(const KURL &url, bool status) { ProjectURL *proUrl = d->m_projectFiles.find(url); if (! proUrl) @@ -1280,7 +1280,7 @@ bool Project::queryClose() reloadTree( &(d->m_projectFiles), true, TQStringList()); d->adjustActions(); d->m_projectRecent->setCurrentItem(-1); - newStatus(); + newtqStatus(); // kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); } } @@ -1345,7 +1345,7 @@ void Project::saveBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf) { KTextEditor::Mark *mark = marks.at(i); if (mark->type == KTextEditor::MarkInterface::Bookmark) - markList << TQString("%1").arg(mark->line); + markList << TQString("%1").tqarg(mark->line); } TQDomNodeList nl = d->dom.elementsByTagName("item"); TQDomElement el; diff --git a/quanta/project/project.h b/quanta/project/project.h index fc88c13b..8c25ccf9 100644 --- a/quanta/project/project.h +++ b/quanta/project/project.h @@ -79,7 +79,7 @@ public: TQStringList fileNameList(); KURL::List files(); - void insertFile( const KURL& nameURL, bool repaint ); + void insertFile( const KURL& nameURL, bool tqrepaint ); void readConfig(KConfig *); /** loads the last project again if reload == true but checks in any case if there is a left over project from a crash @@ -174,7 +174,7 @@ public slots: void slotRescanPrjDir(); void slotFileDescChanged(const KURL& url, const TQString& desc); void slotUploadStatusChanged(const KURL& url, int status); - void slotChangeDocumentFolderStatus(const KURL& url, bool status); + void slotChangeDocumentFoldertqStatus(const KURL& url, bool status); void slotReloadProjectDocs(); @@ -194,7 +194,7 @@ signals: void messages(const TQString& ); void enableMessageWidget(); - void newStatus(); + void newtqStatus(); void statusMsg(const TQString &); /** No descriptions */ void newProjectLoaded(const TQString &, const KURL &, const KURL &); @@ -204,7 +204,7 @@ signals: void getUserToolbarFiles(KURL::List *); void loadToolbarFile(const KURL &); /** ask for the tree status for saving in project */ - void getTreeStatus(TQStringList *); + void getTreetqStatus(TQStringList *); void eventHappened(const TQString&, const TQString&, const TQString& ); private: diff --git a/quanta/project/projectlist.cpp b/quanta/project/projectlist.cpp index d0e5b942..ec46ecb9 100644 --- a/quanta/project/projectlist.cpp +++ b/quanta/project/projectlist.cpp @@ -80,8 +80,8 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL, } else { bool docFolder = (el.attribute("documentFolder", "false") == "true"); - int uploadStatus = el.attribute("uploadstatus", "-1").toInt(); - if (uploadStatus == -1) + int uploadtqStatus = el.attribute("uploadstatus", "-1").toInt(); + if (uploadtqStatus == -1) el.setAttribute("uploadstatus", 1); //remove non-existent local files if ( url.isLocalFile() ) diff --git a/quanta/project/projectnewfinal.cpp b/quanta/project/projectnewfinal.cpp index 1821429c..05dd7cf4 100644 --- a/quanta/project/projectnewfinal.cpp +++ b/quanta/project/projectnewfinal.cpp @@ -17,7 +17,7 @@ // qt includes #include -#include +#include // kde includes #include @@ -37,6 +37,6 @@ ProjectNewFinal::~ProjectNewFinal(){ void ProjectNewFinal::setMargin(int i) { - layout()->setMargin(i); + tqlayout()->setMargin(i); } diff --git a/quanta/project/projectnewfinals.ui b/quanta/project/projectnewfinals.ui index fc3603c9..136245bb 100644 --- a/quanta/project/projectnewfinals.ui +++ b/quanta/project/projectnewfinals.ui @@ -29,13 +29,13 @@ 0 - + 620 410 - + 32000 32000 @@ -61,13 +61,13 @@ 0 - + 115 0 - + 115 480 @@ -79,7 +79,7 @@ true - + AlignTop|AlignLeft @@ -95,7 +95,7 @@ Preferred - + 20 40 @@ -104,7 +104,7 @@ - layout11 + tqlayout11 @@ -141,7 +141,7 @@ TextLabel3_2_3 - + 32767 32767 @@ -160,7 +160,7 @@ TextLabel3_2_2_2 - + 32767 32767 @@ -227,7 +227,7 @@ Fixed - + 16 20 diff --git a/quanta/project/projectnewgeneral.cpp b/quanta/project/projectnewgeneral.cpp index be93eb3d..8869cbdc 100644 --- a/quanta/project/projectnewgeneral.cpp +++ b/quanta/project/projectnewgeneral.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include @@ -164,7 +164,7 @@ TQString ProjectNewGeneral::type() void ProjectNewGeneral::setMargin(int i) { - layout()->setMargin(i); + tqlayout()->setMargin(i); } void ProjectNewGeneral::slotButtonTmpl() @@ -177,7 +177,7 @@ void ProjectNewGeneral::slotButtonTmpl() linePrjTmpl->setText(KURL::relativeURL(baseUrl, url)); } else { - KMessageBox::sorry(this, i18n("The project templates must be stored under the main project folder:

%1").arg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::sorry(this, i18n("The project templates must be stored under the main project folder:

%1").tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); } } @@ -192,7 +192,7 @@ void ProjectNewGeneral::slotButtonToolbar() } { KMessageBox::sorry(0, i18n("The project toolbars must be stored under the main project folder:

%1") - .arg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); + .tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); } } @@ -225,7 +225,7 @@ bool ProjectNewGeneral::eventFilter ( TQObject * watched, TQEvent * e ) url = QExtFileInfo::toAbsolute(url, baseUrl); if (!baseUrl.isParentOf(url)) { - KMessageBox::sorry(this,i18n("The project templates must be stored under the main project folder:

%1").arg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::sorry(this,i18n("The project templates must be stored under the main project folder:

%1").tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); linePrjTmpl->setFocus(); emit enableNextButton(this, false); } else @@ -239,7 +239,7 @@ bool ProjectNewGeneral::eventFilter ( TQObject * watched, TQEvent * e ) if (!baseUrl.isParentOf(url)) { KMessageBox::sorry(0,i18n("The project toolbars must be stored under the main project folder:

%1") - .arg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); + .tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); linePrjToolbar->setFocus(); emit enableNextButton(this, false); } else diff --git a/quanta/project/projectnewgenerals.ui b/quanta/project/projectnewgenerals.ui index b58173eb..8176cb04 100644 --- a/quanta/project/projectnewgenerals.ui +++ b/quanta/project/projectnewgenerals.ui @@ -32,13 +32,13 @@ 0 - + 620 410 - + 32000 32000 @@ -64,13 +64,13 @@ 0 - + 115 0 - + 115 480 @@ -82,7 +82,7 @@ true - + AlignTop|AlignLeft @@ -98,7 +98,7 @@ Preferred - + 20 40 @@ -107,7 +107,7 @@ - layout12 + tqlayout12 @@ -141,13 +141,13 @@ buttonToolbar - + 0 0 - + 32 32767 @@ -174,13 +174,13 @@ buttonTmpl - + 0 0 - + 32 32767 @@ -202,7 +202,7 @@ 0 - + 32 32767 @@ -277,7 +277,7 @@ File: - + AlignVCenter|AlignRight @@ -307,7 +307,7 @@ Protocol: - + AlignVCenter @@ -320,7 +320,7 @@ Password: - + AlignVCenter|AlignRight @@ -359,7 +359,7 @@ 0 - + 0 26 @@ -381,7 +381,7 @@ Port: - + AlignVCenter|AlignRight @@ -397,7 +397,7 @@ Host: - + AlignVCenter|AlignRight diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp index fb67e4fb..1883c03a 100644 --- a/quanta/project/projectnewlocal.cpp +++ b/quanta/project/projectnewlocal.cpp @@ -75,7 +75,7 @@ void ProjectNewLocal::setBaseURL(const KURL& a_baseURL) { baseURL = a_baseURL; baseURL.adjustPath(1); - checkInsert->setText(i18n("Insert files from %1.").arg(baseURL.prettyURL(0, KURL::StripFileProtocol))); + checkInsert->setText(i18n("Insert files from %1.").tqarg(baseURL.prettyURL(0, KURL::StripFileProtocol))); listView->clear(); fileList.clear(); checkInsert->setChecked(false); @@ -254,7 +254,7 @@ void ProjectNewLocal::slotAddFolder() { KURLRequesterDlg *urlRequesterDlg = new KURLRequesterDlg( baseURL.prettyURL(), this, ""); - urlRequesterDlg->setCaption(i18n("%1: Copy to Project").arg(dirURL.prettyURL(0, KURL::StripFileProtocol))); + urlRequesterDlg->setCaption(i18n("%1: Copy to Project").tqarg(dirURL.prettyURL(0, KURL::StripFileProtocol))); urlRequesterDlg->urlRequester()->setMode( KFile::Directory | KFile::ExistingOnly); urlRequesterDlg->exec(); KURL destination = urlRequesterDlg->selectedURL(); diff --git a/quanta/project/projectnewlocals.ui b/quanta/project/projectnewlocals.ui index a23e8de7..5b737924 100644 --- a/quanta/project/projectnewlocals.ui +++ b/quanta/project/projectnewlocals.ui @@ -29,13 +29,13 @@ 0 - + 620 410 - + 32000 32000 @@ -61,13 +61,13 @@ 0 - + 115 0 - + 115 480 @@ -85,7 +85,7 @@ true - + AlignTop|AlignLeft @@ -93,7 +93,7 @@ - layout2 + tqlayout2 @@ -184,7 +184,7 @@ - layout5 + tqlayout5 @@ -205,7 +205,7 @@ - layout5 + tqlayout5 @@ -221,7 +221,7 @@ Fixed - + 85 20 @@ -262,7 +262,7 @@ Fixed - + 89 20 @@ -281,7 +281,7 @@ Fixed - + 16 20 diff --git a/quanta/project/projectnewwebs.ui b/quanta/project/projectnewwebs.ui index df0d8539..4711434a 100644 --- a/quanta/project/projectnewwebs.ui +++ b/quanta/project/projectnewwebs.ui @@ -29,13 +29,13 @@ 0 - + 620 410 - + 32000 32000 @@ -61,13 +61,13 @@ 0 - + 115 0 - + 115 480 @@ -79,7 +79,7 @@ true - + AlignTop|AlignLeft @@ -87,7 +87,7 @@ - layout7 + tqlayout7 @@ -103,7 +103,7 @@ Fixed - + 309 16 @@ -178,7 +178,7 @@ - layout6 + tqlayout6 @@ -202,7 +202,7 @@ Expanding - + 228 20 diff --git a/quanta/project/projectoptions.ui b/quanta/project/projectoptions.ui index 5d2e8cc8..9a577bdd 100644 --- a/quanta/project/projectoptions.ui +++ b/quanta/project/projectoptions.ui @@ -40,13 +40,13 @@ buttonToolbar - + 0 0 - + 32 32767 @@ -60,13 +60,13 @@ buttonTmpl - + 0 0 - + 32 32767 @@ -88,7 +88,7 @@ 0 - + 200 0 @@ -162,7 +162,7 @@ 0 - + 300 0 @@ -302,7 +302,7 @@ TextLabel3_2_2_2 - + 32767 32767 diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp index ce3686bf..52879849 100644 --- a/quanta/project/projectprivate.cpp +++ b/quanta/project/projectprivate.cpp @@ -351,7 +351,7 @@ void ProjectPrivate::insertFiles( KURL::List files ) progressBar->setTextEnabled(false); parent->reloadTree(&(m_projectFiles), false, TQStringList()); - parent->newStatus(); + parent->newtqStatus(); parent->statusMsg(TQString()); } @@ -699,7 +699,7 @@ void ProjectPrivate::loadProjectXML() parent->statusMsg(TQString()); parent->newProjectLoaded(projectName, baseURL, templateURL); parent->reloadTree(&(m_projectFiles), true, treeStatusFromXML()); - parent->newStatus(); + parent->newtqStatus(); adjustActions(); } @@ -917,7 +917,7 @@ void ProjectPrivate::slotSaveAsProjectView(bool askForName) { if (!askForName || KMessageBox::warningContinueCancel(m_mainWindow, i18n("A project view named %1 already exists.
Do you want to overwrite it?") - .arg(currentProjectView), TQString(), i18n("Overwrite")) == KMessageBox::Continue) + .tqarg(currentProjectView), TQString(), i18n("Overwrite")) == KMessageBox::Continue) { node.parentNode().removeChild(node); break; @@ -1056,7 +1056,7 @@ bool ProjectPrivate::createEmptyDom() if (!result) { parent->hideSplash(); - KMessageBox::sorry(m_mainWindow, i18n("Cannot open file %1 for writing.").arg(projectURL.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::sorry(m_mainWindow, i18n("Cannot open file %1 for writing.").tqarg(projectURL.prettyURL(0, KURL::StripFileProtocol))); delete tempFile; tempFile = 0L; delete sessionTempFile; @@ -1099,7 +1099,7 @@ void ProjectPrivate::getStatusFromTree() i--; } TQStringList folderList; - parent->getTreeStatus( &folderList ); + parent->getTreetqStatus( &folderList ); // toplevel folder is always open in a project and QExtFileInfo::toRelative // creates strange output -> we remove the toplevel folder if (folderList.count() > 0) @@ -1122,7 +1122,7 @@ void ProjectPrivate::slotNewProject() { TQWizard *wiz = new TQWizard(m_mainWindow, "new", true); wiz->setCaption(i18n("New Project Wizard")); - wiz->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + wiz->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); png = new ProjectNewGeneral(0L); @@ -1197,7 +1197,7 @@ void ProjectPrivate::slotNewProject() delete wiz; adjustActions(); - parent->newStatus(); + parent->newtqStatus(); } /** close project and edited files */ @@ -1230,8 +1230,8 @@ void ProjectPrivate::slotProceedWithCloseProject(bool success) parent->reloadTree( &(m_projectFiles), true, TQStringList()); adjustActions(); m_projectRecent->setCurrentItem(-1); - parent->newStatus(); - kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); + parent->newtqStatus(); + kapp->tqprocessEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); } @@ -1284,11 +1284,11 @@ bool ProjectPrivate::saveProject() f.close(); } m_modified = false; - parent->statusMsg(i18n( "Wrote project file %1" ).arg(m_tmpProjectFile)); + parent->statusMsg(i18n( "Wrote project file %1" ).tqarg(m_tmpProjectFile)); } else { parent->hideSplash(); - KMessageBox::error(m_mainWindow, i18n("Cannot open the file %1 for writing.").arg(m_tmpProjectFile)); + KMessageBox::error(m_mainWindow, i18n("Cannot open the file %1 for writing.").tqarg(m_tmpProjectFile)); result = false; } return result; @@ -1339,7 +1339,7 @@ void ProjectPrivate::loadProjectFromTemp(const KURL &url, const TQString &tempFi } else { parent->hideSplash(); - KMessageBox::error(m_mainWindow, i18n("Cannot open the file %1 for reading.").arg(tempFile)); + KMessageBox::error(m_mainWindow, i18n("Cannot open the file %1 for reading.").tqarg(tempFile)); } } @@ -1351,13 +1351,13 @@ bool ProjectPrivate::loadProject(const KURL &url) if (!url.isValid()) { parent->hideSplash(); - KMessageBox::sorry(m_mainWindow, i18n("Malformed URL: %1").arg(url.prettyURL())); + KMessageBox::sorry(m_mainWindow, i18n("Malformed URL: %1").tqarg(url.prettyURL())); return false; } if ( projectAlreadyOpen(url.url()) ) { parent->hideSplash(); - if (KMessageBox::warningContinueCancel(m_mainWindow, i18n("The project
%1
seems to be used by another Quanta instance.
You may end up with data loss if you open the same project in two instances, modify and save them in both.

Do you want to proceed with open?").arg(url.prettyURL()), TQString(), KStdGuiItem::open()) == KMessageBox::Cancel) + if (KMessageBox::warningContinueCancel(m_mainWindow, i18n("The project
%1
seems to be used by another Quanta instance.
You may end up with data loss if you open the same project in two instances, modify and save them in both.

Do you want to proceed with open?").tqarg(url.prettyURL()), TQString(), KStdGuiItem::open()) == KMessageBox::Cancel) return false; } TQString projectTmpFile; @@ -1416,7 +1416,7 @@ bool ProjectPrivate::loadProject(const KURL &url) } else { parent->hideSplash(); - KMessageBox::error(m_mainWindow, i18n("Cannot access the project file %1.").arg(url.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(m_mainWindow, i18n("Cannot access the project file %1.").tqarg(url.prettyURL(0, KURL::StripFileProtocol))); return false; } return true; @@ -1532,7 +1532,7 @@ void ProjectPrivate::slotDebuggerOptions() else { parent->hideSplash(); - KMessageBox::error(NULL, i18n("Unable to load the debugger plugin, error code %1 was returned: %2.").arg(errCode).arg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error")); + KMessageBox::error(NULL, i18n("Unable to load the debugger plugin, error code %1 was returned: %2.").tqarg(errCode).tqarg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error")); } } } @@ -1639,7 +1639,7 @@ bool ProjectPrivate::uploadProjectFile() { removeFromConfig(projectURL.url()); // remove the project from the list of open projects if (quantaApp) - parent->statusMsg(i18n( "Uploaded project file %1" ).arg( projectURL.prettyURL())); + parent->statusMsg(i18n( "Uploaded project file %1" ).tqarg( projectURL.prettyURL())); // delete all temp files we used // first the one from creating a new project delete tempFile; diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp index fb439707..ba267753 100644 --- a/quanta/project/projectupload.cpp +++ b/quanta/project/projectupload.cpp @@ -211,15 +211,15 @@ void ProjectUpload::slotBuildTree() uploadedTime = m_uploadTimeList[s]; int modifiedTime = item.time(KIO::UDS_MODIFICATION_TIME); el.setAttribute("modified_time", modifiedTime); - int uploadStatus = el.attribute("uploadstatus", "1").toInt(); - if (m_quickUpload || (forceUpload && uploadStatus == 0)) - uploadStatus = 1; - if (m_quickUpload || (uploadedTime != modifiedTime && uploadStatus != 0)) + int uploadtqStatus = el.attribute("uploadstatus", "1").toInt(); + if (m_quickUpload || (forceUpload && uploadtqStatus == 0)) + uploadtqStatus = 1; + if (m_quickUpload || (uploadedTime != modifiedTime && uploadtqStatus != 0)) { modified.append( u ); it->setSelected(true); } - if (uploadStatus == 2) + if (uploadtqStatus == 2) it->setConfirmUpload(true); totalProgress->setValue(i); } @@ -382,7 +382,7 @@ void ProjectUpload::startUpload() } else { if (KMessageBox::warningContinueCancel(this, i18n("%1 seems to be unaccessible.
Do you want to proceed with upload?") - .arg(u.prettyURL(0, KURL::StripFileProtocol)),TQString(),KStdGuiItem::cont()) == KMessageBox::Continue) + .tqarg(u.prettyURL(0, KURL::StripFileProtocol)),TQString(),KStdGuiItem::cont()) == KMessageBox::Continue) { upload(); return; @@ -463,7 +463,7 @@ void ProjectUpload::upload() connect( job, TQT_SIGNAL( infoMessage( KIO::Job *,const TQString& ) ), this, TQT_SLOT( uploadMessage( KIO::Job *,const TQString& ) ) ); - labelCurFile->setText(i18n("Current: %1").arg(currentURL.fileName())); + labelCurFile->setText(i18n("Current: %1").tqarg(currentURL.fileName())); currentProgress->setProgress( 0 ); return; } else //it is a dir, so just go to the next item @@ -517,7 +517,7 @@ void ProjectUpload::selectModified() { TQListViewItem *it = list->findItem( (*file).path() ); it->setSelected(true); - it->repaint(); + it->tqrepaint(); } list->checkboxTree(); } @@ -564,7 +564,7 @@ void ProjectUpload::slotUploadNext() UploadTreeFile *itf = dynamic_cast(it); if (itf) itf->setWhichPixmap( "check_clear" ); - it->repaint(); + it->tqrepaint(); } toUpload.remove( it ); @@ -639,7 +639,7 @@ void ProjectUpload::slotRemoveProfile() } else { TQString profileName = comboProfile->currentText(); - if (KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the %1 upload profile?").arg(profileName), + if (KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the %1 upload profile?").tqarg(profileName), i18n("Profile Removal"), KStdGuiItem::del()) == KMessageBox::Continue) { m_profilesNode.removeChild(m_currentProfileElement); @@ -652,7 +652,7 @@ void ProjectUpload::slotRemoveProfile() slotNewProfileSelected(currentProfile); if (profileName == defaultProfile()) { - KMessageBox::information(this, i18n("You have removed your default profile.
The new default profile will be %1.").arg(currentProfile), i18n("Profile Removal")); + KMessageBox::information(this, i18n("You have removed your default profile.
The new default profile will be %1.").tqarg(currentProfile), i18n("Profile Removal")); m_profilesNode.toElement().setAttribute("defaultProfile", currentProfile); } comboProfile->removeItem(idx); diff --git a/quanta/project/projectuploads.ui b/quanta/project/projectuploads.ui index 42b79257..3bc4e83a 100644 --- a/quanta/project/projectuploads.ui +++ b/quanta/project/projectuploads.ui @@ -30,7 +30,7 @@ 0 - + 32767 32767 @@ -48,7 +48,7 @@ - layout2 + tqlayout2 @@ -88,7 +88,7 @@ Preferred - + 40 20 @@ -172,7 +172,7 @@ Expanding - + 400 20 @@ -338,7 +338,7 @@ Current: [none] - + WordBreak|AlignVCenter diff --git a/quanta/project/projecturl.h b/quanta/project/projecturl.h index cf3eae66..02232234 100644 --- a/quanta/project/projecturl.h +++ b/quanta/project/projecturl.h @@ -32,26 +32,26 @@ class ProjectURL : public KURL { public: TQString fileDesc; - int uploadStatus; ///< The upload state, see UploadStatus + int uploadtqStatus; ///< The upload state, see UploadtqStatus bool documentFolder; TQDomElement domElement; ProjectURL() - : KURL(), uploadStatus(1), documentFolder(false) {} + : KURL(), uploadtqStatus(1), documentFolder(false) {} ProjectURL(const KURL& url) - : KURL(url), uploadStatus(1), documentFolder(false) {} + : KURL(url), uploadtqStatus(1), documentFolder(false) {} ProjectURL(const KURL& url, const TQString& desc, int status, bool docFolder) - : KURL(url), fileDesc(desc), uploadStatus(status), documentFolder(docFolder) {} + : KURL(url), fileDesc(desc), uploadtqStatus(status), documentFolder(docFolder) {} ProjectURL(const KURL& url, const TQString& desc, int status, bool docFolder, TQDomElement el) - : KURL(url), fileDesc(desc), uploadStatus(status), documentFolder(docFolder), domElement(el) {} + : KURL(url), fileDesc(desc), uploadtqStatus(status), documentFolder(docFolder), domElement(el) {} virtual ~ProjectURL() {} /** The default state for a file when uploading */ - enum UploadStatus + enum UploadtqStatus { NeverUpload = 0, ///< the files is not selected for upload, even if it was modified AlwaysUpload, ///< the file is automatically selected for upload if it was modified diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp index 1d628667..9904cdf2 100644 --- a/quanta/project/rescanprj.cpp +++ b/quanta/project/rescanprj.cpp @@ -18,7 +18,7 @@ // qt includes #include #include -#include +#include #include // kde includes @@ -162,7 +162,7 @@ void RescanPrj::resizeEvent ( TQResizeEvent *t ) { RescanPrjDir::resizeEvent(t); // listView->setColumnWidth(0,listView->width()-listView->columnWidth(1)-20); -// MainLayout->setGeometry(childrenRect()); +// MainLayout->setGeometry(tqchildrenRect()); } void RescanPrj::slotSelect() @@ -227,7 +227,7 @@ void RescanPrj::slotListDone(KIO::Job *) if (m_listJobCount == 0) { progressText->setText(i18n("Building tree:")); - progressText->repaint(); + progressText->tqrepaint(); progress->setTotalSteps(urlList.count()); progress->setValue(0); URLListEntry urlEntry; diff --git a/quanta/project/rescanprjdir.ui b/quanta/project/rescanprjdir.ui index 8fb4b774..019f40a7 100644 --- a/quanta/project/rescanprjdir.ui +++ b/quanta/project/rescanprjdir.ui @@ -29,7 +29,7 @@ 0 - + 620 540 @@ -83,13 +83,13 @@ Line2 - + 0 4 - + 32767 4 @@ -148,7 +148,7 @@ Expanding - + 20 144 diff --git a/quanta/project/teammembersdlg.cpp b/quanta/project/teammembersdlg.cpp index da902bf1..6d4ffa69 100644 --- a/quanta/project/teammembersdlg.cpp +++ b/quanta/project/teammembersdlg.cpp @@ -186,13 +186,13 @@ void TeamMembersDlg::slotDeleteMember() if (deleteYourself) { - if (KMessageBox::warningContinueCancel(this, i18n("Are you sure that you want to remove yourself (%1) from the project team?
If you do so, you should select another member as yourself.").arg(item->text(NAME_COL)), i18n("Delete Member"), KStdGuiItem::del()) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("Are you sure that you want to remove yourself (%1) from the project team?
If you do so, you should select another member as yourself.").tqarg(item->text(NAME_COL)), i18n("Delete Member"), KStdGuiItem::del()) == KMessageBox::Continue) { delete item; setYourself(""); } } else - if (KMessageBox::warningContinueCancel(this, i18n("Are you sure that you want to remove %1 from the project team?").arg(item->text(NAME_COL)), i18n("Delete Member"), KStdGuiItem::del()) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("Are you sure that you want to remove %1 from the project team?").tqarg(item->text(NAME_COL)), i18n("Delete Member"), KStdGuiItem::del()) == KMessageBox::Continue) { delete item; } @@ -213,7 +213,7 @@ bool TeamMembersDlg::checkDuplicates(TQListViewItem *item, const TQString &name, (role == i18n(subprojectLeaderStr.utf8()) && it.current()->text(SUBPROJECT_COL) == subProject) ) ) { - if (KMessageBox::warningYesNo(this, i18n("The %1 role is already assigned to %2. Do you want to reassign it to the current member?").arg(role).arg(it.current()->text(NAME_COL)), TQString(), i18n("Reassign"), i18n("Do Not Reassign")) == KMessageBox::Yes) + if (KMessageBox::warningYesNo(this, i18n("The %1 role is already assigned to %2. Do you want to reassign it to the current member?").tqarg(role).tqarg(it.current()->text(NAME_COL)), TQString(), i18n("Reassign"), i18n("Do Not Reassign")) == KMessageBox::Yes) { it.current()->setText(ROLE_COL, i18n(simpleMemberStr.utf8())); return true; @@ -223,7 +223,7 @@ bool TeamMembersDlg::checkDuplicates(TQListViewItem *item, const TQString &name, } else if (nick.lower() == nickName.lower() && it.current() != item && (it.current()->text(EMAIL_COL) != email || it.current()->text(NAME_COL) != name)) { - KMessageBox::error(this, i18n("The %1 nickname is already assigned to %2 <%3>.").arg(nickName).arg(it.current()->text(NAME_COL)).arg(it.current()->text(EMAIL_COL))); + KMessageBox::error(this, i18n("The %1 nickname is already assigned to %2 <%3>.").tqarg(nickName).tqarg(it.current()->text(NAME_COL)).tqarg(it.current()->text(EMAIL_COL))); return false; } ++it; diff --git a/quanta/project/teammembersdlgs.ui b/quanta/project/teammembersdlgs.ui index 847c8b04..eba26cf6 100644 --- a/quanta/project/teammembersdlgs.ui +++ b/quanta/project/teammembersdlgs.ui @@ -52,7 +52,7 @@ Please select your identity from the member list. - + AlignVCenter @@ -172,7 +172,7 @@ Expanding - + 100 20 diff --git a/quanta/project/uploadprofiledlgs.ui b/quanta/project/uploadprofiledlgs.ui index de6521e6..40fbd905 100644 --- a/quanta/project/uploadprofiledlgs.ui +++ b/quanta/project/uploadprofiledlgs.ui @@ -122,7 +122,7 @@ 0 - + 90 0 @@ -144,7 +144,7 @@ 0 - + 90 0 @@ -167,7 +167,7 @@ Expanding - + 445 20 @@ -263,7 +263,7 @@ is obscured, saving the password in any file is a security risk. Use this option &Protocol: - + AlignVCenter|AlignRight diff --git a/quanta/project/uploadprofilespage.ui b/quanta/project/uploadprofilespage.ui index a5a87110..466dbc27 100644 --- a/quanta/project/uploadprofilespage.ui +++ b/quanta/project/uploadprofilespage.ui @@ -32,7 +32,7 @@ - layout2 + tqlayout2 @@ -98,7 +98,7 @@ Expanding - + 20 40 -- cgit v1.2.1