summaryrefslogtreecommitdiffstats
path: root/kolourpaint
diff options
context:
space:
mode:
Diffstat (limited to 'kolourpaint')
-rw-r--r--kolourpaint/kolourpaint.cpp4
-rw-r--r--kolourpaint/kpcommandhistory.cpp12
-rw-r--r--kolourpaint/kpdocument.cpp4
-rw-r--r--kolourpaint/kpdocumentsaveoptionswidget.cpp42
-rw-r--r--kolourpaint/kpmainwindow.cpp104
-rw-r--r--kolourpaint/kpmainwindow_edit.cpp24
-rw-r--r--kolourpaint/kpmainwindow_file.cpp40
-rw-r--r--kolourpaint/kpmainwindow_help.cpp10
-rw-r--r--kolourpaint/kpmainwindow_image.cpp22
-rw-r--r--kolourpaint/kpmainwindow_settings.cpp14
-rw-r--r--kolourpaint/kpmainwindow_text.cpp12
-rw-r--r--kolourpaint/kpmainwindow_tools.cpp102
-rw-r--r--kolourpaint/kpmainwindow_view.cpp36
-rw-r--r--kolourpaint/kpthumbnail.cpp16
-rw-r--r--kolourpaint/kptool.cpp6
-rw-r--r--kolourpaint/kpview.cpp56
-rw-r--r--kolourpaint/kpviewmanager.cpp4
-rw-r--r--kolourpaint/kpviewscrollablecontainer.cpp50
-rw-r--r--kolourpaint/patches/doc_resize_no_flicker.diff4
-rw-r--r--kolourpaint/pixmapfx/kpeffectbalance.cpp44
-rw-r--r--kolourpaint/pixmapfx/kpeffectblursharpen.cpp8
-rw-r--r--kolourpaint/pixmapfx/kpeffectemboss.cpp8
-rw-r--r--kolourpaint/pixmapfx/kpeffectflatten.cpp12
-rw-r--r--kolourpaint/pixmapfx/kpeffectinvert.cpp18
-rw-r--r--kolourpaint/pixmapfx/kpeffectreducecolors.cpp20
-rw-r--r--kolourpaint/pixmapfx/kpeffectsdialog.cpp20
-rw-r--r--kolourpaint/tools/kptoolairspray.cpp10
-rw-r--r--kolourpaint/tools/kptoolflip.cpp8
-rw-r--r--kolourpaint/tools/kptoolpen.cpp16
-rw-r--r--kolourpaint/tools/kptoolpolygon.cpp16
-rw-r--r--kolourpaint/tools/kptoolpreviewdialog.cpp8
-rw-r--r--kolourpaint/tools/kptoolrectangle.cpp16
-rw-r--r--kolourpaint/tools/kptoolresizescale.cpp36
-rw-r--r--kolourpaint/tools/kptoolrotate.cpp32
-rw-r--r--kolourpaint/tools/kptoolselection.cpp20
-rw-r--r--kolourpaint/tools/kptoolskew.cpp8
-rw-r--r--kolourpaint/views/kpunzoomedthumbnailview.cpp4
-rw-r--r--kolourpaint/widgets/kpcolorsimilaritydialog.cpp8
-rw-r--r--kolourpaint/widgets/kpcolortoolbar.cpp48
-rw-r--r--kolourpaint/widgets/kptooltoolbar.cpp22
40 files changed, 472 insertions, 472 deletions
diff --git a/kolourpaint/kolourpaint.cpp b/kolourpaint/kolourpaint.cpp
index 8dd605fa..1a5d2757 100644
--- a/kolourpaint/kolourpaint.cpp
+++ b/kolourpaint/kolourpaint.cpp
@@ -191,8 +191,8 @@ int main (int argc, char *argv [])
// TQt says this is necessary but I don't think it is...
- TQObject::connect (&app, TQT_SIGNAL (lastWindowClosed ()),
- &app, TQT_SLOT (quit ()));
+ TQObject::connect (&app, TQ_SIGNAL (lastWindowClosed ()),
+ &app, TQ_SLOT (quit ()));
if (app.isRestored ())
diff --git a/kolourpaint/kpcommandhistory.cpp b/kolourpaint/kpcommandhistory.cpp
index a30f028b..943c4501 100644
--- a/kolourpaint/kpcommandhistory.cpp
+++ b/kolourpaint/kpcommandhistory.cpp
@@ -259,13 +259,13 @@ kpCommandHistoryBase::kpCommandHistoryBase (bool doReadConfig,
m_actionUndo = new TDEToolBarPopupAction (undoActionText (),
TQString::fromLatin1 ("edit-undo"),
TDEStdAccel::shortcut (TDEStdAccel::Undo),
- this, TQT_SLOT (undo ()),
+ this, TQ_SLOT (undo ()),
ac, KStdAction::name (KStdAction::Undo));
m_actionRedo = new TDEToolBarPopupAction (redoActionText (),
TQString::fromLatin1 ("edit-redo"),
TDEStdAccel::shortcut (TDEStdAccel::Redo),
- this, TQT_SLOT (redo ()),
+ this, TQ_SLOT (redo ()),
ac, KStdAction::name (KStdAction::Redo));
@@ -273,10 +273,10 @@ kpCommandHistoryBase::kpCommandHistoryBase (bool doReadConfig,
m_actionRedo->setEnabled (false);
- connect (m_actionUndo->popupMenu (), TQT_SIGNAL (activated (int)),
- this, TQT_SLOT (undoUpToNumber (int)));
- connect (m_actionRedo->popupMenu (), TQT_SIGNAL (activated (int)),
- this, TQT_SLOT (redoUpToNumber (int)));
+ connect (m_actionUndo->popupMenu (), TQ_SIGNAL (activated (int)),
+ this, TQ_SLOT (undoUpToNumber (int)));
+ connect (m_actionRedo->popupMenu (), TQ_SIGNAL (activated (int)),
+ this, TQ_SLOT (redoUpToNumber (int)));
m_undoMinLimit = 10;
diff --git a/kolourpaint/kpdocument.cpp b/kolourpaint/kpdocument.cpp
index 2ba20cc3..ededcb99 100644
--- a/kolourpaint/kpdocument.cpp
+++ b/kolourpaint/kpdocument.cpp
@@ -1220,8 +1220,8 @@ void kpDocument::setSelection (const kpSelection &selection)
// 2. We delete our copy when setSelection() is called again.
//
// See code above for both.
- connect (m_selection, TQT_SIGNAL (changed (const TQRect &)),
- this, TQT_SLOT (slotContentsChanged (const TQRect &)));
+ connect (m_selection, TQ_SIGNAL (changed (const TQRect &)),
+ this, TQ_SLOT (slotContentsChanged (const TQRect &)));
if (!hadSelection)
diff --git a/kolourpaint/kpdocumentsaveoptionswidget.cpp b/kolourpaint/kpdocumentsaveoptionswidget.cpp
index 422ca416..6c31834c 100644
--- a/kolourpaint/kpdocumentsaveoptionswidget.cpp
+++ b/kolourpaint/kpdocumentsaveoptionswidget.cpp
@@ -100,8 +100,8 @@ KDialogBase (parent, name, false/*non-modal*/,
lay->setRowStretch (0, 1);
- connect (m_filePixmapLabel, TQT_SIGNAL (resized ()),
- this, TQT_SLOT (updatePixmapPreview ()));
+ connect (m_filePixmapLabel, TQ_SIGNAL (resized ()),
+ this, TQ_SLOT (updatePixmapPreview ()));
}
kpDocumentSaveOptionsPreviewDialog::~kpDocumentSaveOptionsPreviewDialog ()
@@ -331,27 +331,27 @@ void kpDocumentSaveOptionsWidget::init ()
lay->addWidget (m_previewButton, 0/*stretch*/, TQt::AlignRight);
- connect (m_colorDepthCombo, TQT_SIGNAL (activated (int)),
- this, TQT_SLOT (slotColorDepthSelected ()));
- connect (m_colorDepthCombo, TQT_SIGNAL (activated (int)),
- this, TQT_SLOT (updatePreview ()));
+ connect (m_colorDepthCombo, TQ_SIGNAL (activated (int)),
+ this, TQ_SLOT (slotColorDepthSelected ()));
+ connect (m_colorDepthCombo, TQ_SIGNAL (activated (int)),
+ this, TQ_SLOT (updatePreview ()));
- connect (m_qualityInput, TQT_SIGNAL (valueChanged (int)),
- this, TQT_SLOT (updatePreviewDelayed ()));
+ connect (m_qualityInput, TQ_SIGNAL (valueChanged (int)),
+ this, TQ_SLOT (updatePreviewDelayed ()));
- connect (m_previewButton, TQT_SIGNAL (toggled (bool)),
- this, TQT_SLOT (showPreview (bool)));
+ connect (m_previewButton, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SLOT (showPreview (bool)));
m_updatePreviewDelay = 200/*ms*/;
m_updatePreviewTimer = new TQTimer (this);
- connect (m_updatePreviewTimer, TQT_SIGNAL (timeout ()),
- this, TQT_SLOT (updatePreview ()));
+ connect (m_updatePreviewTimer, TQ_SIGNAL (timeout ()),
+ this, TQ_SLOT (updatePreview ()));
m_updatePreviewDialogLastRelativeGeometryTimer = new TQTimer (this);
- connect (m_updatePreviewDialogLastRelativeGeometryTimer, TQT_SIGNAL (timeout ()),
- this, TQT_SLOT (updatePreviewDialogLastRelativeGeometry ()));
+ connect (m_updatePreviewDialogLastRelativeGeometryTimer, TQ_SIGNAL (timeout ()),
+ this, TQ_SLOT (updatePreviewDialogLastRelativeGeometry ()));
setMode (None);
@@ -705,7 +705,7 @@ void kpDocumentSaveOptionsWidget::setMode (Mode mode)
// we change the height of "this", causing the text on the labels
// to move but the first instance of the text doesn't get erased.
// TQt bug.
- TQTimer::singleShot (0, this, TQT_SLOT (repaintLabels ()));
+ TQTimer::singleShot (0, this, TQ_SLOT (repaintLabels ()));
}
// protected slot
@@ -738,8 +738,8 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
m_previewDialog = new kpDocumentSaveOptionsPreviewDialog (m_visualParent, "previewSaveDialog");
updatePreview ();
- connect (m_previewDialog, TQT_SIGNAL (finished ()),
- this, TQT_SLOT (hidePreview ()));
+ connect (m_previewDialog, TQ_SIGNAL (finished ()),
+ this, TQ_SLOT (hidePreview ()));
TDEConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupPreviewSave);
@@ -834,10 +834,10 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
updatePreviewDialogLastRelativeGeometry ();
- connect (m_previewDialog, TQT_SIGNAL (moved ()),
- this, TQT_SLOT (updatePreviewDialogLastRelativeGeometry ()));
- connect (m_previewDialog, TQT_SIGNAL (resized ()),
- this, TQT_SLOT (updatePreviewDialogLastRelativeGeometry ()));
+ connect (m_previewDialog, TQ_SIGNAL (moved ()),
+ this, TQ_SLOT (updatePreviewDialogLastRelativeGeometry ()));
+ connect (m_previewDialog, TQ_SIGNAL (resized ()),
+ this, TQ_SLOT (updatePreviewDialogLastRelativeGeometry ()));
m_updatePreviewDialogLastRelativeGeometryTimer->start (200/*ms*/);
}
diff --git a/kolourpaint/kpmainwindow.cpp b/kolourpaint/kpmainwindow.cpp
index 24a45054..d43921d1 100644
--- a/kolourpaint/kpmainwindow.cpp
+++ b/kolourpaint/kpmainwindow.cpp
@@ -259,20 +259,20 @@ void kpMainWindow::init ()
#endif
m_scrollView = new kpViewScrollableContainer (this, "scrollView");
- connect (m_scrollView, TQT_SIGNAL (beganDocResize ()),
- this, TQT_SLOT (slotBeganDocResize ()));
- connect (m_scrollView, TQT_SIGNAL (continuedDocResize (const TQSize &)),
- this, TQT_SLOT (slotContinuedDocResize (const TQSize &)));
- connect (m_scrollView, TQT_SIGNAL (cancelledDocResize ()),
- this, TQT_SLOT (slotCancelledDocResize ()));
- connect (m_scrollView, TQT_SIGNAL (endedDocResize (const TQSize &)),
- this, TQT_SLOT (slotEndedDocResize (const TQSize &)));
-
- connect (m_scrollView, TQT_SIGNAL (statusMessageChanged (const TQString &)),
- this, TQT_SLOT (slotDocResizeMessageChanged (const TQString &)));
-
- connect (m_scrollView, TQT_SIGNAL (contentsMoving (int, int)),
- this, TQT_SLOT (slotScrollViewAboutToScroll ()));
+ connect (m_scrollView, TQ_SIGNAL (beganDocResize ()),
+ this, TQ_SLOT (slotBeganDocResize ()));
+ connect (m_scrollView, TQ_SIGNAL (continuedDocResize (const TQSize &)),
+ this, TQ_SLOT (slotContinuedDocResize (const TQSize &)));
+ connect (m_scrollView, TQ_SIGNAL (cancelledDocResize ()),
+ this, TQ_SLOT (slotCancelledDocResize ()));
+ connect (m_scrollView, TQ_SIGNAL (endedDocResize (const TQSize &)),
+ this, TQ_SLOT (slotEndedDocResize (const TQSize &)));
+
+ connect (m_scrollView, TQ_SIGNAL (statusMessageChanged (const TQString &)),
+ this, TQ_SLOT (slotDocResizeMessageChanged (const TQString &)));
+
+ connect (m_scrollView, TQ_SIGNAL (contentsMoving (int, int)),
+ this, TQ_SLOT (slotScrollViewAboutToScroll ()));
setCentralWidget (m_scrollView);
m_scrollView->show ();
#if DEBUG_KP_MAIN_WINDOW
@@ -707,16 +707,16 @@ void kpMainWindow::setDocument (kpDocument *newDoc)
#endif
// Copy/Cut/Deselect/Delete
- connect (m_document, TQT_SIGNAL (selectionEnabled (bool)),
- m_actionCut, TQT_SLOT (setEnabled (bool)));
- connect (m_document, TQT_SIGNAL (selectionEnabled (bool)),
- m_actionCopy, TQT_SLOT (setEnabled (bool)));
- connect (m_document, TQT_SIGNAL (selectionEnabled (bool)),
- m_actionDelete, TQT_SLOT (setEnabled (bool)));
- connect (m_document, TQT_SIGNAL (selectionEnabled (bool)),
- m_actionDeselect, TQT_SLOT (setEnabled (bool)));
- connect (m_document, TQT_SIGNAL (selectionEnabled (bool)),
- m_actionCopyToFile, TQT_SLOT (setEnabled (bool)));
+ connect (m_document, TQ_SIGNAL (selectionEnabled (bool)),
+ m_actionCut, TQ_SLOT (setEnabled (bool)));
+ connect (m_document, TQ_SIGNAL (selectionEnabled (bool)),
+ m_actionCopy, TQ_SLOT (setEnabled (bool)));
+ connect (m_document, TQ_SIGNAL (selectionEnabled (bool)),
+ m_actionDelete, TQ_SLOT (setEnabled (bool)));
+ connect (m_document, TQ_SIGNAL (selectionEnabled (bool)),
+ m_actionDeselect, TQ_SLOT (setEnabled (bool)));
+ connect (m_document, TQ_SIGNAL (selectionEnabled (bool)),
+ m_actionCopyToFile, TQ_SLOT (setEnabled (bool)));
// this code won't actually enable any actions at this stage
// (fresh document) but better safe than sorry
@@ -726,40 +726,40 @@ void kpMainWindow::setDocument (kpDocument *newDoc)
m_actionDelete->setEnabled (m_document->selection ());
m_actionCopyToFile->setEnabled (m_document->selection ());
- connect (m_document, TQT_SIGNAL (selectionEnabled (bool)),
- this, TQT_SLOT (slotImageMenuUpdateDueToSelection ()));
- connect (m_document, TQT_SIGNAL (selectionIsTextChanged (bool)),
- this, TQT_SLOT (slotImageMenuUpdateDueToSelection ()));
+ connect (m_document, TQ_SIGNAL (selectionEnabled (bool)),
+ this, TQ_SLOT (slotImageMenuUpdateDueToSelection ()));
+ connect (m_document, TQ_SIGNAL (selectionIsTextChanged (bool)),
+ this, TQ_SLOT (slotImageMenuUpdateDueToSelection ()));
// Status bar
- connect (m_document, TQT_SIGNAL (documentOpened ()),
- this, TQT_SLOT (recalculateStatusBar ()));
+ connect (m_document, TQ_SIGNAL (documentOpened ()),
+ this, TQ_SLOT (recalculateStatusBar ()));
- connect (m_document, TQT_SIGNAL (sizeChanged (const TQSize &)),
- this, TQT_SLOT (setStatusBarDocSize (const TQSize &)));
+ connect (m_document, TQ_SIGNAL (sizeChanged (const TQSize &)),
+ this, TQ_SLOT (setStatusBarDocSize (const TQSize &)));
// Caption (url, modified)
- connect (m_document, TQT_SIGNAL (documentModified ()),
- this, TQT_SLOT (slotUpdateCaption ()));
- connect (m_document, TQT_SIGNAL (documentOpened ()),
- this, TQT_SLOT (slotUpdateCaption ()));
- connect (m_document, TQT_SIGNAL (documentSaved ()),
- this, TQT_SLOT (slotUpdateCaption ()));
+ connect (m_document, TQ_SIGNAL (documentModified ()),
+ this, TQ_SLOT (slotUpdateCaption ()));
+ connect (m_document, TQ_SIGNAL (documentOpened ()),
+ this, TQ_SLOT (slotUpdateCaption ()));
+ connect (m_document, TQ_SIGNAL (documentSaved ()),
+ this, TQ_SLOT (slotUpdateCaption ()));
// File/Reload action only available with non-empty URL
- connect (m_document, TQT_SIGNAL (documentSaved ()),
- this, TQT_SLOT (slotEnableReload ()));
+ connect (m_document, TQ_SIGNAL (documentSaved ()),
+ this, TQ_SLOT (slotEnableReload ()));
- connect (m_document, TQT_SIGNAL (documentSaved ()),
- this, TQT_SLOT (slotEnableSettingsShowPath ()));
+ connect (m_document, TQ_SIGNAL (documentSaved ()),
+ this, TQ_SLOT (slotEnableSettingsShowPath ()));
// Command history
if (m_commandHistory)
{
- connect (m_commandHistory, TQT_SIGNAL (documentRestored ()),
- this, TQT_SLOT (slotDocumentRestored ())); // caption "!modified"
- connect (m_document, TQT_SIGNAL (documentSaved ()),
- m_commandHistory, TQT_SLOT (documentSaved ()));
+ connect (m_commandHistory, TQ_SIGNAL (documentRestored ()),
+ this, TQ_SLOT (slotDocumentRestored ())); // caption "!modified"
+ connect (m_document, TQ_SIGNAL (documentSaved ()),
+ m_commandHistory, TQ_SLOT (documentSaved ()));
}
else
{
@@ -768,10 +768,10 @@ void kpMainWindow::setDocument (kpDocument *newDoc)
}
// Sync document -> views
- connect (m_document, TQT_SIGNAL (contentsChanged (const TQRect &)),
- m_viewManager, TQT_SLOT (updateViews (const TQRect &)));
- connect (m_document, TQT_SIGNAL (sizeChanged (int, int)),
- m_viewManager, TQT_SLOT (adjustViewsToEnvironment ()));
+ connect (m_document, TQ_SIGNAL (contentsChanged (const TQRect &)),
+ m_viewManager, TQ_SLOT (updateViews (const TQRect &)));
+ connect (m_document, TQ_SIGNAL (sizeChanged (int, int)),
+ m_viewManager, TQ_SLOT (adjustViewsToEnvironment ()));
#if DEBUG_KP_MAIN_WINDOW
kdDebug () << "\tenabling actions" << endl;
@@ -814,7 +814,7 @@ void kpMainWindow::setDocument (kpDocument *newDoc)
#if DEBUG_KP_MAIN_WINDOW
kdDebug () << "\tcreating thumbnail LATER" << endl;
#endif
- TQTimer::singleShot (0, this, TQT_SLOT (slotCreateThumbnail ()));
+ TQTimer::singleShot (0, this, TQ_SLOT (slotCreateThumbnail ()));
}
}
#endif
@@ -1003,7 +1003,7 @@ void kpMainWindow::slotScrollViewAboutToScroll ()
}
#endif
- TQTimer::singleShot (0, this, TQT_SLOT (slotScrollViewAfterScroll ()));
+ TQTimer::singleShot (0, this, TQ_SLOT (slotScrollViewAfterScroll ()));
}
// private slot
diff --git a/kolourpaint/kpmainwindow_edit.cpp b/kolourpaint/kpmainwindow_edit.cpp
index dd62bcda..81312049 100644
--- a/kolourpaint/kpmainwindow_edit.cpp
+++ b/kolourpaint/kpmainwindow_edit.cpp
@@ -103,25 +103,25 @@ void kpMainWindow::setupEditMenuActions ()
}
- m_actionCut = KStdAction::cut (this, TQT_SLOT (slotCut ()), ac);
- m_actionCopy = KStdAction::copy (this, TQT_SLOT (slotCopy ()), ac);
- m_actionPaste = KStdAction::paste (this, TQT_SLOT (slotPaste ()), ac);
+ m_actionCut = KStdAction::cut (this, TQ_SLOT (slotCut ()), ac);
+ m_actionCopy = KStdAction::copy (this, TQ_SLOT (slotCopy ()), ac);
+ m_actionPaste = KStdAction::paste (this, TQ_SLOT (slotPaste ()), ac);
m_actionPasteInNewWindow = new TDEAction (i18n ("Paste in &New Window"),
TQt::CTRL + TQt::SHIFT + TQt::Key_V,
- this, TQT_SLOT (slotPasteInNewWindow ()), ac, "edit_paste_in_new_window");
+ this, TQ_SLOT (slotPasteInNewWindow ()), ac, "edit_paste_in_new_window");
- //m_actionDelete = KStdAction::clear (this, TQT_SLOT (slotDelete ()), ac);
+ //m_actionDelete = KStdAction::clear (this, TQ_SLOT (slotDelete ()), ac);
m_actionDelete = new TDEAction (i18n ("&Delete Selection"), 0,
- this, TQT_SLOT (slotDelete ()), ac, "edit_clear");
+ this, TQ_SLOT (slotDelete ()), ac, "edit_clear");
- m_actionSelectAll = KStdAction::selectAll (this, TQT_SLOT (slotSelectAll ()), ac);
- m_actionDeselect = KStdAction::deselect (this, TQT_SLOT (slotDeselect ()), ac);
+ m_actionSelectAll = KStdAction::selectAll (this, TQ_SLOT (slotSelectAll ()), ac);
+ m_actionDeselect = KStdAction::deselect (this, TQ_SLOT (slotDeselect ()), ac);
m_actionCopyToFile = new TDEAction (i18n ("C&opy to File..."), 0,
- this, TQT_SLOT (slotCopyToFile ()), ac, "edit_copy_to_file");
+ this, TQ_SLOT (slotCopyToFile ()), ac, "edit_copy_to_file");
m_actionPasteFromFile = new TDEAction (i18n ("Paste &From File..."), 0,
- this, TQT_SLOT (slotPasteFromFile ()), ac, "edit_paste_from_file");
+ this, TQ_SLOT (slotPasteFromFile ()), ac, "edit_paste_from_file");
m_editMenuDocumentActionsEnabled = false;
@@ -129,8 +129,8 @@ void kpMainWindow::setupEditMenuActions ()
// Paste should always be enabled, as long as there is something paste
// (independent of whether we have a document or not)
- connect (TQApplication::clipboard (), TQT_SIGNAL (dataChanged ()),
- this, TQT_SLOT (slotEnablePaste ()));
+ connect (TQApplication::clipboard (), TQ_SIGNAL (dataChanged ()),
+ this, TQ_SLOT (slotEnablePaste ()));
slotEnablePaste ();
}
diff --git a/kolourpaint/kpmainwindow_file.cpp b/kolourpaint/kpmainwindow_file.cpp
index 25834797..60fd99a7 100644
--- a/kolourpaint/kpmainwindow_file.cpp
+++ b/kolourpaint/kpmainwindow_file.cpp
@@ -67,41 +67,41 @@ void kpMainWindow::setupFileMenuActions ()
#endif
TDEActionCollection *ac = actionCollection ();
- m_actionNew = KStdAction::openNew (this, TQT_SLOT (slotNew ()), ac);
- m_actionOpen = KStdAction::open (this, TQT_SLOT (slotOpen ()), ac);
+ m_actionNew = KStdAction::openNew (this, TQ_SLOT (slotNew ()), ac);
+ m_actionOpen = KStdAction::open (this, TQ_SLOT (slotOpen ()), ac);
- m_actionOpenRecent = KStdAction::openRecent (this, TQT_SLOT (slotOpenRecent (const KURL &)), ac);
+ m_actionOpenRecent = KStdAction::openRecent (this, TQ_SLOT (slotOpenRecent (const KURL &)), ac);
m_actionOpenRecent->loadEntries (kapp->config ());
#if DEBUG_KP_MAIN_WINDOW
kdDebug () << "\trecent URLs=" << m_actionOpenRecent->items () << endl;
#endif
- m_actionSave = KStdAction::save (this, TQT_SLOT (slotSave ()), ac);
- m_actionSaveAs = KStdAction::saveAs (this, TQT_SLOT (slotSaveAs ()), ac);
+ m_actionSave = KStdAction::save (this, TQ_SLOT (slotSave ()), ac);
+ m_actionSaveAs = KStdAction::saveAs (this, TQ_SLOT (slotSaveAs ()), ac);
m_actionExport = new TDEAction (i18n ("E&xport..."), 0,
- this, TQT_SLOT (slotExport ()), ac, "file_export");
+ this, TQ_SLOT (slotExport ()), ac, "file_export");
m_actionScan = new TDEAction (i18n ("Scan..."), SmallIcon ("scanner"), 0,
- this, TQT_SLOT (slotScan ()), ac, "file_scan");
+ this, TQ_SLOT (slotScan ()), ac, "file_scan");
- //m_actionRevert = KStdAction::revert (this, TQT_SLOT (slotRevert ()), ac);
+ //m_actionRevert = KStdAction::revert (this, TQ_SLOT (slotRevert ()), ac);
m_actionReload = new TDEAction (i18n ("Reloa&d"), TDEStdAccel::reload (),
- this, TQT_SLOT (slotReload ()), ac, "file_revert");
+ this, TQ_SLOT (slotReload ()), ac, "file_revert");
slotEnableReload ();
- m_actionPrint = KStdAction::print (this, TQT_SLOT (slotPrint ()), ac);
- m_actionPrintPreview = KStdAction::printPreview (this, TQT_SLOT (slotPrintPreview ()), ac);
+ m_actionPrint = KStdAction::print (this, TQ_SLOT (slotPrint ()), ac);
+ m_actionPrintPreview = KStdAction::printPreview (this, TQ_SLOT (slotPrintPreview ()), ac);
- m_actionMail = KStdAction::mail (this, TQT_SLOT (slotMail ()), ac);
+ m_actionMail = KStdAction::mail (this, TQ_SLOT (slotMail ()), ac);
m_actionSetAsWallpaperCentered = new TDEAction (i18n ("Set as Wa&llpaper (Centered)"), 0,
- this, TQT_SLOT (slotSetAsWallpaperCentered ()), ac, "file_set_as_wallpaper_centered");
+ this, TQ_SLOT (slotSetAsWallpaperCentered ()), ac, "file_set_as_wallpaper_centered");
m_actionSetAsWallpaperTiled = new TDEAction (i18n ("Set as Wallpaper (&Tiled)"), 0,
- this, TQT_SLOT (slotSetAsWallpaperTiled ()), ac, "file_set_as_wallpaper_tiled");
+ this, TQ_SLOT (slotSetAsWallpaperTiled ()), ac, "file_set_as_wallpaper_tiled");
- m_actionClose = KStdAction::close (this, TQT_SLOT (slotClose ()), ac);
- m_actionQuit = KStdAction::quit (this, TQT_SLOT (slotQuit ()), ac);
+ m_actionClose = KStdAction::close (this, TQ_SLOT (slotClose ()), ac);
+ m_actionQuit = KStdAction::quit (this, TQ_SLOT (slotQuit ()), ac);
m_scanDialog = 0;
@@ -451,8 +451,8 @@ void kpMainWindow::slotScan ()
#if DEBUG_KP_MAIN_WINDOW
kdDebug () << "\tcreated scanDialog=" << m_scanDialog << endl;
#endif
- connect (m_scanDialog, TQT_SIGNAL (finalImage (const TQImage &, int)),
- TQT_SLOT (slotScanned (const TQImage &, int)));
+ connect (m_scanDialog, TQ_SIGNAL (finalImage (const TQImage &, int)),
+ TQ_SLOT (slotScanned (const TQImage &, int)));
}
@@ -704,8 +704,8 @@ KURL kpMainWindow::askForSaveURL (const TQString &caption,
if (localOnly)
fd.setMode (KFile::File | KFile::LocalOnly);
- connect (&fd, TQT_SIGNAL (filterChanged (const TQString &)),
- saveOptionsWidget, TQT_SLOT (setMimeType (const TQString &)));
+ connect (&fd, TQ_SIGNAL (filterChanged (const TQString &)),
+ saveOptionsWidget, TQ_SLOT (setMimeType (const TQString &)));
if (fd.exec ())
diff --git a/kolourpaint/kpmainwindow_help.cpp b/kolourpaint/kpmainwindow_help.cpp
index 7b4488fa..4a1709ab 100644
--- a/kolourpaint/kpmainwindow_help.cpp
+++ b/kolourpaint/kpmainwindow_help.cpp
@@ -57,7 +57,7 @@ void kpMainWindow::setupHelpMenuActions ()
// -- Thurston
d->m_actionHelpTakingScreenshots = new TDEAction (
i18n ("Acquiring &Screenshots"), 0,
- this, TQT_SLOT (slotHelpTakingScreenshots ()),
+ this, TQ_SLOT (slotHelpTakingScreenshots ()),
ac, "help_taking_screenshots");
@@ -185,10 +185,10 @@ void kpMainWindow::slotHelpTakingScreenshots ()
true/*separator line*/);
KActiveLabel *messageLabel = new KActiveLabel (message, &dlg);
- disconnect (messageLabel, TQT_SIGNAL (linkClicked (const TQString &)),
- messageLabel, TQT_SLOT (openLink (const TQString &)));
- connect (messageLabel, TQT_SIGNAL (linkClicked (const TQString &)),
- this, TQT_SLOT (slotHelpTakingScreenshotsFollowLink (const TQString &)));
+ disconnect (messageLabel, TQ_SIGNAL (linkClicked (const TQString &)),
+ messageLabel, TQ_SLOT (openLink (const TQString &)));
+ connect (messageLabel, TQ_SIGNAL (linkClicked (const TQString &)),
+ this, TQ_SLOT (slotHelpTakingScreenshotsFollowLink (const TQString &)));
dlg.setMainWidget (messageLabel);
diff --git a/kolourpaint/kpmainwindow_image.cpp b/kolourpaint/kpmainwindow_image.cpp
index 533b11f9..9a5fd060 100644
--- a/kolourpaint/kpmainwindow_image.cpp
+++ b/kolourpaint/kpmainwindow_image.cpp
@@ -90,37 +90,37 @@ void kpMainWindow::setupImageMenuActions ()
TDEActionCollection *ac = actionCollection ();
m_actionResizeScale = new TDEAction (i18n ("R&esize / Scale..."), TQt::CTRL + TQt::Key_E,
- this, TQT_SLOT (slotResizeScale ()), ac, "image_resize_scale");
+ this, TQ_SLOT (slotResizeScale ()), ac, "image_resize_scale");
m_actionCrop = new TDEAction (i18n ("Se&t as Image (Crop)"), TQt::CTRL + TQt::Key_T,
- this, TQT_SLOT (slotCrop ()), ac, "image_crop");
+ this, TQ_SLOT (slotCrop ()), ac, "image_crop");
m_actionAutoCrop = new TDEAction (autoCropText (), TQt::CTRL + TQt::Key_U,
- this, TQT_SLOT (slotAutoCrop ()), ac, "image_auto_crop");
+ this, TQ_SLOT (slotAutoCrop ()), ac, "image_auto_crop");
m_actionFlip = new TDEAction (i18n ("&Flip..."), TQt::CTRL + TQt::Key_F,
- this, TQT_SLOT (slotFlip ()), ac, "image_flip");
+ this, TQ_SLOT (slotFlip ()), ac, "image_flip");
m_actionRotate = new TDEAction (i18n ("&Rotate..."), TQt::CTRL + TQt::Key_R,
- this, TQT_SLOT (slotRotate ()), ac, "image_rotate");
+ this, TQ_SLOT (slotRotate ()), ac, "image_rotate");
m_actionSkew = new TDEAction (i18n ("S&kew..."), TQt::CTRL + TQt::Key_K,
- this, TQT_SLOT (slotSkew ()), ac, "image_skew");
+ this, TQ_SLOT (slotSkew ()), ac, "image_skew");
m_actionConvertToBlackAndWhite = new TDEAction (i18n ("Reduce to Mo&nochrome (Dithered)"), 0,
- this, TQT_SLOT (slotConvertToBlackAndWhite ()), ac, "image_convert_to_black_and_white");
+ this, TQ_SLOT (slotConvertToBlackAndWhite ()), ac, "image_convert_to_black_and_white");
m_actionConvertToGrayscale = new TDEAction (i18n ("Reduce to &Grayscale"), 0,
- this, TQT_SLOT (slotConvertToGrayscale ()), ac, "image_convert_to_grayscale");
+ this, TQ_SLOT (slotConvertToGrayscale ()), ac, "image_convert_to_grayscale");
m_actionInvertColors = new TDEAction (i18n ("&Invert Colors"), TQt::CTRL + TQt::Key_I,
- this, TQT_SLOT (slotInvertColors ()), ac, "image_invert_colors");
+ this, TQ_SLOT (slotInvertColors ()), ac, "image_invert_colors");
m_actionClear = new TDEAction (i18n ("C&lear"), TQt::CTRL + TQt::SHIFT + TQt::Key_N,
- this, TQT_SLOT (slotClear ()), ac, "image_clear");
+ this, TQ_SLOT (slotClear ()), ac, "image_clear");
m_actionMoreEffects = new TDEAction (i18n ("&More Effects..."), TQt::CTRL + TQt::Key_M,
- this, TQT_SLOT (slotMoreEffects ()), ac, "image_more_effects");
+ this, TQ_SLOT (slotMoreEffects ()), ac, "image_more_effects");
enableImageMenuDocumentActions (false);
}
diff --git a/kolourpaint/kpmainwindow_settings.cpp b/kolourpaint/kpmainwindow_settings.cpp
index 6dfff99b..c3fe3025 100644
--- a/kolourpaint/kpmainwindow_settings.cpp
+++ b/kolourpaint/kpmainwindow_settings.cpp
@@ -57,19 +57,19 @@ void kpMainWindow::setupSettingsMenuActions ()
createStandardStatusBarAction ();
- m_actionFullScreen = KStdAction::fullScreen (this, TQT_SLOT (slotFullScreen ()), ac,
+ m_actionFullScreen = KStdAction::fullScreen (this, TQ_SLOT (slotFullScreen ()), ac,
this/*window*/);
m_actionShowPath = new TDEToggleAction (i18n ("Show &Path"), 0,
- this, TQT_SLOT (slotShowPathToggled ()), ac, "settings_show_path");
+ this, TQ_SLOT (slotShowPathToggled ()), ac, "settings_show_path");
m_actionShowPath->setCheckedState (i18n ("Hide &Path"));
slotEnableSettingsShowPath ();
- m_actionKeyBindings = KStdAction::keyBindings (this, TQT_SLOT (slotKeyBindings ()), ac);
- m_actionConfigureToolbars = KStdAction::configureToolbars (this, TQT_SLOT (slotConfigureToolBars ()), ac);
- // m_actionConfigure = KStdAction::preferences (this, TQT_SLOT (slotConfigure ()), ac);
+ m_actionKeyBindings = KStdAction::keyBindings (this, TQ_SLOT (slotKeyBindings ()), ac);
+ m_actionConfigureToolbars = KStdAction::configureToolbars (this, TQ_SLOT (slotConfigureToolBars ()), ac);
+ // m_actionConfigure = KStdAction::preferences (this, TQ_SLOT (slotConfigure ()), ac);
enableSettingsMenuDocumentActions (false);
@@ -174,8 +174,8 @@ void kpMainWindow::slotConfigureToolBars ()
// Clicking on OK after Apply brings up the dialog (below) again.
// Bug with KEditToolBar.
dialog.showButtonApply (false);
- connect (&dialog, TQT_SIGNAL (newToolbarConfig ()),
- this, TQT_SLOT (slotNewToolBarConfig ()));
+ connect (&dialog, TQ_SIGNAL (newToolbarConfig ()),
+ this, TQ_SLOT (slotNewToolBarConfig ()));
dialog.exec ();
}
diff --git a/kolourpaint/kpmainwindow_text.cpp b/kolourpaint/kpmainwindow_text.cpp
index 11058217..55dff166 100644
--- a/kolourpaint/kpmainwindow_text.cpp
+++ b/kolourpaint/kpmainwindow_text.cpp
@@ -50,22 +50,22 @@ void kpMainWindow::setupTextToolBarActions ()
TDEActionCollection *ac = actionCollection ();
m_actionTextFontFamily = new TDEFontAction (i18n ("Font Family"), 0/*shortcut*/,
- this, TQT_SLOT (slotTextFontFamilyChanged ()), ac, "text_font_family");
+ this, TQ_SLOT (slotTextFontFamilyChanged ()), ac, "text_font_family");
m_actionTextFontSize = new TDEFontSizeAction (i18n ("Font Size"), 0/*shortcut*/,
- this, TQT_SLOT (slotTextFontSizeChanged ()), ac, "text_font_size");
+ this, TQ_SLOT (slotTextFontSizeChanged ()), ac, "text_font_size");
m_actionTextBold = new TDEToggleAction (i18n ("Bold"),
"format-text-bold"/*icon*/, 0/*shortcut*/,
- this, TQT_SLOT (slotTextBoldChanged ()), ac, "format-text-bold");
+ this, TQ_SLOT (slotTextBoldChanged ()), ac, "format-text-bold");
m_actionTextItalic = new TDEToggleAction (i18n ("Italic"),
"format-text-italic"/*icon*/, 0/*shortcut*/,
- this, TQT_SLOT (slotTextItalicChanged ()), ac, "format-text-italic");
+ this, TQ_SLOT (slotTextItalicChanged ()), ac, "format-text-italic");
m_actionTextUnderline = new TDEToggleAction (i18n ("Underline"),
"format-text-underline"/*icon*/, 0/*shortcut*/,
- this, TQT_SLOT (slotTextUnderlineChanged ()), ac, "text_underline");
+ this, TQ_SLOT (slotTextUnderlineChanged ()), ac, "text_underline");
m_actionTextStrikeThru = new TDEToggleAction (i18n ("Strike Through"),
"format-text-strikethrough"/*icon*/, 0/*shortcut*/,
- this, TQT_SLOT (slotTextStrikeThruChanged ()), ac, "text_strike_thru");
+ this, TQ_SLOT (slotTextStrikeThruChanged ()), ac, "text_strike_thru");
readAndApplyTextSettings ();
diff --git a/kolourpaint/kpmainwindow_tools.cpp b/kolourpaint/kpmainwindow_tools.cpp
index 26c6bc00..3e906899 100644
--- a/kolourpaint/kpmainwindow_tools.cpp
+++ b/kolourpaint/kpmainwindow_tools.cpp
@@ -103,23 +103,23 @@ void kpMainWindow::setupToolActions ()
m_actionPrevToolOptionGroup1 = new kpSingleKeyTriggersAction (
i18n ("Previous Tool Option (Group #1)"),
kpTool::shortcutForKey (TQt::Key_1),
- this, TQT_SLOT (slotActionPrevToolOptionGroup1 ()),
+ this, TQ_SLOT (slotActionPrevToolOptionGroup1 ()),
ac, "prev_tool_option_group_1");
m_actionNextToolOptionGroup1 = new kpSingleKeyTriggersAction (
i18n ("Next Tool Option (Group #1)"),
kpTool::shortcutForKey (TQt::Key_2),
- this, TQT_SLOT (slotActionNextToolOptionGroup1 ()),
+ this, TQ_SLOT (slotActionNextToolOptionGroup1 ()),
ac, "next_tool_option_group_1");
m_actionPrevToolOptionGroup2 = new kpSingleKeyTriggersAction (
i18n ("Previous Tool Option (Group #2)"),
kpTool::shortcutForKey (TQt::Key_3),
- this, TQT_SLOT (slotActionPrevToolOptionGroup2 ()),
+ this, TQ_SLOT (slotActionPrevToolOptionGroup2 ()),
ac, "prev_tool_option_group_2");
m_actionNextToolOptionGroup2 = new kpSingleKeyTriggersAction (
i18n ("Next Tool Option (Group #2)"),
kpTool::shortcutForKey (TQt::Key_4),
- this, TQT_SLOT (slotActionNextToolOptionGroup2 ()),
+ this, TQ_SLOT (slotActionNextToolOptionGroup2 ()),
ac, "next_tool_option_group_2");
}
@@ -127,10 +127,10 @@ void kpMainWindow::setupToolActions ()
void kpMainWindow::createToolBox ()
{
m_toolToolBar = new kpToolToolBar (i18n ("Tool Box"), this, 2/*columns/rows*/, "Tool Box");
- connect (m_toolToolBar, TQT_SIGNAL (sigToolSelected (kpTool *)),
- this, TQT_SLOT (slotToolSelected (kpTool *)));
- connect (m_toolToolBar, TQT_SIGNAL (toolWidgetOptionSelected ()),
- this, TQT_SLOT (updateToolOptionPrevNextActionsEnabled ()));
+ connect (m_toolToolBar, TQ_SIGNAL (sigToolSelected (kpTool *)),
+ this, TQ_SLOT (slotToolSelected (kpTool *)));
+ connect (m_toolToolBar, TQ_SIGNAL (toolWidgetOptionSelected ()),
+ this, TQ_SLOT (updateToolOptionPrevNextActionsEnabled ()));
for (TQPtrList <kpTool>::const_iterator it = m_tools.begin ();
it != m_tools.end ();
@@ -331,55 +331,55 @@ void kpMainWindow::slotToolSelected (kpTool *tool)
if (previousTool)
{
- disconnect (previousTool, TQT_SIGNAL (movedAndAboutToDraw (const TQPoint &, const TQPoint &, int, bool *)),
- this, TQT_SLOT (slotDragScroll (const TQPoint &, const TQPoint &, int, bool *)));
- disconnect (previousTool, TQT_SIGNAL (endedDraw (const TQPoint &)),
- this, TQT_SLOT (slotEndDragScroll ()));
- disconnect (previousTool, TQT_SIGNAL (cancelledShape (const TQPoint &)),
- this, TQT_SLOT (slotEndDragScroll ()));
-
- disconnect (previousTool, TQT_SIGNAL (userMessageChanged (const TQString &)),
- this, TQT_SLOT (recalculateStatusBarMessage ()));
- disconnect (previousTool, TQT_SIGNAL (userShapePointsChanged (const TQPoint &, const TQPoint &)),
- this, TQT_SLOT (recalculateStatusBarShape ()));
- disconnect (previousTool, TQT_SIGNAL (userShapeSizeChanged (const TQSize &)),
- this, TQT_SLOT (recalculateStatusBarShape ()));
-
- disconnect (m_colorToolBar, TQT_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)),
- previousTool, TQT_SLOT (slotColorsSwappedInternal (const kpColor &, const kpColor &)));
- disconnect (m_colorToolBar, TQT_SIGNAL (foregroundColorChanged (const kpColor &)),
- previousTool, TQT_SLOT (slotForegroundColorChangedInternal (const kpColor &)));
- disconnect (m_colorToolBar, TQT_SIGNAL (backgroundColorChanged (const kpColor &)),
- previousTool, TQT_SLOT (slotBackgroundColorChangedInternal (const kpColor &)));
- disconnect (m_colorToolBar, TQT_SIGNAL (colorSimilarityChanged (double, int)),
- previousTool, TQT_SLOT (slotColorSimilarityChangedInternal (double, int)));
+ disconnect (previousTool, TQ_SIGNAL (movedAndAboutToDraw (const TQPoint &, const TQPoint &, int, bool *)),
+ this, TQ_SLOT (slotDragScroll (const TQPoint &, const TQPoint &, int, bool *)));
+ disconnect (previousTool, TQ_SIGNAL (endedDraw (const TQPoint &)),
+ this, TQ_SLOT (slotEndDragScroll ()));
+ disconnect (previousTool, TQ_SIGNAL (cancelledShape (const TQPoint &)),
+ this, TQ_SLOT (slotEndDragScroll ()));
+
+ disconnect (previousTool, TQ_SIGNAL (userMessageChanged (const TQString &)),
+ this, TQ_SLOT (recalculateStatusBarMessage ()));
+ disconnect (previousTool, TQ_SIGNAL (userShapePointsChanged (const TQPoint &, const TQPoint &)),
+ this, TQ_SLOT (recalculateStatusBarShape ()));
+ disconnect (previousTool, TQ_SIGNAL (userShapeSizeChanged (const TQSize &)),
+ this, TQ_SLOT (recalculateStatusBarShape ()));
+
+ disconnect (m_colorToolBar, TQ_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)),
+ previousTool, TQ_SLOT (slotColorsSwappedInternal (const kpColor &, const kpColor &)));
+ disconnect (m_colorToolBar, TQ_SIGNAL (foregroundColorChanged (const kpColor &)),
+ previousTool, TQ_SLOT (slotForegroundColorChangedInternal (const kpColor &)));
+ disconnect (m_colorToolBar, TQ_SIGNAL (backgroundColorChanged (const kpColor &)),
+ previousTool, TQ_SLOT (slotBackgroundColorChangedInternal (const kpColor &)));
+ disconnect (m_colorToolBar, TQ_SIGNAL (colorSimilarityChanged (double, int)),
+ previousTool, TQ_SLOT (slotColorSimilarityChangedInternal (double, int)));
}
if (tool)
{
- connect (tool, TQT_SIGNAL (movedAndAboutToDraw (const TQPoint &, const TQPoint &, int, bool *)),
- this, TQT_SLOT (slotDragScroll (const TQPoint &, const TQPoint &, int, bool *)));
- connect (tool, TQT_SIGNAL (endedDraw (const TQPoint &)),
- this, TQT_SLOT (slotEndDragScroll ()));
- connect (tool, TQT_SIGNAL (cancelledShape (const TQPoint &)),
- this, TQT_SLOT (slotEndDragScroll ()));
-
- connect (tool, TQT_SIGNAL (userMessageChanged (const TQString &)),
- this, TQT_SLOT (recalculateStatusBarMessage ()));
- connect (tool, TQT_SIGNAL (userShapePointsChanged (const TQPoint &, const TQPoint &)),
- this, TQT_SLOT (recalculateStatusBarShape ()));
- connect (tool, TQT_SIGNAL (userShapeSizeChanged (const TQSize &)),
- this, TQT_SLOT (recalculateStatusBarShape ()));
+ connect (tool, TQ_SIGNAL (movedAndAboutToDraw (const TQPoint &, const TQPoint &, int, bool *)),
+ this, TQ_SLOT (slotDragScroll (const TQPoint &, const TQPoint &, int, bool *)));
+ connect (tool, TQ_SIGNAL (endedDraw (const TQPoint &)),
+ this, TQ_SLOT (slotEndDragScroll ()));
+ connect (tool, TQ_SIGNAL (cancelledShape (const TQPoint &)),
+ this, TQ_SLOT (slotEndDragScroll ()));
+
+ connect (tool, TQ_SIGNAL (userMessageChanged (const TQString &)),
+ this, TQ_SLOT (recalculateStatusBarMessage ()));
+ connect (tool, TQ_SIGNAL (userShapePointsChanged (const TQPoint &, const TQPoint &)),
+ this, TQ_SLOT (recalculateStatusBarShape ()));
+ connect (tool, TQ_SIGNAL (userShapeSizeChanged (const TQSize &)),
+ this, TQ_SLOT (recalculateStatusBarShape ()));
recalculateStatusBar ();
- connect (m_colorToolBar, TQT_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)),
- tool, TQT_SLOT (slotColorsSwappedInternal (const kpColor &, const kpColor &)));
- connect (m_colorToolBar, TQT_SIGNAL (foregroundColorChanged (const kpColor &)),
- tool, TQT_SLOT (slotForegroundColorChangedInternal (const kpColor &)));
- connect (m_colorToolBar, TQT_SIGNAL (backgroundColorChanged (const kpColor &)),
- tool, TQT_SLOT (slotBackgroundColorChangedInternal (const kpColor &)));
- connect (m_colorToolBar, TQT_SIGNAL (colorSimilarityChanged (double, int)),
- tool, TQT_SLOT (slotColorSimilarityChangedInternal (double, int)));
+ connect (m_colorToolBar, TQ_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)),
+ tool, TQ_SLOT (slotColorsSwappedInternal (const kpColor &, const kpColor &)));
+ connect (m_colorToolBar, TQ_SIGNAL (foregroundColorChanged (const kpColor &)),
+ tool, TQ_SLOT (slotForegroundColorChangedInternal (const kpColor &)));
+ connect (m_colorToolBar, TQ_SIGNAL (backgroundColorChanged (const kpColor &)),
+ tool, TQ_SLOT (slotBackgroundColorChangedInternal (const kpColor &)));
+ connect (m_colorToolBar, TQ_SIGNAL (colorSimilarityChanged (double, int)),
+ tool, TQ_SLOT (slotColorSimilarityChangedInternal (double, int)));
saveLastTool ();
diff --git a/kolourpaint/kpmainwindow_view.cpp b/kolourpaint/kpmainwindow_view.cpp
index 39d6cab3..e45888e9 100644
--- a/kolourpaint/kpmainwindow_view.cpp
+++ b/kolourpaint/kpmainwindow_view.cpp
@@ -67,18 +67,18 @@ void kpMainWindow::setupViewMenuActions ()
m_actionFullScreen->setEnabled (false);*/
- m_actionActualSize = KStdAction::actualSize (this, TQT_SLOT (slotActualSize ()), ac);
- /*m_actionFitToPage = KStdAction::fitToPage (this, TQT_SLOT (slotFitToPage ()), ac);
- m_actionFitToWidth = KStdAction::fitToWidth (this, TQT_SLOT (slotFitToWidth ()), ac);
- m_actionFitToHeight = KStdAction::fitToHeight (this, TQT_SLOT (slotFitToHeight ()), ac);*/
+ m_actionActualSize = KStdAction::actualSize (this, TQ_SLOT (slotActualSize ()), ac);
+ /*m_actionFitToPage = KStdAction::fitToPage (this, TQ_SLOT (slotFitToPage ()), ac);
+ m_actionFitToWidth = KStdAction::fitToWidth (this, TQ_SLOT (slotFitToWidth ()), ac);
+ m_actionFitToHeight = KStdAction::fitToHeight (this, TQ_SLOT (slotFitToHeight ()), ac);*/
- m_actionZoomIn = KStdAction::zoomIn (this, TQT_SLOT (slotZoomIn ()), ac);
- m_actionZoomOut = KStdAction::zoomOut (this, TQT_SLOT (slotZoomOut ()), ac);
+ m_actionZoomIn = KStdAction::zoomIn (this, TQ_SLOT (slotZoomIn ()), ac);
+ m_actionZoomOut = KStdAction::zoomOut (this, TQ_SLOT (slotZoomOut ()), ac);
m_actionZoom = new TDESelectAction (i18n ("&Zoom"), 0,
- this, TQT_SLOT (slotZoom ()), actionCollection (), "view_zoom_to");
+ this, TQ_SLOT (slotZoom ()), actionCollection (), "view_zoom_to");
m_actionZoom->setEditable (true);
// create the zoom list for the 1st call to zoomTo() below
@@ -91,7 +91,7 @@ void kpMainWindow::setupViewMenuActions ()
m_actionShowGrid = new TDEToggleAction (i18n ("Show &Grid"), CTRL + Key_G,
- this, TQT_SLOT (slotShowGridToggled ()), actionCollection (), "view_show_grid");
+ this, TQ_SLOT (slotShowGridToggled ()), actionCollection (), "view_show_grid");
m_actionShowGrid->setCheckedState (i18n ("Hide &Grid"));
@@ -99,12 +99,12 @@ void kpMainWindow::setupViewMenuActions ()
// Testcase: Press CTRL+H twice on a fresh KolourPaint.
// The second CTRL+H doesn't close the thumbnail.
m_actionShowThumbnail = new TDEToggleAction (i18n ("Show T&humbnail"), CTRL + Key_H,
- this, TQT_SLOT (slotShowThumbnailToggled ()), actionCollection (), "view_show_thumbnail");
+ this, TQ_SLOT (slotShowThumbnailToggled ()), actionCollection (), "view_show_thumbnail");
m_actionShowThumbnail->setCheckedState (i18n ("Hide T&humbnail"));
// Please do not use setCheckedState() here - it wouldn't make sense
m_actionZoomedThumbnail = new TDEToggleAction (i18n ("Zoo&med Thumbnail Mode"), 0,
- this, TQT_SLOT (slotZoomedThumbnailToggled ()), actionCollection (), "view_zoomed_thumbnail");
+ this, TQ_SLOT (slotZoomedThumbnailToggled ()), actionCollection (), "view_zoomed_thumbnail");
// For consistency with the above action, don't use setCheckedState()
//
@@ -114,7 +114,7 @@ void kpMainWindow::setupViewMenuActions ()
d->m_actionShowThumbnailRectangle = new TDEToggleAction (
i18n ("Enable Thumbnail &Rectangle"),
0,
- this, TQT_SLOT (slotThumbnailShowRectangleToggled ()),
+ this, TQ_SLOT (slotThumbnailShowRectangleToggled ()),
actionCollection (), "view_show_thumbnail_rectangle");
@@ -511,7 +511,7 @@ void kpMainWindow::zoomTo (int zoomLevel, bool centerUnderCursor)
// caused mainly by m_scrollView->center()
//
// TODO: remove flicker completely
- //TQTimer::singleShot (0, this, TQT_SLOT (finishZoomTo ()));
+ //TQTimer::singleShot (0, this, TQ_SLOT (finishZoomTo ()));
// Later: I don't think there is an update() that needs to be queued
// - let's reduce latency instead.
@@ -822,8 +822,8 @@ void kpMainWindow::notifyThumbnailGeometryChanged ()
if (!m_thumbnailSaveConfigTimer)
{
m_thumbnailSaveConfigTimer = new TQTimer (this);
- connect (m_thumbnailSaveConfigTimer, TQT_SIGNAL (timeout ()),
- this, TQT_SLOT (slotSaveThumbnailGeometry ()));
+ connect (m_thumbnailSaveConfigTimer, TQ_SIGNAL (timeout ()),
+ this, TQ_SLOT (slotSaveThumbnailGeometry ()));
}
m_thumbnailSaveConfigTimer->start (500/*msec*/, true/*single shot*/);
@@ -1121,8 +1121,8 @@ void kpMainWindow::updateThumbnail ()
#if DEBUG_KP_MAIN_WINDOW
kdDebug () << "\t\tconnecting thumbnail::visibilityChange to destroy slot" << endl;
#endif
- connect (m_thumbnail, TQT_SIGNAL (visibilityChanged (bool)),
- this, TQT_SLOT (slotDestroyThumbnailIfNotVisible (bool)));
+ connect (m_thumbnail, TQ_SIGNAL (visibilityChanged (bool)),
+ this, TQ_SLOT (slotDestroyThumbnailIfNotVisible (bool)));
#if DEBUG_KP_MAIN_WINDOW
kdDebug () << "\t\tDONE" << endl;
#endif
@@ -1143,8 +1143,8 @@ void kpMainWindow::updateThumbnail ()
destroyThumbnailView ();
- disconnect (m_thumbnail, TQT_SIGNAL (visibilityChanged (bool)),
- this, TQT_SLOT (slotDestroyThumbnailIfNotVisible (bool)));
+ disconnect (m_thumbnail, TQ_SIGNAL (visibilityChanged (bool)),
+ this, TQ_SLOT (slotDestroyThumbnailIfNotVisible (bool)));
m_thumbnail->deleteLater (); m_thumbnail = 0;
}
diff --git a/kolourpaint/kpthumbnail.cpp b/kolourpaint/kpthumbnail.cpp
index dbf6ff01..5aa2a4fa 100644
--- a/kolourpaint/kpthumbnail.cpp
+++ b/kolourpaint/kpthumbnail.cpp
@@ -109,10 +109,10 @@ void kpThumbnail::setView (kpThumbnailView *view)
if (m_view)
{
- disconnect (m_view, TQT_SIGNAL (destroyed ()),
- this, TQT_SLOT (slotViewDestroyed ()));
- disconnect (m_view, TQT_SIGNAL (zoomLevelChanged (int, int)),
- this, TQT_SLOT (updateCaption ()));
+ disconnect (m_view, TQ_SIGNAL (destroyed ()),
+ this, TQ_SLOT (slotViewDestroyed ()));
+ disconnect (m_view, TQ_SIGNAL (zoomLevelChanged (int, int)),
+ this, TQ_SLOT (updateCaption ()));
boxLayout ()->remove (m_view);
}
@@ -121,10 +121,10 @@ void kpThumbnail::setView (kpThumbnailView *view)
if (m_view)
{
- connect (m_view, TQT_SIGNAL (destroyed ()),
- this, TQT_SLOT (slotViewDestroyed ()));
- connect (m_view, TQT_SIGNAL (zoomLevelChanged (int, int)),
- this, TQT_SLOT (updateCaption ()));
+ connect (m_view, TQ_SIGNAL (destroyed ()),
+ this, TQ_SLOT (slotViewDestroyed ()));
+ connect (m_view, TQ_SIGNAL (zoomLevelChanged (int, int)),
+ this, TQ_SLOT (updateCaption ()));
updateCaption ();
boxLayout ()->addWidget (m_view);
diff --git a/kolourpaint/kptool.cpp b/kolourpaint/kptool.cpp
index ff6a3271..15f1c895 100644
--- a/kolourpaint/kptool.cpp
+++ b/kolourpaint/kptool.cpp
@@ -151,13 +151,13 @@ void kpTool::createAction ()
m_action = new kpToolAction (text (), iconName (), shortcutForKey (m_key),
- this, TQT_SLOT (slotActionActivated ()),
+ this, TQ_SLOT (slotActionActivated ()),
m_mainWindow->actionCollection (), name ());
m_action->setExclusiveGroup (TQString::fromLatin1 ("Tool Box Actions"));
m_action->setWhatsThis (description ());
- connect (m_action, TQT_SIGNAL (toolTipChanged (const TQString &)),
- this, TQT_SLOT (slotActionToolTipChanged (const TQString &)));
+ connect (m_action, TQ_SIGNAL (toolTipChanged (const TQString &)),
+ this, TQ_SLOT (slotActionToolTipChanged (const TQString &)));
}
diff --git a/kolourpaint/kpview.cpp b/kolourpaint/kpview.cpp
index da3097e1..8447b966 100644
--- a/kolourpaint/kpview.cpp
+++ b/kolourpaint/kpview.cpp
@@ -297,55 +297,55 @@ void kpView::showBuddyViewScrollableContainerRectangle (bool yes)
// Got these connect statements by analysing deps of
// updateBuddyViewScrollableContainerRectangle() rect update code.
- connect (this, TQT_SIGNAL (zoomLevelChanged (int, int)),
- this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ()));
- connect (this, TQT_SIGNAL (originChanged (const TQPoint &)),
- this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ()));
+ connect (this, TQ_SIGNAL (zoomLevelChanged (int, int)),
+ this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ()));
+ connect (this, TQ_SIGNAL (originChanged (const TQPoint &)),
+ this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ()));
if (buddyViewScrollableContainer ())
{
- connect (buddyViewScrollableContainer (), TQT_SIGNAL (contentsMovingSoon (int, int)),
- this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ()));
- connect (buddyViewScrollableContainer (), TQT_SIGNAL (resized ()),
- this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ()));
+ connect (buddyViewScrollableContainer (), TQ_SIGNAL (contentsMovingSoon (int, int)),
+ this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ()));
+ connect (buddyViewScrollableContainer (), TQ_SIGNAL (resized ()),
+ this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ()));
}
if (buddyView ())
{
- connect (buddyView (), TQT_SIGNAL (zoomLevelChanged (int, int)),
- this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ()));
- connect (buddyView (), TQT_SIGNAL (originChanged (const TQPoint &)),
- this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ()));
+ connect (buddyView (), TQ_SIGNAL (zoomLevelChanged (int, int)),
+ this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ()));
+ connect (buddyView (), TQ_SIGNAL (originChanged (const TQPoint &)),
+ this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ()));
- connect (buddyView (), TQT_SIGNAL (sizeChanged (int, int)),
- this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ()));
+ connect (buddyView (), TQ_SIGNAL (sizeChanged (int, int)),
+ this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ()));
}
}
else
{
- disconnect (this, TQT_SIGNAL (zoomLevelChanged (int, int)),
- this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ()));
- disconnect (this, TQT_SIGNAL (originChanged (const TQPoint &)),
- this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ()));
+ disconnect (this, TQ_SIGNAL (zoomLevelChanged (int, int)),
+ this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ()));
+ disconnect (this, TQ_SIGNAL (originChanged (const TQPoint &)),
+ this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ()));
if (buddyViewScrollableContainer ())
{
- disconnect (buddyViewScrollableContainer (), TQT_SIGNAL (contentsMovingSoon (int, int)),
- this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ()));
- disconnect (buddyViewScrollableContainer (), TQT_SIGNAL (resized ()),
- this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ()));
+ disconnect (buddyViewScrollableContainer (), TQ_SIGNAL (contentsMovingSoon (int, int)),
+ this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ()));
+ disconnect (buddyViewScrollableContainer (), TQ_SIGNAL (resized ()),
+ this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ()));
}
if (buddyView ())
{
- disconnect (buddyView (), TQT_SIGNAL (zoomLevelChanged (int, int)),
- this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ()));
- disconnect (buddyView (), TQT_SIGNAL (originChanged (const TQPoint &)),
- this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ()));
+ disconnect (buddyView (), TQ_SIGNAL (zoomLevelChanged (int, int)),
+ this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ()));
+ disconnect (buddyView (), TQ_SIGNAL (originChanged (const TQPoint &)),
+ this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ()));
- disconnect (buddyView (), TQT_SIGNAL (sizeChanged (int, int)),
- this, TQT_SLOT (updateBuddyViewScrollableContainerRectangle ()));
+ disconnect (buddyView (), TQ_SIGNAL (sizeChanged (int, int)),
+ this, TQ_SLOT (updateBuddyViewScrollableContainerRectangle ()));
}
}
diff --git a/kolourpaint/kpviewmanager.cpp b/kolourpaint/kpviewmanager.cpp
index 71b58a2c..8764b91b 100644
--- a/kolourpaint/kpviewmanager.cpp
+++ b/kolourpaint/kpviewmanager.cpp
@@ -229,8 +229,8 @@ void kpViewManager::setTextCursorEnabled (bool yes)
if (yes)
{
m_textCursorBlinkTimer = new TQTimer (this);
- connect (m_textCursorBlinkTimer, TQT_SIGNAL (timeout ()),
- this, TQT_SLOT (slotTextCursorBlink ()));
+ connect (m_textCursorBlinkTimer, TQ_SIGNAL (timeout ()),
+ this, TQ_SLOT (slotTextCursorBlink ()));
slotTextCursorBlink ();
}
// TODO: What if !yes - shouldn't it clear the cursor?
diff --git a/kolourpaint/kpviewscrollablecontainer.cpp b/kolourpaint/kpviewscrollablecontainer.cpp
index 65b0da89..47c842d9 100644
--- a/kolourpaint/kpviewscrollablecontainer.cpp
+++ b/kolourpaint/kpviewscrollablecontainer.cpp
@@ -424,11 +424,11 @@ kpViewScrollableContainer::kpViewScrollableContainer (kpMainWindow *parent,
connectGripSignals (m_bottomRightGrip);
- connect (this, TQT_SIGNAL (contentsMoving (int, int)),
- this, TQT_SLOT (slotContentsMoving (int, int)));
+ connect (this, TQ_SIGNAL (contentsMoving (int, int)),
+ this, TQ_SLOT (slotContentsMoving (int, int)));
- connect (m_dragScrollTimer, TQT_SIGNAL (timeout ()),
- this, TQT_SLOT (slotDragScroll ()));
+ connect (m_dragScrollTimer, TQ_SIGNAL (timeout ()),
+ this, TQ_SLOT (slotDragScroll ()));
}
kpViewScrollableContainer::~kpViewScrollableContainer ()
@@ -458,20 +458,20 @@ int kpViewScrollableContainer::contentsYSoon ()
// protected
void kpViewScrollableContainer::connectGripSignals (kpGrip *grip)
{
- connect (grip, TQT_SIGNAL (beganDraw ()),
- this, TQT_SLOT (slotGripBeganDraw ()));
- connect (grip, TQT_SIGNAL (continuedDraw (int, int, bool)),
- this, TQT_SLOT (slotGripContinuedDraw (int, int, bool)));
- connect (grip, TQT_SIGNAL (cancelledDraw ()),
- this, TQT_SLOT (slotGripCancelledDraw ()));
- connect (grip, TQT_SIGNAL (endedDraw (int, int)),
- this, TQT_SLOT (slotGripEndedDraw (int, int)));
+ connect (grip, TQ_SIGNAL (beganDraw ()),
+ this, TQ_SLOT (slotGripBeganDraw ()));
+ connect (grip, TQ_SIGNAL (continuedDraw (int, int, bool)),
+ this, TQ_SLOT (slotGripContinuedDraw (int, int, bool)));
+ connect (grip, TQ_SIGNAL (cancelledDraw ()),
+ this, TQ_SLOT (slotGripCancelledDraw ()));
+ connect (grip, TQ_SIGNAL (endedDraw (int, int)),
+ this, TQ_SLOT (slotGripEndedDraw (int, int)));
- connect (grip, TQT_SIGNAL (statusMessageChanged (const TQString &)),
- this, TQT_SLOT (slotGripStatusMessageChanged (const TQString &)));
+ connect (grip, TQ_SIGNAL (statusMessageChanged (const TQString &)),
+ this, TQ_SLOT (slotGripStatusMessageChanged (const TQString &)));
- connect (grip, TQT_SIGNAL (releasedAllButtons ()),
- this, TQT_SLOT (recalculateStatusMessage ()));
+ connect (grip, TQ_SIGNAL (releasedAllButtons ()),
+ this, TQ_SLOT (recalculateStatusMessage ()));
}
@@ -946,7 +946,7 @@ void kpViewScrollableContainer::slotContentsMoving (int x, int y)
// Reduce flicker - don't let TQScrollView scroll to-be-erased lines
eraseResizeLines ();
- TQTimer::singleShot (0, this, TQT_SLOT (slotContentsMoved ()));
+ TQTimer::singleShot (0, this, TQ_SLOT (slotContentsMoved ()));
}
// protected slot
@@ -972,19 +972,19 @@ void kpViewScrollableContainer::slotContentsMoved ()
// protected
void kpViewScrollableContainer::disconnectViewSignals ()
{
- disconnect (m_view, TQT_SIGNAL (sizeChanged (const TQSize &)),
- this, TQT_SLOT (updateGrips ()));
- disconnect (m_view, TQT_SIGNAL (destroyed ()),
- this, TQT_SLOT (slotViewDestroyed ()));
+ disconnect (m_view, TQ_SIGNAL (sizeChanged (const TQSize &)),
+ this, TQ_SLOT (updateGrips ()));
+ disconnect (m_view, TQ_SIGNAL (destroyed ()),
+ this, TQ_SLOT (slotViewDestroyed ()));
}
// protected
void kpViewScrollableContainer::connectViewSignals ()
{
- connect (m_view, TQT_SIGNAL (sizeChanged (const TQSize &)),
- this, TQT_SLOT (updateGrips ()));
- connect (m_view, TQT_SIGNAL (destroyed ()),
- this, TQT_SLOT (slotViewDestroyed ()));
+ connect (m_view, TQ_SIGNAL (sizeChanged (const TQSize &)),
+ this, TQ_SLOT (updateGrips ()));
+ connect (m_view, TQ_SIGNAL (destroyed ()),
+ this, TQ_SLOT (slotViewDestroyed ()));
}
diff --git a/kolourpaint/patches/doc_resize_no_flicker.diff b/kolourpaint/patches/doc_resize_no_flicker.diff
index 22565194..112b48d1 100644
--- a/kolourpaint/patches/doc_resize_no_flicker.diff
+++ b/kolourpaint/patches/doc_resize_no_flicker.diff
@@ -389,7 +389,7 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp
+ //m_resizeLinesNeedErase = false;
+
- QTimer::singleShot (0, this, SLOT (slotContentsMoved ()));
+ QTimer::singleShot (0, this, TQ_SLOT (slotContentsMoved ()));
}
@@ -874,9 +982,27 @@ void kpViewScrollableContainer::slotCont
<< " grip=" << grip << endl;
@@ -466,7 +466,7 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp
+ QScrollView::windowActivationChange (wasActive);
+
+ // Wait for m_view to update
-+ QTimer::singleShot (0, this, SLOT (windowActivationChanged ()));
++ QTimer::singleShot (0, this, TQ_SLOT (windowActivationChanged ()));
+}
+
+
diff --git a/kolourpaint/pixmapfx/kpeffectbalance.cpp b/kolourpaint/pixmapfx/kpeffectbalance.cpp
index a6b0a7ac..d9b503d6 100644
--- a/kolourpaint/pixmapfx/kpeffectbalance.cpp
+++ b/kolourpaint/pixmapfx/kpeffectbalance.cpp
@@ -327,28 +327,28 @@ kpEffectBalanceWidget::kpEffectBalanceWidget (bool actOnSelection,
// (no need for settingsChangedDelayed() since BCG effect is so fast :))
- connect (m_brightnessInput, TQT_SIGNAL (valueChanged (int)),
- this, TQT_SIGNAL (settingsChangedNoWaitCursor ()));
- connect (m_contrastInput, TQT_SIGNAL (valueChanged (int)),
- this, TQT_SIGNAL (settingsChangedNoWaitCursor ()));
-
- connect (m_gammaInput, TQT_SIGNAL (valueChanged (int)),
- this, TQT_SLOT (recalculateGammaLabel ()));
- connect (m_gammaInput, TQT_SIGNAL (valueChanged (int)),
- this, TQT_SIGNAL (settingsChangedNoWaitCursor ()));
-
- connect (m_channelsComboBox, TQT_SIGNAL (activated (int)),
- this, TQT_SIGNAL (settingsChanged ()));
-
- connect (brightnessResetPushButton, TQT_SIGNAL (clicked ()),
- this, TQT_SLOT (resetBrightness ()));
- connect (contrastResetPushButton, TQT_SIGNAL (clicked ()),
- this, TQT_SLOT (resetContrast ()));
- connect (gammaResetPushButton, TQT_SIGNAL (clicked ()),
- this, TQT_SLOT (resetGamma ()));
-
- connect (resetPushButton, TQT_SIGNAL (clicked ()),
- this, TQT_SLOT (resetAll ()));
+ connect (m_brightnessInput, TQ_SIGNAL (valueChanged (int)),
+ this, TQ_SIGNAL (settingsChangedNoWaitCursor ()));
+ connect (m_contrastInput, TQ_SIGNAL (valueChanged (int)),
+ this, TQ_SIGNAL (settingsChangedNoWaitCursor ()));
+
+ connect (m_gammaInput, TQ_SIGNAL (valueChanged (int)),
+ this, TQ_SLOT (recalculateGammaLabel ()));
+ connect (m_gammaInput, TQ_SIGNAL (valueChanged (int)),
+ this, TQ_SIGNAL (settingsChangedNoWaitCursor ()));
+
+ connect (m_channelsComboBox, TQ_SIGNAL (activated (int)),
+ this, TQ_SIGNAL (settingsChanged ()));
+
+ connect (brightnessResetPushButton, TQ_SIGNAL (clicked ()),
+ this, TQ_SLOT (resetBrightness ()));
+ connect (contrastResetPushButton, TQ_SIGNAL (clicked ()),
+ this, TQ_SLOT (resetContrast ()));
+ connect (gammaResetPushButton, TQ_SIGNAL (clicked ()),
+ this, TQ_SLOT (resetGamma ()));
+
+ connect (resetPushButton, TQ_SIGNAL (clicked ()),
+ this, TQ_SLOT (resetAll ()));
recalculateGammaLabel ();
diff --git a/kolourpaint/pixmapfx/kpeffectblursharpen.cpp b/kolourpaint/pixmapfx/kpeffectblursharpen.cpp
index 000b2114..f92ac99d 100644
--- a/kolourpaint/pixmapfx/kpeffectblursharpen.cpp
+++ b/kolourpaint/pixmapfx/kpeffectblursharpen.cpp
@@ -149,11 +149,11 @@ kpEffectBlurSharpenWidget::kpEffectBlurSharpenWidget (bool actOnSelection,
lay->setColStretch (1, 1);
- connect (m_amountInput, TQT_SIGNAL (valueChanged (int)),
- this, TQT_SIGNAL (settingsChangedDelayed ()));
+ connect (m_amountInput, TQ_SIGNAL (valueChanged (int)),
+ this, TQ_SIGNAL (settingsChangedDelayed ()));
- connect (m_amountInput, TQT_SIGNAL (valueChanged (int)),
- this, TQT_SLOT (slotUpdateTypeLabel ()));
+ connect (m_amountInput, TQ_SIGNAL (valueChanged (int)),
+ this, TQ_SLOT (slotUpdateTypeLabel ()));
}
kpEffectBlurSharpenWidget::~kpEffectBlurSharpenWidget ()
diff --git a/kolourpaint/pixmapfx/kpeffectemboss.cpp b/kolourpaint/pixmapfx/kpeffectemboss.cpp
index 87cb7d14..9ed8eb17 100644
--- a/kolourpaint/pixmapfx/kpeffectemboss.cpp
+++ b/kolourpaint/pixmapfx/kpeffectemboss.cpp
@@ -131,8 +131,8 @@ kpEffectEmbossWidget::kpEffectEmbossWidget (bool actOnSelection,
lay->setColStretch (1, 1);
- connect (m_amountInput, TQT_SIGNAL (valueChanged (int)),
- this, TQT_SIGNAL (settingsChanged ()));
+ connect (m_amountInput, TQ_SIGNAL (valueChanged (int)),
+ this, TQ_SIGNAL (settingsChanged ()));
#endif
m_enableCheckBox = new TQCheckBox (i18n ("E&nable"), this);
@@ -144,8 +144,8 @@ kpEffectEmbossWidget::kpEffectEmbossWidget (bool actOnSelection,
// (settingsChangedDelayed() instead of settingsChanged() so that the
// user can quickly press OK to apply effect to document directly and
// not have to wait for the also slow preview)
- connect (m_enableCheckBox, TQT_SIGNAL (toggled (bool)),
- this, TQT_SIGNAL (settingsChangedDelayed ()));
+ connect (m_enableCheckBox, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SIGNAL (settingsChangedDelayed ()));
}
kpEffectEmbossWidget::~kpEffectEmbossWidget ()
diff --git a/kolourpaint/pixmapfx/kpeffectflatten.cpp b/kolourpaint/pixmapfx/kpeffectflatten.cpp
index 51d74381..a6b482bb 100644
--- a/kolourpaint/pixmapfx/kpeffectflatten.cpp
+++ b/kolourpaint/pixmapfx/kpeffectflatten.cpp
@@ -168,13 +168,13 @@ kpEffectFlattenWidget::kpEffectFlattenWidget (bool actOnSelection,
lay->addWidget (colorButtonContainer);
- connect (m_enableCheckBox, TQT_SIGNAL (toggled (bool)),
- this, TQT_SLOT (slotEnableChanged (bool)));
+ connect (m_enableCheckBox, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SLOT (slotEnableChanged (bool)));
- connect (m_color1Button, TQT_SIGNAL (changed (const TQColor &)),
- this, TQT_SIGNAL (settingsChanged ()));
- connect (m_color2Button, TQT_SIGNAL (changed (const TQColor &)),
- this, TQT_SIGNAL (settingsChanged ()));
+ connect (m_color1Button, TQ_SIGNAL (changed (const TQColor &)),
+ this, TQ_SIGNAL (settingsChanged ()));
+ connect (m_color2Button, TQ_SIGNAL (changed (const TQColor &)),
+ this, TQ_SIGNAL (settingsChanged ()));
}
kpEffectFlattenWidget::~kpEffectFlattenWidget ()
diff --git a/kolourpaint/pixmapfx/kpeffectinvert.cpp b/kolourpaint/pixmapfx/kpeffectinvert.cpp
index d6229aca..20a55726 100644
--- a/kolourpaint/pixmapfx/kpeffectinvert.cpp
+++ b/kolourpaint/pixmapfx/kpeffectinvert.cpp
@@ -192,15 +192,15 @@ kpEffectInvertWidget::kpEffectInvertWidget (bool actOnSelection,
m_inSignalHandler = false;
- connect (m_redCheckBox, TQT_SIGNAL (toggled (bool)),
- this, TQT_SLOT (slotRGBCheckBoxToggled ()));
- connect (m_greenCheckBox, TQT_SIGNAL (toggled (bool)),
- this, TQT_SLOT (slotRGBCheckBoxToggled ()));
- connect (m_blueCheckBox, TQT_SIGNAL (toggled (bool)),
- this, TQT_SLOT (slotRGBCheckBoxToggled ()));
-
- connect (m_allCheckBox, TQT_SIGNAL (toggled (bool)),
- this, TQT_SLOT (slotAllCheckBoxToggled ()));
+ connect (m_redCheckBox, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SLOT (slotRGBCheckBoxToggled ()));
+ connect (m_greenCheckBox, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SLOT (slotRGBCheckBoxToggled ()));
+ connect (m_blueCheckBox, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SLOT (slotRGBCheckBoxToggled ()));
+
+ connect (m_allCheckBox, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SLOT (slotAllCheckBoxToggled ()));
}
kpEffectInvertWidget::~kpEffectInvertWidget ()
diff --git a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
index b6fbd6bb..528acf27 100644
--- a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
+++ b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
@@ -361,16 +361,16 @@ kpEffectReduceColorsWidget::kpEffectReduceColorsWidget (bool actOnSelection,
lay->addWidget (m_24BitRadioButton);
- connect (m_blackAndWhiteRadioButton, TQT_SIGNAL (toggled (bool)),
- this, TQT_SIGNAL (settingsChanged ()));
- connect (m_blackAndWhiteDitheredRadioButton, TQT_SIGNAL (toggled (bool)),
- this, TQT_SIGNAL (settingsChanged ()));
- connect (m_8BitRadioButton, TQT_SIGNAL (toggled (bool)),
- this, TQT_SIGNAL (settingsChanged ()));
- connect (m_8BitDitheredRadioButton, TQT_SIGNAL (toggled (bool)),
- this, TQT_SIGNAL (settingsChanged ()));
- connect (m_24BitRadioButton, TQT_SIGNAL (toggled (bool)),
- this, TQT_SIGNAL (settingsChanged ()));
+ connect (m_blackAndWhiteRadioButton, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SIGNAL (settingsChanged ()));
+ connect (m_blackAndWhiteDitheredRadioButton, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SIGNAL (settingsChanged ()));
+ connect (m_8BitRadioButton, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SIGNAL (settingsChanged ()));
+ connect (m_8BitDitheredRadioButton, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SIGNAL (settingsChanged ()));
+ connect (m_24BitRadioButton, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SIGNAL (settingsChanged ()));
}
kpEffectReduceColorsWidget::~kpEffectReduceColorsWidget ()
diff --git a/kolourpaint/pixmapfx/kpeffectsdialog.cpp b/kolourpaint/pixmapfx/kpeffectsdialog.cpp
index c23c028f..87ef6859 100644
--- a/kolourpaint/pixmapfx/kpeffectsdialog.cpp
+++ b/kolourpaint/pixmapfx/kpeffectsdialog.cpp
@@ -84,8 +84,8 @@ kpEffectsDialog::kpEffectsDialog (bool actOnSelection,
setCaption (i18n ("More Image Effects"));
- connect (m_delayedUpdateTimer, TQT_SIGNAL (timeout ()),
- this, TQT_SLOT (slotUpdateWithWaitCursor ()));
+ connect (m_delayedUpdateTimer, TQ_SIGNAL (timeout ()),
+ this, TQ_SLOT (slotUpdateWithWaitCursor ()));
TQHBox *effectContainer = new TQHBox (mainWidget ());
@@ -116,8 +116,8 @@ kpEffectsDialog::kpEffectsDialog (bool actOnSelection,
addCustomWidgetToBack (m_settingsGroupBox);
- connect (m_effectsComboBox, TQT_SIGNAL (activated (int)),
- this, TQT_SLOT (selectEffect (int)));
+ connect (m_effectsComboBox, TQ_SIGNAL (activated (int)),
+ this, TQ_SLOT (selectEffect (int)));
selectEffect (0);
@@ -308,12 +308,12 @@ void kpEffectsDialog::selectEffect (int which)
#endif
- connect (m_colorEffectWidget, TQT_SIGNAL (settingsChangedNoWaitCursor ()),
- this, TQT_SLOT (slotUpdate ()));
- connect (m_colorEffectWidget, TQT_SIGNAL (settingsChanged ()),
- this, TQT_SLOT (slotUpdateWithWaitCursor ()));
- connect (m_colorEffectWidget, TQT_SIGNAL (settingsChangedDelayed ()),
- this, TQT_SLOT (slotDelayedUpdate ()));
+ connect (m_colorEffectWidget, TQ_SIGNAL (settingsChangedNoWaitCursor ()),
+ this, TQ_SLOT (slotUpdate ()));
+ connect (m_colorEffectWidget, TQ_SIGNAL (settingsChanged ()),
+ this, TQ_SLOT (slotUpdateWithWaitCursor ()));
+ connect (m_colorEffectWidget, TQ_SIGNAL (settingsChangedDelayed ()),
+ this, TQ_SLOT (slotDelayedUpdate ()));
slotUpdateWithWaitCursor ();
#if DEBUG_KP_EFFECTS_DIALOG
kdDebug () << "\tafter slotUpdateWithWaitCursor, previewGroupBox.size="
diff --git a/kolourpaint/tools/kptoolairspray.cpp b/kolourpaint/tools/kptoolairspray.cpp
index dc2b4a23..5450a79e 100644
--- a/kolourpaint/tools/kptoolairspray.cpp
+++ b/kolourpaint/tools/kptoolairspray.cpp
@@ -65,7 +65,7 @@ kpToolAirSpray::kpToolAirSpray (kpMainWindow *mainWindow)
m_currentCommand (0)
{
m_timer = new TQTimer (this);
- connect (m_timer, TQT_SIGNAL (timeout ()), this, TQT_SLOT (actuallyDraw ()));
+ connect (m_timer, TQ_SIGNAL (timeout ()), this, TQ_SLOT (actuallyDraw ()));
}
kpToolAirSpray::~kpToolAirSpray ()
@@ -95,8 +95,8 @@ void kpToolAirSpray::begin ()
if (m_toolWidgetSpraycanSize)
{
m_size = m_toolWidgetSpraycanSize->spraycanSize ();
- connect (m_toolWidgetSpraycanSize, TQT_SIGNAL (spraycanSizeChanged (int)),
- this, TQT_SLOT (slotSpraycanSizeChanged (int)));
+ connect (m_toolWidgetSpraycanSize, TQ_SIGNAL (spraycanSizeChanged (int)),
+ this, TQ_SLOT (slotSpraycanSizeChanged (int)));
m_toolWidgetSpraycanSize->show ();
}
@@ -110,8 +110,8 @@ void kpToolAirSpray::end ()
{
if (m_toolWidgetSpraycanSize)
{
- disconnect (m_toolWidgetSpraycanSize, TQT_SIGNAL (spraycanSizeChanged (int)),
- this, TQT_SLOT (slotSpraycanSizeChanged (int)));
+ disconnect (m_toolWidgetSpraycanSize, TQ_SIGNAL (spraycanSizeChanged (int)),
+ this, TQ_SLOT (slotSpraycanSizeChanged (int)));
m_toolWidgetSpraycanSize = 0;
}
diff --git a/kolourpaint/tools/kptoolflip.cpp b/kolourpaint/tools/kptoolflip.cpp
index 49aed85f..c3d13f9b 100644
--- a/kolourpaint/tools/kptoolflip.cpp
+++ b/kolourpaint/tools/kptoolflip.cpp
@@ -171,10 +171,10 @@ kpToolFlipDialog::kpToolFlipDialog (bool actOnSelection, TQWidget *parent)
m_verticalFlipRadioButton->setChecked (s_lastIsVerticalFlip);
m_horizontalFlipRadioButton->setChecked (!s_lastIsVerticalFlip);
- connect (m_verticalFlipRadioButton, TQT_SIGNAL (toggled (bool)),
- this, TQT_SLOT (slotIsVerticalFlipChanged ()));
- connect (m_horizontalFlipRadioButton, TQT_SIGNAL (toggled (bool)),
- this, TQT_SLOT (slotIsVerticalFlipChanged ()));
+ connect (m_verticalFlipRadioButton, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SLOT (slotIsVerticalFlipChanged ()));
+ connect (m_horizontalFlipRadioButton, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SLOT (slotIsVerticalFlipChanged ()));
}
}
diff --git a/kolourpaint/tools/kptoolpen.cpp b/kolourpaint/tools/kptoolpen.cpp
index 387f4bb7..fe8ab3c5 100644
--- a/kolourpaint/tools/kptoolpen.cpp
+++ b/kolourpaint/tools/kptoolpen.cpp
@@ -133,8 +133,8 @@ void kpToolPen::begin ()
if (m_mode & SquareBrushes)
{
m_toolWidgetEraserSize = tb->toolWidgetEraserSize ();
- connect (m_toolWidgetEraserSize, TQT_SIGNAL (eraserSizeChanged (int)),
- this, TQT_SLOT (slotEraserSizeChanged (int)));
+ connect (m_toolWidgetEraserSize, TQ_SIGNAL (eraserSizeChanged (int)),
+ this, TQ_SLOT (slotEraserSizeChanged (int)));
m_toolWidgetEraserSize->show ();
slotEraserSizeChanged (m_toolWidgetEraserSize->eraserSize ());
@@ -145,8 +145,8 @@ void kpToolPen::begin ()
if (m_mode & DiverseBrushes)
{
m_toolWidgetBrush = tb->toolWidgetBrush ();
- connect (m_toolWidgetBrush, TQT_SIGNAL (brushChanged (const TQPixmap &, bool)),
- this, TQT_SLOT (slotBrushChanged (const TQPixmap &, bool)));
+ connect (m_toolWidgetBrush, TQ_SIGNAL (brushChanged (const TQPixmap &, bool)),
+ this, TQ_SLOT (slotBrushChanged (const TQPixmap &, bool)));
m_toolWidgetBrush->show ();
slotBrushChanged (m_toolWidgetBrush->brush (),
@@ -163,15 +163,15 @@ void kpToolPen::end ()
{
if (m_toolWidgetEraserSize)
{
- disconnect (m_toolWidgetEraserSize, TQT_SIGNAL (eraserSizeChanged (int)),
- this, TQT_SLOT (slotEraserSizeChanged (int)));
+ disconnect (m_toolWidgetEraserSize, TQ_SIGNAL (eraserSizeChanged (int)),
+ this, TQ_SLOT (slotEraserSizeChanged (int)));
m_toolWidgetEraserSize = 0;
}
if (m_toolWidgetBrush)
{
- disconnect (m_toolWidgetBrush, TQT_SIGNAL (brushChanged (const TQPixmap &, bool)),
- this, TQT_SLOT (slotBrushChanged (const TQPixmap &, bool)));
+ disconnect (m_toolWidgetBrush, TQ_SIGNAL (brushChanged (const TQPixmap &, bool)),
+ this, TQ_SLOT (slotBrushChanged (const TQPixmap &, bool)));
m_toolWidgetBrush = 0;
}
diff --git a/kolourpaint/tools/kptoolpolygon.cpp b/kolourpaint/tools/kptoolpolygon.cpp
index f71ff6f8..65f380c7 100644
--- a/kolourpaint/tools/kptoolpolygon.cpp
+++ b/kolourpaint/tools/kptoolpolygon.cpp
@@ -370,11 +370,11 @@ void kpToolPolygon::begin ()
if (m_toolWidgetFillStyle)
{
- connect (m_toolWidgetFillStyle, TQT_SIGNAL (fillStyleChanged (kpToolWidgetFillStyle::FillStyle)),
- this, TQT_SLOT (slotFillStyleChanged (kpToolWidgetFillStyle::FillStyle)));
+ connect (m_toolWidgetFillStyle, TQ_SIGNAL (fillStyleChanged (kpToolWidgetFillStyle::FillStyle)),
+ this, TQ_SLOT (slotFillStyleChanged (kpToolWidgetFillStyle::FillStyle)));
}
- connect (m_toolWidgetLineWidth, TQT_SIGNAL (lineWidthChanged (int)),
- this, TQT_SLOT (slotLineWidthChanged (int)));
+ connect (m_toolWidgetLineWidth, TQ_SIGNAL (lineWidthChanged (int)),
+ this, TQ_SLOT (slotLineWidthChanged (int)));
if (m_toolWidgetFillStyle)
m_toolWidgetFillStyle->show ();
@@ -404,15 +404,15 @@ void kpToolPolygon::end ()
if (m_toolWidgetFillStyle)
{
- disconnect (m_toolWidgetFillStyle, TQT_SIGNAL (fillStyleChanged (kpToolWidgetFillStyle::FillStyle)),
- this, TQT_SLOT (slotFillStyleChanged (kpToolWidgetFillStyle::FillStyle)));
+ disconnect (m_toolWidgetFillStyle, TQ_SIGNAL (fillStyleChanged (kpToolWidgetFillStyle::FillStyle)),
+ this, TQ_SLOT (slotFillStyleChanged (kpToolWidgetFillStyle::FillStyle)));
m_toolWidgetFillStyle = 0;
}
if (m_toolWidgetLineWidth)
{
- disconnect (m_toolWidgetLineWidth, TQT_SIGNAL (lineWidthChanged (int)),
- this, TQT_SLOT (slotLineWidthChanged (int)));
+ disconnect (m_toolWidgetLineWidth, TQ_SIGNAL (lineWidthChanged (int)),
+ this, TQ_SLOT (slotLineWidthChanged (int)));
m_toolWidgetLineWidth = 0;
}
diff --git a/kolourpaint/tools/kptoolpreviewdialog.cpp b/kolourpaint/tools/kptoolpreviewdialog.cpp
index 65afb587..d28ab542 100644
--- a/kolourpaint/tools/kptoolpreviewdialog.cpp
+++ b/kolourpaint/tools/kptoolpreviewdialog.cpp
@@ -162,13 +162,13 @@ void kpToolPreviewDialog::createPreviewGroupBox ()
m_previewPixmapLabel = new kpResizeSignallingLabel (m_previewGroupBox);
m_previewPixmapLabel->setMinimumSize (150, 110);
- connect (m_previewPixmapLabel, TQT_SIGNAL (resized ()),
- this, TQT_SLOT (updatePreview ()));
+ connect (m_previewPixmapLabel, TQ_SIGNAL (resized ()),
+ this, TQ_SLOT (updatePreview ()));
TQPushButton *updatePushButton = new TQPushButton (i18n ("&Update"),
m_previewGroupBox);
- connect (updatePushButton, TQT_SIGNAL (clicked ()),
- this, TQT_SLOT (slotUpdateWithWaitCursor ()));
+ connect (updatePushButton, TQ_SIGNAL (clicked ()),
+ this, TQ_SLOT (slotUpdateWithWaitCursor ()));
TQVBoxLayout *previewLayout = new TQVBoxLayout (m_previewGroupBox,
diff --git a/kolourpaint/tools/kptoolrectangle.cpp b/kolourpaint/tools/kptoolrectangle.cpp
index 90a7352d..efc9cd16 100644
--- a/kolourpaint/tools/kptoolrectangle.cpp
+++ b/kolourpaint/tools/kptoolrectangle.cpp
@@ -323,16 +323,16 @@ void kpToolRectangle::begin ()
if (tb)
{
m_toolWidgetLineWidth = tb->toolWidgetLineWidth ();
- connect (m_toolWidgetLineWidth, TQT_SIGNAL (lineWidthChanged (int)),
- this, TQT_SLOT (slotLineWidthChanged ()));
+ connect (m_toolWidgetLineWidth, TQ_SIGNAL (lineWidthChanged (int)),
+ this, TQ_SLOT (slotLineWidthChanged ()));
m_toolWidgetLineWidth->show ();
updatePens ();
m_toolWidgetFillStyle = tb->toolWidgetFillStyle ();
- connect (m_toolWidgetFillStyle, TQT_SIGNAL (fillStyleChanged (kpToolWidgetFillStyle::FillStyle)),
- this, TQT_SLOT (slotFillStyleChanged ()));
+ connect (m_toolWidgetFillStyle, TQ_SIGNAL (fillStyleChanged (kpToolWidgetFillStyle::FillStyle)),
+ this, TQ_SLOT (slotFillStyleChanged ()));
m_toolWidgetFillStyle->show ();
updateBrushes ();
@@ -356,15 +356,15 @@ void kpToolRectangle::end ()
if (m_toolWidgetLineWidth)
{
- disconnect (m_toolWidgetLineWidth, TQT_SIGNAL (lineWidthChanged (int)),
- this, TQT_SLOT (slotLineWidthChanged ()));
+ disconnect (m_toolWidgetLineWidth, TQ_SIGNAL (lineWidthChanged (int)),
+ this, TQ_SLOT (slotLineWidthChanged ()));
m_toolWidgetLineWidth = 0;
}
if (m_toolWidgetFillStyle)
{
- disconnect (m_toolWidgetFillStyle, TQT_SIGNAL (fillStyleChanged (kpToolWidgetFillStyle::FillStyle)),
- this, TQT_SLOT (slotFillStyleChanged ()));
+ disconnect (m_toolWidgetFillStyle, TQ_SIGNAL (fillStyleChanged (kpToolWidgetFillStyle::FillStyle)),
+ this, TQ_SLOT (slotFillStyleChanged ()));
m_toolWidgetFillStyle = 0;
}
diff --git a/kolourpaint/tools/kptoolresizescale.cpp b/kolourpaint/tools/kptoolresizescale.cpp
index 73e6303c..dc9d88ff 100644
--- a/kolourpaint/tools/kptoolresizescale.cpp
+++ b/kolourpaint/tools/kptoolresizescale.cpp
@@ -591,8 +591,8 @@ void kpToolResizeScaleDialog::createActOnBox (TQWidget *baseWidget)
m_actOnBox->setStretchFactor (m_actOnCombo, 1);
- connect (m_actOnCombo, TQT_SIGNAL (activated (int)),
- this, TQT_SLOT (slotActOnChanged ()));
+ connect (m_actOnCombo, TQ_SIGNAL (activated (int)),
+ this, TQ_SLOT (slotActOnChanged ()));
}
@@ -713,12 +713,12 @@ void kpToolResizeScaleDialog::createOperationGroupBox (TQWidget *baseWidget)
//operationLayout->addWidget (m_smoothScaleLabel, 1, 2, TQt::AlignCenter);
- connect (m_resizeButton, TQT_SIGNAL (toggled (bool)),
- this, TQT_SLOT (slotTypeChanged ()));
- connect (m_scaleButton, TQT_SIGNAL (toggled (bool)),
- this, TQT_SLOT (slotTypeChanged ()));
- connect (m_smoothScaleButton, TQT_SIGNAL (toggled (bool)),
- this, TQT_SLOT (slotTypeChanged ()));
+ connect (m_resizeButton, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SLOT (slotTypeChanged ()));
+ connect (m_scaleButton, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SLOT (slotTypeChanged ()));
+ connect (m_smoothScaleButton, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SLOT (slotTypeChanged ()));
}
// private
@@ -800,18 +800,18 @@ void kpToolResizeScaleDialog::createDimensionsGroupBox (TQWidget *baseWidget)
dimensionsLayout->setRowSpacing (4/*row*/, dimensionsLayout->rowSpacing (4) * 2);
- connect (m_newWidthInput, TQT_SIGNAL (valueChanged (int)),
- this, TQT_SLOT (slotWidthChanged (int)));
- connect (m_newHeightInput, TQT_SIGNAL (valueChanged (int)),
- this, TQT_SLOT (slotHeightChanged (int)));
+ connect (m_newWidthInput, TQ_SIGNAL (valueChanged (int)),
+ this, TQ_SLOT (slotWidthChanged (int)));
+ connect (m_newHeightInput, TQ_SIGNAL (valueChanged (int)),
+ this, TQ_SLOT (slotHeightChanged (int)));
- connect (m_percentWidthInput, TQT_SIGNAL (valueChanged (double)),
- this, TQT_SLOT (slotPercentWidthChanged (double)));
- connect (m_percentHeightInput, TQT_SIGNAL (valueChanged (double)),
- this, TQT_SLOT (slotPercentHeightChanged (double)));
+ connect (m_percentWidthInput, TQ_SIGNAL (valueChanged (double)),
+ this, TQ_SLOT (slotPercentWidthChanged (double)));
+ connect (m_percentHeightInput, TQ_SIGNAL (valueChanged (double)),
+ this, TQ_SLOT (slotPercentHeightChanged (double)));
- connect (m_keepAspectRatioCheckBox, TQT_SIGNAL (toggled (bool)),
- this, TQT_SLOT (setKeepAspectRatio (bool)));
+ connect (m_keepAspectRatioCheckBox, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SLOT (setKeepAspectRatio (bool)));
}
diff --git a/kolourpaint/tools/kptoolrotate.cpp b/kolourpaint/tools/kptoolrotate.cpp
index 28e05d3e..c70836a5 100644
--- a/kolourpaint/tools/kptoolrotate.cpp
+++ b/kolourpaint/tools/kptoolrotate.cpp
@@ -300,10 +300,10 @@ void kpToolRotateDialog::createDirectionGroupBox ()
directionLayout->addWidget (m_clockwiseRadioButton, 1, 1, TQt::AlignCenter);
- connect (m_antiClockwiseRadioButton, TQT_SIGNAL (toggled (bool)),
- this, TQT_SLOT (slotUpdate ()));
- connect (m_clockwiseRadioButton, TQT_SIGNAL (toggled (bool)),
- this, TQT_SLOT (slotUpdate ()));
+ connect (m_antiClockwiseRadioButton, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SLOT (slotUpdate ()));
+ connect (m_clockwiseRadioButton, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SLOT (slotUpdate ()));
}
// private
@@ -351,20 +351,20 @@ void kpToolRotateDialog::createAngleGroupBox ()
angleLayout->setColStretch (1, 2); // Stretch Custom Angle Input
- connect (m_angle90RadioButton, TQT_SIGNAL (toggled (bool)),
- this, TQT_SLOT (slotUpdate ()));
- connect (m_angle180RadioButton, TQT_SIGNAL (toggled (bool)),
- this, TQT_SLOT (slotUpdate ()));
- connect (m_angle270RadioButton, TQT_SIGNAL (toggled (bool)),
- this, TQT_SLOT (slotUpdate ()));
+ connect (m_angle90RadioButton, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SLOT (slotUpdate ()));
+ connect (m_angle180RadioButton, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SLOT (slotUpdate ()));
+ connect (m_angle270RadioButton, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SLOT (slotUpdate ()));
- connect (m_angleCustomRadioButton, TQT_SIGNAL (toggled (bool)),
- this, TQT_SLOT (slotAngleCustomRadioButtonToggled (bool)));
- connect (m_angleCustomRadioButton, TQT_SIGNAL (toggled (bool)),
- this, TQT_SLOT (slotUpdate ()));
+ connect (m_angleCustomRadioButton, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SLOT (slotAngleCustomRadioButtonToggled (bool)));
+ connect (m_angleCustomRadioButton, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SLOT (slotUpdate ()));
- connect (m_angleCustomInput, TQT_SIGNAL (valueChanged (int)),
- this, TQT_SLOT (slotUpdate ()));
+ connect (m_angleCustomInput, TQ_SIGNAL (valueChanged (int)),
+ this, TQ_SLOT (slotUpdate ()));
}
diff --git a/kolourpaint/tools/kptoolselection.cpp b/kolourpaint/tools/kptoolselection.cpp
index 8fbdee55..c6ee4bba 100644
--- a/kolourpaint/tools/kptoolselection.cpp
+++ b/kolourpaint/tools/kptoolselection.cpp
@@ -68,10 +68,10 @@ kpToolSelection::kpToolSelection (Mode mode,
m_createNOPTimer (new TQTimer (this)),
m_RMBMoveUpdateGUITimer (new TQTimer (this))
{
- connect (m_createNOPTimer, TQT_SIGNAL (timeout ()),
- this, TQT_SLOT (delayedDraw ()));
- connect (m_RMBMoveUpdateGUITimer, TQT_SIGNAL (timeout ()),
- this, TQT_SLOT (slotRMBMoveUpdateGUI ()));
+ connect (m_createNOPTimer, TQ_SIGNAL (timeout ()),
+ this, TQ_SLOT (delayedDraw ()));
+ connect (m_RMBMoveUpdateGUITimer, TQ_SIGNAL (timeout ()),
+ this, TQ_SLOT (slotRMBMoveUpdateGUI ()));
}
kpToolSelection::~kpToolSelection ()
@@ -180,8 +180,8 @@ void kpToolSelection::begin ()
if (m_toolWidgetOpaqueOrTransparent)
{
- connect (m_toolWidgetOpaqueOrTransparent, TQT_SIGNAL (isOpaqueChanged (bool)),
- this, TQT_SLOT (slotIsOpaqueChanged ()));
+ connect (m_toolWidgetOpaqueOrTransparent, TQ_SIGNAL (isOpaqueChanged (bool)),
+ this, TQ_SLOT (slotIsOpaqueChanged ()));
m_toolWidgetOpaqueOrTransparent->show ();
}
}
@@ -225,8 +225,8 @@ void kpToolSelection::end ()
if (m_toolWidgetOpaqueOrTransparent)
{
- disconnect (m_toolWidgetOpaqueOrTransparent, TQT_SIGNAL (isOpaqueChanged (bool)),
- this, TQT_SLOT (slotIsOpaqueChanged ()));
+ disconnect (m_toolWidgetOpaqueOrTransparent, TQ_SIGNAL (isOpaqueChanged (bool)),
+ this, TQ_SLOT (slotIsOpaqueChanged ()));
m_toolWidgetOpaqueOrTransparent = 0;
}
@@ -2037,8 +2037,8 @@ kpToolSelectionResizeScaleCommand::kpToolSelectionResizeScaleCommand (
m_newWidth = selection ()->width ();
m_newHeight = selection ()->height ();
- connect (m_smoothScaleTimer, TQT_SIGNAL (timeout ()),
- this, TQT_SLOT (resizeScaleAndMove ()));
+ connect (m_smoothScaleTimer, TQ_SIGNAL (timeout ()),
+ this, TQ_SLOT (resizeScaleAndMove ()));
}
kpToolSelectionResizeScaleCommand::~kpToolSelectionResizeScaleCommand ()
diff --git a/kolourpaint/tools/kptoolskew.cpp b/kolourpaint/tools/kptoolskew.cpp
index 230db783..5cdeeb9e 100644
--- a/kolourpaint/tools/kptoolskew.cpp
+++ b/kolourpaint/tools/kptoolskew.cpp
@@ -296,10 +296,10 @@ void kpToolSkewDialog::createAngleGroupBox ()
angleLayout->addWidget (verticalSkewDegreesLabel, 1, 3);
- connect (m_horizontalSkewInput, TQT_SIGNAL (valueChanged (int)),
- this, TQT_SLOT (slotUpdate ()));
- connect (m_verticalSkewInput, TQT_SIGNAL (valueChanged (int)),
- this, TQT_SLOT (slotUpdate ()));
+ connect (m_horizontalSkewInput, TQ_SIGNAL (valueChanged (int)),
+ this, TQ_SLOT (slotUpdate ()));
+ connect (m_verticalSkewInput, TQ_SIGNAL (valueChanged (int)),
+ this, TQ_SLOT (slotUpdate ()));
}
diff --git a/kolourpaint/views/kpunzoomedthumbnailview.cpp b/kolourpaint/views/kpunzoomedthumbnailview.cpp
index 59b91f85..139366eb 100644
--- a/kolourpaint/views/kpunzoomedthumbnailview.cpp
+++ b/kolourpaint/views/kpunzoomedthumbnailview.cpp
@@ -61,9 +61,9 @@ kpUnzoomedThumbnailView::kpUnzoomedThumbnailView (
if (buddyViewScrollableContainer ())
{
connect (buddyViewScrollableContainer (),
- TQT_SIGNAL (contentsMovingSoon (int, int)),
+ TQ_SIGNAL (contentsMovingSoon (int, int)),
this,
- TQT_SLOT (adjustToEnvironment ()));
+ TQ_SLOT (adjustToEnvironment ()));
}
// Call to virtual function - this is why the class is sealed
diff --git a/kolourpaint/widgets/kpcolorsimilaritydialog.cpp b/kolourpaint/widgets/kpcolorsimilaritydialog.cpp
index f55f9d14..a2783f2d 100644
--- a/kolourpaint/widgets/kpcolorsimilaritydialog.cpp
+++ b/kolourpaint/widgets/kpcolorsimilaritydialog.cpp
@@ -69,8 +69,8 @@ kpColorSimilarityDialog::kpColorSimilarityDialog (kpMainWindow *mainWindow,
cubeLayout->addWidget (updatePushButton, 0/*stretch*/, TQt::AlignHCenter);
- connect (updatePushButton, TQT_SIGNAL (clicked ()),
- this, TQT_SLOT (slotColorSimilarityValueChanged ()));
+ connect (updatePushButton, TQ_SIGNAL (clicked ()),
+ this, TQ_SLOT (slotColorSimilarityValueChanged ()));
TQGroupBox *inputGroupBox = new TQGroupBox (i18n ("RGB Color Cube Distance"), baseWidget);
@@ -86,8 +86,8 @@ kpColorSimilarityDialog::kpColorSimilarityDialog (kpMainWindow *mainWindow,
inputLayout->addWidget (m_colorSimilarityInput);
- connect (m_colorSimilarityInput, TQT_SIGNAL (valueChanged (int)),
- this, TQT_SLOT (slotColorSimilarityValueChanged ()));
+ connect (m_colorSimilarityInput, TQ_SIGNAL (valueChanged (int)),
+ this, TQ_SLOT (slotColorSimilarityValueChanged ()));
TQVBoxLayout *baseLayout = new TQVBoxLayout (baseWidget, 0/*margin*/, spacingHint () * 2);
diff --git a/kolourpaint/widgets/kpcolortoolbar.cpp b/kolourpaint/widgets/kpcolortoolbar.cpp
index b60f70ed..67e1e7e8 100644
--- a/kolourpaint/widgets/kpcolortoolbar.cpp
+++ b/kolourpaint/widgets/kpcolortoolbar.cpp
@@ -476,8 +476,8 @@ kpColorCells::kpColorCells (TQWidget *parent,
setAcceptDrops (true);
setAcceptDrags (true);
- connect (this, TQT_SIGNAL (colorDoubleClicked (int)),
- TQT_SLOT (slotColorDoubleClicked (int)));
+ connect (this, TQ_SIGNAL (colorDoubleClicked (int)),
+ TQ_SLOT (slotColorDoubleClicked (int)));
if (!ownColorsInitialised)
{
@@ -674,9 +674,9 @@ void kpColorCells::mouseReleaseEvent (TQMouseEvent *e)
m_mouseButton = 1;
}
- connect (this, TQT_SIGNAL (colorSelected (int)), this, TQT_SLOT (slotColorSelected (int)));
+ connect (this, TQ_SIGNAL (colorSelected (int)), this, TQ_SLOT (slotColorSelected (int)));
KColorCells::mouseReleaseEvent (e);
- disconnect (this, TQT_SIGNAL (colorSelected (int)), this, TQT_SLOT (slotColorSelected (int)));
+ disconnect (this, TQ_SIGNAL (colorSelected (int)), this, TQ_SLOT (slotColorSelected (int)));
#if DEBUG_KP_COLOR_TOOL_BAR
kdDebug () << "kpColorCells::mouseReleaseEvent() setting m_mouseButton back to -1" << endl;
@@ -830,16 +830,16 @@ kpColorPalette::kpColorPalette (TQWidget *parent,
m_transparentColorCell = new kpTransparentColorCell (this);
m_transparentColorCell->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
- connect (m_transparentColorCell, TQT_SIGNAL (foregroundColorChanged (const kpColor &)),
- this, TQT_SIGNAL (foregroundColorChanged (const kpColor &)));
- connect (m_transparentColorCell, TQT_SIGNAL (backgroundColorChanged (const kpColor &)),
- this, TQT_SIGNAL (backgroundColorChanged (const kpColor &)));
+ connect (m_transparentColorCell, TQ_SIGNAL (foregroundColorChanged (const kpColor &)),
+ this, TQ_SIGNAL (foregroundColorChanged (const kpColor &)));
+ connect (m_transparentColorCell, TQ_SIGNAL (backgroundColorChanged (const kpColor &)),
+ this, TQ_SIGNAL (backgroundColorChanged (const kpColor &)));
m_colorCells = new kpColorCells (this);
- connect (m_colorCells, TQT_SIGNAL (foregroundColorChanged (const kpColor &)),
- this, TQT_SIGNAL (foregroundColorChanged (const kpColor &)));
- connect (m_colorCells, TQT_SIGNAL (backgroundColorChanged (const kpColor &)),
- this, TQT_SIGNAL (backgroundColorChanged (const kpColor &)));
+ connect (m_colorCells, TQ_SIGNAL (foregroundColorChanged (const kpColor &)),
+ this, TQ_SIGNAL (foregroundColorChanged (const kpColor &)));
+ connect (m_colorCells, TQ_SIGNAL (backgroundColorChanged (const kpColor &)),
+ this, TQ_SIGNAL (backgroundColorChanged (const kpColor &)));
setOrientation (o);
}
@@ -965,25 +965,25 @@ kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow,
m_dualColorButton = new kpDualColorButton (mainWindow, base);
m_dualColorButton->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
- connect (m_dualColorButton, TQT_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)),
- this, TQT_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)));
- connect (m_dualColorButton, TQT_SIGNAL (foregroundColorChanged (const kpColor &)),
- this, TQT_SIGNAL (foregroundColorChanged (const kpColor &)));
- connect (m_dualColorButton, TQT_SIGNAL (backgroundColorChanged (const kpColor &)),
- this, TQT_SIGNAL (backgroundColorChanged (const kpColor &)));
+ connect (m_dualColorButton, TQ_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)),
+ this, TQ_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)));
+ connect (m_dualColorButton, TQ_SIGNAL (foregroundColorChanged (const kpColor &)),
+ this, TQ_SIGNAL (foregroundColorChanged (const kpColor &)));
+ connect (m_dualColorButton, TQ_SIGNAL (backgroundColorChanged (const kpColor &)),
+ this, TQ_SIGNAL (backgroundColorChanged (const kpColor &)));
m_boxLayout->addWidget (m_dualColorButton, 0/*stretch*/);
m_colorPalette = new kpColorPalette (base);
- connect (m_colorPalette, TQT_SIGNAL (foregroundColorChanged (const kpColor &)),
- m_dualColorButton, TQT_SLOT (setForegroundColor (const kpColor &)));
- connect (m_colorPalette, TQT_SIGNAL (backgroundColorChanged (const kpColor &)),
- m_dualColorButton, TQT_SLOT (setBackgroundColor (const kpColor &)));
+ connect (m_colorPalette, TQ_SIGNAL (foregroundColorChanged (const kpColor &)),
+ m_dualColorButton, TQ_SLOT (setForegroundColor (const kpColor &)));
+ connect (m_colorPalette, TQ_SIGNAL (backgroundColorChanged (const kpColor &)),
+ m_dualColorButton, TQ_SLOT (setBackgroundColor (const kpColor &)));
m_boxLayout->addWidget (m_colorPalette, 0/*stretch*/);
m_colorSimilarityToolBarItem = new kpColorSimilarityToolBarItem (mainWindow, base);
m_colorSimilarityToolBarItem->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
- connect (m_colorSimilarityToolBarItem, TQT_SIGNAL (colorSimilarityChanged (double, int)),
- this, TQT_SIGNAL (colorSimilarityChanged (double, int)));
+ connect (m_colorSimilarityToolBarItem, TQ_SIGNAL (colorSimilarityChanged (double, int)),
+ this, TQ_SIGNAL (colorSimilarityChanged (double, int)));
m_boxLayout->addWidget (m_colorSimilarityToolBarItem, 0/*stretch*/);
// HACK: couldn't get TQSpacerItem to work
diff --git a/kolourpaint/widgets/kptooltoolbar.cpp b/kolourpaint/widgets/kptooltoolbar.cpp
index dcd79e77..0df59f2e 100644
--- a/kolourpaint/widgets/kptooltoolbar.cpp
+++ b/kolourpaint/widgets/kptooltoolbar.cpp
@@ -131,8 +131,8 @@ kpToolToolBar::kpToolToolBar (const TQString &label, kpMainWindow *mainWindow, i
it != m_toolWidgets.end ();
it++)
{
- connect (*it, TQT_SIGNAL (optionSelected (int, int)),
- this, TQT_SIGNAL (toolWidgetOptionSelected ()));
+ connect (*it, TQ_SIGNAL (optionSelected (int, int)),
+ this, TQ_SIGNAL (toolWidgetOptionSelected ()));
}
#if DEBUG_KP_TOOL_TOOL_BAR
@@ -151,7 +151,7 @@ kpToolToolBar::kpToolToolBar (const TQString &label, kpMainWindow *mainWindow, i
m_buttonGroup = new TQButtonGroup (); // invisible
m_buttonGroup->setExclusive (true);
- connect (m_buttonGroup, TQT_SIGNAL (clicked (int)), TQT_SLOT (slotToolButtonClicked ()));
+ connect (m_buttonGroup, TQ_SIGNAL (clicked (int)), TQ_SLOT (slotToolButtonClicked ()));
hideAllToolWidgets ();
}
@@ -247,10 +247,10 @@ void kpToolToolBar::registerTool (kpTool *tool)
m_buttonToolPairs.append (kpButtonToolPair (b, tool));
- connect (tool, TQT_SIGNAL (actionActivated ()),
- this, TQT_SLOT (slotToolActionActivated ()));
- connect (tool, TQT_SIGNAL (actionToolTipChanged (const TQString &)),
- this, TQT_SLOT (slotToolActionToolTipChanged ()));
+ connect (tool, TQ_SIGNAL (actionActivated ()),
+ this, TQ_SLOT (slotToolActionActivated ()));
+ connect (tool, TQ_SIGNAL (actionToolTipChanged (const TQString &)),
+ this, TQ_SLOT (slotToolActionToolTipChanged ()));
}
// public
@@ -265,10 +265,10 @@ void kpToolToolBar::unregisterTool (kpTool *tool)
delete ((*it).m_button);
m_buttonToolPairs.erase (it);
- disconnect (tool, TQT_SIGNAL (actionActivated ()),
- this, TQT_SLOT (slotToolActionActivated ()));
- disconnect (tool, TQT_SIGNAL (actionToolTipChanged (const TQString &)),
- this, TQT_SLOT (slotToolActionToolTipChanged ()));
+ disconnect (tool, TQ_SIGNAL (actionActivated ()),
+ this, TQ_SLOT (slotToolActionActivated ()));
+ disconnect (tool, TQ_SIGNAL (actionToolTipChanged (const TQString &)),
+ this, TQ_SLOT (slotToolActionToolTipChanged ()));
break;
}
}