summaryrefslogtreecommitdiffstats
path: root/quanta/utility
diff options
context:
space:
mode:
Diffstat (limited to 'quanta/utility')
-rw-r--r--quanta/utility/newstuff.cpp4
-rw-r--r--quanta/utility/quantabookmarks.cpp14
-rw-r--r--quanta/utility/tagaction.cpp40
-rw-r--r--quanta/utility/tagactionset.cpp28
-rw-r--r--quanta/utility/toolbartabwidget.cpp48
5 files changed, 67 insertions, 67 deletions
diff --git a/quanta/utility/newstuff.cpp b/quanta/utility/newstuff.cpp
index a00e9c75..56d5027d 100644
--- a/quanta/utility/newstuff.cpp
+++ b/quanta/utility/newstuff.cpp
@@ -56,7 +56,7 @@ void QNewDTEPStuff::installResource()
QNewToolbarStuff::QNewToolbarStuff(const TQString &type, TQWidget *parentWidget)
:TDENewStuffSecure(type, parentWidget)
{
- connect(this, TQT_SIGNAL(loadToolbarFile(const KURL&)), parentWidget, TQT_SLOT(slotLoadToolbarFile(const KURL&)));
+ connect(this, TQ_SIGNAL(loadToolbarFile(const KURL&)), parentWidget, TQ_SLOT(slotLoadToolbarFile(const KURL&)));
}
@@ -83,7 +83,7 @@ void QNewToolbarStuff::installResource()
QNewTemplateStuff::QNewTemplateStuff(const TQString &type, TQWidget *parentWidget)
:TDENewStuffSecure(type, parentWidget)
{
- connect(this, TQT_SIGNAL(openFile(const KURL&)), parentWidget, TQT_SLOT(slotFileOpen(const KURL&)));
+ connect(this, TQ_SIGNAL(openFile(const KURL&)), parentWidget, TQ_SLOT(slotFileOpen(const KURL&)));
}
diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp
index c5d57a56..87e953fb 100644
--- a/quanta/utility/quantabookmarks.cpp
+++ b/quanta/utility/quantabookmarks.cpp
@@ -86,33 +86,33 @@ void QuantaBookmarks::init(TDEActionCollection* ac)
{
m_bookmarkToggle = new TDEToggleAction(
i18n("Set &Bookmark"), "bookmark", CTRL+Key_B,
- this, TQT_SLOT(toggleBookmark()),
+ this, TQ_SLOT(toggleBookmark()),
ac, "bookmarks_toggle" );
m_bookmarkToggle->setWhatsThis(i18n("If a line has no bookmark then add one, otherwise remove it."));
m_bookmarkToggle->setCheckedState( i18n("Clear &Bookmark") );
m_bookmarkClear = new TDEAction(
i18n("Clear &All Bookmarks"), 0,
- this, TQT_SLOT(clearBookmarks()),
+ this, TQ_SLOT(clearBookmarks()),
ac, "bookmarks_clear");
m_bookmarkClear->setWhatsThis(i18n("Remove all bookmarks of the current document."));
m_goNext = new TDEAction(
i18n("Next Bookmark"), "go-next", ALT + Key_PageDown,
- this, TQT_SLOT(goNext()),
+ this, TQ_SLOT(goNext()),
ac, "bookmarks_next");
m_goNext->setWhatsThis(i18n("Go to the next bookmark."));
m_goPrevious = new TDEAction(
i18n("Previous Bookmark"), "go-previous", ALT + Key_PageUp,
- this, TQT_SLOT(goPrevious()),
+ this, TQ_SLOT(goPrevious()),
ac, "bookmarks_previous");
m_goPrevious->setWhatsThis(i18n("Go to the previous bookmark."));
//connect the aboutToShow() and aboutToHide() signals with
//the bookmarkMenuAboutToShow() and bookmarkMenuAboutToHide() slots
- connect( m_bookmarksMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(bookmarkMenuAboutToShow()));
- connect( m_bookmarksMenu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(bookmarkMenuAboutToHide()) );
+ connect( m_bookmarksMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(bookmarkMenuAboutToShow()));
+ connect( m_bookmarksMenu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(bookmarkMenuAboutToHide()) );
marksChanged ();
}
@@ -234,7 +234,7 @@ int QuantaBookmarks::insertBookmarks(TQPopupMenu& menu, Document *doc, bool inse
if ( next || prev )
menu.insertSeparator( idx );
}
- connect(&menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(gotoLineNumber(int)));
+ connect(&menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(gotoLineNumber(int)));
}
return insertedItems;
}
diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp
index 1ea54048..71eb0e41 100644
--- a/quanta/utility/tagaction.cpp
+++ b/quanta/utility/tagaction.cpp
@@ -93,15 +93,15 @@ TagAction::TagAction( TQDomElement *element, TDEMainWindow *parentMainWindow, bo
m_file = 0L;
loopStarted = false;
#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
- connect(this, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)),
- TQT_SLOT(slotActionActivated(TDEAction::ActivationReason, TQt::ButtonState)));
+ connect(this, TQ_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)),
+ TQ_SLOT(slotActionActivated(TDEAction::ActivationReason, TQt::ButtonState)));
#else
- connect(this, TQT_SIGNAL(activated()), TQT_SLOT(slotActionActivated()));
+ connect(this, TQ_SIGNAL(activated()), TQ_SLOT(slotActionActivated()));
#endif
- connect(this, TQT_SIGNAL(showMessage(const TQString&, bool)), m_parentMainWindow, TQT_SIGNAL(showMessage(const TQString&, bool)));
- connect(this, TQT_SIGNAL(clearMessages()), m_parentMainWindow, TQT_SIGNAL(clearMessages()));
- connect(this, TQT_SIGNAL(showMessagesView()), m_parentMainWindow, TQT_SLOT(slotShowMessagesView()));
- connect(this, TQT_SIGNAL(createNewFile()), m_parentMainWindow, TQT_SLOT(slotFileNew()));
+ connect(this, TQ_SIGNAL(showMessage(const TQString&, bool)), m_parentMainWindow, TQ_SIGNAL(showMessage(const TQString&, bool)));
+ connect(this, TQ_SIGNAL(clearMessages()), m_parentMainWindow, TQ_SIGNAL(clearMessages()));
+ connect(this, TQ_SIGNAL(showMessagesView()), m_parentMainWindow, TQ_SLOT(slotShowMessagesView()));
+ connect(this, TQ_SIGNAL(createNewFile()), m_parentMainWindow, TQ_SLOT(slotFileNew()));
}
TagAction::~TagAction()
@@ -434,12 +434,12 @@ bool TagAction::slotActionActivated(TDEAction::ActivationReason reason, TQt::But
firstOutput = true;
firstError = true;
- connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this,
- TQT_SLOT( slotGetScriptOutput(TDEProcess*,char*,int)));
- connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this,
- TQT_SLOT( slotGetScriptError(TDEProcess*,char*,int)));
- connect( proc, TQT_SIGNAL(processExited( TDEProcess*)), this,
- TQT_SLOT( slotProcessExited(TDEProcess*)));
+ connect( proc, TQ_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this,
+ TQ_SLOT( slotGetScriptOutput(TDEProcess*,char*,int)));
+ connect( proc, TQ_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this,
+ TQ_SLOT( slotGetScriptError(TDEProcess*,char*,int)));
+ connect( proc, TQ_SIGNAL(processExited( TDEProcess*)), this,
+ TQ_SLOT( slotProcessExited(TDEProcess*)));
@@ -688,12 +688,12 @@ bool TagAction::slotActionActivated()
firstOutput = true;
firstError = true;
- connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this,
- TQT_SLOT( slotGetScriptOutput(TDEProcess*,char*,int)));
- connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this,
- TQT_SLOT( slotGetScriptError(TDEProcess*,char*,int)));
- connect( proc, TQT_SIGNAL(processExited( TDEProcess*)), this,
- TQT_SLOT( slotProcessExited(TDEProcess*)));
+ connect( proc, TQ_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this,
+ TQ_SLOT( slotGetScriptOutput(TDEProcess*,char*,int)));
+ connect( proc, TQ_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this,
+ TQ_SLOT( slotGetScriptError(TDEProcess*,char*,int)));
+ connect( proc, TQ_SIGNAL(processExited( TDEProcess*)), this,
+ TQ_SLOT( slotProcessExited(TDEProcess*)));
@@ -991,7 +991,7 @@ void TagAction::execute(bool blocking)
{
//To avoid lock-ups, start a timer.
timer = new TQTimer(this);
- connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
+ connect(timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()));
timer->start(180*1000, true);
QExtFileInfo internalFileInfo;
loopStarted = true;
diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp
index 2eb9bf68..72c764ea 100644
--- a/quanta/utility/tagactionset.cpp
+++ b/quanta/utility/tagactionset.cpp
@@ -102,17 +102,17 @@ void TagActionSet::initActions(TQWidget* /*parent*/)
const char *actionName = "apply_source_indentation";
new TDEAction(i18n("Apply Source Indentation"), 0, this,
- TQT_SLOT(slotApplySourceIndentation()),
+ TQ_SLOT(slotApplySourceIndentation()),
ac, actionName);
actionName = "copy_div_element";
new TDEAction(i18n("Copy DIV Area"), 0, this,
- TQT_SLOT(slotCopyDivElement()),
+ TQ_SLOT(slotCopyDivElement()),
ac, actionName);
actionName = "cut_div_element";
new TDEAction(i18n("Cut DIV Area"), 0, this,
- TQT_SLOT(slotCutDivElement()),
+ TQ_SLOT(slotCutDivElement()),
ac, actionName);
}
@@ -299,31 +299,31 @@ void TableTagActionSet::initActions(TQWidget* parent)
const char *actionName = "insert_table";
//m_actionNames += actionName;
new TDEAction(i18n("Table..."), 0, this,
- TQT_SLOT(slotInsertTable()),
+ TQ_SLOT(slotInsertTable()),
ac, actionName);
actionName = "insert_row_above";
//m_actionNames += actionName;
new TDEAction(i18n("Row Above"), 0, this,
- TQT_SLOT(slotInsertRowAbove()),
+ TQ_SLOT(slotInsertRowAbove()),
ac, actionName);
actionName = "insert_row_below";
//m_actionNames += actionName;
new TDEAction(i18n("Row Below"), 0, this,
- TQT_SLOT(slotInsertRowBelow()),
+ TQ_SLOT(slotInsertRowBelow()),
ac, actionName);
actionName = "insert_column_left";
//m_actionNames += actionName;
new TDEAction(i18n("Column Left"), 0, this,
- TQT_SLOT(slotInsertColumnLeft()),
+ TQ_SLOT(slotInsertColumnLeft()),
ac, actionName);
actionName = "insert_column_right";
//m_actionNames += actionName;
new TDEAction(i18n("Column Right"), 0, this,
- TQT_SLOT(slotInsertColumnRight()),
+ TQ_SLOT(slotInsertColumnRight()),
ac, actionName);
// Remove___________________________________________________________________________
@@ -331,31 +331,31 @@ void TableTagActionSet::initActions(TQWidget* parent)
actionName = "remove_table";
//m_actionNames += actionName;
new TDEAction(i18n("Table"), 0, this,
- TQT_SLOT(slotRemoveTable()),
+ TQ_SLOT(slotRemoveTable()),
ac, actionName);
actionName = "remove_rows";
//m_actionNames += actionName;
new TDEAction(i18n("Row(s)"), 0, this,
- TQT_SLOT(slotRemoveRows()),
+ TQ_SLOT(slotRemoveRows()),
ac, actionName);
actionName = "remove_columns";
//m_actionNames += actionName;
new TDEAction(i18n("Column(s)"), 0, this,
- TQT_SLOT(slotRemoveColumns()),
+ TQ_SLOT(slotRemoveColumns()),
ac, actionName);
actionName = "remove_cells";
//m_actionNames += actionName;
new TDEAction(i18n("Cell(s)"), 0, this,
- TQT_SLOT(slotRemoveCells()),
+ TQ_SLOT(slotRemoveCells()),
ac, actionName);
actionName = "remove_cells_content";
//m_actionNames += actionName;
new TDEAction(i18n("Cell(s) Content"), 0, this,
- TQT_SLOT(slotRemoveCellsContent()),
+ TQ_SLOT(slotRemoveCellsContent()),
ac, actionName);
// Merge___________________________________________________________________________
@@ -363,7 +363,7 @@ void TableTagActionSet::initActions(TQWidget* parent)
actionName = "merge_selected_cells";
//m_actionNames += actionName;
new TDEAction(i18n("Merge Selected Cells"), 0, this,
- TQT_SLOT(slotMergeSelectedCells()),
+ TQ_SLOT(slotMergeSelectedCells()),
ac, actionName);
}
diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp
index 990b4372..e23145e3 100644
--- a/quanta/utility/toolbartabwidget.cpp
+++ b/quanta/utility/toolbartabwidget.cpp
@@ -43,23 +43,23 @@ ToolbarTabWidget::ToolbarTabWidget(TQWidget * parent, const char * name, WFlags
{
m_popupMenu = new TDEPopupMenu(this);
m_popupMenu->insertTitle(i18n("Toolbar Menu"), 1);
- m_popupMenu->insertItem(i18n("New Action..."), parent, TQT_SLOT(slotNewAction()));
+ m_popupMenu->insertItem(i18n("New Action..."), parent, TQ_SLOT(slotNewAction()));
m_popupMenu->insertSeparator();
- m_popupMenu->insertItem(i18n("New Toolbar..."), parent, TQT_SLOT(slotAddToolbar()));
- m_popupMenu->insertItem(i18n("Remove Toolbar"), this, TQT_SLOT(slotRemoveToolbar()));
- m_popupMenu->insertItem(i18n("Rename Toolbar..."), this, TQT_SLOT(slotRenameToolbar()));
- m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), this, TQT_SLOT(slotEditToolbar()));
+ m_popupMenu->insertItem(i18n("New Toolbar..."), parent, TQ_SLOT(slotAddToolbar()));
+ m_popupMenu->insertItem(i18n("Remove Toolbar"), this, TQ_SLOT(slotRemoveToolbar()));
+ m_popupMenu->insertItem(i18n("Rename Toolbar..."), this, TQ_SLOT(slotRenameToolbar()));
+ m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), this, TQ_SLOT(slotEditToolbar()));
- connect(this, TQT_SIGNAL(removeToolbar(const TQString&)),
- parent, TQT_SLOT(slotRemoveToolbar(const TQString&)));
- connect(this, TQT_SIGNAL(renameToolbar(const TQString&)),
- parent, TQT_SLOT(slotRenameToolbar(const TQString&)));
- connect(this, TQT_SIGNAL(editToolbar(const TQString&)),
- parent, TQT_SLOT(slotConfigureToolbars(const TQString&)));
- connect(this, TQT_SIGNAL(newAction()),
- parent, TQT_SLOT(slotNewAction()));
- connect(this, TQT_SIGNAL(addToolbar()),
- parent, TQT_SLOT(slotAddToolbar()));
+ connect(this, TQ_SIGNAL(removeToolbar(const TQString&)),
+ parent, TQ_SLOT(slotRemoveToolbar(const TQString&)));
+ connect(this, TQ_SIGNAL(renameToolbar(const TQString&)),
+ parent, TQ_SLOT(slotRenameToolbar(const TQString&)));
+ connect(this, TQ_SIGNAL(editToolbar(const TQString&)),
+ parent, TQ_SLOT(slotConfigureToolbars(const TQString&)));
+ connect(this, TQ_SIGNAL(newAction()),
+ parent, TQ_SLOT(slotNewAction()));
+ connect(this, TQ_SIGNAL(addToolbar()),
+ parent, TQ_SLOT(slotAddToolbar()));
TDEAcceleratorManager::setNoAccel(this);
}
@@ -235,8 +235,8 @@ QuantaToolBar::QuantaToolBar(TQWidget *parent, const char *name, bool honor_styl
m_iconTextMenu->insertItem(i18n("Text Only"), 1);
m_iconTextMenu->insertItem(i18n("Text Alongside Icons"), 2);
m_iconTextMenu->insertItem(i18n("Text Under Icons"), 3);
- connect(m_iconTextMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotIconTextChanged(int)));
- connect(m_iconTextMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotIconTextMenuAboutToShow()));
+ connect(m_iconTextMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotIconTextChanged(int)));
+ connect(m_iconTextMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotIconTextMenuAboutToShow()));
setIconText(ToolbarTabWidget::ref()->iconText(), false);
}
@@ -306,7 +306,7 @@ void QuantaToolBar::mousePressEvent(TQMouseEvent *e)
m_toolbarTab->tabUnderMouseLabel = m_toolbarTab->label(m_toolbarTab->currentPageIndex());
m_popupMenu->insertTitle(i18n("Toolbar Menu") + " - "
+ i18n(m_toolbarTab->tabUnderMouseLabel.utf8()));
- m_popupMenu->insertItem(i18n("New Action..."), m_toolbarTab, TQT_SIGNAL(newAction()));
+ m_popupMenu->insertItem(i18n("New Action..."), m_toolbarTab, TQ_SIGNAL(newAction()));
TQObjectList* childrenList = queryList("TDEToolBarButton");
for (uint i = 0; i < childrenList->count(); i++)
{
@@ -317,18 +317,18 @@ void QuantaToolBar::mousePressEvent(TQMouseEvent *e)
{
currentActionName = w->textLabel();
TQString actionName = currentActionName;
- m_popupMenu->insertItem(i18n("Remove Action - %1").arg(actionName.replace('&',"&&")), this, TQT_SLOT(slotRemoveAction()));
- m_popupMenu->insertItem(i18n("Edit Action - %1").arg(actionName), this, TQT_SLOT(slotEditAction()));
+ m_popupMenu->insertItem(i18n("Remove Action - %1").arg(actionName.replace('&',"&&")), this, TQ_SLOT(slotRemoveAction()));
+ m_popupMenu->insertItem(i18n("Edit Action - %1").arg(actionName), this, TQ_SLOT(slotEditAction()));
break;
}
}
m_popupMenu->insertSeparator();
- m_popupMenu->insertItem(i18n("New Toolbar..."), m_toolbarTab, TQT_SIGNAL(addToolbar()));
- m_popupMenu->insertItem(i18n("Remove Toolbar"), m_toolbarTab, TQT_SLOT(slotRemoveToolbar()));
- m_popupMenu->insertItem(i18n("Rename Toolbar..."), m_toolbarTab, TQT_SLOT(slotRenameToolbar()));
+ m_popupMenu->insertItem(i18n("New Toolbar..."), m_toolbarTab, TQ_SIGNAL(addToolbar()));
+ m_popupMenu->insertItem(i18n("Remove Toolbar"), m_toolbarTab, TQ_SLOT(slotRemoveToolbar()));
+ m_popupMenu->insertItem(i18n("Rename Toolbar..."), m_toolbarTab, TQ_SLOT(slotRenameToolbar()));
m_popupMenu->insertSeparator();
m_popupMenu->insertItem( i18n("Text Position"), m_iconTextMenu);
- m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), m_toolbarTab, TQT_SLOT(slotEditToolbar()));
+ m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), m_toolbarTab, TQ_SLOT(slotEditToolbar()));
}
m_popupMenu->popup(p);
}