summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-12-07 18:21:42 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-12-07 18:21:42 +0900
commit69c8b6084655e30ef0fd8b0aef498faf8f23bff3 (patch)
tree48a4acd6d4d7531feba3d53cb6372a168e2f35f0
parente843c525bae66c3443db6c2526d162df138acdd9 (diff)
downloadksquirrel-69c8b6084655e30ef0fd8b0aef498faf8f23bff3.tar.gz
ksquirrel-69c8b6084655e30ef0fd8b0aef498faf8f23bff3.zip
Replaced various '#define' with actual strings - part 6
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--ksquirrel/ksquirrel.cpp130
-rw-r--r--ksquirrel/ksquirrelpart/ksquirrelpart.cpp2
-rw-r--r--ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui.h2
-rw-r--r--ksquirrel/ksquirrelpart/sq_glwidget.cpp2
-rw-r--r--ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp68
-rw-r--r--ksquirrel/ksquirrelpart/sq_imageproperties.ui.h10
-rw-r--r--ksquirrel/sidebar/sq_categoriesview.cpp24
-rw-r--r--ksquirrel/sidebar/sq_directorybasket.cpp26
-rw-r--r--ksquirrel/sidebar/sq_multibar.cpp4
-rw-r--r--ksquirrel/sidebar/sq_previewwidget.cpp20
-rw-r--r--ksquirrel/sidebar/sq_treeview.cpp4
-rw-r--r--ksquirrel/sq_diroperator.cpp64
-rw-r--r--ksquirrel/sq_glwidget.cpp2
-rw-r--r--ksquirrel/sq_glwidget_stuff.cpp68
-rw-r--r--ksquirrel/sq_imageproperties.ui.h6
-rw-r--r--ksquirrel/sq_kipiinterface.cpp2
-rw-r--r--ksquirrel/sq_options.ui.h2
17 files changed, 218 insertions, 218 deletions
diff --git a/ksquirrel/ksquirrel.cpp b/ksquirrel/ksquirrel.cpp
index bcceaa3..ae67703 100644
--- a/ksquirrel/ksquirrel.cpp
+++ b/ksquirrel/ksquirrel.cpp
@@ -142,13 +142,13 @@ KSquirrel::KSquirrel(TQWidget *parent, const char *name)
// create TDEConfig instance.
// It will help us to read and write config entries
- tdeconf = new SQ_Config(TQT_TQOBJECT(this));
+ tdeconf = new SQ_Config(this);
old_id = 0;
tdeconf->setGroup("Thumbnails");
- thumbSize = new SQ_ThumbnailSize(TQT_TQOBJECT(this), static_cast<SQ_ThumbnailSize::Size>(tdeconf->readNumEntry("size",
+ thumbSize = new SQ_ThumbnailSize(this, static_cast<SQ_ThumbnailSize::Size>(tdeconf->readNumEntry("size",
SQ_ThumbnailSize::Large)));
thumbSize->setExtended(tdeconf->readBoolEntry("extended", false));
@@ -351,13 +351,13 @@ void KSquirrel::createLocationToolbar(TDEToolBar *pTLocation)
// some additional setup
pTLocation->setFullSize();
- pTLocation->insertButton("button_cancel", 0, TQT_SIGNAL(clicked()), TQT_TQOBJECT(pCurrentURL), TQT_SLOT(clearHistory()), true, i18n("Clear history"));
- pTLocation->insertButton("locationbar_erase", 1, TQT_SIGNAL(clicked()), TQT_TQOBJECT(pCurrentURL), TQT_SLOT(clearEdit()), true, i18n("Clear address"));
+ pTLocation->insertButton("button_cancel", 0, TQT_SIGNAL(clicked()), pCurrentURL, TQT_SLOT(clearHistory()), true, i18n("Clear history"));
+ pTLocation->insertButton("locationbar_erase", 1, TQT_SIGNAL(clicked()), pCurrentURL, TQT_SLOT(clearEdit()), true, i18n("Clear address"));
pTLocation->insertWidget(2, 10, new TQLabel("URL:", pTLocation, "tde toolbar widget"));
pTLocation->setItemAutoSized(2);
pTLocation->insertWidget(3, 10, pCurrentURL);
pTLocation->setItemAutoSized(3);
- pTLocation->insertButton("goto", 4, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotGo()), true, i18n("Go!"));
+ pTLocation->insertButton("goto", 4, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGo()), true, i18n("Go!"));
tdeconf->setGroup("History");
@@ -456,7 +456,7 @@ void KSquirrel::initFilterMenu()
}
disconnect(actionFilterMenu, TQT_SIGNAL(activated(int)), 0, 0);
- connect(actionFilterMenu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetFilter(int)));
+ connect(actionFilterMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetFilter(int)));
// finally, set current filter
setFilter(last, Id);
@@ -537,7 +537,7 @@ void KSquirrel::createWidgets(int createFirst)
createLocationToolbar(pTLocation);
createStatusBar(s);
- new SQ_NavigatorDropMenu(TQT_TQOBJECT(this));
+ new SQ_NavigatorDropMenu(this);
sideBar = new SQ_MultiBar(mainView);
@@ -573,9 +573,9 @@ void KSquirrel::createWidgets(int createFirst)
connect(pWidgetStack, TQT_SIGNAL(newLastURL(const TQString &)), pWidgetStack->action("dirop_repeat"), TQT_SLOT(setText(const TQString &)));
connect(SQ_PreviewWidget::instance(), TQT_SIGNAL(first()), pWidgetStack, TQT_SLOT(slotSelectFirstFile()));
connect(SQ_PreviewWidget::instance(), TQT_SIGNAL(last()), pWidgetStack, TQT_SLOT(slotSelectLastFile()));
- connect(SQ_PreviewWidget::instance(), TQT_SIGNAL(next()), TQT_TQOBJECT(this), TQT_SLOT(slotPreviewWidgetNext()));
- connect(SQ_PreviewWidget::instance(), TQT_SIGNAL(previous()), TQT_TQOBJECT(this), TQT_SLOT(slotPreviewWidgetPrevious()));
- connect(SQ_PreviewWidget::instance(), TQT_SIGNAL(execute()), TQT_TQOBJECT(this), TQT_SLOT(slotPreviewWidgetExecute()));
+ connect(SQ_PreviewWidget::instance(), TQT_SIGNAL(next()), this, TQT_SLOT(slotPreviewWidgetNext()));
+ connect(SQ_PreviewWidget::instance(), TQT_SIGNAL(previous()), this, TQT_SLOT(slotPreviewWidgetPrevious()));
+ connect(SQ_PreviewWidget::instance(), TQT_SIGNAL(execute()), this, TQT_SLOT(slotPreviewWidgetExecute()));
pWidgetStack->init();
@@ -663,7 +663,7 @@ void KSquirrel::createStatusBar(KStatusBar *bar)
fireDisk->setIconSet(SQ_IconLoader::instance()->loadIcon("reload", TDEIcon::Desktop, TDEIcon::SizeSmall));
fireDisk->setTextLabel(i18n("Reload"));
fireDisk->setUsesTextLabel(false);
- connect(fireDisk, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotFireDisk()));
+ connect(fireDisk, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFireDisk()));
diskProg = new SQ_Progress(sbar, "SQ_Progress [disk space]");
diskProg->setFixedWidth(150);
@@ -788,37 +788,37 @@ void KSquirrel::createToolbar(TDEToolBar *tools)
void KSquirrel::createActions()
{
pAThumbs = new TDEActionMenu(i18n("Thumbnail size"), "thumbnail");
- pAExit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection(), "SQ close");
- pAConfigure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotOptions()), actionCollection(), "SQ Configure");
- pAGLView = new TDEAction(i18n("Image window"), "raise", CTRL+TQt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(raiseGLWidget()), actionCollection(), "SQ gl view widget");
- pARescan = KStdAction::redisplay(TQT_TQOBJECT(this), TQT_SLOT(slotRescan()), actionCollection(), "SQ rescan libraries");
+ pAExit = KStdAction::quit(this, TQT_SLOT(slotClose()), actionCollection(), "SQ close");
+ pAConfigure = KStdAction::preferences(this, TQT_SLOT(slotOptions()), actionCollection(), "SQ Configure");
+ pAGLView = new TDEAction(i18n("Image window"), "raise", CTRL+TQt::Key_I, this, TQT_SLOT(raiseGLWidget()), actionCollection(), "SQ gl view widget");
+ pARescan = KStdAction::redisplay(this, TQT_SLOT(slotRescan()), actionCollection(), "SQ rescan libraries");
pARescan->setText(i18n("Reload codecs from disk"));
- pAExtTools = new TDEAction(i18n("Configure external tools..."), "launch", 0, TQT_TQOBJECT(this), TQT_SLOT(slotExtTools()), actionCollection(), "SQ external tools");
- pAFilters = new TDEAction(i18n("Configure filters..."), "filefind", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFilters()), actionCollection(), "SQ filters");
- pAGotoTray = new TDEAction(i18n("Go to tray"), "background", CTRL+TQt::Key_T, TQT_TQOBJECT(this), TQT_SLOT(slotGotoTray()), actionCollection(), "SQ goto tray");
- pAOpenAndSet = new TDEAction(i18n("Open file and change directory"), "document-open", CTRL+ALT+TQt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotOpenFileAndSet()), actionCollection(), "SQ open and set");
- pAOpen = new TDEAction(i18n("Open file"), "document-open", CTRL+TQt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotOpenFile()), actionCollection(), "SQ open file");
- pATCMaster = new TDEAction(i18n("Thumbnail cache manager..."), "cache", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTCMaster()), actionCollection(), "SQ TC Master");
+ pAExtTools = new TDEAction(i18n("Configure external tools..."), "launch", 0, this, TQT_SLOT(slotExtTools()), actionCollection(), "SQ external tools");
+ pAFilters = new TDEAction(i18n("Configure filters..."), "filefind", 0, this, TQT_SLOT(slotFilters()), actionCollection(), "SQ filters");
+ pAGotoTray = new TDEAction(i18n("Go to tray"), "background", CTRL+TQt::Key_T, this, TQT_SLOT(slotGotoTray()), actionCollection(), "SQ goto tray");
+ pAOpenAndSet = new TDEAction(i18n("Open file and change directory"), "document-open", CTRL+ALT+TQt::Key_O, this, TQT_SLOT(slotOpenFileAndSet()), actionCollection(), "SQ open and set");
+ pAOpen = new TDEAction(i18n("Open file"), "document-open", CTRL+TQt::Key_O, this, TQT_SLOT(slotOpenFile()), actionCollection(), "SQ open file");
+ pATCMaster = new TDEAction(i18n("Thumbnail cache manager..."), "cache", 0, this, TQT_SLOT(slotTCMaster()), actionCollection(), "SQ TC Master");
pASelectAll = KStdAction::selectAll(0, 0, actionCollection(), "SQ Select All");
pADeselectAll = KStdAction::deselect(0, 0, actionCollection(), "SQ Deselect All");
- pARaiseListView = new TDERadioAction(i18n("List"), "view_multicolumn", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRaiseListView()), actionCollection(), "SQ raise list view");
- pARaiseIconView = new TDERadioAction(i18n("Icons"), "view_icon", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRaiseIconView()), actionCollection(), "SQ raise icon view");
- pARaiseDetailView = new TDERadioAction(i18n("Details"), "view_detailed", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRaiseDetailView()), actionCollection(), "SQ raise detailed view");
- pARaiseThumbView = new TDERadioAction(i18n("Thumbnails"), "view_icon", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRaiseThumbView()), actionCollection(), "SQ raise thumbs view");
+ pARaiseListView = new TDERadioAction(i18n("List"), "view_multicolumn", 0, this, TQT_SLOT(slotRaiseListView()), actionCollection(), "SQ raise list view");
+ pARaiseIconView = new TDERadioAction(i18n("Icons"), "view_icon", 0, this, TQT_SLOT(slotRaiseIconView()), actionCollection(), "SQ raise icon view");
+ pARaiseDetailView = new TDERadioAction(i18n("Details"), "view_detailed", 0, this, TQT_SLOT(slotRaiseDetailView()), actionCollection(), "SQ raise detailed view");
+ pARaiseThumbView = new TDERadioAction(i18n("Thumbnails"), "view_icon", 0, this, TQT_SLOT(slotRaiseThumbView()), actionCollection(), "SQ raise thumbs view");
pAURL = new TDEToggleAction(i18n("Show URL box"), "history", CTRL+TQt::Key_U, 0, 0, actionCollection(), "SQ toggle url box");
- pASlideShow = new TDEAction(i18n("Slideshow"), "folder_video", CTRL+TQt::Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotSlideShowStart()), actionCollection(), "SQ Slideshow");
- pASlideShowDialog = new TDEAction(i18n("Slideshow advanced"), 0, CTRL+ALT+TQt::Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotSlideShowDialog()), actionCollection(), "SQ SlideShow Dialog");
- pARename = new TDEAction(i18n("Rename"), "file_move", TQt::Key_F2, TQT_TQOBJECT(this), TQT_SLOT(slotRename()), actionCollection(), "SQ Rename");
- pAPluginsInfo = new TDEAction(i18n("Codec information..."), "application-vnd.tde.info", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPluginsInfo()), actionCollection(), "SQ Plugins Info");
- pAPluginsDel = new TDEAction(i18n("Codec manager..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotPluginsDel()), actionCollection(), "SQ Plugins Deleter");
- pAGLInfo = new TDEAction(i18n("OpenGL information..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotGLInfo()), actionCollection(), "SQ OpenGL Info");
+ pASlideShow = new TDEAction(i18n("Slideshow"), "folder_video", CTRL+TQt::Key_S, this, TQT_SLOT(slotSlideShowStart()), actionCollection(), "SQ Slideshow");
+ pASlideShowDialog = new TDEAction(i18n("Slideshow advanced"), 0, CTRL+ALT+TQt::Key_S, this, TQT_SLOT(slotSlideShowDialog()), actionCollection(), "SQ SlideShow Dialog");
+ pARename = new TDEAction(i18n("Rename"), "file_move", TQt::Key_F2, this, TQT_SLOT(slotRename()), actionCollection(), "SQ Rename");
+ pAPluginsInfo = new TDEAction(i18n("Codec information..."), "application-vnd.tde.info", 0, this, TQT_SLOT(slotPluginsInfo()), actionCollection(), "SQ Plugins Info");
+ pAPluginsDel = new TDEAction(i18n("Codec manager..."), 0, 0, this, TQT_SLOT(slotPluginsDel()), actionCollection(), "SQ Plugins Deleter");
+ pAGLInfo = new TDEAction(i18n("OpenGL information..."), 0, 0, this, TQT_SLOT(slotGLInfo()), actionCollection(), "SQ OpenGL Info");
- pAThumb1 = new TDERadioAction(i18n("Medium thumbnails"), locate("data", "images/thumbs/thumbs_medium.png"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotThumbsMedium()), actionCollection(), "SQ thumbs1");
- pAThumb2 = new TDERadioAction(i18n("Large thumbnails"), locate("data", "images/thumbs/thumbs_large.png"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotThumbsLarge()), actionCollection(), "SQ thumbs2");
- pAThumb3 = new TDERadioAction(i18n("Huge thumbnails"), locate("data", "images/thumbs/thumbs_huge.png"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotThumbsHuge()), actionCollection(), "SQ thumbs3");
+ pAThumb1 = new TDERadioAction(i18n("Medium thumbnails"), locate("data", "images/thumbs/thumbs_medium.png"), 0, this, TQT_SLOT(slotThumbsMedium()), actionCollection(), "SQ thumbs1");
+ pAThumb2 = new TDERadioAction(i18n("Large thumbnails"), locate("data", "images/thumbs/thumbs_large.png"), 0, this, TQT_SLOT(slotThumbsLarge()), actionCollection(), "SQ thumbs2");
+ pAThumb3 = new TDERadioAction(i18n("Huge thumbnails"), locate("data", "images/thumbs/thumbs_huge.png"), 0, this, TQT_SLOT(slotThumbsHuge()), actionCollection(), "SQ thumbs3");
pASelectGroup = new TDEAction(i18n("Select group"), "zoom-in", CTRL+TQt::Key_Plus, 0, 0, actionCollection(), "SQ Select Group");
pADeselectGroup = new TDEAction(i18n("Deselect group"), "zoom-out", CTRL+TQt::Key_Minus, 0, 0, actionCollection(), "SQ Deselect Group");
@@ -844,7 +844,7 @@ void KSquirrel::createActions()
pAThumbsE = new TDEToggleAction(i18n("Extended thumbnails"), "", CTRL+TQt::Key_E, 0, 0, actionCollection(), "SQ Extended thumbs");
tdeconf->setGroup("Thumbnails");
pAThumbsE->setChecked(tdeconf->readBoolEntry("extended", false));
- connect(pAThumbsE, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotExtendedToggled(bool)));
+ connect(pAThumbsE, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExtendedToggled(bool)));
pAThumbs->insert(pAThumbsE);
pAThumbs->setDelayed(false);
@@ -876,7 +876,7 @@ void KSquirrel::initExternalTools()
{
// create SQ_ExternalTool and create new
// popup menu with tools
- extool = new SQ_ExternalTool(TQT_TQOBJECT(this));
+ extool = new SQ_ExternalTool(this);
extool->newPopupMenu();
}
@@ -1229,35 +1229,35 @@ void KSquirrel::enableThumbsMenu(bool enable)
*/
void KSquirrel::preCreate()
{
- new SQ_IconLoader(TQT_TQOBJECT(this));
- new SQ_PixmapCache(TQT_TQOBJECT(this));
- new SQ_ArchiveHandler(TQT_TQOBJECT(this));
- new SQ_ImageLoader(TQT_TQOBJECT(this));
- new SQ_DragProvider(TQT_TQOBJECT(this));
+ new SQ_IconLoader(this);
+ new SQ_PixmapCache(this);
+ new SQ_ArchiveHandler(this);
+ new SQ_ImageLoader(this);
+ new SQ_DragProvider(this);
- libhandler = new SQ_LibraryHandler(TQT_TQOBJECT(this));
+ libhandler = new SQ_LibraryHandler(this);
initExternalTools();
- new SQ_ErrorString(TQT_TQOBJECT(this));
- new SQ_ThumbnailsUnused(TQT_TQOBJECT(this));
- new SQ_Converter(TQT_TQOBJECT(this));
+ new SQ_ErrorString(this);
+ new SQ_ThumbnailsUnused(this);
+ new SQ_Converter(this);
listingDialog = new SQ_SlideShowListing(this, "SlideShow Listing", true, TQt::WStyle_Customize | TQt::WStyle_NoBorder);
- connect(listingDialog, TQT_SIGNAL(kill()), TQT_TQOBJECT(this), TQT_SLOT(slotSlideShowListingKill()));
+ connect(listingDialog, TQT_SIGNAL(kill()), this, TQT_SLOT(slotSlideShowListingKill()));
slideShowItems.setAutoDelete(true);
- down = new SQ_Downloader(TQT_TQOBJECT(this));
+ down = new SQ_Downloader(this);
- connect(down, TQT_SIGNAL(result(const KURL &)), TQT_TQOBJECT(this), TQT_SLOT(slotDownloaderResult(const KURL &)));
+ connect(down, TQT_SIGNAL(result(const KURL &)), this, TQT_SLOT(slotDownloaderResult(const KURL &)));
SQ_SlideShowWidget *sls = new SQ_SlideShowWidget(0, "ksquirrel-slideshow");
- connect(sls, TQT_SIGNAL(stopSlideShow()), TQT_TQOBJECT(this), TQT_SLOT(slotStopSlideShow()));
- connect(sls, TQT_SIGNAL(pause()), TQT_TQOBJECT(this), TQT_SLOT(slotPauseSlideShow()));
- connect(sls, TQT_SIGNAL(next()), TQT_TQOBJECT(this), TQT_SLOT(slotNextSlideShow()));
- connect(sls, TQT_SIGNAL(previous()), TQT_TQOBJECT(this), TQT_SLOT(slotPreviousSlideShow()));
+ connect(sls, TQT_SIGNAL(stopSlideShow()), this, TQT_SLOT(slotStopSlideShow()));
+ connect(sls, TQT_SIGNAL(pause()), this, TQT_SLOT(slotPauseSlideShow()));
+ connect(sls, TQT_SIGNAL(next()), this, TQT_SLOT(slotNextSlideShow()));
+ connect(sls, TQT_SIGNAL(previous()), this, TQT_SLOT(slotPreviousSlideShow()));
// timer for slideshow
slideShowTimer = new TQTimer(this);
@@ -1303,7 +1303,7 @@ void KSquirrel::preCreate()
TDEIO::StatJob *job = TDEIO::stat(url, false);
job->setSide(true);
job->setDetails(0);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotStatResult(TDEIO::Job *)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotStatResult(TDEIO::Job *)));
}
else
continueLoading();
@@ -1367,7 +1367,7 @@ void KSquirrel::slotStatResult(TDEIO::Job *_job)
TDEIO::StatJob *job2 = TDEIO::stat(url, false);
job2->setSide(true);
job2->setDetails(0);
- connect(job2, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotStatResult(TDEIO::Job *)));
+ connect(job2, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotStatResult(TDEIO::Job *)));
}
else
continueLoading();
@@ -1401,13 +1401,13 @@ void KSquirrel::continueLoading()
if(mainPage->isVisible())
{
TQEvent e(TQEvent::Show);
- eventFilter(TQT_TQOBJECT(mainPage), &e);
+ eventFilter(mainPage, &e);
}
tray = new KSystemTray(this);
tray->setPixmap(TQPixmap(locate("data", "images/tray.png")));
- connect(tray, TQT_SIGNAL(quitSelected()), TQT_TQOBJECT(this), TQT_SLOT(slotTrayQuit()));
+ connect(tray, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(slotTrayQuit()));
SQ_SplashScreen::advance();
SQ_SplashScreen::finish();
@@ -1432,7 +1432,7 @@ void KSquirrel::continueLoading()
if(kapp->isRestored())
slotGotoTray();
- connect(kapp, TQT_SIGNAL(saveYourself()), TQT_TQOBJECT(this), TQT_SLOT(slotSaveYourself()));
+ connect(kapp, TQT_SIGNAL(saveYourself()), this, TQT_SLOT(slotSaveYourself()));
}
// Set caption to main window or to image window
@@ -1578,7 +1578,7 @@ bool KSquirrel::process(const TQCString &fun, const TQByteArray &data, TQCString
TDEIO::StatJob *job = TDEIO::stat(url, false);
job->setSide(true);
job->setDetails(0);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotDCOPStatResult(TDEIO::Job *)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotDCOPStatResult(TDEIO::Job *)));
replyType = "void";
@@ -1817,9 +1817,9 @@ void KSquirrel::slotSlideShowStart()
: TDEIO::listDir(slideShowDir, false, false);
connect(listing, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)),
- TQT_TQOBJECT(this), TQT_SLOT(slotSlideShowEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)));
+ this, TQT_SLOT(slotSlideShowEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)));
- connect(listing, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotSlideShowJobResult(TDEIO::Job *)));
+ connect(listing, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotSlideShowJobResult(TDEIO::Job *)));
timerShowListing->start(1000, true);
}
@@ -1890,7 +1890,7 @@ void KSquirrel::slideShowPrivate()
slideShowDirection = KSquirrel::Default;
disconnect(slideShowTimer, TQT_SIGNAL(timeout()), 0, 0);
- connect(slideShowTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotSlideShowNextImage()));
+ connect(slideShowTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSlideShowNextImage()));
tdeconf->setGroup("Slideshow");
@@ -1917,7 +1917,7 @@ void KSquirrel::slideShowPrivate()
// start!
SQ_SlideShowWidget::instance()->beginSlideShow(slideShowTotal);
- TQTimer::singleShot(1, TQT_TQOBJECT(this), TQT_SLOT(slideShowDetermine()));
+ TQTimer::singleShot(1, this, TQT_SLOT(slideShowDetermine()));
}
void KSquirrel::slotDownloaderResult(const KURL &u)
@@ -1957,7 +1957,7 @@ void KSquirrel::slideShowDetermine()
{
// nice hack to make final delay
disconnect(slideShowTimer, TQT_SIGNAL(timeout()), 0, 0);
- connect(slideShowTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotStopSlideShow()));
+ connect(slideShowTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotStopSlideShow()));
slideShowTimer->start(slideShowDelay, true);
return;
}
@@ -2123,7 +2123,7 @@ void KSquirrel::configAnime(bool init)
// show animated logo in toolbar if needed
if(!tdeconf->readBoolEntry("anime_dont", false) && (init || (!init && !anim)))
{
- tools->insertAnimatedWidget(1000, TQT_TQOBJECT(this), TQT_SLOT(slotAnimatedClicked()), locate("data", "images/anime.png"));
+ tools->insertAnimatedWidget(1000, this, TQT_SLOT(slotAnimatedClicked()), locate("data", "images/anime.png"));
tools->alignItemRight(1000);
tools->animatedWidget(1000)->start();
}
@@ -2168,7 +2168,7 @@ void KSquirrel::slotRename()
renameDestURL.setFileName(mNewFilename);
TDEIO::Job *job = TDEIO::move(renameSrcURL, renameDestURL);
- connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_TQOBJECT(this), TQT_SLOT(slotRenameResult(TDEIO::Job*)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotRenameResult(TDEIO::Job*)));
}
void KSquirrel::slotRenameResult(TDEIO::Job *job)
diff --git a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
index 4971ea7..6e7fcdd 100644
--- a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
+++ b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
@@ -52,7 +52,7 @@ KSquirrelPart::KSquirrelPart(TQWidget *parentWidget, const char *,
TDEGlobal::locale()->setActiveCatalogue(KSquirrelFactory::instance()->instanceName());
if(!SQ_ErrorString::instance())
- new SQ_ErrorString(TQT_TQOBJECT(parentWidget));
+ new SQ_ErrorString(parentWidget);
if(!SQ_Config::instance())
new SQ_Config;
diff --git a/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui.h b/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui.h
index 2c39790..d976149 100644
--- a/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui.h
+++ b/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui.h
@@ -19,7 +19,7 @@ void SQ_CodecSettingsSkeleton::addSettingsWidget(const TQString &path)
TQWidget *fake;
if(w)
- fake = TQT_TQWIDGET(w);
+ fake = w;
else
{
pushApply->setEnabled(false);
diff --git a/ksquirrel/ksquirrelpart/sq_glwidget.cpp b/ksquirrel/ksquirrelpart/sq_glwidget.cpp
index 30f67d7..33b2647 100644
--- a/ksquirrel/ksquirrelpart/sq_glwidget.cpp
+++ b/ksquirrel/ksquirrelpart/sq_glwidget.cpp
@@ -121,7 +121,7 @@ SQ_GLWidget::SQ_GLWidget(TQWidget *parent, const char *name) : TQGLWidget(parent
images = 0;
parts_broken = 0;
- ac = new TDEActionCollection(this, TQT_TQOBJECT(this), "GLWidget actionCollection");
+ ac = new TDEActionCollection(this, this, "GLWidget actionCollection");
changed = blocked = decoded = reset_mode = false;
movetype = -1;
buffer = new RGBA [512 * 512];
diff --git a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
index 87d02ab..521e4fa 100644
--- a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
+++ b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
@@ -78,15 +78,15 @@
// Create actions
void SQ_GLWidget::createActions()
{
- pASelectionRect = new TDEToggleAction(i18n("Rectangle"), TQPixmap(locate("data", "images/actions/glselection_rect.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectionRect()), ac, "SQ Selection Rect");
- pASelectionEllipse = new TDEToggleAction(i18n("Ellipse"), TQPixmap(locate("data", "images/actions/glselection_ellipse.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectionEllipse()), ac, "SQ Selection Ellipse");
- pASelectionClear = new TDEAction(i18n("Clear"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectionClear()), ac, "SQ Selection Clear");
-
- pAZoomW = new TDEToggleAction(i18n("Fit width"), TQPixmap(locate("data", "images/actions/zoomW.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoomW()), ac, "SQ ZoomW");
- pAZoomH = new TDEToggleAction(i18n("Fit height"), TQPixmap(locate("data", "images/actions/zoomH.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoomH()), ac, "SQ ZoomH");
- pAZoomWH = new TDEToggleAction(i18n("Fit image"), TQPixmap(locate("data", "images/actions/zoomWH.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoomWH()), ac, "SQ ZoomWH");
- pAZoom100 = new TDEToggleAction(i18n("Zoom 100%"), TQPixmap(locate("data", "images/actions/zoom100.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoom100()), ac, "SQ Zoom100");
- pAZoomLast = new TDEToggleAction(i18n("Leave previous zoom"), TQPixmap(locate("data", "images/actions/zoomlast.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoomLast()), ac, "SQ ZoomLast");
+ pASelectionRect = new TDEToggleAction(i18n("Rectangle"), TQPixmap(locate("data", "images/actions/glselection_rect.png")), 0, this, TQT_SLOT(slotSelectionRect()), ac, "SQ Selection Rect");
+ pASelectionEllipse = new TDEToggleAction(i18n("Ellipse"), TQPixmap(locate("data", "images/actions/glselection_ellipse.png")), 0, this, TQT_SLOT(slotSelectionEllipse()), ac, "SQ Selection Ellipse");
+ pASelectionClear = new TDEAction(i18n("Clear"), 0, 0, this, TQT_SLOT(slotSelectionClear()), ac, "SQ Selection Clear");
+
+ pAZoomW = new TDEToggleAction(i18n("Fit width"), TQPixmap(locate("data", "images/actions/zoomW.png")), 0, this, TQT_SLOT(slotZoomW()), ac, "SQ ZoomW");
+ pAZoomH = new TDEToggleAction(i18n("Fit height"), TQPixmap(locate("data", "images/actions/zoomH.png")), 0, this, TQT_SLOT(slotZoomH()), ac, "SQ ZoomH");
+ pAZoomWH = new TDEToggleAction(i18n("Fit image"), TQPixmap(locate("data", "images/actions/zoomWH.png")), 0, this, TQT_SLOT(slotZoomWH()), ac, "SQ ZoomWH");
+ pAZoom100 = new TDEToggleAction(i18n("Zoom 100%"), TQPixmap(locate("data", "images/actions/zoom100.png")), 0, this, TQT_SLOT(slotZoom100()), ac, "SQ Zoom100");
+ pAZoomLast = new TDEToggleAction(i18n("Leave previous zoom"), TQPixmap(locate("data", "images/actions/zoomlast.png")), 0, this, TQT_SLOT(slotZoomLast()), ac, "SQ ZoomLast");
pAIfLess = new TDEToggleAction(i18n("Ignore, if image is smaller than window"), TQPixmap(locate("data", "images/actions/ifless.png")), 0, 0, 0, ac, "if less");
pAFull = new TDEToggleAction(TQString(), 0, 0, 0, ac, "SQ GL Full");
@@ -102,7 +102,7 @@ void SQ_GLWidget::createActions()
pASelectionEllipse->setExclusiveGroup(squirrel_selection_type);
pASelectionRect->setExclusiveGroup(squirrel_selection_type);
- connect(pAIfLess, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotZoomIfLess()));
+ connect(pAIfLess, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotZoomIfLess()));
#ifndef KSQUIRREL_PART
connect(pAFull, TQT_SIGNAL(toggled(bool)), KSquirrel::app(), TQT_SLOT(slotFullScreen(bool)));
@@ -163,29 +163,29 @@ void SQ_GLWidget::createToolbar()
*
* Plugged TDEActions also don't know about autorepeat :(
*/
- new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_first.png")), i18n("Go to first image"), TQT_TQOBJECT(this), TQT_SLOT(slotFirst()), toolbar);
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_prev.png")), i18n("Previous image"), TQT_TQOBJECT(this), TQT_SLOT(slotPrev()), toolbar);
+ new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_first.png")), i18n("Go to first image"), this, TQT_SLOT(slotFirst()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_prev.png")), i18n("Previous image"), this, TQT_SLOT(slotPrev()), toolbar);
pATool->setAutoRepeat(true);
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_next.png")), i18n("Next image"), TQT_TQOBJECT(this), TQT_SLOT(slotNext()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_next.png")), i18n("Next image"), this, TQT_SLOT(slotNext()), toolbar);
pATool->setAutoRepeat(true);
- new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_last.png")), i18n("Go to last image"), TQT_TQOBJECT(this), TQT_SLOT(slotLast()), toolbar);
+ new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_last.png")), i18n("Go to last image"), this, TQT_SLOT(slotLast()), toolbar);
// some toolbuttons need autorepeat...
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/zoom+.png")), i18n("Zoom +"), TQT_TQOBJECT(this), TQT_SLOT(slotZoomPlus()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/zoom+.png")), i18n("Zoom +"), this, TQT_SLOT(slotZoomPlus()), toolbar);
pATool->setAutoRepeat(true);
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/zoom-.png")), i18n("Zoom -"), TQT_TQOBJECT(this), TQT_SLOT(slotZoomMinus()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/zoom-.png")), i18n("Zoom -"), this, TQT_SLOT(slotZoomMinus()), toolbar);
pATool->setAutoRepeat(true);
pAToolZoom = new SQ_ToolButtonPopup(TQPixmap(locate("data", "images/actions/zoom_template.png")), i18n("Zoom"), toolbar);
pAToolZoom->setPopup(zoomMenu);
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/rotateL.png")), i18n("Rotate left"), TQT_TQOBJECT(this), TQT_SLOT(slotRotateLeft()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/rotateL.png")), i18n("Rotate left"), this, TQT_SLOT(slotRotateLeft()), toolbar);
pATool->setAutoRepeat(true);
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/rotateR.png")), i18n("Rotate right"), TQT_TQOBJECT(this), TQT_SLOT(slotRotateRight()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/rotateR.png")), i18n("Rotate right"), this, TQT_SLOT(slotRotateRight()), toolbar);
pATool->setAutoRepeat(true);
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/flipV.png")), i18n("Flip vertically"), TQT_TQOBJECT(this), TQT_SLOT(slotFlipV()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/flipV.png")), i18n("Flip vertically"), this, TQT_SLOT(slotFlipV()), toolbar);
pATool->setAutoRepeat(true);
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/flipH.png")), i18n("Flip horizontally"), TQT_TQOBJECT(this), TQT_SLOT(slotFlipH()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/flipH.png")), i18n("Flip horizontally"), this, TQT_SLOT(slotFlipH()), toolbar);
pATool->setAutoRepeat(true);
- new SQ_ToolButton(TQPixmap(locate("data", "images/actions/reload.png")), i18n("Normalize"), TQT_TQOBJECT(this), TQT_SLOT(slotMatrixReset()), toolbar);
+ new SQ_ToolButton(TQPixmap(locate("data", "images/actions/reload.png")), i18n("Normalize"), this, TQT_SLOT(slotMatrixReset()), toolbar);
pAToolFull = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/fullscreen.png")), i18n("Fullscreen"), pAFull, TQT_SLOT(activate()), toolbar);
pAToolFull->setToggleButton(true);
@@ -193,16 +193,16 @@ void SQ_GLWidget::createToolbar()
pAToolImages->setPopup(images);
SQ_ToolButtonPopup *pAToolSel = new SQ_ToolButtonPopup(TQPixmap(locate("data", "images/actions/glselection.png")), i18n("Selection"), toolbar);
pAToolSel->setPopup(selectionMenu);
- pAToolQuick = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/configure.png")), i18n("Codec settings"), TQT_TQOBJECT(this), TQT_SLOT(slotShowCodecSettings()), toolbar);
+ pAToolQuick = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/configure.png")), i18n("Codec settings"), this, TQT_SLOT(slotShowCodecSettings()), toolbar);
pAToolQuick->setEnabled(false);
- pAToolProp = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/prop.png")), i18n("Image Properties"), TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), toolbar);
- pAToolPrint = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/print.png")), i18n("Print"), TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), toolbar);
- new SQ_ToolButton(TQPixmap(locate("data", "images/actions/shownav.png")), i18n("Show navigator"), TQT_TQOBJECT(this), TQT_SLOT(slotShowNav()), toolbar);
+ pAToolProp = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/prop.png")), i18n("Image Properties"), this, TQT_SLOT(slotProperties()), toolbar);
+ pAToolPrint = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/print.png")), i18n("Print"), this, TQT_SLOT(slotPrint()), toolbar);
+ new SQ_ToolButton(TQPixmap(locate("data", "images/actions/shownav.png")), i18n("Show navigator"), this, TQT_SLOT(slotShowNav()), toolbar);
slider_zoom = new TQSlider(1, 38, 2, 19, TQt::Horizontal, toolbar);
slider_zoom->setTickmarks(TQSlider::Below);
slider_zoom->setTickInterval(19);
- connect(slider_zoom, TQT_SIGNAL(valueChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetZoomPercents(int)));
+ connect(slider_zoom, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetZoomPercents(int)));
toolbar->insertWidget(1000, 0, slider_zoom);
toolbar->setItemAutoSized(1000);
toolbar->alignItemRight(1000);
@@ -335,7 +335,7 @@ void SQ_GLWidget::slotShowCodecSettings()
SQ_CodecSettingsSkeleton skel(this);
- connect(&skel, TQT_SIGNAL(apply()), TQT_TQOBJECT(this), TQT_SLOT(slotApplyCodecSettings()));
+ connect(&skel, TQT_SIGNAL(apply()), this, TQT_SLOT(slotApplyCodecSettings()));
skel.addSettingsWidget(tab->lib->config);
skel.setCodecInfo(tab->lib->mime, tab->lib->quickinfo);
@@ -609,7 +609,7 @@ void SQ_GLWidget::saveAs()
// src dst perm overwrite resume progress
TDEIO::Job *j = TDEIO::file_copy(path, url, -1, true, false, false);
- connect(j, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyResult(TDEIO::Job *)));
+ connect(j, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotCopyResult(TDEIO::Job *)));
}
}
@@ -632,7 +632,7 @@ void SQ_GLWidget::slotCopyResult(TDEIO::Job *job)
return;
TDEIO::Job *j = TDEIO::file_copy(tmp->name(), d.selectedURL(), -1, true, false, false);
- connect(j, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyResult(TDEIO::Job *)));
+ connect(j, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotCopyResult(TDEIO::Job *)));
}
}
}
@@ -663,7 +663,7 @@ void SQ_GLWidget::bcg()
_bcg.setPreviewImage(generatePreview());
- connect(&_bcg, TQT_SIGNAL(bcg(SQ_ImageBCGOptions *)), TQT_TQOBJECT(this), TQT_SLOT(slotBCG(SQ_ImageBCGOptions *)));
+ connect(&_bcg, TQT_SIGNAL(bcg(SQ_ImageBCGOptions *)), this, TQT_SLOT(slotBCG(SQ_ImageBCGOptions *)));
_bcg.exec();
@@ -681,7 +681,7 @@ void SQ_GLWidget::filter()
flt.setPreviewImage(generatePreview());
- connect(&flt, TQT_SIGNAL(filter(SQ_ImageFilterOptions *)), TQT_TQOBJECT(this), TQT_SLOT(slotFilter(SQ_ImageFilterOptions *)));
+ connect(&flt, TQT_SIGNAL(filter(SQ_ImageFilterOptions *)), this, TQT_SLOT(slotFilter(SQ_ImageFilterOptions *)));
flt.exec();
@@ -871,7 +871,7 @@ void SQ_GLWidget::initAccelsAndMenu()
menu->insertItem(i18n("Image"), menuImage);
#define SQ_ADD_KACTION(b) \
- (new TDEAction(TQString(), b, TQT_TQOBJECT(this), TQT_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").arg(b)))
+ (new TDEAction(TQString(), b, this, TQT_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").arg(b)))
id_saveas = menuFile->insertItem(SQ_IconLoader::instance()->loadIcon("document-save-as", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Save As...") + "\tS", SQ_ADD_KACTION(TQt::Key_S), TQT_SLOT(activate()));
@@ -1073,7 +1073,7 @@ void SQ_GLWidget::slotAccelActivated()
job = TDEIO::move(tab->m_original, url);
job->setWindow(this);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyJobResult(TDEIO::Job *)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotCopyJobResult(TDEIO::Job *)));
}
else if(!ks.compare(TQt::Key_F7) || !ks.compare(TQt::Key_F8))
{
@@ -1085,7 +1085,7 @@ void SQ_GLWidget::slotAccelActivated()
job = TDEIO::move(tab->m_original, lastCopy);
job->setWindow(this);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyJobResult(TDEIO::Job *)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotCopyJobResult(TDEIO::Job *)));
}
else if(!ks.compare(TQt::Key_F9)) copyURL();
else if(!ks.compare(TQt::Key_Slash)) slotShowHelp();
diff --git a/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h b/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h
index c93f0d9..41926a2 100644
--- a/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h
+++ b/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h
@@ -25,9 +25,9 @@
void SQ_ImageProperties::init()
{
menu = new TDEPopupMenu;
- copy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopyString()), 0);
- copyentry = new TDEAction(i18n("Copy entry"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCopyEntry()), 0);
- copyall = new TDEAction(i18n("Copy all entries"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCopyAll()), 0);
+ copy = KStdAction::copy(this, TQT_SLOT(slotCopyString()), 0);
+ copyentry = new TDEAction(i18n("Copy entry"), 0, this, TQT_SLOT(slotCopyEntry()), 0);
+ copyall = new TDEAction(i18n("Copy all entries"), 0, this, TQT_SLOT(slotCopyAll()), 0);
copyentry->setIcon(copy->icon());
copyall->setIcon(copy->icon());
@@ -85,7 +85,7 @@ void SQ_ImageProperties::setURL(const KURL &_url)
void SQ_ImageProperties::setFileParams()
{
TDEIO::Job *stjob = TDEIO::stat(url, false);
- connect(stjob, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotStatResult(TDEIO::Job *)));
+ connect(stjob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotStatResult(TDEIO::Job *)));
#ifdef SQ_HAVE_KEXIF
SQ_Config::instance()->setGroup("GL view");
@@ -98,7 +98,7 @@ void SQ_ImageProperties::setFileParams()
TQButtonGroup *gr = new TQButtonGroup(tabWidgetEXIF, "EXIF mode");
gr->setFrameShape(TQFrame::NoFrame);
gr->setExclusive(true);
- connect(gr, TQT_SIGNAL(clicked(int)), TQT_TQOBJECT(this), TQT_SLOT(slotModeClicked(int)));
+ connect(gr, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotModeClicked(int)));
TQGridLayout *pageLayoutGR = new TQGridLayout(gr, 1, 3, 0, -1, "tabWidgetEXIFGRLayout");
diff --git a/ksquirrel/sidebar/sq_categoriesview.cpp b/ksquirrel/sidebar/sq_categoriesview.cpp
index 317ca50..3111c78 100644
--- a/ksquirrel/sidebar/sq_categoriesview.cpp
+++ b/ksquirrel/sidebar/sq_categoriesview.cpp
@@ -105,10 +105,10 @@ SQ_CategoriesView::SQ_CategoriesView(TQWidget *parent, const char *name) : KFile
menu = new SQ_TreeViewMenu(this);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(spacePressed(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SIGNAL(executed(TQListViewItem*)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(returnPressed(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SIGNAL(executed(TQListViewItem*)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(executed(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotItemExecuted(TQListViewItem*)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
+ connect(this, TQT_SIGNAL(spacePressed(TQListViewItem*)), this, TQT_SIGNAL(executed(TQListViewItem*)));
+ connect(this, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SIGNAL(executed(TQListViewItem*)));
+ connect(this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotItemExecuted(TQListViewItem*)));
+ connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
}
SQ_CategoriesView::~SQ_CategoriesView()
@@ -160,20 +160,20 @@ SQ_CategoriesBox::SQ_CategoriesBox(TQWidget *parent, const char *name) : TQVBox(
view = new SQ_CategoriesView(this);
toolbar = new TDEToolBar(this);
- connect(view, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)));
+ connect(view, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)));
menu = new SQ_CategoryBrowserMenu(view->dir()->root(), 0, "Categories menu");
toolbar->setIconSize(TDEIcon::SizeSmall);
- toolbar->insertButton("folder-new", 0, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotNewCategory()), true, i18n("New category"));
- toolbar->insertButton("edittrash", 0, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotDeleteItem()), true, i18n("Delete"));
- toolbar->insertButton("application-vnd.tde.info", 0, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotItemProperties()), true, i18n("Properties"));
- toolbar->insertButton("bookmark_add", 0, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotDefaultCategories()), true, i18n("Create default categories"));
+ toolbar->insertButton("folder-new", 0, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewCategory()), true, i18n("New category"));
+ toolbar->insertButton("edittrash", 0, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteItem()), true, i18n("Delete"));
+ toolbar->insertButton("application-vnd.tde.info", 0, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotItemProperties()), true, i18n("Properties"));
+ toolbar->insertButton("bookmark_add", 0, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDefaultCategories()), true, i18n("Create default categories"));
- view->popupMenu()->reconnect(SQ_TreeViewMenu::New, TQT_TQOBJECT(this), TQT_SLOT(slotNewCategory()));
- view->popupMenu()->reconnect(SQ_TreeViewMenu::Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteItem()));
- view->popupMenu()->reconnect(SQ_TreeViewMenu::Properties, TQT_TQOBJECT(this), TQT_SLOT(slotItemProperties()));
+ view->popupMenu()->reconnect(SQ_TreeViewMenu::New, this, TQT_SLOT(slotNewCategory()));
+ view->popupMenu()->reconnect(SQ_TreeViewMenu::Delete, this, TQT_SLOT(slotDeleteItem()));
+ view->popupMenu()->reconnect(SQ_TreeViewMenu::Properties, this, TQT_SLOT(slotItemProperties()));
}
SQ_CategoriesBox::~SQ_CategoriesBox()
diff --git a/ksquirrel/sidebar/sq_directorybasket.cpp b/ksquirrel/sidebar/sq_directorybasket.cpp
index 5fad80a..57d5730 100644
--- a/ksquirrel/sidebar/sq_directorybasket.cpp
+++ b/ksquirrel/sidebar/sq_directorybasket.cpp
@@ -51,7 +51,7 @@ SQ_DirectoryBasket * SQ_DirectoryBasket::m_inst = 0;
SQ_DBMenu::SQ_DBMenu(TQWidget *parent, const char *name) : SQ_TreeViewMenu(parent, name), item(0)
{
insertSeparator();
- id_icon = insertItem(i18n("Change icon"), TQT_TQOBJECT(this), TQT_SLOT(slotChangeIcon()));
+ id_icon = insertItem(i18n("Change icon"), this, TQT_SLOT(slotChangeIcon()));
}
SQ_DBMenu::~SQ_DBMenu()
@@ -112,7 +112,7 @@ void SQ_DBMenu::slotDirectoryDelete()
{
TDEIO::Job *job = TDEIO::del(item->KFileTreeViewItem::url());
- connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_TQOBJECT(this), TQT_SLOT(slotDirectoryResult(TDEIO::Job *)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotDirectoryResult(TDEIO::Job *)));
}
}
@@ -209,10 +209,10 @@ SQ_DirectoryBasket::SQ_DirectoryBasket(TQWidget *parent, const char *name) : KFi
menu = new SQ_DBMenu(this);
timer = new TQTimer(this);
- connect(timer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotSortReal()));
+ connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSortReal()));
timerAdd = new TQTimer(this);
- connect(timerAdd, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotDelayedShowAdd()));
+ connect(timerAdd, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDelayedShowAdd()));
setSorting(-1);
setAcceptDrops(true);
@@ -246,16 +246,16 @@ SQ_DirectoryBasket::SQ_DirectoryBasket(TQWidget *parent, const char *name) : KFi
root->setOpen(true);
setRootIsDecorated(false);
- menu->reconnect(SQ_TreeViewMenu::New, TQT_TQOBJECT(this), TQT_SLOT(slotNewDirectory()));
+ menu->reconnect(SQ_TreeViewMenu::New, this, TQT_SLOT(slotNewDirectory()));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(spacePressed(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SIGNAL(executed(TQListViewItem*)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(returnPressed(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SIGNAL(executed(TQListViewItem*)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(executed(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotItemExecuted(TQListViewItem*)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(itemRenamed(TQListViewItem *, int, const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotItemRenamedMy(TQListViewItem *, int, const TQString &)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(itemAdded(TQListViewItem *)), TQT_TQOBJECT(this), TQT_SLOT(slotSort()));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(moved()), TQT_TQOBJECT(this), TQT_SLOT(slotReindex()));
+ connect(this, TQT_SIGNAL(spacePressed(TQListViewItem*)), this, TQT_SIGNAL(executed(TQListViewItem*)));
+ connect(this, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SIGNAL(executed(TQListViewItem*)));
+ connect(this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotItemExecuted(TQListViewItem*)));
+ connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
+ connect(this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)));
+ connect(this, TQT_SIGNAL(itemRenamed(TQListViewItem *, int, const TQString &)), this, TQT_SLOT(slotItemRenamedMy(TQListViewItem *, int, const TQString &)));
+ connect(this, TQT_SIGNAL(itemAdded(TQListViewItem *)), this, TQT_SLOT(slotSort()));
+ connect(this, TQT_SIGNAL(moved()), this, TQT_SLOT(slotReindex()));
}
SQ_DirectoryBasket::~SQ_DirectoryBasket()
diff --git a/ksquirrel/sidebar/sq_multibar.cpp b/ksquirrel/sidebar/sq_multibar.cpp
index 3af025c..2be7d16 100644
--- a/ksquirrel/sidebar/sq_multibar.cpp
+++ b/ksquirrel/sidebar/sq_multibar.cpp
@@ -43,7 +43,7 @@ SQ_MultiBar::SQ_MultiBar(TQWidget *parent, const char *name) : TQHBox(parent, na
SQ_Config::instance()->setGroup("Interface");
m_width = SQ_Config::instance()->readNumEntry("splitter", 220);
- mapper = new TQSignalMapper(TQT_TQOBJECT(this));
+ mapper = new TQSignalMapper(this);
connect(mapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(raiseWidget(int)));
@@ -83,7 +83,7 @@ void SQ_MultiBar::addWidget(TQWidget *new_w, const TQString &text, const TQStrin
// since we cann't determine which tab was clicked,
// we should use TQSignalMapper to determine it.
- mapper->setMapping(TQT_TQOBJECT(mt->tab(m_id)), m_id);
+ mapper->setMapping(mt->tab(m_id), m_id);
connect(mt->tab(m_id), TQT_SIGNAL(clicked()), mapper, TQT_SLOT(map()));
diff --git a/ksquirrel/sidebar/sq_previewwidget.cpp b/ksquirrel/sidebar/sq_previewwidget.cpp
index 4ff93da..db039a7 100644
--- a/ksquirrel/sidebar/sq_previewwidget.cpp
+++ b/ksquirrel/sidebar/sq_previewwidget.cpp
@@ -55,20 +55,20 @@ SQ_PreviewWidget::SQ_PreviewWidget(TQWidget *parent, const char *name)
rereadColor();
- down = new SQ_Downloader(TQT_TQOBJECT(this));
- connect(down, TQT_SIGNAL(result(const KURL &)), TQT_TQOBJECT(this), TQT_SLOT(slotDownloadResult(const KURL &)));
- connect(down, TQT_SIGNAL(percents(int)), TQT_TQOBJECT(this), TQT_SLOT(slotDownloadPercents(int)));
+ down = new SQ_Downloader(this);
+ connect(down, TQT_SIGNAL(result(const KURL &)), this, TQT_SLOT(slotDownloadResult(const KURL &)));
+ connect(down, TQT_SIGNAL(percents(int)), this, TQT_SLOT(slotDownloadPercents(int)));
popup = new TDEPopupMenu;
- popup->insertItem(i18n("Background color..."), TQT_TQOBJECT(this), TQT_SLOT(slotBackground()));
- popup->insertItem(i18n("Text color..."), TQT_TQOBJECT(this), TQT_SLOT(slotText()));
+ popup->insertItem(i18n("Background color..."), this, TQT_SLOT(slotBackground()));
+ popup->insertItem(i18n("Text color..."), this, TQT_SLOT(slotText()));
popup->insertSeparator();
- popup->insertItem(i18n("Go to first image")+"\tHome", TQT_TQOBJECT(this), TQT_SIGNAL(first()));
- popup->insertItem(i18n("Next image")+"\tSpace", TQT_TQOBJECT(this), TQT_SIGNAL(next()));
- popup->insertItem(i18n("Previous image")+"\tBackSpace", TQT_TQOBJECT(this), TQT_SIGNAL(previous()));
- popup->insertItem(i18n("Go to last image")+"\tEnd", TQT_TQOBJECT(this), TQT_SIGNAL(last()));
+ popup->insertItem(i18n("Go to first image")+"\tHome", this, TQT_SIGNAL(first()));
+ popup->insertItem(i18n("Next image")+"\tSpace", this, TQT_SIGNAL(next()));
+ popup->insertItem(i18n("Previous image")+"\tBackSpace", this, TQT_SIGNAL(previous()));
+ popup->insertItem(i18n("Go to last image")+"\tEnd", this, TQT_SIGNAL(last()));
popup->insertSeparator();
- popup->insertItem(i18n("Execute")+"\tEnter", TQT_TQOBJECT(this), TQT_SIGNAL(execute()));
+ popup->insertItem(i18n("Execute")+"\tEnter", this, TQT_SIGNAL(execute()));
multi_pix = SQ_IconLoader::instance()->loadIcon("application-vnd.tde.tdemultiple", TDEIcon::Desktop, TDEIcon::SizeSmall);
diff --git a/ksquirrel/sidebar/sq_treeview.cpp b/ksquirrel/sidebar/sq_treeview.cpp
index fb0c295..38c7280 100644
--- a/ksquirrel/sidebar/sq_treeview.cpp
+++ b/ksquirrel/sidebar/sq_treeview.cpp
@@ -78,7 +78,7 @@ SQ_TreeView::SQ_TreeView(TQWidget *parent, const char *name) : KFileTreeView(par
dw = 0;
m_recurs = No;
- lister = new SQ_ThreadDirLister(TQT_TQOBJECT(this));
+ lister = new SQ_ThreadDirLister(this);
setupRecursion();
setFrameShape(TQFrame::NoFrame);
@@ -185,7 +185,7 @@ void SQ_TreeView::setRecursion(int b)
// turn recursion on
if(m_recurs == No && b)
{
- dw = new KDirWatch(TQT_TQOBJECT(this));
+ dw = new KDirWatch(this);
connect(dw, TQT_SIGNAL(dirty(const TQString &)), this, TQT_SLOT(slotDirty(const TQString &)));
dw->blockSignals(true);
diff --git a/ksquirrel/sq_diroperator.cpp b/ksquirrel/sq_diroperator.cpp
index 70a0649..a7f1bbe 100644
--- a/ksquirrel/sq_diroperator.cpp
+++ b/ksquirrel/sq_diroperator.cpp
@@ -77,19 +77,19 @@ SQ_DirOperator::SQ_DirOperator(const KURL &url, ViewT type_, TQWidget *parent, c
// create and insert new actions in context menu
setupActionsMy();
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(finishedLoading()), TQT_TQOBJECT(this), TQT_SLOT(slotFinishedLoading()));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(updateInformation(int,int)), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInformation(int,int)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(urlEntered(const KURL&)), TQT_TQOBJECT(this), TQT_SLOT(slotUrlEntered(const KURL&)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(dropped(const KFileItem *, TQDropEvent*, const KURL::List&)),
- TQT_TQOBJECT(this), TQT_SLOT(slotDropped(const KFileItem *, TQDropEvent*, const KURL::List&)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(fileSelected(const KFileItem *)), TQT_TQOBJECT(this), TQT_SLOT(slotExecutedConst(const KFileItem *)));
+ connect(this, TQT_SIGNAL(finishedLoading()), this, TQT_SLOT(slotFinishedLoading()));
+ connect(this, TQT_SIGNAL(updateInformation(int,int)), this, TQT_SLOT(slotUpdateInformation(int,int)));
+ connect(this, TQT_SIGNAL(urlEntered(const KURL&)), this, TQT_SLOT(slotUrlEntered(const KURL&)));
+ connect(this, TQT_SIGNAL(dropped(const KFileItem *, TQDropEvent*, const KURL::List&)),
+ this, TQT_SLOT(slotDropped(const KFileItem *, TQDropEvent*, const KURL::List&)));
+ connect(this, TQT_SIGNAL(fileSelected(const KFileItem *)), this, TQT_SLOT(slotExecutedConst(const KFileItem *)));
- connect(dirLister(), TQT_SIGNAL(deleteItem(KFileItem *)), TQT_TQOBJECT(this), TQT_SLOT(slotItemDeleted(KFileItem *)));
- connect(dirLister(), TQT_SIGNAL(newItems(const KFileItemList &)), TQT_TQOBJECT(this), TQT_SLOT(slotNewItems(const KFileItemList &)));
- connect(dirLister(), TQT_SIGNAL(refreshItems(const KFileItemList &)), TQT_TQOBJECT(this), TQT_SLOT(slotRefreshItems(const KFileItemList &)));
+ connect(dirLister(), TQT_SIGNAL(deleteItem(KFileItem *)), this, TQT_SLOT(slotItemDeleted(KFileItem *)));
+ connect(dirLister(), TQT_SIGNAL(newItems(const KFileItemList &)), this, TQT_SLOT(slotNewItems(const KFileItemList &)));
+ connect(dirLister(), TQT_SIGNAL(refreshItems(const KFileItemList &)), this, TQT_SLOT(slotRefreshItems(const KFileItemList &)));
timer_preview = new TQTimer(this);
- connect(timer_preview, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotPreview()));
+ connect(timer_preview, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotPreview()));
setAcceptDrops(true);
@@ -98,11 +98,11 @@ SQ_DirOperator::SQ_DirOperator(const KURL &url, ViewT type_, TQWidget *parent, c
fireDiskSize(url);
- down = new SQ_Downloader(TQT_TQOBJECT(this), "SQ_Downloader [dirop]");
- connect(down, TQT_SIGNAL(result(const KURL &)), TQT_TQOBJECT(this), TQT_SLOT(slotDownloaderResult(const KURL &)));
- connect(down, TQT_SIGNAL(percents(int)), TQT_TQOBJECT(this), TQT_SLOT(slotDownloadPercents(int)));
+ down = new SQ_Downloader(this, "SQ_Downloader [dirop]");
+ connect(down, TQT_SIGNAL(result(const KURL &)), this, TQT_SLOT(slotDownloaderResult(const KURL &)));
+ connect(down, TQT_SIGNAL(percents(int)), this, TQT_SLOT(slotDownloadPercents(int)));
- connect(SQ_ArchiveHandler::instance(), TQT_SIGNAL(unpack(const KURL &)), TQT_TQOBJECT(this), TQT_SLOT(slotSetURL(const KURL &)));
+ connect(SQ_ArchiveHandler::instance(), TQT_SIGNAL(unpack(const KURL &)), this, TQT_SLOT(slotSetURL(const KURL &)));
// read sorting settings
SQ_Config::instance()->setGroup("Fileview");
@@ -153,7 +153,7 @@ void SQ_DirOperator::fireDiskSize(const KURL &url)
const unsigned long&,
const unsigned long&,
const TQString&)),
- TQT_TQOBJECT(this), TQT_SLOT(slotFoundMountPoint(const unsigned long&,
+ this, TQT_SLOT(slotFoundMountPoint(const unsigned long&,
const unsigned long&,
const unsigned long&,
const TQString&)));
@@ -238,9 +238,9 @@ void SQ_DirOperator::prepareView(ViewT t)
SQ_FileDetailView *dv;
fileview = dv = new SQ_FileDetailView(this, "detail view");
- connect(dv, TQT_SIGNAL(currentChanged(TQListViewItem *)), TQT_TQOBJECT(this), TQT_SLOT(slotCurrentChanged(TQListViewItem *)));
- connect(dv, TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotSelectionChanged()));
- connect(dv, TQT_SIGNAL(invokeBrowser()), TQT_TQOBJECT(this), TQT_SLOT(slotInvokeBrowser()));
+ connect(dv, TQT_SIGNAL(currentChanged(TQListViewItem *)), this, TQT_SLOT(slotCurrentChanged(TQListViewItem *)));
+ connect(dv, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
+ connect(dv, TQT_SIGNAL(invokeBrowser()), this, TQT_SLOT(slotInvokeBrowser()));
connect(KSquirrel::app(), TQT_SIGNAL(resetToolTip()), dv, TQT_SLOT(slotResetToolTip()));
}
break;
@@ -251,9 +251,9 @@ void SQ_DirOperator::prepareView(ViewT t)
SQ_FileIconView *iv;
fileview = iv = new SQ_FileIconView(this, (type == SQ_DirOperator::TypeIcons) ? "icon view":"list view");
- connect(iv, TQT_SIGNAL(currentChanged(TQIconViewItem *)), TQT_TQOBJECT(this), TQT_SLOT(slotCurrentChanged(TQIconViewItem *)));
- connect(iv, TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotSelectionChanged()));
- connect(iv, TQT_SIGNAL(invokeBrowser()), TQT_TQOBJECT(this), TQT_SLOT(slotInvokeBrowser()));
+ connect(iv, TQT_SIGNAL(currentChanged(TQIconViewItem *)), this, TQT_SLOT(slotCurrentChanged(TQIconViewItem *)));
+ connect(iv, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
+ connect(iv, TQT_SIGNAL(invokeBrowser()), this, TQT_SLOT(slotInvokeBrowser()));
connect(KSquirrel::app(), TQT_SIGNAL(resetToolTip()), iv, TQT_SLOT(slotResetToolTip()));
disableSpecificActions(iv);
@@ -265,9 +265,9 @@ void SQ_DirOperator::prepareView(ViewT t)
SQ_FileThumbView *tv;
fileview = tv = new SQ_FileThumbView(this, "thumb view");
- connect(tv, TQT_SIGNAL(currentChanged(TQIconViewItem *)), TQT_TQOBJECT(this), TQT_SLOT(slotCurrentChanged(TQIconViewItem *)));
- connect(tv, TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotSelectionChanged()));
- connect(tv, TQT_SIGNAL(invokeBrowser()), TQT_TQOBJECT(this), TQT_SLOT(slotInvokeBrowser()));
+ connect(tv, TQT_SIGNAL(currentChanged(TQIconViewItem *)), this, TQT_SLOT(slotCurrentChanged(TQIconViewItem *)));
+ connect(tv, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
+ connect(tv, TQT_SIGNAL(invokeBrowser()), this, TQT_SLOT(slotInvokeBrowser()));
connect(dirLister(), TQT_SIGNAL(canceled()), tv, TQT_SLOT(stopThumbnailUpdate()));
connect(KSquirrel::app(), TQT_SIGNAL(resetToolTip()), tv, TQT_SLOT(slotResetToolTip()));
@@ -349,13 +349,13 @@ void SQ_DirOperator::slotDropped(const KFileItem *i, TQDropEvent*, const KURL::L
// Insert new actions in context menu.
void SQ_DirOperator::setupActionsMy()
{
- new TDEAction(i18n("Edit file type"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditMime()), actionCollection(), "dirop_edit_mime");
+ new TDEAction(i18n("Edit file type"), 0, 0, this, TQT_SLOT(slotEditMime()), actionCollection(), "dirop_edit_mime");
if(SQ_HLOptions::instance()->have_imagebasket)
- new TDEAction(i18n("Add to Basket"), "folder_image", CTRL+TQt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(slotAddToBasket()), actionCollection(), "dirop_tobasket");
+ new TDEAction(i18n("Add to Basket"), "folder_image", CTRL+TQt::Key_B, this, TQT_SLOT(slotAddToBasket()), actionCollection(), "dirop_tobasket");
if(SQ_HLOptions::instance()->have_directorybasket)
- new TDEAction(i18n("Add to Folder Basket"), "folder_image", CTRL+TQt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(slotAddToDirectoryBasket()), actionCollection(), "dirop_todirbasket");
+ new TDEAction(i18n("Add to Folder Basket"), "folder_image", CTRL+TQt::Key_D, this, TQT_SLOT(slotAddToDirectoryBasket()), actionCollection(), "dirop_todirbasket");
TDEActionMenu *file = new TDEActionMenu(i18n("File actions"), actionCollection(), "dirop_file_menu");
TDEAction *prop = actionCollection()->action("properties");
@@ -364,7 +364,7 @@ void SQ_DirOperator::setupActionsMy()
if(reload && reload->shortcut().isNull()) reload->setShortcut(TDEShortcut(CTRL+TQt::Key_N));
reload = actionCollection()->action("reload");
- connect(prop, TQT_SIGNAL(enabled(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotEnableFileActions(bool)));
+ connect(prop, TQT_SIGNAL(enabled(bool)), this, TQT_SLOT(slotEnableFileActions(bool)));
TDEAction *sep = actionCollection()->action("separator");
@@ -377,15 +377,15 @@ void SQ_DirOperator::setupActionsMy()
file->insert(new TDEAction(i18n("Link to..."), 0, TQt::Key_F7, SQ_WidgetStack::instance(), TQT_SLOT(slotFileLinkTo()), actionCollection(), "dirop_linkto"));
file->insert(sep);
file->insert(new TDEAction(i18n("Run"), "launch", CTRL+Key_J, SQ_WidgetStack::instance(), TQT_SLOT(slotRunSeparately()), actionCollection(), "dirop_runsepar"));
- file->insert(new TDEAction(i18n("Repeat (nothing to repeat)"), "go-down", TQt::Key_F10, TQT_TQOBJECT(KSquirrel::app()), TQT_SLOT(slotRepeat()), actionCollection(), "dirop_repeat"));
+ file->insert(new TDEAction(i18n("Repeat (nothing to repeat)"), "go-down", TQt::Key_F10, KSquirrel::app(), TQT_SLOT(slotRepeat()), actionCollection(), "dirop_repeat"));
file->insert(new TDEAction(i18n("Convert..."), 0, CTRL+TQt::Key_K, SQ_Converter::instance(), TQT_SLOT(slotStartEdit()), actionCollection(), "dirop_convert"));
file->insert(sep);
file->insert(new TDEAction(i18n("Recreate selected thumbnails"), "reload", CTRL+TQt::Key_R, SQ_WidgetStack::instance(),
TQT_SLOT(slotRecreateThumbnail()), actionCollection(), "dirop_recreate_thumbnails"));
file->insert(sep);
- file->insert(new TDEAction(i18n("Copy file path"), 0, TQt::Key_F8, TQT_TQOBJECT(this), TQT_SLOT(slotCopyPath()), actionCollection(), "dirop_copypath"));
- file->insert(new TDEAction(i18n("Copy file url"), 0, TQt::Key_F9, TQT_TQOBJECT(this), TQT_SLOT(slotCopyURL()), actionCollection(), "dirop_copyurl"));
+ file->insert(new TDEAction(i18n("Copy file path"), 0, TQt::Key_F8, this, TQT_SLOT(slotCopyPath()), actionCollection(), "dirop_copypath"));
+ file->insert(new TDEAction(i18n("Copy file url"), 0, TQt::Key_F9, this, TQT_SLOT(slotCopyURL()), actionCollection(), "dirop_copyurl"));
if(reload) reload->setShortcut(CTRL+TQt::Key_F5);
}
@@ -494,7 +494,7 @@ void SQ_DirOperator::slotFinishedLoading()
// setting current file directly doesn't work. let
// events to be processed and only then set current file
- TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotDelayedFinishedLoading()));
+ TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedFinishedLoading()));
}
void SQ_DirOperator::slotDelayedFinishedLoading()
diff --git a/ksquirrel/sq_glwidget.cpp b/ksquirrel/sq_glwidget.cpp
index 30f67d7..33b2647 100644
--- a/ksquirrel/sq_glwidget.cpp
+++ b/ksquirrel/sq_glwidget.cpp
@@ -121,7 +121,7 @@ SQ_GLWidget::SQ_GLWidget(TQWidget *parent, const char *name) : TQGLWidget(parent
images = 0;
parts_broken = 0;
- ac = new TDEActionCollection(this, TQT_TQOBJECT(this), "GLWidget actionCollection");
+ ac = new TDEActionCollection(this, this, "GLWidget actionCollection");
changed = blocked = decoded = reset_mode = false;
movetype = -1;
buffer = new RGBA [512 * 512];
diff --git a/ksquirrel/sq_glwidget_stuff.cpp b/ksquirrel/sq_glwidget_stuff.cpp
index 87d02ab..521e4fa 100644
--- a/ksquirrel/sq_glwidget_stuff.cpp
+++ b/ksquirrel/sq_glwidget_stuff.cpp
@@ -78,15 +78,15 @@
// Create actions
void SQ_GLWidget::createActions()
{
- pASelectionRect = new TDEToggleAction(i18n("Rectangle"), TQPixmap(locate("data", "images/actions/glselection_rect.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectionRect()), ac, "SQ Selection Rect");
- pASelectionEllipse = new TDEToggleAction(i18n("Ellipse"), TQPixmap(locate("data", "images/actions/glselection_ellipse.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectionEllipse()), ac, "SQ Selection Ellipse");
- pASelectionClear = new TDEAction(i18n("Clear"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectionClear()), ac, "SQ Selection Clear");
-
- pAZoomW = new TDEToggleAction(i18n("Fit width"), TQPixmap(locate("data", "images/actions/zoomW.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoomW()), ac, "SQ ZoomW");
- pAZoomH = new TDEToggleAction(i18n("Fit height"), TQPixmap(locate("data", "images/actions/zoomH.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoomH()), ac, "SQ ZoomH");
- pAZoomWH = new TDEToggleAction(i18n("Fit image"), TQPixmap(locate("data", "images/actions/zoomWH.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoomWH()), ac, "SQ ZoomWH");
- pAZoom100 = new TDEToggleAction(i18n("Zoom 100%"), TQPixmap(locate("data", "images/actions/zoom100.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoom100()), ac, "SQ Zoom100");
- pAZoomLast = new TDEToggleAction(i18n("Leave previous zoom"), TQPixmap(locate("data", "images/actions/zoomlast.png")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotZoomLast()), ac, "SQ ZoomLast");
+ pASelectionRect = new TDEToggleAction(i18n("Rectangle"), TQPixmap(locate("data", "images/actions/glselection_rect.png")), 0, this, TQT_SLOT(slotSelectionRect()), ac, "SQ Selection Rect");
+ pASelectionEllipse = new TDEToggleAction(i18n("Ellipse"), TQPixmap(locate("data", "images/actions/glselection_ellipse.png")), 0, this, TQT_SLOT(slotSelectionEllipse()), ac, "SQ Selection Ellipse");
+ pASelectionClear = new TDEAction(i18n("Clear"), 0, 0, this, TQT_SLOT(slotSelectionClear()), ac, "SQ Selection Clear");
+
+ pAZoomW = new TDEToggleAction(i18n("Fit width"), TQPixmap(locate("data", "images/actions/zoomW.png")), 0, this, TQT_SLOT(slotZoomW()), ac, "SQ ZoomW");
+ pAZoomH = new TDEToggleAction(i18n("Fit height"), TQPixmap(locate("data", "images/actions/zoomH.png")), 0, this, TQT_SLOT(slotZoomH()), ac, "SQ ZoomH");
+ pAZoomWH = new TDEToggleAction(i18n("Fit image"), TQPixmap(locate("data", "images/actions/zoomWH.png")), 0, this, TQT_SLOT(slotZoomWH()), ac, "SQ ZoomWH");
+ pAZoom100 = new TDEToggleAction(i18n("Zoom 100%"), TQPixmap(locate("data", "images/actions/zoom100.png")), 0, this, TQT_SLOT(slotZoom100()), ac, "SQ Zoom100");
+ pAZoomLast = new TDEToggleAction(i18n("Leave previous zoom"), TQPixmap(locate("data", "images/actions/zoomlast.png")), 0, this, TQT_SLOT(slotZoomLast()), ac, "SQ ZoomLast");
pAIfLess = new TDEToggleAction(i18n("Ignore, if image is smaller than window"), TQPixmap(locate("data", "images/actions/ifless.png")), 0, 0, 0, ac, "if less");
pAFull = new TDEToggleAction(TQString(), 0, 0, 0, ac, "SQ GL Full");
@@ -102,7 +102,7 @@ void SQ_GLWidget::createActions()
pASelectionEllipse->setExclusiveGroup(squirrel_selection_type);
pASelectionRect->setExclusiveGroup(squirrel_selection_type);
- connect(pAIfLess, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotZoomIfLess()));
+ connect(pAIfLess, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotZoomIfLess()));
#ifndef KSQUIRREL_PART
connect(pAFull, TQT_SIGNAL(toggled(bool)), KSquirrel::app(), TQT_SLOT(slotFullScreen(bool)));
@@ -163,29 +163,29 @@ void SQ_GLWidget::createToolbar()
*
* Plugged TDEActions also don't know about autorepeat :(
*/
- new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_first.png")), i18n("Go to first image"), TQT_TQOBJECT(this), TQT_SLOT(slotFirst()), toolbar);
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_prev.png")), i18n("Previous image"), TQT_TQOBJECT(this), TQT_SLOT(slotPrev()), toolbar);
+ new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_first.png")), i18n("Go to first image"), this, TQT_SLOT(slotFirst()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_prev.png")), i18n("Previous image"), this, TQT_SLOT(slotPrev()), toolbar);
pATool->setAutoRepeat(true);
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_next.png")), i18n("Next image"), TQT_TQOBJECT(this), TQT_SLOT(slotNext()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_next.png")), i18n("Next image"), this, TQT_SLOT(slotNext()), toolbar);
pATool->setAutoRepeat(true);
- new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_last.png")), i18n("Go to last image"), TQT_TQOBJECT(this), TQT_SLOT(slotLast()), toolbar);
+ new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_last.png")), i18n("Go to last image"), this, TQT_SLOT(slotLast()), toolbar);
// some toolbuttons need autorepeat...
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/zoom+.png")), i18n("Zoom +"), TQT_TQOBJECT(this), TQT_SLOT(slotZoomPlus()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/zoom+.png")), i18n("Zoom +"), this, TQT_SLOT(slotZoomPlus()), toolbar);
pATool->setAutoRepeat(true);
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/zoom-.png")), i18n("Zoom -"), TQT_TQOBJECT(this), TQT_SLOT(slotZoomMinus()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/zoom-.png")), i18n("Zoom -"), this, TQT_SLOT(slotZoomMinus()), toolbar);
pATool->setAutoRepeat(true);
pAToolZoom = new SQ_ToolButtonPopup(TQPixmap(locate("data", "images/actions/zoom_template.png")), i18n("Zoom"), toolbar);
pAToolZoom->setPopup(zoomMenu);
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/rotateL.png")), i18n("Rotate left"), TQT_TQOBJECT(this), TQT_SLOT(slotRotateLeft()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/rotateL.png")), i18n("Rotate left"), this, TQT_SLOT(slotRotateLeft()), toolbar);
pATool->setAutoRepeat(true);
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/rotateR.png")), i18n("Rotate right"), TQT_TQOBJECT(this), TQT_SLOT(slotRotateRight()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/rotateR.png")), i18n("Rotate right"), this, TQT_SLOT(slotRotateRight()), toolbar);
pATool->setAutoRepeat(true);
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/flipV.png")), i18n("Flip vertically"), TQT_TQOBJECT(this), TQT_SLOT(slotFlipV()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/flipV.png")), i18n("Flip vertically"), this, TQT_SLOT(slotFlipV()), toolbar);
pATool->setAutoRepeat(true);
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/flipH.png")), i18n("Flip horizontally"), TQT_TQOBJECT(this), TQT_SLOT(slotFlipH()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/flipH.png")), i18n("Flip horizontally"), this, TQT_SLOT(slotFlipH()), toolbar);
pATool->setAutoRepeat(true);
- new SQ_ToolButton(TQPixmap(locate("data", "images/actions/reload.png")), i18n("Normalize"), TQT_TQOBJECT(this), TQT_SLOT(slotMatrixReset()), toolbar);
+ new SQ_ToolButton(TQPixmap(locate("data", "images/actions/reload.png")), i18n("Normalize"), this, TQT_SLOT(slotMatrixReset()), toolbar);
pAToolFull = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/fullscreen.png")), i18n("Fullscreen"), pAFull, TQT_SLOT(activate()), toolbar);
pAToolFull->setToggleButton(true);
@@ -193,16 +193,16 @@ void SQ_GLWidget::createToolbar()
pAToolImages->setPopup(images);
SQ_ToolButtonPopup *pAToolSel = new SQ_ToolButtonPopup(TQPixmap(locate("data", "images/actions/glselection.png")), i18n("Selection"), toolbar);
pAToolSel->setPopup(selectionMenu);
- pAToolQuick = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/configure.png")), i18n("Codec settings"), TQT_TQOBJECT(this), TQT_SLOT(slotShowCodecSettings()), toolbar);
+ pAToolQuick = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/configure.png")), i18n("Codec settings"), this, TQT_SLOT(slotShowCodecSettings()), toolbar);
pAToolQuick->setEnabled(false);
- pAToolProp = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/prop.png")), i18n("Image Properties"), TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), toolbar);
- pAToolPrint = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/print.png")), i18n("Print"), TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), toolbar);
- new SQ_ToolButton(TQPixmap(locate("data", "images/actions/shownav.png")), i18n("Show navigator"), TQT_TQOBJECT(this), TQT_SLOT(slotShowNav()), toolbar);
+ pAToolProp = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/prop.png")), i18n("Image Properties"), this, TQT_SLOT(slotProperties()), toolbar);
+ pAToolPrint = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/print.png")), i18n("Print"), this, TQT_SLOT(slotPrint()), toolbar);
+ new SQ_ToolButton(TQPixmap(locate("data", "images/actions/shownav.png")), i18n("Show navigator"), this, TQT_SLOT(slotShowNav()), toolbar);
slider_zoom = new TQSlider(1, 38, 2, 19, TQt::Horizontal, toolbar);
slider_zoom->setTickmarks(TQSlider::Below);
slider_zoom->setTickInterval(19);
- connect(slider_zoom, TQT_SIGNAL(valueChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetZoomPercents(int)));
+ connect(slider_zoom, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetZoomPercents(int)));
toolbar->insertWidget(1000, 0, slider_zoom);
toolbar->setItemAutoSized(1000);
toolbar->alignItemRight(1000);
@@ -335,7 +335,7 @@ void SQ_GLWidget::slotShowCodecSettings()
SQ_CodecSettingsSkeleton skel(this);
- connect(&skel, TQT_SIGNAL(apply()), TQT_TQOBJECT(this), TQT_SLOT(slotApplyCodecSettings()));
+ connect(&skel, TQT_SIGNAL(apply()), this, TQT_SLOT(slotApplyCodecSettings()));
skel.addSettingsWidget(tab->lib->config);
skel.setCodecInfo(tab->lib->mime, tab->lib->quickinfo);
@@ -609,7 +609,7 @@ void SQ_GLWidget::saveAs()
// src dst perm overwrite resume progress
TDEIO::Job *j = TDEIO::file_copy(path, url, -1, true, false, false);
- connect(j, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyResult(TDEIO::Job *)));
+ connect(j, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotCopyResult(TDEIO::Job *)));
}
}
@@ -632,7 +632,7 @@ void SQ_GLWidget::slotCopyResult(TDEIO::Job *job)
return;
TDEIO::Job *j = TDEIO::file_copy(tmp->name(), d.selectedURL(), -1, true, false, false);
- connect(j, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyResult(TDEIO::Job *)));
+ connect(j, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotCopyResult(TDEIO::Job *)));
}
}
}
@@ -663,7 +663,7 @@ void SQ_GLWidget::bcg()
_bcg.setPreviewImage(generatePreview());
- connect(&_bcg, TQT_SIGNAL(bcg(SQ_ImageBCGOptions *)), TQT_TQOBJECT(this), TQT_SLOT(slotBCG(SQ_ImageBCGOptions *)));
+ connect(&_bcg, TQT_SIGNAL(bcg(SQ_ImageBCGOptions *)), this, TQT_SLOT(slotBCG(SQ_ImageBCGOptions *)));
_bcg.exec();
@@ -681,7 +681,7 @@ void SQ_GLWidget::filter()
flt.setPreviewImage(generatePreview());
- connect(&flt, TQT_SIGNAL(filter(SQ_ImageFilterOptions *)), TQT_TQOBJECT(this), TQT_SLOT(slotFilter(SQ_ImageFilterOptions *)));
+ connect(&flt, TQT_SIGNAL(filter(SQ_ImageFilterOptions *)), this, TQT_SLOT(slotFilter(SQ_ImageFilterOptions *)));
flt.exec();
@@ -871,7 +871,7 @@ void SQ_GLWidget::initAccelsAndMenu()
menu->insertItem(i18n("Image"), menuImage);
#define SQ_ADD_KACTION(b) \
- (new TDEAction(TQString(), b, TQT_TQOBJECT(this), TQT_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").arg(b)))
+ (new TDEAction(TQString(), b, this, TQT_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").arg(b)))
id_saveas = menuFile->insertItem(SQ_IconLoader::instance()->loadIcon("document-save-as", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Save As...") + "\tS", SQ_ADD_KACTION(TQt::Key_S), TQT_SLOT(activate()));
@@ -1073,7 +1073,7 @@ void SQ_GLWidget::slotAccelActivated()
job = TDEIO::move(tab->m_original, url);
job->setWindow(this);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyJobResult(TDEIO::Job *)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotCopyJobResult(TDEIO::Job *)));
}
else if(!ks.compare(TQt::Key_F7) || !ks.compare(TQt::Key_F8))
{
@@ -1085,7 +1085,7 @@ void SQ_GLWidget::slotAccelActivated()
job = TDEIO::move(tab->m_original, lastCopy);
job->setWindow(this);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyJobResult(TDEIO::Job *)));
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotCopyJobResult(TDEIO::Job *)));
}
else if(!ks.compare(TQt::Key_F9)) copyURL();
else if(!ks.compare(TQt::Key_Slash)) slotShowHelp();
diff --git a/ksquirrel/sq_imageproperties.ui.h b/ksquirrel/sq_imageproperties.ui.h
index d93ccc4..41926a2 100644
--- a/ksquirrel/sq_imageproperties.ui.h
+++ b/ksquirrel/sq_imageproperties.ui.h
@@ -25,9 +25,9 @@
void SQ_ImageProperties::init()
{
menu = new TDEPopupMenu;
- copy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopyString()), 0);
- copyentry = new TDEAction(i18n("Copy entry"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCopyEntry()), 0);
- copyall = new TDEAction(i18n("Copy all entries"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCopyAll()), 0);
+ copy = KStdAction::copy(this, TQT_SLOT(slotCopyString()), 0);
+ copyentry = new TDEAction(i18n("Copy entry"), 0, this, TQT_SLOT(slotCopyEntry()), 0);
+ copyall = new TDEAction(i18n("Copy all entries"), 0, this, TQT_SLOT(slotCopyAll()), 0);
copyentry->setIcon(copy->icon());
copyall->setIcon(copy->icon());
diff --git a/ksquirrel/sq_kipiinterface.cpp b/ksquirrel/sq_kipiinterface.cpp
index a5feec7..4d7eb60 100644
--- a/ksquirrel/sq_kipiinterface.cpp
+++ b/ksquirrel/sq_kipiinterface.cpp
@@ -112,7 +112,7 @@ class SQ_KIPIImageInfo : public KIPI::ImageInfoShared
/***************************************************************/
SQ_KIPIInterface::SQ_KIPIInterface(TQWidget *parent)
- : KIPI::Interface(TQT_TQOBJECT(parent), "KSquirrel KIPI Interface")
+ : KIPI::Interface(parent, "KSquirrel KIPI Interface")
{
connect(SQ_WidgetStack::instance()->diroperator(), TQT_SIGNAL(fileHighlighted(const KFileItem *)),
this, TQT_SLOT(slotSelectionChanged()));
diff --git a/ksquirrel/sq_options.ui.h b/ksquirrel/sq_options.ui.h
index d4fdd9a..a2154f1 100644
--- a/ksquirrel/sq_options.ui.h
+++ b/ksquirrel/sq_options.ui.h
@@ -162,7 +162,7 @@ void SQ_Options::init()
checkKIPIDemand->setEnabled(true);
#endif
- listMain->updateAndInstall(TQT_TQOBJECT(this));
+ listMain->updateAndInstall(this);
connect(listMain, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotShowPage()));