diff options
Diffstat (limited to 'quanta/treeviews')
-rw-r--r-- | quanta/treeviews/basetreeview.cpp | 40 | ||||
-rw-r--r-- | quanta/treeviews/basetreeview.h | 4 | ||||
-rw-r--r-- | quanta/treeviews/filestreeview.cpp | 6 | ||||
-rw-r--r-- | quanta/treeviews/projecttreeview.cpp | 24 | ||||
-rw-r--r-- | quanta/treeviews/projecttreeview.h | 8 | ||||
-rw-r--r-- | quanta/treeviews/quantapropertiespage.ui | 8 | ||||
-rw-r--r-- | quanta/treeviews/scripttreeview.cpp | 2 | ||||
-rw-r--r-- | quanta/treeviews/servertreeview.cpp | 2 | ||||
-rw-r--r-- | quanta/treeviews/structtreetag.cpp | 8 | ||||
-rw-r--r-- | quanta/treeviews/structtreeview.cpp | 4 | ||||
-rw-r--r-- | quanta/treeviews/structtreeview.h | 2 | ||||
-rw-r--r-- | quanta/treeviews/tagattributeitems.cpp | 8 | ||||
-rw-r--r-- | quanta/treeviews/tagattributetree.cpp | 10 | ||||
-rw-r--r-- | quanta/treeviews/templatedirform.ui | 8 | ||||
-rw-r--r-- | quanta/treeviews/templatestreeview.cpp | 24 | ||||
-rw-r--r-- | quanta/treeviews/uploadtreefile.cpp | 4 | ||||
-rw-r--r-- | quanta/treeviews/uploadtreeview.cpp | 22 |
17 files changed, 92 insertions, 92 deletions
diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp index baf6bbe5..d2da546f 100644 --- a/quanta/treeviews/basetreeview.cpp +++ b/quanta/treeviews/basetreeview.cpp @@ -17,12 +17,12 @@ // QT includes #include <tqeventloop.h> -#include <tqlayout.h> +#include <layout.h> #include <tqfileinfo.h> #include <tqlabel.h> #include <tqimage.h> #include <tqregexp.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqpoint.h> #include <tqregexp.h> #include <tqlineedit.h> @@ -106,7 +106,7 @@ void BaseTreeViewToolTip::maybeTip( const TQPoint &pos ) text.append( "<br>" + item->text(1)); } if ( !text.isEmpty() ) - tip(m_view->tqitemRect(item), text); + tip(m_view->itemRect(item), text); } @@ -265,7 +265,7 @@ void BaseTreeBranch::updateOpenFolder() while (item) { if (item->isDir() && item->isOpen()) { updateDirectory( item->url() ); - kapp->tqprocessEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); + kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); // dive into the tree first newItem = dynamic_cast<KFileTreeViewItem *>(item->firstChild()); if (newItem) { @@ -371,7 +371,7 @@ void BaseTreeView::slotSelectFile(TQListViewItem *item) if ( QuantaCommon::checkMimeGroup(urlToOpen,"text") ) { emit openFile(urlToOpen); - item->tqrepaint(); + item->repaint(); } else if ( QuantaCommon::checkMimeGroup(urlToOpen, "image") ) //it may be an image { @@ -385,7 +385,7 @@ void BaseTreeView::slotSelectFile(TQListViewItem *item) if (QuantaCommon::denyBinaryInsert(this) == KMessageBox::Yes) { emit openFile(urlToOpen); - item->tqrepaint(); + item->repaint(); } } } @@ -494,15 +494,15 @@ FileInfoDlg* BaseTreeView::addFileInfoPage(KPropertiesDialog* propDlg) } qfile.close(); - quantaFileProperties->lineNum->setText(i18n("Number of lines: %1").tqarg(ct)); - quantaFileProperties->imageNum->setText(i18n("Number of images included: %1").tqarg(imgct)); - quantaFileProperties->imageSize->setText(i18n("Size of the included images: %1 bytes").tqarg(fimgsize)); - quantaFileProperties->totalSize->setText(i18n("Total size with images: %1 bytes").tqarg(fsize+fimgsize)); + quantaFileProperties->lineNum->setText(i18n("Number of lines: %1").arg(ct)); + quantaFileProperties->imageNum->setText(i18n("Number of images included: %1").arg(imgct)); + quantaFileProperties->imageSize->setText(i18n("Size of the included images: %1 bytes").arg(fimgsize)); + quantaFileProperties->totalSize->setText(i18n("Total size with images: %1 bytes").arg(fsize+fimgsize)); } else if (mimetype.contains("image")) { // assume it's an image file TQImage imagefile=TQImage(nameForInfo); - quantaFileProperties->lineNum->setText(i18n("Image size: %1 x %2").tqarg(imagefile.width()).tqarg(imagefile.height())); + quantaFileProperties->lineNum->setText(i18n("Image size: %1 x %2").arg(imagefile.width()).arg(imagefile.height())); quantaFileProperties->imageNum->hide(); quantaFileProperties->imageSize->hide(); quantaFileProperties->totalSize->hide(); @@ -536,7 +536,7 @@ void BaseTreeView::slotOpen() if (item) { emit open(item); - item->tqrepaint(); + item->repaint(); } } @@ -648,7 +648,7 @@ void BaseTreeView::slotCopy() { if (currentItem()) { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setText( currentURL().prettyURL() ); } } @@ -658,7 +658,7 @@ void BaseTreeView::slotPaste() { if (currentItem()) { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); KURL::List list( TQStringList::split( TQChar('\n'), cb->text() ) ); KURL url = currentURL(); @@ -952,7 +952,7 @@ bool BaseTreeView::isFileOpen(const KURL &url) bool BaseTreeView::isPathInClipboard() { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); KURL::List list( TQStringList::split( TQChar('\n'), cb->text() ) ); for ( KURL::List::Iterator it = list.begin(); it != list.end(); ++it ) { @@ -972,13 +972,13 @@ void BaseTreeView::slotDocumentClosed(const KURL& url) item = (*it)->findTVIByURL(url); if (item) { - item->tqrepaint(); + item->repaint(); } } /* TQListViewItemIterator iter(this); for ( ; iter.current(); ++iter ) { - iter.current()->tqrepaint(); + iter.current()->repaint(); }*/ } @@ -1038,7 +1038,7 @@ void BaseTreeView::doRename(KFileTreeViewItem* kftvi, const TQString & newName) bool proceed = true; if (QExtFileInfo::exists(newURL, false, this)) { - proceed = KMessageBox::warningContinueCancel(this, i18n("<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").tqarg(newURL.prettyURL(0, KURL::StripFileProtocol)),i18n("Overwrite"), i18n("Overwrite")) == KMessageBox::Continue; + proceed = KMessageBox::warningContinueCancel(this, i18n("<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").arg(newURL.prettyURL(0, KURL::StripFileProtocol)),i18n("Overwrite"), i18n("Overwrite")) == KMessageBox::Continue; } if (proceed) { @@ -1184,7 +1184,7 @@ void BaseTreeView::slotCreateSiteTemplate() error = true; if (error) - KMessageBox::error(this, i18n("<qt>There was an error while creating the site template tarball.<br>Check that you can read the files from <i>%1</i>, you have write access to <i>%2</i> and that you have enough free space in your temporary folder.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)).tqarg(targetURL.prettyURL(0, KURL::StripFileProtocol)), i18n("Template Creation Error")); + KMessageBox::error(this, i18n("<qt>There was an error while creating the site template tarball.<br>Check that you can read the files from <i>%1</i>, you have write access to <i>%2</i> and that you have enough free space in your temporary folder.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)).arg(targetURL.prettyURL(0, KURL::StripFileProtocol)), i18n("Template Creation Error")); delete tempFile; } @@ -1216,7 +1216,7 @@ void BaseTreeView::slotCreateFile() url.setPath(url.directory() + "/" + fileName); if (QExtFileInfo::exists(url, false, this)) { - KMessageBox::error(this, i18n("<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>").tqarg(fileName), i18n("Error Creating File")); + KMessageBox::error(this, i18n("<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>").arg(fileName), i18n("Error Creating File")); return; } KTempFile *tempFile = new KTempFile(tmpDir); diff --git a/quanta/treeviews/basetreeview.h b/quanta/treeviews/basetreeview.h index b0418558..94c4611a 100644 --- a/quanta/treeviews/basetreeview.h +++ b/quanta/treeviews/basetreeview.h @@ -141,7 +141,7 @@ public: virtual ~BaseTreeView(); /** - * Saves the list view's tqlayout (column widtsh, column order, sort column) + * Saves the list view's layout (column widtsh, column order, sort column) * to a KConfig group. Reimplemented to save the open folders. * * @param config the KConfig object to write to @@ -150,7 +150,7 @@ public: void saveLayout(KConfig *config, const TQString &group); /** - * Reads the list view's tqlayout from a KConfig group as stored with + * Reads the list view's layout from a KConfig group as stored with * saveLayout. Reimplemented to load the open folders. * * @param config the KConfig object to read from diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp index bebac21d..d543f5d0 100644 --- a/quanta/treeviews/filestreeview.cpp +++ b/quanta/treeviews/filestreeview.cpp @@ -261,7 +261,7 @@ void FilesTreeView::slotAddToTop() topURLAliases.insert(url.url(), aliasName); newBranch(url); } else { - KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").tqarg(url.url())); + KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").arg(url.url())); } } else { // remove @@ -287,7 +287,7 @@ void FilesTreeView::slotNewTopFolder() newBranch(url); topURLList.append(url); } else { - KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").tqarg(url.url())); + KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").arg(url.url())); } } @@ -324,7 +324,7 @@ void FilesTreeView::slotChangeAlias() newBranch(url); } } else { - KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").tqarg(url.url())); + KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").arg(url.url())); } } } diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp index dcfab886..205e5bf0 100644 --- a/quanta/treeviews/projecttreeview.cpp +++ b/quanta/treeviews/projecttreeview.cpp @@ -154,7 +154,7 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name ) m_folderMenu->insertItem(i18n("&Remove From Project"), this, TQT_SLOT(slotRemoveFromProject(int))); m_folderMenu->insertItem(SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); m_folderMenu->insertSeparator(); - m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQT_SLOT(slotChangeDocumentFoldertqStatus())); + m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQT_SLOT(slotChangeDocumentFolderStatus())); m_folderMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu); m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); @@ -400,7 +400,7 @@ void ProjectTreeView::slotCreateFile() url.setPath(url.directory() + "/" + fileName); if (QExtFileInfo::exists(url, false, this)) { - KMessageBox::error(this, i18n("<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>").tqarg(fileName), i18n("Error Creating File")); + KMessageBox::error(this, i18n("<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>").arg(fileName), i18n("Error Creating File")); return; } KTempFile *tempFile = new KTempFile(tmpDir); @@ -425,7 +425,7 @@ void ProjectTreeView::slotRemoveFromProject(int askForRemove) TQString nice = QExtFileInfo::toRelative(url, m_projectBaseURL).path(); nice = KStringHandler::lsqueeze(nice, 60); if ( !askForRemove || - KMessageBox::warningContinueCancel(this,i18n("<qt>Do you really want to remove <br><b>%1</b><br> from the project?</qt>").tqarg(nice), i18n("Remove From Project"), KStdGuiItem::remove(), "RemoveFromProject") == KMessageBox::Continue ) + KMessageBox::warningContinueCancel(this,i18n("<qt>Do you really want to remove <br><b>%1</b><br> from the project?</qt>").arg(nice), i18n("Remove From Project"), KStdGuiItem::remove(), "RemoveFromProject") == KMessageBox::Continue ) { if ( currentKFileTreeViewItem()->isDir() ) url.adjustPath(+1); emit removeFromProject(url); @@ -527,7 +527,7 @@ void ProjectTreeView::slotAlwaysUpload() url.adjustPath(+1); if (m_projectFiles->contains(url) || url == m_projectBaseURL) { - emit changeUploadtqStatus(url, ProjectURL::AlwaysUpload); + emit changeUploadStatus(url, ProjectURL::AlwaysUpload); } } @@ -541,7 +541,7 @@ void ProjectTreeView::slotNeverUpload() url.adjustPath(+1); if (m_projectFiles->contains(url) || url == m_projectBaseURL) { - emit changeUploadtqStatus(url, ProjectURL::NeverUpload); + emit changeUploadStatus(url, ProjectURL::NeverUpload); } } @@ -555,7 +555,7 @@ void ProjectTreeView::slotConfirmUpload() url.adjustPath(+1); if (m_projectFiles->contains(url) || url == m_projectBaseURL) { - emit changeUploadtqStatus(url, ProjectURL::ConfirmUpload); + emit changeUploadStatus(url, ProjectURL::ConfirmUpload); } } @@ -573,7 +573,7 @@ void ProjectTreeView::slotUploadMenuAboutToShow() ProjectURL *proUrl = m_projectFiles->find( url ); if (proUrl) { - switch (proUrl->uploadtqStatus) + switch (proUrl->uploadStatus) { case ProjectURL::NeverUpload: { @@ -595,7 +595,7 @@ void ProjectTreeView::slotUploadMenuAboutToShow() } } -void ProjectTreeView::slotChangeDocumentFoldertqStatus() +void ProjectTreeView::slotChangeDocumentFolderStatus() { KFileTreeViewItem *kftvi = currentKFileTreeViewItem(); if (! kftvi) @@ -606,14 +606,14 @@ void ProjectTreeView::slotChangeDocumentFoldertqStatus() if (!m_documentFolderList.contains(currentURL())) { m_documentFolderList.append(currentURL()); - emit changeUploadtqStatus(url, ProjectURL::AlwaysUpload); - emit changeDocumentFoldertqStatus(url, true); + emit changeUploadStatus(url, ProjectURL::AlwaysUpload); + emit changeDocumentFolderStatus(url, true); } else { m_documentFolderList.remove(currentURL()); - emit changeUploadtqStatus(url, false); + emit changeUploadStatus(url, false); } - currentItem()->tqrepaint(); + currentItem()->repaint(); } bool ProjectTreeView::isDocumentFolder(const KURL &url) diff --git a/quanta/treeviews/projecttreeview.h b/quanta/treeviews/projecttreeview.h index 1e290328..b5dfa5a5 100644 --- a/quanta/treeviews/projecttreeview.h +++ b/quanta/treeviews/projecttreeview.h @@ -83,7 +83,7 @@ public slots: // Public slots /** makes the url visible in the tree */ void slotViewActivated(const KURL&); /** fills the list with the url's of the open folder */ - void slotGetTreetqStatus(TQStringList *folderToOpen) + void slotGetTreeStatus(TQStringList *folderToOpen) { m_projectDir->addOpenFolder(folderToOpen); } @@ -107,8 +107,8 @@ signals: // Signals void loadToolbarFile(const KURL&); void uploadProject(); void changeFileDescription(const KURL& url, const TQString& desc); - void changeUploadtqStatus(const KURL& url, int status); - void changeDocumentFoldertqStatus(const KURL& url, bool status); + void changeUploadStatus(const KURL& url, int status); + void changeDocumentFolderStatus(const KURL& url, bool status); void reloadProject(); private: @@ -170,7 +170,7 @@ private slots: // Private slots void slotNeverUpload(); void slotConfirmUpload(); void slotUploadMenuAboutToShow(); - void slotChangeDocumentFoldertqStatus(); + void slotChangeDocumentFolderStatus(); }; #endif diff --git a/quanta/treeviews/quantapropertiespage.ui b/quanta/treeviews/quantapropertiespage.ui index 109caf2f..d70a6f6e 100644 --- a/quanta/treeviews/quantapropertiespage.ui +++ b/quanta/treeviews/quantapropertiespage.ui @@ -29,7 +29,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>400</height> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>92</width> <height>20</height> @@ -161,7 +161,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>93</width> <height>20</height> @@ -207,7 +207,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/quanta/treeviews/scripttreeview.cpp b/quanta/treeviews/scripttreeview.cpp index eb64dd0b..d7b5b3cc 100644 --- a/quanta/treeviews/scripttreeview.cpp +++ b/quanta/treeviews/scripttreeview.cpp @@ -36,7 +36,7 @@ #include <tqlineedit.h> #include <tqregexp.h> #include <tqstringlist.h> -#include <tqtextedit.h> +#include <textedit.h> //other includes #include <libxml/xmlmemory.h> diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp index 1618d588..ad2309da 100644 --- a/quanta/treeviews/servertreeview.cpp +++ b/quanta/treeviews/servertreeview.cpp @@ -188,7 +188,7 @@ void ServerTreeView::slotReloadTree( ProjectList *fileList, bool buildNewTree, c TQListViewItemIterator iter(this); for ( ; iter.current(); ++iter ) { - iter.current()->tqrepaint(); + iter.current()->repaint(); } } diff --git a/quanta/treeviews/structtreetag.cpp b/quanta/treeviews/structtreetag.cpp index e897d14c..0325645e 100644 --- a/quanta/treeviews/structtreetag.cpp +++ b/quanta/treeviews/structtreetag.cpp @@ -116,7 +116,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString { node->tag->write()->setErrorMark(line); TQString parentTagName = node->tag->dtd()->caseSensitive ? node->parent->tag->name : node->parent->tag->name.upper(); - parentTree->showMessage(i18n("Line %1: %2 is not a possible child of %3.\n").tqarg(line + 1).tqarg(qTagName).tqarg(parentTagName)); + parentTree->showMessage(i18n("Line %1: %2 is not a possible child of %3.\n").arg(line + 1).arg(qTagName).arg(parentTagName)); } TQString nextTagName; if (node->next) @@ -129,12 +129,12 @@ StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString (!node->next || ( !node->getClosingNode())) ) { node->tag->write()->setErrorMark(line); - parentTree->showMessage(i18n("Line %1, column %2: Closing tag for %3 is missing.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName)); + parentTree->showMessage(i18n("Line %1, column %2: Closing tag for %3 is missing.").arg(line + 1).arg(col + 1).arg(qTagName)); } else if (!parentTQTag && node->tag->name.upper() != "!DOCTYPE") { node->tag->write()->setErrorMark(line); - parentTree->showMessage(i18n("Line %1, column %2: %3 is not part of %4.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName).tqarg(node->tag->dtd()->nickName)); + parentTree->showMessage(i18n("Line %1, column %2: %3 is not part of %4.").arg(line + 1).arg(col + 1).arg(qTagName).arg(node->tag->dtd()->nickName)); } } break; @@ -182,7 +182,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString if (!node->prev || qTagName != "/" + qPrevTagName) { node->tag->write()->setErrorMark(line); - parentTree->showMessage(i18n("Line %1, column %2: Opening tag for %3 is missing.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName)); + parentTree->showMessage(i18n("Line %1, column %2: Opening tag for %3 is missing.").arg(line + 1).arg(col + 1).arg(qTagName)); } } title = tag->tagStr().left(70).stripWhiteSpace(); diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp index 24f48174..5cfe5dc9 100644 --- a/quanta/treeviews/structtreeview.cpp +++ b/quanta/treeviews/structtreeview.cpp @@ -376,7 +376,7 @@ void StructTreeView::deleteList(bool groupOnly) groupsCount = 0; } -/** tqrepaint document structure */ +/** repaint document structure */ void StructTreeView::slotReparse(Document *w, Node* node, int openLevel, bool groupOnly) { timer->restart(); @@ -1005,7 +1005,7 @@ void StructTreeView::slotOpenFile() emit openImage(url); } } else - KMessageBox::error(this, i18n("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(this, i18n("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol))); } } diff --git a/quanta/treeviews/structtreeview.h b/quanta/treeviews/structtreeview.h index 66c6b68e..2087f3fc 100644 --- a/quanta/treeviews/structtreeview.h +++ b/quanta/treeviews/structtreeview.h @@ -72,7 +72,7 @@ public: bool useOpenLevelSetting; public slots: // Public slots - /** tqrepaint document structure */ + /** repaint document structure */ void slotReparse(Document *w, Node* node, int openLevel = 3,bool groupOnly=false); void slotMouseClicked(int button, TQListViewItem*, const TQPoint&, int); void slotDoubleClicked( TQListViewItem * ); diff --git a/quanta/treeviews/tagattributeitems.cpp b/quanta/treeviews/tagattributeitems.cpp index 50e4825e..776ac366 100644 --- a/quanta/treeviews/tagattributeitems.cpp +++ b/quanta/treeviews/tagattributeitems.cpp @@ -81,11 +81,11 @@ ParentItem::ParentItem(TagAttributeTree *listView, TQListViewItem* parent) { m_listView = listView; comboBox = new TQComboBox(false, m_listView->viewport() ); - TQRect r = m_listView->tqitemRect( this ); + TQRect r = m_listView->itemRect( this ); if ( !r.size().isValid() ) { m_listView->ensureItemVisible( this ); - r = m_listView->tqitemRect( this ); + r = m_listView->itemRect( this ); } r.setX( m_listView->header()->sectionPos( 0 ) + 20); r.setWidth( m_listView->header()->sectionSize( 0 ) - 20); @@ -262,11 +262,11 @@ void AttributeItem::hideEditor(int column) void AttributeItem::placeEditor( TQWidget *w, int column) { - TQRect r = m_listView->tqitemRect( this ); + TQRect r = m_listView->itemRect( this ); if ( !r.size().isValid() ) { m_listView->ensureItemVisible( this ); - r = m_listView->tqitemRect( this ); + r = m_listView->itemRect( this ); } if(column == 1) { diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp index 0ef63151..4d49c841 100644 --- a/quanta/treeviews/tagattributetree.cpp +++ b/quanta/treeviews/tagattributetree.cpp @@ -18,7 +18,7 @@ #include <tqtimer.h> #include <tqlineedit.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> //kde includes @@ -458,11 +458,11 @@ EnhancedTagAttributeTree::EnhancedTagAttributeTree(TQWidget *parent, const char widgetLayout = new TQGridLayout( this, 1, 1, 11, 6, "MainLayout"); attrTree = new TagAttributeTree(this, "TagAttributeTree"); - attrTree->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding); + attrTree->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding); widgetLayout->addMultiCellWidget( attrTree, 1, 1, 0, 3 ); nodeName = new TQLabel(this, i18n( "Node Name" ).ascii()); - nodeName->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed, 0, 0, nodeName->sizePolicy().hasHeightForWidth() ) ); + nodeName->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed, 0, 0, nodeName->sizePolicy().hasHeightForWidth() ) ); widgetLayout->addWidget( nodeName, 0, 0 ); deleteTag = new KPushButton(this, i18n( "Delete Tag" ).ascii()); @@ -475,7 +475,7 @@ EnhancedTagAttributeTree::EnhancedTagAttributeTree(TQWidget *parent, const char deleteAll->setPixmap(SmallIcon("editdelete")); deleteAll->setMaximumHeight(32); deleteAll->setMaximumWidth(32); - TQToolTip::add(deleteAll, i18n("Delete the current tag and all its tqchildren.")); + TQToolTip::add(deleteAll, i18n("Delete the current tag and all its children.")); widgetLayout->addWidget( deleteTag, 0, 2 ); widgetLayout->addWidget( deleteAll, 0, 3 ); @@ -515,7 +515,7 @@ void EnhancedTagAttributeTree::showCaption() if(curNode->tag->type == Tag::XmlTag || curNode->tag->type == Tag::XmlTagEnd || curNode->tag->type == Tag::ScriptTag) { - TQString s = i18n("Current tag: <b>%1</b>").tqarg(curNode->tag->name); + TQString s = i18n("Current tag: <b>%1</b>").arg(curNode->tag->name); nodeName->setText(KStringHandler::rPixelSqueeze(s, nodeName->fontMetrics(), attrTree->width()- 50)); } else if(curNode->tag->type == Tag::Text) diff --git a/quanta/treeviews/templatedirform.ui b/quanta/treeviews/templatedirform.ui index d08f6b28..a8cb7705 100644 --- a/quanta/treeviews/templatedirform.ui +++ b/quanta/treeviews/templatedirform.ui @@ -65,7 +65,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -81,7 +81,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>38</width> <height>20</height> @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>25</width> <height>20</height> @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>38</width> <height>20</height> diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp index 98fc5048..c26dc395 100644 --- a/quanta/treeviews/templatestreeview.cpp +++ b/quanta/treeviews/templatestreeview.cpp @@ -21,13 +21,13 @@ // QT includes #include <tqbuttongroup.h> #include <tqcheckbox.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqdir.h> #include <tqpixmap.h> #include <tqheader.h> #include <tqpoint.h> -#include <tqlayout.h> -#include <tqtextedit.h> +#include <layout.h> +#include <textedit.h> #include <tqregexp.h> #include <tqlabel.h> #include <tqmap.h> @@ -386,7 +386,7 @@ void TemplatesTreeView::slotNewDir() createDirDlg->parentAttr->setText(i18n("&Inherit parent attribute (nothing)")); } else { - createDirDlg->parentAttr->setText(i18n("&Inherit parent attribute (%1)").tqarg(typeToi18n[m_dirInfo.mimeType])); + createDirDlg->parentAttr->setText(i18n("&Inherit parent attribute (%1)").arg(typeToi18n[m_dirInfo.mimeType])); } if (createDirDlg->exec()) { @@ -404,7 +404,7 @@ void TemplatesTreeView::slotNewDir() if (!dir.mkdir(startDir+"/"+createDirDlg->dirName->text())) { KMessageBox::error(this,i18n("Error while creating the new folder.\n \ - Maybe you do not have permission to write in the %1 folder.").tqarg(startDir)); + Maybe you do not have permission to write in the %1 folder.").arg(startDir)); return; } if (! createDirDlg->parentAttr->isChecked()) @@ -467,13 +467,13 @@ void TemplatesTreeView::contentsDropEvent(TQDropEvent *e) bool proceed = true; if (QExtFileInfo::exists(url, false, this)) { - proceed = KMessageBox::warningContinueCancel(this, i18n("<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)),i18n("Overwrite"), i18n("Overwrite")) == KMessageBox::Continue; + proceed = KMessageBox::warningContinueCancel(this, i18n("<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)),i18n("Overwrite"), i18n("Overwrite")) == KMessageBox::Continue; } if (proceed) { if (!QuantaNetAccess::upload(tempFile->name(), url, m_parent, false)) { - KMessageBox::error(this,i18n("<qt>Could not write to file <b>%1</b>.<br>Check if you have rights to write there or that your connection is working.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(this,i18n("<qt>Could not write to file <b>%1</b>.<br>Check if you have rights to write there or that your connection is working.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol))); } } delete tempFile; @@ -619,7 +619,7 @@ void TemplatesTreeView::slotProperties() m_quantaProperties->parentAttr->setText(i18n("&Inherit parent attribute (nothing)")); } else { - m_quantaProperties->parentAttr->setText(i18n("&Inherit parent attribute (%1)").tqarg(typeToi18n[m_parentDirInfo.mimeType])); + m_quantaProperties->parentAttr->setText(i18n("&Inherit parent attribute (%1)").arg(typeToi18n[m_parentDirInfo.mimeType])); } m_quantaProperties->preTextEdit->setText(m_dirInfo.preText); m_quantaProperties->postTextEdit->setText(m_dirInfo.postText); @@ -846,7 +846,7 @@ void TemplatesTreeView::slotPaste() { if (currentItem()) { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); KURL::List list( TQStringList::split( TQChar('\n'), cb->text() ) ); KURL url; @@ -873,9 +873,9 @@ void TemplatesTreeView::slotDelete() KURL url = currentURL(); TQString msg; if ( currentKFileTreeViewItem()->isDir() ) - msg = i18n("Do you really want to delete folder \n%1 ?\n").tqarg(url.path()); + msg = i18n("Do you really want to delete folder \n%1 ?\n").arg(url.path()); else - msg = i18n("Do you really want to delete file \n%1 ?\n").tqarg(url.path()); + msg = i18n("Do you really want to delete file \n%1 ?\n").arg(url.path()); if ( KMessageBox::warningContinueCancel(this, msg, TQString(), KStdGuiItem::del()) == KMessageBox::Continue ) { @@ -1072,7 +1072,7 @@ void TemplatesTreeView::slotExtractSiteTemplate() } else error = true; if (error) - KMessageBox::error(this, i18n("<qt>Some error happened while extracting the <i>%1</i> site template file.<br>Check that you have write permission for <i>%2</i> and that there is enough free space in your temporary folder.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)).tqarg(targetURL.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(this, i18n("<qt>Some error happened while extracting the <i>%1</i> site template file.<br>Check that you have write permission for <i>%2</i> and that there is enough free space in your temporary folder.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)).arg(targetURL.prettyURL(0, KURL::StripFileProtocol))); } } diff --git a/quanta/treeviews/uploadtreefile.cpp b/quanta/treeviews/uploadtreefile.cpp index c4c40197..9c055424 100644 --- a/quanta/treeviews/uploadtreefile.cpp +++ b/quanta/treeviews/uploadtreefile.cpp @@ -28,7 +28,7 @@ #include "resource.h" UploadTreeFile::UploadTreeFile( UploadTreeFolder *parent, const KURL &a_url, const KFileItem &a_fileItem) - : KListViewItem( parent, a_url.fileName(), "", TQString("%1").tqarg( (long int)a_fileItem.size() ), a_fileItem.timeString()) + : KListViewItem( parent, a_url.fileName(), "", TQString("%1").arg( (long int)a_fileItem.size() ), a_fileItem.timeString()) { m_url = a_url; isDir = false; @@ -41,7 +41,7 @@ UploadTreeFile::UploadTreeFile( UploadTreeFolder *parent, const KURL &a_url, con } UploadTreeFile::UploadTreeFile( TQListView *parent, const KURL &a_url, const KFileItem &a_fileItem) - : KListViewItem( parent, a_url.fileName(), "", TQString("%1").tqarg( (long int)a_fileItem.size() ), a_fileItem.timeString()) + : KListViewItem( parent, a_url.fileName(), "", TQString("%1").arg( (long int)a_fileItem.size() ), a_fileItem.timeString()) { m_url = a_url; isDir = false; diff --git a/quanta/treeviews/uploadtreeview.cpp b/quanta/treeviews/uploadtreeview.cpp index 8f5457e2..259b81dc 100644 --- a/quanta/treeviews/uploadtreeview.cpp +++ b/quanta/treeviews/uploadtreeview.cpp @@ -56,8 +56,8 @@ int UploadTreeView::checkboxTree( TQListViewItem *it ) TQListViewItem *itIter = it ? it->firstChild() : firstChild(); - // bitFlag structure: (0/1)all tqchildren exist (0/1)no tqchildren exist. - // We don't need some tqchildren as a bit flag, because that's implied if the bits are "00". + // bitFlag structure: (0/1)all children exist (0/1)no children exist. + // We don't need some children as a bit flag, because that's implied if the bits are "00". int bitFlags = 3; int retVal = 1; @@ -73,17 +73,17 @@ int UploadTreeView::checkboxTree( TQListViewItem *it ) UploadTreeFolder *itF = static_cast<UploadTreeFolder *>(itIter); if (hadCheckFlags == 2) { - // All tqchildren exist. + // All children exist. itF->setWhichPixmap( "check" ); itF->setSelected( true ); } else if (hadCheckFlags == 1) { - // No tqchildren exist. + // No children exist. itF->setWhichPixmap( "check_clear" ); itF->setSelected( false ); } else { - // Some tqchildren exist. + // Some children exist. itF->setWhichPixmap( "check_grey" ); itF->setSelected( true ); } @@ -95,13 +95,13 @@ int UploadTreeView::checkboxTree( TQListViewItem *it ) if ( itF->isSelected() ) { itF->setWhichPixmap("check"); - // Turn off "no tqchildren" + // Turn off "no children" if ( bitFlags % 2 == 1 ) bitFlags -= 1; } else { itF->setWhichPixmap("check_clear"); - // Turn off "all tqchildren". + // Turn off "all children". if (bitFlags >> 1 == 1) bitFlags -= 2; } @@ -162,17 +162,17 @@ void UploadTreeView::slotSelectFile( TQListViewItem *it ) if ( itF ) { if (hadCheckFlags == 2) { - // All tqchildren exist. + // All children exist. itF->setWhichPixmap( "check" ); itF->setSelected( true ); } else if (hadCheckFlags == 1) { - // No tqchildren exist. + // No children exist. itF->setWhichPixmap( "check_clear" ); itF->setSelected( false ); } else { - // Some tqchildren exist. + // Some children exist. itF->setWhichPixmap( "check_grey" ); itF->setSelected( true ); } @@ -199,7 +199,7 @@ void UploadTreeView::slotSelectFile( TQListViewItem *it ) { bool hasSelected = false; bool allSelected = true; - //check if the item has any tqchildren's selected + //check if the item has any children's selected TQListViewItemIterator iter(itF->firstChild()); while ( iter.current() && iter.current() != itF->nextSibling()) { |