summaryrefslogtreecommitdiffstats
path: root/quanta/utility
diff options
context:
space:
mode:
Diffstat (limited to 'quanta/utility')
-rw-r--r--quanta/utility/CMakeLists.txt4
-rw-r--r--quanta/utility/myprocess.h2
-rw-r--r--quanta/utility/newstuff.cpp4
-rw-r--r--quanta/utility/newstuff.h10
-rw-r--r--quanta/utility/qpevents.cpp2
-rw-r--r--quanta/utility/qpevents.h2
-rw-r--r--quanta/utility/quantabookmarks.cpp20
-rw-r--r--quanta/utility/quantabookmarks.h5
-rw-r--r--quanta/utility/tagaction.cpp40
-rw-r--r--quanta/utility/tagaction.h2
-rw-r--r--quanta/utility/tagactionset.cpp30
-rw-r--r--quanta/utility/tagactionset.h6
-rw-r--r--quanta/utility/toolbartabwidget.cpp54
-rw-r--r--quanta/utility/toolbartabwidget.h4
14 files changed, 91 insertions, 94 deletions
diff --git a/quanta/utility/CMakeLists.txt b/quanta/utility/CMakeLists.txt
index c65eb97a..5faa5f29 100644
--- a/quanta/utility/CMakeLists.txt
+++ b/quanta/utility/CMakeLists.txt
@@ -19,11 +19,13 @@ include_directories(
${CMAKE_SOURCE_DIR}/quanta/messages
${CMAKE_SOURCE_DIR}/quanta/parts/kafka
${CMAKE_SOURCE_DIR}/quanta/project
+)
+
+include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
-
##### utility (static) ##########################
tde_add_library( utility STATIC_PIC AUTOMOC
diff --git a/quanta/utility/myprocess.h b/quanta/utility/myprocess.h
index a80a199c..bb12d2fe 100644
--- a/quanta/utility/myprocess.h
+++ b/quanta/utility/myprocess.h
@@ -20,7 +20,7 @@
class MyProcess:public TDEProcess
{
- Q_OBJECT
+ TQ_OBJECT
public:
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/newstuff.h b/quanta/utility/newstuff.h
index c35be15b..929734d6 100644
--- a/quanta/utility/newstuff.h
+++ b/quanta/utility/newstuff.h
@@ -31,7 +31,7 @@ class KURL;
class QNewDTEPStuff: public TDENewStuffSecure
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -50,7 +50,7 @@ Makes possible downloading and installing a Toolbar resource files from a server
*/
class QNewToolbarStuff: public TDENewStuffSecure
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -71,7 +71,7 @@ Makes possible downloading and installing a template resource files from a serve
*/
class QNewTemplateStuff: public TDENewStuffSecure
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -92,7 +92,7 @@ Makes possible downloading and installing a script resource files from a server.
*/
class QNewScriptStuff: public TDENewStuffSecure
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -111,7 +111,7 @@ Makes possible downloading and installing a documentation resource files from a
*/
class QNewDocStuff: public TDENewStuffSecure
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/quanta/utility/qpevents.cpp b/quanta/utility/qpevents.cpp
index 8a8dfa26..87ec17d9 100644
--- a/quanta/utility/qpevents.cpp
+++ b/quanta/utility/qpevents.cpp
@@ -294,7 +294,7 @@ bool QPEvents::handleEvent(const EventAction& ev)
TQTextStream stream(&file);
stream.setEncoding(TQTextStream::UnicodeUTF8);
//Note: the log text should not be translated.
- TQString s = TQDateTime::currentDateTime().toString(Qt::ISODate) + ": ";
+ TQString s = TQDateTime::currentDateTime().toString(TQt::ISODate) + ": ";
s.append( "Event : " + m_eventName + " : ");
s.append( "Action: " + ev.action + " : ");
if (ev.arguments[1] == "full")
diff --git a/quanta/utility/qpevents.h b/quanta/utility/qpevents.h
index 6b3638ae..4c65c359 100644
--- a/quanta/utility/qpevents.h
+++ b/quanta/utility/qpevents.h
@@ -52,7 +52,7 @@ typedef TQMap<TQString, TQValueList<EventAction> > EventActions;
class QPEvents : public TQObject
{
-Q_OBJECT
+TQ_OBJECT
public:
static QPEvents* const ref(TQObject *parent = 0L)
diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp
index 8d32e20a..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;
}
@@ -361,10 +361,10 @@ void QuantaBookmarks::gotoLineNumber(int line)
Document *doc = m_doc;
if (!doc)
doc = m_viewManager->activeDocument();
- TQObject *s = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()));
+ TQObject *s = const_cast<TQObject*>(sender());
for (uint i = 0; i < m_othersMenuList.count(); i++)
{
- if (TQT_BASE_OBJECT(s) == TQT_BASE_OBJECT(m_othersMenuList[i]))
+ if (s == m_othersMenuList[i])
{
doc = m_others[i];
break;
@@ -395,5 +395,3 @@ void QuantaBookmarks::marksChanged ()
}
#include "quantabookmarks.moc"
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/quanta/utility/quantabookmarks.h b/quanta/utility/quantabookmarks.h
index 71353c17..c1e4bb99 100644
--- a/quanta/utility/quantabookmarks.h
+++ b/quanta/utility/quantabookmarks.h
@@ -42,7 +42,7 @@ class TQMenuData;
class QuantaBookmarks : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -95,6 +95,3 @@ class QuantaBookmarks : public TQObject
};
#endif
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
-// vim: noet ts=2
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/tagaction.h b/quanta/utility/tagaction.h
index eeff1560..783665e3 100644
--- a/quanta/utility/tagaction.h
+++ b/quanta/utility/tagaction.h
@@ -46,7 +46,7 @@ class NodeSelection;
class TagAction : public TDEToggleAction
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp
index 116832e9..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);
}
@@ -281,7 +281,7 @@ void TableTagActionSet::initActionMenus(TQWidget* widget)
{
Q_ASSERT(!m_tableActionMenu_0);
- m_tableActionMenu_0 = new TDEActionMenu(i18n("Table..."), TQT_TQOBJECT(widget));
+ m_tableActionMenu_0 = new TDEActionMenu(i18n("Table..."), widget);
m_insertActionMenu_1 = new TDEActionMenu(i18n("Insert..."), m_tableActionMenu_0);
m_removeActionMenu_1 = new TDEActionMenu(i18n("Remove..."), m_tableActionMenu_0);
}
@@ -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/tagactionset.h b/quanta/utility/tagactionset.h
index 9e056543..7ecc6d1a 100644
--- a/quanta/utility/tagactionset.h
+++ b/quanta/utility/tagactionset.h
@@ -37,7 +37,7 @@ class NodeModifsSet;
*/
class TagActionSetAbstract : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
TagActionSetAbstract(TQObject *parent = 0, const char *name = 0);
@@ -66,7 +66,7 @@ private:
class TagActionSet : public TagActionSetAbstract
{
- Q_OBJECT
+ TQ_OBJECT
public:
TagActionSet(TQObject *parent = 0, const char *name = 0);
@@ -95,7 +95,7 @@ private:
class TableTagActionSet : public TagActionSetAbstract
{
- Q_OBJECT
+ TQ_OBJECT
public:
TableTagActionSet(TQObject *parent = 0, const char *name = 0);
diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp
index 26765eee..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);
}
@@ -157,7 +157,7 @@ void ToolbarTabWidget::slotEditToolbar()
void ToolbarTabWidget::mousePressEvent ( TQMouseEvent * e )
{
- if (e->button() == Qt::RightButton)
+ if (e->button() == TQt::RightButton)
{
TQPoint p = e->globalPos();
TQTab *tab = 0L;
@@ -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);
}
@@ -296,7 +296,7 @@ void QuantaToolBar::slotIconTextChanged(int id)
void QuantaToolBar::mousePressEvent(TQMouseEvent *e)
{
- if (e->button() == Qt::RightButton)
+ if (e->button() == TQt::RightButton)
{
m_popupMenu->clear();
TQPoint p = e->globalPos();
@@ -306,29 +306,29 @@ 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++)
{
- TDEToolBarButton *w = static_cast<TDEToolBarButton*>(TQT_TQWIDGET(childrenList->at(i)));
+ TDEToolBarButton *w = static_cast<TDEToolBarButton*>(childrenList->at(i));
TQPoint p1 = w->parentWidget()->mapToGlobal(w->pos());
TQPoint p2 = TQPoint(p1.x() + w->width(), p1.y()+w->height());
if (TQRect(p1, p2).contains(p))
{
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);
}
diff --git a/quanta/utility/toolbartabwidget.h b/quanta/utility/toolbartabwidget.h
index a8ce9ecc..3536ca83 100644
--- a/quanta/utility/toolbartabwidget.h
+++ b/quanta/utility/toolbartabwidget.h
@@ -26,7 +26,7 @@ class TDEToolBar;
class ToolbarTabWidget: public TQTabWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
TQWidgetStack *m_widgetStack;
@@ -84,7 +84,7 @@ private:
class QuantaToolBar: public TDEToolBar
{
- Q_OBJECT
+ TQ_OBJECT
public:
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-31 23:04:04 +0000