summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/common/storage.cpp4
-rw-r--r--src/common/common/synchronous.cpp2
-rw-r--r--src/common/global/process.cpp12
-rw-r--r--src/common/global/purl.cpp6
-rw-r--r--src/common/gui/dialog.cpp12
-rw-r--r--src/common/gui/editlistbox.cpp20
-rw-r--r--src/common/gui/hexword_gui.cpp4
-rw-r--r--src/common/gui/misc_gui.cpp22
-rw-r--r--src/common/gui/number_gui.cpp4
-rw-r--r--src/common/gui/purl_gui.cpp8
-rw-r--r--src/common/nokde/nokde_kprocess.cpp6
11 files changed, 50 insertions, 50 deletions
diff --git a/src/common/common/storage.cpp b/src/common/common/storage.cpp
index 447a8a0..601ff2a 100644
--- a/src/common/common/storage.cpp
+++ b/src/common/common/storage.cpp
@@ -15,7 +15,7 @@ void GenericStorage::delayedChanged()
{
if (_dirty) return;
_dirty = true;
- TQTimer::singleShot(0, this, TQT_SLOT(changedSlot()));
+ TQTimer::singleShot(0, this, TQ_SLOT(changedSlot()));
}
void GenericStorage::changedSlot()
@@ -27,7 +27,7 @@ void GenericStorage::changedSlot()
//----------------------------------------------------------------------------
void GenericViewProxy::addStorage(GenericStorage &storage)
{
- connect(&storage, TQT_SIGNAL(changed()), TQT_SLOT(changed()));
+ connect(&storage, TQ_SIGNAL(changed()), TQ_SLOT(changed()));
}
void GenericViewProxy::changed()
diff --git a/src/common/common/synchronous.cpp b/src/common/common/synchronous.cpp
index dbf782f..e480a0d 100644
--- a/src/common/common/synchronous.cpp
+++ b/src/common/common/synchronous.cpp
@@ -13,7 +13,7 @@
Synchronous::Synchronous(uint timeout)
{
- connect(&_timer, TQT_SIGNAL(timeout()), TQT_SLOT(done()));
+ connect(&_timer, TQ_SIGNAL(timeout()), TQ_SLOT(done()));
if (timeout) _timer.start(timeout, true);
}
diff --git a/src/common/global/process.cpp b/src/common/global/process.cpp
index 9dc4761..bc6102d 100644
--- a/src/common/global/process.cpp
+++ b/src/common/global/process.cpp
@@ -22,8 +22,8 @@
Process::State Process::runSynchronously(Base &process, RunActions actions, uint timeout)
{
Synchronous sync(timeout);
- TQObject::connect(&process, TQT_SIGNAL(done(int)), &sync, TQT_SLOT(done()));
- TQObject::connect(&process, TQT_SIGNAL(requestSynchronousStop()), &sync, TQT_SLOT(done()));
+ TQObject::connect(&process, TQ_SIGNAL(done(int)), &sync, TQ_SLOT(done()));
+ TQObject::connect(&process, TQ_SIGNAL(requestSynchronousStop()), &sync, TQ_SLOT(done()));
if ( (actions & Start) && !process.start(0) ) return process.state();
Q_ASSERT( process.isRunning() );
if ( !sync.enterLoop() ) process.timeoutSlot();
@@ -35,11 +35,11 @@ Process::Base::Base(TQObject *parent, const char *name)
: TQObject(parent, name), _state(Stopped)
{
_process = new TDEProcess(this);
- connect(_process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(exited()));
- connect(_process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(receivedStdout(TDEProcess*, char *, int)));
- connect(_process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(receivedStderr(TDEProcess*, char *, int)));
+ connect(_process, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(exited()));
+ connect(_process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQ_SLOT(receivedStdout(TDEProcess*, char *, int)));
+ connect(_process, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQ_SLOT(receivedStderr(TDEProcess*, char *, int)));
_timer = new TQTimer(this);
- connect(_timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeoutSlot()));
+ connect(_timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeoutSlot()));
}
Process::Base::~Base()
diff --git a/src/common/global/purl.cpp b/src/common/global/purl.cpp
index c47fa7b..7b29f56 100644
--- a/src/common/global/purl.cpp
+++ b/src/common/global/purl.cpp
@@ -28,8 +28,8 @@
PURL::Http::Http(const TQString &hostname)
: TQHttp(hostname)
{
- connect(this, TQT_SIGNAL(responseHeaderReceived(const TQHttpResponseHeader &)),
- TQT_SLOT(responseHeaderReceivedSlot(const TQHttpResponseHeader &)));
+ connect(this, TQ_SIGNAL(responseHeaderReceived(const TQHttpResponseHeader &)),
+ TQ_SLOT(responseHeaderReceivedSlot(const TQHttpResponseHeader &)));
}
//-----------------------------------------------------------------------------
@@ -254,7 +254,7 @@ bool PURL::Base::httpUrlExists(bool *ok) const
if (ok) *ok = false;
Http http(_url.host());
Synchronous sync(500);
- TQObject::connect(&http, TQT_SIGNAL(done(bool)), &sync, TQT_SLOT(done()));
+ TQObject::connect(&http, TQ_SIGNAL(done(bool)), &sync, TQ_SLOT(done()));
TQFileInfo info(_url.fileName(false));
http.head(_url.path());
if ( !sync.enterLoop() ) return false; // timeout
diff --git a/src/common/gui/dialog.cpp b/src/common/gui/dialog.cpp
index 554f364..b865edf 100644
--- a/src/common/gui/dialog.cpp
+++ b/src/common/gui/dialog.cpp
@@ -28,7 +28,7 @@ Dialog::Dialog(TQWidget *parent, const char *name, bool modal,
TQWidget *main = new TQWidget(this);
setMainWidget(main);
- TQTimer::singleShot(0, this, TQT_SLOT(updateSize()));
+ TQTimer::singleShot(0, this, TQ_SLOT(updateSize()));
}
Dialog::Dialog(DialogType type, const TQString &caption, int buttonMask, ButtonCode defaultButton,
@@ -38,7 +38,7 @@ Dialog::Dialog(DialogType type, const TQString &caption, int buttonMask, ButtonC
{
PBusyCursor::start();
Q_ASSERT(name);
- TQTimer::singleShot(0, this, TQT_SLOT(updateSize()));
+ TQTimer::singleShot(0, this, TQ_SLOT(updateSize()));
}
Dialog::~Dialog()
@@ -76,7 +76,7 @@ TreeListDialog::TreeListDialog(TQWidget *parent, const char *name, bool modal,
Splitter *splitter = new Splitter(widths,TQt::Horizontal, mainWidget(), name);
top->addWidget(splitter);
_listView = new TDEListView(splitter);
- connect(_listView, TQT_SIGNAL(currentChanged(TQListViewItem *)), TQT_SLOT(currentChanged(TQListViewItem *)));
+ connect(_listView, TQ_SIGNAL(currentChanged(TQListViewItem *)), TQ_SLOT(currentChanged(TQListViewItem *)));
_listView->setAllColumnsShowFocus(true);
_listView->setRootIsDecorated(true);
_listView->setSorting(0);
@@ -91,7 +91,7 @@ TreeListDialog::TreeListDialog(TQWidget *parent, const char *name, bool modal,
_label = new TQLabel(_frame);
_titleBox->addWidget(_label);
_stack = new TQWidgetStack(_frame);
- connect(_stack, TQT_SIGNAL(aboutToShow(TQWidget *)), TQT_SIGNAL(aboutToShowPage(TQWidget *)));
+ connect(_stack, TQ_SIGNAL(aboutToShow(TQWidget *)), TQ_SIGNAL(aboutToShowPage(TQWidget *)));
vbox->addWidget(_stack);
vbox->addStretch(1);
}
@@ -111,7 +111,7 @@ TQWidget *TreeListDialog::addPage(const TQStringList &labels)
}
if ( item==0 ) {
page = new TQWidget(_stack);
- connect(page, TQT_SIGNAL(destroyed(TQObject *)), TQT_SLOT(pageDestroyed(TQObject *)));
+ connect(page, TQ_SIGNAL(destroyed(TQObject *)), TQ_SLOT(pageDestroyed(TQObject *)));
_stack->addWidget(page);
item = new Item(labels[0], page, labels[0], _listView);
item->setOpen(true);
@@ -130,7 +130,7 @@ TQWidget *TreeListDialog::addPage(const TQStringList &labels)
}
if ( item==0 ) {
page = new TQWidget(_stack);
- connect(page, TQT_SIGNAL(destroyed(TQObject *)), TQT_SLOT(pageDestroyed(TQObject *)));
+ connect(page, TQ_SIGNAL(destroyed(TQObject *)), TQ_SLOT(pageDestroyed(TQObject *)));
_stack->addWidget(page);
item = new Item(labels[i], page, labels[i], parent);
item->setOpen(true);
diff --git a/src/common/gui/editlistbox.cpp b/src/common/gui/editlistbox.cpp
index c583a1a..41b41bd 100644
--- a/src/common/gui/editlistbox.cpp
+++ b/src/common/gui/editlistbox.cpp
@@ -64,7 +64,7 @@ void EditListBox::init(uint nbColumns, TQWidget *view)
TDEIconLoader loader;
TQIconSet iconset = loader.loadIcon("locationbar_erase", TDEIcon::Toolbar);
KPushButton *button = new KPushButton(iconset, TQString(), this);
- connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(clearEdit()));
+ connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(clearEdit()));
hbox->addWidget(button);
}
view->reparent( this, TQPoint(0,0) );
@@ -87,11 +87,11 @@ void EditListBox::init(uint nbColumns, TQWidget *view)
setButtons(_buttons);
if (m_lineEdit) {
- connect(m_lineEdit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(typedSomething(const TQString&)));
+ connect(m_lineEdit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(typedSomething(const TQString&)));
m_lineEdit->setTrapReturnKey(true);
- connect(m_lineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(addItem()));
+ connect(m_lineEdit,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(addItem()));
}
- connect(_listView, TQT_SIGNAL(selectionChanged()), TQT_SLOT(selectionChanged()));
+ connect(_listView, TQ_SIGNAL(selectionChanged()), TQ_SLOT(selectionChanged()));
// maybe supplied lineedit has some text already
typedSomething(m_lineEdit ? m_lineEdit->text() : TQString());
@@ -111,7 +111,7 @@ void EditListBox::setButtons(Buttons buttons)
#endif
_addButton->setEnabled(false);
_addButton->show();
- connect(_addButton, TQT_SIGNAL(clicked()), TQT_SLOT(addItem()));
+ connect(_addButton, TQ_SIGNAL(clicked()), TQ_SLOT(addItem()));
_buttonsLayout->addWidget(_addButton);
}
@@ -121,7 +121,7 @@ void EditListBox::setButtons(Buttons buttons)
_removeButton = new KPushButton(KGuiItem(i18n("Remove"), "clear"), this);
_removeButton->setEnabled(false);
_removeButton->show();
- connect(_removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem()));
+ connect(_removeButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeItem()));
_buttonsLayout->addWidget(_removeButton);
}
@@ -130,7 +130,7 @@ void EditListBox::setButtons(Buttons buttons)
if ( buttons & RemoveAll ) {
_removeAllButton = new KPushButton(KGuiItem(i18n("Remove All"), "delete"), this);
_removeAllButton->show();
- connect(_removeAllButton, TQT_SIGNAL(clicked()), TQT_SLOT(clear()));
+ connect(_removeAllButton, TQ_SIGNAL(clicked()), TQ_SLOT(clear()));
_buttonsLayout->addWidget(_removeAllButton);
}
@@ -142,12 +142,12 @@ void EditListBox::setButtons(Buttons buttons)
_moveUpButton = new KPushButton(KGuiItem(i18n("Move &Up"), "go-up"), this);
_moveUpButton->setEnabled(false);
_moveUpButton->show();
- connect(_moveUpButton, TQT_SIGNAL(clicked()), TQT_SLOT(moveItemUp()));
+ connect(_moveUpButton, TQ_SIGNAL(clicked()), TQ_SLOT(moveItemUp()));
_buttonsLayout->addWidget(_moveUpButton);
_moveDownButton = new KPushButton(KGuiItem(i18n("Move &Down"), "go-down"), this);
_moveDownButton->setEnabled(false);
_moveDownButton->show();
- connect(_moveDownButton, TQT_SIGNAL(clicked()), TQT_SLOT(moveItemDown()));
+ connect(_moveDownButton, TQ_SIGNAL(clicked()), TQ_SLOT(moveItemDown()));
_buttonsLayout->addWidget(_moveDownButton);
}
@@ -156,7 +156,7 @@ void EditListBox::setButtons(Buttons buttons)
if ( buttons & Reset ) {
_resetButton = new KPushButton(KStdGuiItem::reset(), this);
_resetButton->show();
- connect(_resetButton, TQT_SIGNAL(clicked()), TQT_SIGNAL(reset()));
+ connect(_resetButton, TQ_SIGNAL(clicked()), TQ_SIGNAL(reset()));
_buttonsLayout->addWidget(_resetButton);
}
}
diff --git a/src/common/gui/hexword_gui.cpp b/src/common/gui/hexword_gui.cpp
index 01a5f8d..97cc25c 100644
--- a/src/common/gui/hexword_gui.cpp
+++ b/src/common/gui/hexword_gui.cpp
@@ -33,7 +33,7 @@ GenericHexWordEditor::GenericHexWordEditor(uint nbChars, bool hasBlankValue, TQW
{
setFocusPolicy(TQWidget::ClickFocus);
setValidator(new HexValueValidator(nbChars, this));
- connect(this, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotTextChanged()));
+ connect(this, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotTextChanged()));
setFrame(false);
}
@@ -81,7 +81,7 @@ bool GenericHexWordEditor::event(TQEvent *e)
changeValue();
break;
case TQEvent::FocusIn:
- TQTimer::singleShot(0, this, TQT_SLOT(selectAll())); // ugly but it works
+ TQTimer::singleShot(0, this, TQ_SLOT(selectAll())); // ugly but it works
break;
case TQEvent::KeyPress:
switch ( static_cast<TQKeyEvent*>(e)->key() ) {
diff --git a/src/common/gui/misc_gui.cpp b/src/common/gui/misc_gui.cpp
index 0121585..06e0d6b 100644
--- a/src/common/gui/misc_gui.cpp
+++ b/src/common/gui/misc_gui.cpp
@@ -126,7 +126,7 @@ void PopupButton::init()
_separator = false;
setFlat(true);
TQPopupMenu *popup = new TQPopupMenu(this);
- connect(popup, TQT_SIGNAL(activated(int)), TQT_SIGNAL(activated(int)));
+ connect(popup, TQ_SIGNAL(activated(int)), TQ_SIGNAL(activated(int)));
setPopup(popup);
}
@@ -163,7 +163,7 @@ Splitter::Splitter(const TQValueList<int> &defaultSizes, TQt::Orientation o, TQW
{
Q_ASSERT(name);
setOpaqueResize(true);
- TQTimer::singleShot(0, this, TQT_SLOT(updateSizes()));
+ TQTimer::singleShot(0, this, TQ_SLOT(updateSizes()));
}
Splitter::~Splitter()
@@ -211,15 +211,15 @@ void TabWidget::wheelEvent(TQWheelEvent *e)
void TabWidget::setTabBar(TabBar *tabbar)
{
KTabWidget::setTabBar(tabbar);
- connect(tabBar(), TQT_SIGNAL(contextMenu( int, const TQPoint & )), TQT_SLOT(contextMenu( int, const TQPoint & )));
- connect(tabBar(), TQT_SIGNAL(mouseDoubleClick( int )), TQT_SLOT(mouseDoubleClick( int )));
- connect(tabBar(), TQT_SIGNAL(mouseMiddleClick( int )), TQT_SLOT(mouseMiddleClick( int )));
- connect(tabBar(), TQT_SIGNAL(initiateDrag( int )), TQT_SLOT(initiateDrag( int )));
- connect(tabBar(), TQT_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & )), TQT_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & )));
- connect(tabBar(), TQT_SIGNAL(receivedDropEvent( int, TQDropEvent * )), TQT_SLOT(receivedDropEvent( int, TQDropEvent * )));
- connect(tabBar(), TQT_SIGNAL(moveTab( int, int )), TQT_SLOT(moveTab( int, int )));
- connect(tabBar(), TQT_SIGNAL(closeRequest( int )), TQT_SLOT(closeRequest( int )));
- connect(tabBar(), TQT_SIGNAL(wheelDelta( int )), TQT_SLOT(wheelDelta( int )));
+ connect(tabBar(), TQ_SIGNAL(contextMenu( int, const TQPoint & )), TQ_SLOT(contextMenu( int, const TQPoint & )));
+ connect(tabBar(), TQ_SIGNAL(mouseDoubleClick( int )), TQ_SLOT(mouseDoubleClick( int )));
+ connect(tabBar(), TQ_SIGNAL(mouseMiddleClick( int )), TQ_SLOT(mouseMiddleClick( int )));
+ connect(tabBar(), TQ_SIGNAL(initiateDrag( int )), TQ_SLOT(initiateDrag( int )));
+ connect(tabBar(), TQ_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & )), TQ_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & )));
+ connect(tabBar(), TQ_SIGNAL(receivedDropEvent( int, TQDropEvent * )), TQ_SLOT(receivedDropEvent( int, TQDropEvent * )));
+ connect(tabBar(), TQ_SIGNAL(moveTab( int, int )), TQ_SLOT(moveTab( int, int )));
+ connect(tabBar(), TQ_SIGNAL(closeRequest( int )), TQ_SLOT(closeRequest( int )));
+ connect(tabBar(), TQ_SIGNAL(wheelDelta( int )), TQ_SLOT(wheelDelta( int )));
}
//-----------------------------------------------------------------------------
diff --git a/src/common/gui/number_gui.cpp b/src/common/gui/number_gui.cpp
index cb58d4c..8e036c3 100644
--- a/src/common/gui/number_gui.cpp
+++ b/src/common/gui/number_gui.cpp
@@ -39,13 +39,13 @@ uint maxLabelWidth(NumberBase base, uint nbChars, const TQFont &font)
NumberLineEdit::NumberLineEdit(TQWidget *parent, const char *name)
: KLineEdit(parent, name)
{
- connect(this, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChangedSlot()));
+ connect(this, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(textChangedSlot()));
}
NumberLineEdit::NumberLineEdit(const TQString &text, TQWidget *parent, const char *name)
: KLineEdit(text, parent, name)
{
- connect(this, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChangedSlot()));
+ connect(this, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(textChangedSlot()));
}
TQValidator::State validateNumber(const TQString &input)
diff --git a/src/common/gui/purl_gui.cpp b/src/common/gui/purl_gui.cpp
index fb7aacc..e936a99 100644
--- a/src/common/gui/purl_gui.cpp
+++ b/src/common/gui/purl_gui.cpp
@@ -77,7 +77,7 @@ PURL::Label::Label(const TQString &url, const TQString &text,
TQWidget *parent, const char *name)
: KURLLabel(url, text, parent, name)
{
- connect(this, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(urlClickedSlot()));
+ connect(this, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(urlClickedSlot()));
}
void PURL::Label::urlClickedSlot()
@@ -103,12 +103,12 @@ void PURL::BaseWidget::init()
TQHBoxLayout *top = new TQHBoxLayout(this, 0, 10);
_edit = new KLineEdit(this);
- connect(_edit, TQT_SIGNAL(textChanged(const TQString &)), TQT_SIGNAL(changed()));
+ connect(_edit, TQ_SIGNAL(textChanged(const TQString &)), TQ_SIGNAL(changed()));
top->addWidget(_edit);
TDEIconLoader loader;
TQIconSet iconset = loader.loadIcon("document-open", TDEIcon::Toolbar);
TQPushButton *button = new KPushButton(iconset, TQString(), this);
- connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(buttonClicked()));
+ connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(buttonClicked()));
top->addWidget(button);
}
@@ -138,7 +138,7 @@ void PURL::DirectoriesWidget::init(const TQString &defaultDir)
{
DirectoryWidget *edit = new DirectoryWidget(defaultDir);
_editListBox = new EditListBox(1, edit, edit->lineEdit(), this, "directories_editlistbox");
- connect(_editListBox, TQT_SIGNAL(changed()), TQT_SIGNAL(changed()));
+ connect(_editListBox, TQ_SIGNAL(changed()), TQ_SIGNAL(changed()));
}
//----------------------------------------------------------------------------
diff --git a/src/common/nokde/nokde_kprocess.cpp b/src/common/nokde/nokde_kprocess.cpp
index ee3e35b..a8489f1 100644
--- a/src/common/nokde/nokde_kprocess.cpp
+++ b/src/common/nokde/nokde_kprocess.cpp
@@ -15,9 +15,9 @@ TDEProcess::TDEProcess(TQObject *parent, const char *name)
: TQObject(parent, name)
{
_process = new Q3Process(this);
- connect(_process, TQT_SIGNAL(processExited()), TQT_SLOT(processExitedSlot()));
- connect(_process, TQT_SIGNAL(readyReadStdout()), TQT_SLOT(readyReadStdoutSlot()));
- connect(_process, TQT_SIGNAL(readyReadStderr()), TQT_SLOT(readyReadStderrSlot()));
+ connect(_process, TQ_SIGNAL(processExited()), TQ_SLOT(processExitedSlot()));
+ connect(_process, TQ_SIGNAL(readyReadStdout()), TQ_SLOT(readyReadStdoutSlot()));
+ connect(_process, TQ_SIGNAL(readyReadStderr()), TQ_SLOT(readyReadStderrSlot()));
}
bool TDEProcess::start()