summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-12-30 16:29:10 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-12-31 22:26:50 +0900
commit77d98cdf1ebfa3590fa6d897af930eeecc7fa1dd (patch)
treeaa6e330071d092f9f939833fd30868edcaf22e01
parente814f1e8bb3f6189aa4fc336ad084adbd7fae5b2 (diff)
downloadksquirrel-77d98cdf1ebfa3590fa6d897af930eeecc7fa1dd.tar.gz
ksquirrel-77d98cdf1ebfa3590fa6d897af930eeecc7fa1dd.zip
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit bd78d59d712b6ac594d0bd0b9d4bd7cc3c6af8db)
-rw-r--r--ksquirrel/imageedit/sq_converter.cpp8
-rw-r--r--ksquirrel/imageedit/sq_imagebcg.ui.h2
-rw-r--r--ksquirrel/imageedit/sq_imagefilter.ui.h52
-rw-r--r--ksquirrel/ksquirrel-libs-configurator/klc.cpp4
-rw-r--r--ksquirrel/ksquirrel-libs-configurator/klc.ui.h10
-rw-r--r--ksquirrel/ksquirrel.cpp140
-rw-r--r--ksquirrel/ksquirrelpart/ksquirrelpart.cpp34
-rw-r--r--ksquirrel/ksquirrelpart/sq_diroperator.cpp4
-rw-r--r--ksquirrel/ksquirrelpart/sq_downloader.cpp4
-rw-r--r--ksquirrel/ksquirrelpart/sq_externaltool.cpp4
-rw-r--r--ksquirrel/ksquirrelpart/sq_glview.cpp2
-rw-r--r--ksquirrel/ksquirrelpart/sq_glwidget.cpp16
-rw-r--r--ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp186
-rw-r--r--ksquirrel/ksquirrelpart/sq_imagebcg.ui.h2
-rw-r--r--ksquirrel/ksquirrelpart/sq_imagefilter.ui.h52
-rw-r--r--ksquirrel/ksquirrelpart/sq_imageproperties.ui.h10
-rw-r--r--ksquirrel/sidebar/sq_categoriesview.cpp24
-rw-r--r--ksquirrel/sidebar/sq_categorybrowsermenu.cpp16
-rw-r--r--ksquirrel/sidebar/sq_directorybasket.cpp28
-rw-r--r--ksquirrel/sidebar/sq_imagebasket.cpp18
-rw-r--r--ksquirrel/sidebar/sq_mountview.cpp22
-rw-r--r--ksquirrel/sidebar/sq_multibar.cpp4
-rw-r--r--ksquirrel/sidebar/sq_previewwidget.cpp18
-rw-r--r--ksquirrel/sidebar/sq_treeview.cpp30
-rw-r--r--ksquirrel/sidebar/sq_treeviewmenu.cpp22
-rw-r--r--ksquirrel/sq_diroperator.cpp102
-rw-r--r--ksquirrel/sq_downloader.cpp4
-rw-r--r--ksquirrel/sq_externaltool.cpp4
-rw-r--r--ksquirrel/sq_filedetailview.cpp8
-rw-r--r--ksquirrel/sq_fileiconviewbase.cpp8
-rw-r--r--ksquirrel/sq_filethumbview.cpp12
-rw-r--r--ksquirrel/sq_glview.cpp8
-rw-r--r--ksquirrel/sq_glwidget.cpp16
-rw-r--r--ksquirrel/sq_glwidget_stuff.cpp186
-rw-r--r--ksquirrel/sq_imageproperties.ui.h10
-rw-r--r--ksquirrel/sq_kipiinterface.cpp8
-rw-r--r--ksquirrel/sq_kipimanager.cpp4
-rw-r--r--ksquirrel/sq_navigatordropmenu.cpp12
-rw-r--r--ksquirrel/sq_options.ui.h2
-rw-r--r--ksquirrel/sq_progressbox.cpp2
-rw-r--r--ksquirrel/sq_slideshow.ui.h2
-rw-r--r--ksquirrel/sq_slideshowlisting.ui.h2
-rw-r--r--ksquirrel/sq_slideshowwidget.cpp16
-rw-r--r--ksquirrel/sq_thumbnailcachemaster.ui.h2
-rw-r--r--ksquirrel/sq_thumbnailloadjob.cpp4
-rw-r--r--ksquirrel/sq_widgetstack.cpp16
46 files changed, 570 insertions, 570 deletions
diff --git a/ksquirrel/imageedit/sq_converter.cpp b/ksquirrel/imageedit/sq_converter.cpp
index 9271b51..04ab3aa 100644
--- a/ksquirrel/imageedit/sq_converter.cpp
+++ b/ksquirrel/imageedit/sq_converter.cpp
@@ -425,10 +425,10 @@ void SQ_Converter::startEditPrivate()
convert = new SQ_ImageConvert(KSquirrel::app());
convert->setCaption(i18n("Convert 1 file", "Convert %n files", files.count()));
- connect(convert, TQT_SIGNAL(convert(SQ_ImageOptions*, SQ_ImageConvertOptions*)), this, TQT_SLOT(slotStartConvert(SQ_ImageOptions*, SQ_ImageConvertOptions*)));
- connect(this, TQT_SIGNAL(convertText(const TQString &, bool)), convert, TQT_SLOT(slotDebugText(const TQString &, bool)));
- connect(this, TQT_SIGNAL(oneFileProcessed()), convert, TQT_SLOT(slotOneProcessed()));
- connect(this, TQT_SIGNAL(done(bool)), convert, TQT_SLOT(slotDone(bool)));
+ connect(convert, TQ_SIGNAL(convert(SQ_ImageOptions*, SQ_ImageConvertOptions*)), this, TQ_SLOT(slotStartConvert(SQ_ImageOptions*, SQ_ImageConvertOptions*)));
+ connect(this, TQ_SIGNAL(convertText(const TQString &, bool)), convert, TQ_SLOT(slotDebugText(const TQString &, bool)));
+ connect(this, TQ_SIGNAL(oneFileProcessed()), convert, TQ_SLOT(slotOneProcessed()));
+ connect(this, TQ_SIGNAL(done(bool)), convert, TQ_SLOT(slotDone(bool)));
convert->exec();
}
diff --git a/ksquirrel/imageedit/sq_imagebcg.ui.h b/ksquirrel/imageedit/sq_imagebcg.ui.h
index 3d0913d..31c3516 100644
--- a/ksquirrel/imageedit/sq_imagebcg.ui.h
+++ b/ksquirrel/imageedit/sq_imagebcg.ui.h
@@ -46,7 +46,7 @@ void SQ_ImageBCG::init()
spinG->setRange(0, 6.0, 0.01, 2);
spinG->setValue(1.0);
- connect(spinG, TQT_SIGNAL(valueChanged(int)), spinG, TQT_SLOT(slotValueChanged(int)));
+ connect(spinG, TQ_SIGNAL(valueChanged(int)), spinG, TQ_SLOT(slotValueChanged(int)));
}
void SQ_ImageBCG::slotResetG()
diff --git a/ksquirrel/imageedit/sq_imagefilter.ui.h b/ksquirrel/imageedit/sq_imagefilter.ui.h
index 643b0a5..18eb263 100644
--- a/ksquirrel/imageedit/sq_imagefilter.ui.h
+++ b/ksquirrel/imageedit/sq_imagefilter.ui.h
@@ -576,32 +576,32 @@ void SQ_ImageFilter::oil()
void SQ_ImageFilter::hackConnect()
{
- connect( blendOpacity, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( blend() ) );
- connect( pushBlendColor, TQT_SIGNAL( changed(const TQColor&) ), this, TQT_SLOT( blend() ) );
- connect( blurRadius, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( blur() ) );
- connect( blurSigma, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( blur() ) );
- connect( desaturateValue, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( desaturate() ) );
- connect( edgeRadius, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( edge() ) );
- connect( embossRadius, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( emboss() ) );
- connect( embossSigma, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( emboss() ) );
- connect( fadeColor, TQT_SIGNAL( changed(const TQColor&) ), this, TQT_SLOT( fade() ) );
- connect( fadeValue, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( fade() ) );
- connect( flattenColor1, TQT_SIGNAL( changed(const TQColor&) ), this, TQT_SLOT( flatten() ) );
- connect( flattenColor2, TQT_SIGNAL( changed(const TQColor&) ), this, TQT_SLOT( flatten() ) );
- connect( implodeFactor, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( implode() ) );
- connect( buttonGroupNoise, TQT_SIGNAL( clicked(int) ), this, TQT_SLOT( noise() ) );
- connect( oilRadius, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( oil() ) );
- connect( shadeAzim, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( shade() ) );
- connect( shadeColor, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( shade() ) );
- connect( shadeElev, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( shade() ) );
- connect( sharpenRadius, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( sharpen() ) );
- connect( sharpenSigma, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( sharpen() ) );
- connect( solarizeValue, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( solarize() ) );
- connect( spreadValue, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( spread() ) );
- connect( buttonGroupSwapRGB, TQT_SIGNAL( clicked(int) ), this, TQT_SLOT( swapRGB() ) );
- connect( swirlAngle, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( swirl() ) );
- connect( thresholdValue, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( threshold() ) );
- connect( thresholdRE, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( redeye() ) );
+ connect( blendOpacity, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( blend() ) );
+ connect( pushBlendColor, TQ_SIGNAL( changed(const TQColor&) ), this, TQ_SLOT( blend() ) );
+ connect( blurRadius, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( blur() ) );
+ connect( blurSigma, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( blur() ) );
+ connect( desaturateValue, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( desaturate() ) );
+ connect( edgeRadius, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( edge() ) );
+ connect( embossRadius, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( emboss() ) );
+ connect( embossSigma, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( emboss() ) );
+ connect( fadeColor, TQ_SIGNAL( changed(const TQColor&) ), this, TQ_SLOT( fade() ) );
+ connect( fadeValue, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( fade() ) );
+ connect( flattenColor1, TQ_SIGNAL( changed(const TQColor&) ), this, TQ_SLOT( flatten() ) );
+ connect( flattenColor2, TQ_SIGNAL( changed(const TQColor&) ), this, TQ_SLOT( flatten() ) );
+ connect( implodeFactor, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( implode() ) );
+ connect( buttonGroupNoise, TQ_SIGNAL( clicked(int) ), this, TQ_SLOT( noise() ) );
+ connect( oilRadius, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( oil() ) );
+ connect( shadeAzim, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( shade() ) );
+ connect( shadeColor, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( shade() ) );
+ connect( shadeElev, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( shade() ) );
+ connect( sharpenRadius, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( sharpen() ) );
+ connect( sharpenSigma, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( sharpen() ) );
+ connect( solarizeValue, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( solarize() ) );
+ connect( spreadValue, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( spread() ) );
+ connect( buttonGroupSwapRGB, TQ_SIGNAL( clicked(int) ), this, TQ_SLOT( swapRGB() ) );
+ connect( swirlAngle, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( swirl() ) );
+ connect( thresholdValue, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( threshold() ) );
+ connect( thresholdRE, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( redeye() ) );
}
SQ_ImageFilter* SQ_ImageFilter::instance()
diff --git a/ksquirrel/ksquirrel-libs-configurator/klc.cpp b/ksquirrel/ksquirrel-libs-configurator/klc.cpp
index b6aaaa0..f4b79d0 100644
--- a/ksquirrel/ksquirrel-libs-configurator/klc.cpp
+++ b/ksquirrel/ksquirrel-libs-configurator/klc.cpp
@@ -78,8 +78,8 @@ KLC::KLC( TQWidget* parent, const char* name, WFlags fl )
clearWState( WState_Polished );
// signals and slots connections
- connect( pushApply, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotApply() ) );
- connect( pushClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( close() ) );
+ connect( pushApply, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotApply() ) );
+ connect( pushClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( close() ) );
// tab order
setTabOrder( listEnabled, listDisabled );
diff --git a/ksquirrel/ksquirrel-libs-configurator/klc.ui.h b/ksquirrel/ksquirrel-libs-configurator/klc.ui.h
index ccccad2..5acfa45 100644
--- a/ksquirrel/ksquirrel-libs-configurator/klc.ui.h
+++ b/ksquirrel/ksquirrel-libs-configurator/klc.ui.h
@@ -26,9 +26,9 @@ void KLC::init()
listDisabled->header()->hide();
lister = new KDirLister;
- connect(lister, TQT_SIGNAL(completed(const KURL &)), this, TQT_SLOT(slotCompleted(const KURL &)));
- connect(lister, TQT_SIGNAL(deleteItem(KFileItem *)), this, TQT_SLOT(slotDeleteItem(KFileItem *)));
- connect(lister, TQT_SIGNAL(newItems(const KFileItemList &)), this, TQT_SLOT(slotNewItems(const KFileItemList &)));
+ connect(lister, TQ_SIGNAL(completed(const KURL &)), this, TQ_SLOT(slotCompleted(const KURL &)));
+ connect(lister, TQ_SIGNAL(deleteItem(KFileItem *)), this, TQ_SLOT(slotDeleteItem(KFileItem *)));
+ connect(lister, TQ_SIGNAL(newItems(const KFileItemList &)), this, TQ_SLOT(slotNewItems(const KFileItemList &)));
base = KURL::fromPathOrURL(QT_STRINGIFY(SQ_KLIBS));
@@ -39,7 +39,7 @@ void KLC::init()
TDEIO::NetAccess::mkdir(backup, this);
- TQTimer::singleShot(0, this, TQT_SLOT(slotLoad()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotLoad()));
}
void KLC::slotLoad()
@@ -83,7 +83,7 @@ void KLC::moveCodecs(bool e2d)
TDEIO::Job *job = TDEIO::move(list, e2d ? backup : base);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotDelResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotDelResult(TDEIO::Job *)));
}
void KLC::slotCompleted(const KURL &u)
diff --git a/ksquirrel/ksquirrel.cpp b/ksquirrel/ksquirrel.cpp
index ae67703..e26ff64 100644
--- a/ksquirrel/ksquirrel.cpp
+++ b/ksquirrel/ksquirrel.cpp
@@ -248,7 +248,7 @@ bool KSquirrel::eventFilter(TQObject *o, TQEvent *e)
if(SQ_HLOptions::instance()->have_mountview)
{
sideBar->addWidget(new SQ_MountView, i18n("Mount points"), "blockdevice");
- connect(SQ_MountView::instance(), TQT_SIGNAL(path(const TQString &)), pWidgetStack, TQT_SLOT(setURLForCurrent(const TQString &)));
+ connect(SQ_MountView::instance(), TQ_SIGNAL(path(const TQString &)), pWidgetStack, TQ_SLOT(setURLForCurrent(const TQString &)));
}
if(SQ_HLOptions::instance()->have_categories)
@@ -351,13 +351,13 @@ void KSquirrel::createLocationToolbar(TDEToolBar *pTLocation)
// some additional setup
pTLocation->setFullSize();
- 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->insertButton("button_cancel", 0, TQ_SIGNAL(clicked()), pCurrentURL, TQ_SLOT(clearHistory()), true, i18n("Clear history"));
+ pTLocation->insertButton("locationbar_erase", 1, TQ_SIGNAL(clicked()), pCurrentURL, TQ_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()), this, TQT_SLOT(slotGo()), true, i18n("Go!"));
+ pTLocation->insertButton("goto", 4, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGo()), true, i18n("Go!"));
tdeconf->setGroup("History");
@@ -455,8 +455,8 @@ void KSquirrel::initFilterMenu()
actionFilterMenu->setItemParameter(id, i++);
}
- disconnect(actionFilterMenu, TQT_SIGNAL(activated(int)), 0, 0);
- connect(actionFilterMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetFilter(int)));
+ disconnect(actionFilterMenu, TQ_SIGNAL(activated(int)), 0, 0);
+ connect(actionFilterMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetFilter(int)));
// finally, set current filter
setFilter(last, Id);
@@ -567,15 +567,15 @@ void KSquirrel::createWidgets(int createFirst)
sideBar->addWidget(ptree, i18n("Folder tree"), "view_tree");
sideBar->updateLayout();
- connect(ptree, TQT_SIGNAL(urlAdded(const KURL &)), pWidgetStack->diroperator(), TQT_SLOT(urlAdded(const KURL &)));
- connect(ptree, TQT_SIGNAL(urlRemoved(const KURL &)), pWidgetStack->diroperator(), TQT_SLOT(urlRemoved(const KURL &)));
- connect(pWidgetStack->diroperator(), TQT_SIGNAL(urlEntered(const KURL &)), ptree, TQT_SLOT(slotClearChecked()));
- 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()), 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()));
+ connect(ptree, TQ_SIGNAL(urlAdded(const KURL &)), pWidgetStack->diroperator(), TQ_SLOT(urlAdded(const KURL &)));
+ connect(ptree, TQ_SIGNAL(urlRemoved(const KURL &)), pWidgetStack->diroperator(), TQ_SLOT(urlRemoved(const KURL &)));
+ connect(pWidgetStack->diroperator(), TQ_SIGNAL(urlEntered(const KURL &)), ptree, TQ_SLOT(slotClearChecked()));
+ connect(pWidgetStack, TQ_SIGNAL(newLastURL(const TQString &)), pWidgetStack->action("dirop_repeat"), TQ_SLOT(setText(const TQString &)));
+ connect(SQ_PreviewWidget::instance(), TQ_SIGNAL(first()), pWidgetStack, TQ_SLOT(slotSelectFirstFile()));
+ connect(SQ_PreviewWidget::instance(), TQ_SIGNAL(last()), pWidgetStack, TQ_SLOT(slotSelectLastFile()));
+ connect(SQ_PreviewWidget::instance(), TQ_SIGNAL(next()), this, TQ_SLOT(slotPreviewWidgetNext()));
+ connect(SQ_PreviewWidget::instance(), TQ_SIGNAL(previous()), this, TQ_SLOT(slotPreviewWidgetPrevious()));
+ connect(SQ_PreviewWidget::instance(), TQ_SIGNAL(execute()), this, TQ_SLOT(slotPreviewWidgetExecute()));
pWidgetStack->init();
@@ -584,8 +584,8 @@ void KSquirrel::createWidgets(int createFirst)
mainPage->setStretchFactor(mainView, 1);
// connect signals from location toolbar
- connect(pCurrentURL, TQT_SIGNAL(returnPressed(const TQString&)), pWidgetStack, TQT_SLOT(setURLForCurrent(const TQString&)));
- connect(pCurrentURL, TQT_SIGNAL(activated(const TQString&)), pWidgetStack, TQT_SLOT(setURLForCurrent(const TQString&)));
+ connect(pCurrentURL, TQ_SIGNAL(returnPressed(const TQString&)), pWidgetStack, TQ_SLOT(setURLForCurrent(const TQString&)));
+ connect(pCurrentURL, TQ_SIGNAL(activated(const TQString&)), pWidgetStack, TQ_SLOT(setURLForCurrent(const TQString&)));
gl_view = new SQ_GLView;
@@ -611,11 +611,11 @@ void KSquirrel::createWidgets(int createFirst)
}
// connect signals from widgets
- connect(pAURL, TQT_SIGNAL(toggled(bool)), pTLocation, TQT_SLOT(setShown(bool)));
- connect(pASelectGroup, TQT_SIGNAL(activated()), pWidgetStack, TQT_SLOT(slotSelectGroup()));
- connect(pADeselectGroup, TQT_SIGNAL(activated()), pWidgetStack, TQT_SLOT(slotDeselectGroup()));
- connect(pASelectAll, TQT_SIGNAL(activated()), pWidgetStack, TQT_SLOT(slotSelectAll()));
- connect(pADeselectAll, TQT_SIGNAL(activated()), pWidgetStack, TQT_SLOT(slotDeselectAll()));
+ connect(pAURL, TQ_SIGNAL(toggled(bool)), pTLocation, TQ_SLOT(setShown(bool)));
+ connect(pASelectGroup, TQ_SIGNAL(activated()), pWidgetStack, TQ_SLOT(slotSelectGroup()));
+ connect(pADeselectGroup, TQ_SIGNAL(activated()), pWidgetStack, TQ_SLOT(slotDeselectGroup()));
+ connect(pASelectAll, TQ_SIGNAL(activated()), pWidgetStack, TQ_SLOT(slotSelectAll()));
+ connect(pADeselectAll, TQ_SIGNAL(activated()), pWidgetStack, TQ_SLOT(slotDeselectAll()));
SQ_SplashScreen::advance();
@@ -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()), this, TQT_SLOT(slotFireDisk()));
+ connect(fireDisk, TQ_SIGNAL(clicked()), this, TQ_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(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");
+ pAExit = KStdAction::quit(this, TQ_SLOT(slotClose()), actionCollection(), "SQ close");
+ pAConfigure = KStdAction::preferences(this, TQ_SLOT(slotOptions()), actionCollection(), "SQ Configure");
+ pAGLView = new TDEAction(i18n("Image window"), "raise", CTRL+TQt::Key_I, this, TQ_SLOT(raiseGLWidget()), actionCollection(), "SQ gl view widget");
+ pARescan = KStdAction::redisplay(this, TQ_SLOT(slotRescan()), actionCollection(), "SQ rescan libraries");
pARescan->setText(i18n("Reload codecs from disk"));
- 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");
+ pAExtTools = new TDEAction(i18n("Configure external tools..."), "launch", 0, this, TQ_SLOT(slotExtTools()), actionCollection(), "SQ external tools");
+ pAFilters = new TDEAction(i18n("Configure filters..."), "filefind", 0, this, TQ_SLOT(slotFilters()), actionCollection(), "SQ filters");
+ pAGotoTray = new TDEAction(i18n("Go to tray"), "background", CTRL+TQt::Key_T, this, TQ_SLOT(slotGotoTray()), actionCollection(), "SQ goto tray");
+ pAOpenAndSet = new TDEAction(i18n("Open file and change directory"), "document-open", CTRL+ALT+TQt::Key_O, this, TQ_SLOT(slotOpenFileAndSet()), actionCollection(), "SQ open and set");
+ pAOpen = new TDEAction(i18n("Open file"), "document-open", CTRL+TQt::Key_O, this, TQ_SLOT(slotOpenFile()), actionCollection(), "SQ open file");
+ pATCMaster = new TDEAction(i18n("Thumbnail cache manager..."), "cache", 0, this, TQ_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, 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");
+ pARaiseListView = new TDERadioAction(i18n("List"), "view_multicolumn", 0, this, TQ_SLOT(slotRaiseListView()), actionCollection(), "SQ raise list view");
+ pARaiseIconView = new TDERadioAction(i18n("Icons"), "view_icon", 0, this, TQ_SLOT(slotRaiseIconView()), actionCollection(), "SQ raise icon view");
+ pARaiseDetailView = new TDERadioAction(i18n("Details"), "view_detailed", 0, this, TQ_SLOT(slotRaiseDetailView()), actionCollection(), "SQ raise detailed view");
+ pARaiseThumbView = new TDERadioAction(i18n("Thumbnails"), "view_icon", 0, this, TQ_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, 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");
+ pASlideShow = new TDEAction(i18n("Slideshow"), "folder_video", CTRL+TQt::Key_S, this, TQ_SLOT(slotSlideShowStart()), actionCollection(), "SQ Slideshow");
+ pASlideShowDialog = new TDEAction(i18n("Slideshow advanced"), 0, CTRL+ALT+TQt::Key_S, this, TQ_SLOT(slotSlideShowDialog()), actionCollection(), "SQ SlideShow Dialog");
+ pARename = new TDEAction(i18n("Rename"), "file_move", TQt::Key_F2, this, TQ_SLOT(slotRename()), actionCollection(), "SQ Rename");
+ pAPluginsInfo = new TDEAction(i18n("Codec information..."), "application-vnd.tde.info", 0, this, TQ_SLOT(slotPluginsInfo()), actionCollection(), "SQ Plugins Info");
+ pAPluginsDel = new TDEAction(i18n("Codec manager..."), 0, 0, this, TQ_SLOT(slotPluginsDel()), actionCollection(), "SQ Plugins Deleter");
+ pAGLInfo = new TDEAction(i18n("OpenGL information..."), 0, 0, this, TQ_SLOT(slotGLInfo()), actionCollection(), "SQ OpenGL Info");
- 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");
+ pAThumb1 = new TDERadioAction(i18n("Medium thumbnails"), locate("data", "images/thumbs/thumbs_medium.png"), 0, this, TQ_SLOT(slotThumbsMedium()), actionCollection(), "SQ thumbs1");
+ pAThumb2 = new TDERadioAction(i18n("Large thumbnails"), locate("data", "images/thumbs/thumbs_large.png"), 0, this, TQ_SLOT(slotThumbsLarge()), actionCollection(), "SQ thumbs2");
+ pAThumb3 = new TDERadioAction(i18n("Huge thumbnails"), locate("data", "images/thumbs/thumbs_huge.png"), 0, this, TQ_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)), this, TQT_SLOT(slotExtendedToggled(bool)));
+ connect(pAThumbsE, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotExtendedToggled(bool)));
pAThumbs->insert(pAThumbsE);
pAThumbs->setDelayed(false);
@@ -955,7 +955,7 @@ void KSquirrel::initBookmarks()
bookmarks = new TDEActionMenu(i18n("&Bookmarks"), "bookmark", actionCollection(), "bookmarks");
bookmarkMenu = new KBookmarkMenu(bmanager, bookmarkOwner, bookmarks->popupMenu(), actionCollection(), true);
- connect(bookmarkOwner, TQT_SIGNAL(openURL(const KURL&)), pWidgetStack, TQT_SLOT(setURLForCurrent(const KURL&)));
+ connect(bookmarkOwner, TQ_SIGNAL(openURL(const KURL&)), pWidgetStack, TQ_SLOT(setURLForCurrent(const KURL&)));
bookmarkOwner->setURL(pWidgetStack->diroperator()->url());
}
@@ -1244,25 +1244,25 @@ void KSquirrel::preCreate()
new SQ_Converter(this);
listingDialog = new SQ_SlideShowListing(this, "SlideShow Listing", true, TQt::WStyle_Customize | TQt::WStyle_NoBorder);
- connect(listingDialog, TQT_SIGNAL(kill()), this, TQT_SLOT(slotSlideShowListingKill()));
+ connect(listingDialog, TQ_SIGNAL(kill()), this, TQ_SLOT(slotSlideShowListingKill()));
slideShowItems.setAutoDelete(true);
down = new SQ_Downloader(this);
- connect(down, TQT_SIGNAL(result(const KURL &)), this, TQT_SLOT(slotDownloaderResult(const KURL &)));
+ connect(down, TQ_SIGNAL(result(const KURL &)), this, TQ_SLOT(slotDownloaderResult(const KURL &)));
SQ_SlideShowWidget *sls = new SQ_SlideShowWidget(0, "ksquirrel-slideshow");
- 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()));
+ connect(sls, TQ_SIGNAL(stopSlideShow()), this, TQ_SLOT(slotStopSlideShow()));
+ connect(sls, TQ_SIGNAL(pause()), this, TQ_SLOT(slotPauseSlideShow()));
+ connect(sls, TQ_SIGNAL(next()), this, TQ_SLOT(slotNextSlideShow()));
+ connect(sls, TQ_SIGNAL(previous()), this, TQ_SLOT(slotPreviousSlideShow()));
// timer for slideshow
slideShowTimer = new TQTimer(this);
timerShowListing = new TQTimer(this);
- connect(timerShowListing, TQT_SIGNAL(timeout()), listingDialog, TQT_SLOT(show()));
+ connect(timerShowListing, TQ_SIGNAL(timeout()), listingDialog, TQ_SLOT(show()));
SQ_SplashScreen::advance();
@@ -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 *)), this, TQT_SLOT(slotStatResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_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 *)), this, TQT_SLOT(slotStatResult(TDEIO::Job *)));
+ connect(job2, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotStatResult(TDEIO::Job *)));
}
else
continueLoading();
@@ -1407,7 +1407,7 @@ void KSquirrel::continueLoading()
tray = new KSystemTray(this);
tray->setPixmap(TQPixmap(locate("data", "images/tray.png")));
- connect(tray, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(slotTrayQuit()));
+ connect(tray, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(slotTrayQuit()));
SQ_SplashScreen::advance();
SQ_SplashScreen::finish();
@@ -1432,7 +1432,7 @@ void KSquirrel::continueLoading()
if(kapp->isRestored())
slotGotoTray();
- connect(kapp, TQT_SIGNAL(saveYourself()), this, TQT_SLOT(slotSaveYourself()));
+ connect(kapp, TQ_SIGNAL(saveYourself()), this, TQ_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 *)), this, TQT_SLOT(slotDCOPStatResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotDCOPStatResult(TDEIO::Job *)));
replyType = "void";
@@ -1816,10 +1816,10 @@ void KSquirrel::slotSlideShowStart()
listing = recurs ? TDEIO::listRecursive(slideShowDir, false, false)
: TDEIO::listDir(slideShowDir, false, false);
- connect(listing, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)),
- this, TQT_SLOT(slotSlideShowEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)));
+ connect(listing, TQ_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)),
+ this, TQ_SLOT(slotSlideShowEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)));
- connect(listing, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotSlideShowJobResult(TDEIO::Job *)));
+ connect(listing, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotSlideShowJobResult(TDEIO::Job *)));
timerShowListing->start(1000, true);
}
@@ -1889,8 +1889,8 @@ void KSquirrel::slideShowPrivate()
slideShowInit = true;
slideShowDirection = KSquirrel::Default;
- disconnect(slideShowTimer, TQT_SIGNAL(timeout()), 0, 0);
- connect(slideShowTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSlideShowNextImage()));
+ disconnect(slideShowTimer, TQ_SIGNAL(timeout()), 0, 0);
+ connect(slideShowTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSlideShowNextImage()));
tdeconf->setGroup("Slideshow");
@@ -1917,7 +1917,7 @@ void KSquirrel::slideShowPrivate()
// start!
SQ_SlideShowWidget::instance()->beginSlideShow(slideShowTotal);
- TQTimer::singleShot(1, this, TQT_SLOT(slideShowDetermine()));
+ TQTimer::singleShot(1, this, TQ_SLOT(slideShowDetermine()));
}
void KSquirrel::slotDownloaderResult(const KURL &u)
@@ -1956,8 +1956,8 @@ void KSquirrel::slideShowDetermine()
if(!slideShowRepeat)
{
// nice hack to make final delay
- disconnect(slideShowTimer, TQT_SIGNAL(timeout()), 0, 0);
- connect(slideShowTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotStopSlideShow()));
+ disconnect(slideShowTimer, TQ_SIGNAL(timeout()), 0, 0);
+ connect(slideShowTimer, TQ_SIGNAL(timeout()), this, TQ_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, this, TQT_SLOT(slotAnimatedClicked()), locate("data", "images/anime.png"));
+ tools->insertAnimatedWidget(1000, this, TQ_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*)), this, TQT_SLOT(slotRenameResult(TDEIO::Job*)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotRenameResult(TDEIO::Job*)));
}
void KSquirrel::slotRenameResult(TDEIO::Job *job)
diff --git a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
index 6e7fcdd..7021e54 100644
--- a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
+++ b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
@@ -75,52 +75,52 @@ KSquirrelPart::KSquirrelPart(TQWidget *parentWidget, const char *,
gl = new SQ_GLWidget(parentWidget, "ksquirrelpart-opengl-widget");
gl->glInitA();
- connect(gl, TQT_SIGNAL(message(const TQString &)), this, TQT_SIGNAL(setStatusBarText(const TQString&)));
+ connect(gl, TQ_SIGNAL(message(const TQString &)), this, TQ_SIGNAL(setStatusBarText(const TQString&)));
setWidget(gl);
TDEAction *a;
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Plus));
- new TDEAction(i18n("Zoom +"), "zoom-in", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart zoom in");
+ new TDEAction(i18n("Zoom +"), "zoom-in", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart zoom in");
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Minus));
- new TDEAction(i18n("Zoom -"), "zoom-out", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart zoom out");
+ new TDEAction(i18n("Zoom -"), "zoom-out", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart zoom out");
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_P));
- new TDEAction(i18n("Properties"), "image-x-generic", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart properties");
+ new TDEAction(i18n("Properties"), "image-x-generic", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart properties");
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_R));
- new TDEAction(i18n("Normalize"), "rebuild", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart normalize");
+ new TDEAction(i18n("Normalize"), "rebuild", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart normalize");
// colorize & filters
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_D));
- new TDEAction(i18n("Color balance..."), "colorize", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart colorbalance");
+ new TDEAction(i18n("Color balance..."), "colorize", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart colorbalance");
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_U));
- new TDEAction(i18n("Apply filter..."), "effect", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart filter");
+ new TDEAction(i18n("Apply filter..."), "effect", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart filter");
// rotate
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Left+CTRL));
- new TDEAction(i18n("Rotate left"), "object-rotate-left", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart rotateleft");
+ new TDEAction(i18n("Rotate left"), "object-rotate-left", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart rotateleft");
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Right+CTRL));
- new TDEAction(i18n("Rotate right"), "object-rotate-right", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart rotateright");
+ new TDEAction(i18n("Rotate right"), "object-rotate-right", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart rotateright");
// copy/move
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F5));
- new TDEAction(i18n("Copy to..."), "edit-copy", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart copyto");
+ new TDEAction(i18n("Copy to..."), "edit-copy", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart copyto");
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F7));
- new TDEAction(i18n("Move to..."), "edit-cut", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart moveto");
+ new TDEAction(i18n("Move to..."), "edit-cut", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart moveto");
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F6));
- new TDEAction(i18n("Copy to last folder"), "", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart copy");
+ new TDEAction(i18n("Copy to last folder"), "", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart copy");
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F8));
- new TDEAction(i18n("Move to last folder"), "", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart move");
+ new TDEAction(i18n("Move to last folder"), "", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart move");
a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_S));
- new TDEAction(i18n("Save As..."), "document-save-as", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart saveas");
+ new TDEAction(i18n("Save As..."), "document-save-as", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart saveas");
sa = new TDESelectAction(i18n("Zoom"), 0, actionCollection(), "ksquirrelpart zoom");
sa->setEditable(true);
@@ -148,17 +148,17 @@ KSquirrelPart::KSquirrelPart(TQWidget *parentWidget, const char *,
sa->setItems(zooms);
sa->setCurrentItem(5);
- connect(sa, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotZoom()));
+ connect(sa, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotZoom()));
TQString group = "selection_group";
ar = new TDEToggleAction(i18n("Rectangle"), "rectangle", TDEShortcut(TQt::Key_R+CTRL), 0, 0, actionCollection(), "ksquirrelpart rectangle");
ar->setExclusiveGroup(group);
- connect(ar, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSelectionRect(bool)));
+ connect(ar, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSelectionRect(bool)));
ae = new TDEToggleAction(i18n("Ellipse"), "circle", TDEShortcut(TQt::Key_E+CTRL), 0, 0, actionCollection(), "ksquirrelpart ellipse");
ae->setExclusiveGroup(group);
- connect(ae, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSelectionEllipse(bool)));
+ connect(ae, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSelectionEllipse(bool)));
setXMLFile("ksquirrelpart/ksquirrelpart.rc");
}
diff --git a/ksquirrel/ksquirrelpart/sq_diroperator.cpp b/ksquirrel/ksquirrelpart/sq_diroperator.cpp
index 00eabf6..bf2232f 100644
--- a/ksquirrel/ksquirrelpart/sq_diroperator.cpp
+++ b/ksquirrel/ksquirrelpart/sq_diroperator.cpp
@@ -31,8 +31,8 @@ SQ_DirOperator::SQ_DirOperator(TQObject *parent) : TQObject(parent)
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(down, TQ_SIGNAL(result(const KURL &)), this, TQ_SLOT(slotDownloaderResult(const KURL &)));
+ connect(down, TQ_SIGNAL(percents(int)), this, TQ_SLOT(slotDownloadPercents(int)));
}
SQ_DirOperator::~SQ_DirOperator()
diff --git a/ksquirrel/ksquirrelpart/sq_downloader.cpp b/ksquirrel/ksquirrelpart/sq_downloader.cpp
index 772fce0..e877850 100644
--- a/ksquirrel/ksquirrelpart/sq_downloader.cpp
+++ b/ksquirrel/ksquirrelpart/sq_downloader.cpp
@@ -66,8 +66,8 @@ void SQ_Downloader::start(KFileItem *fi)
continueDownload = false;
- connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotDataResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotDataResult(TDEIO::Job *)));
}
void SQ_Downloader::slotData(TDEIO::Job *job, const TQByteArray &ba)
diff --git a/ksquirrel/ksquirrelpart/sq_externaltool.cpp b/ksquirrel/ksquirrelpart/sq_externaltool.cpp
index c62e09e..adca2bf 100644
--- a/ksquirrel/ksquirrelpart/sq_externaltool.cpp
+++ b/ksquirrel/ksquirrelpart/sq_externaltool.cpp
@@ -50,8 +50,8 @@ SQ_ExternalTool::SQ_ExternalTool(TQObject *parent) : TQObject(parent), TQValueVe
m_instance = this;
menu = new SQ_PopupMenu(0, "External tools");
- connect(menu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotAboutToShowMenu()));
- connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivateTool(int)));
+ connect(menu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotAboutToShowMenu()));
+ connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivateTool(int)));
TQString str, tmp;
diff --git a/ksquirrel/ksquirrelpart/sq_glview.cpp b/ksquirrel/ksquirrelpart/sq_glview.cpp
index c7bbc28..8fb909a 100644
--- a/ksquirrel/ksquirrelpart/sq_glview.cpp
+++ b/ksquirrel/ksquirrelpart/sq_glview.cpp
@@ -56,7 +56,7 @@ SQ_GLView::SQ_GLView() : TQObject()
SQ_Setters::iterator itEnd = map.end();
for(SQ_Setters::iterator it = map.begin();it != itEnd;++it)
- connect(it.data(), TQT_SIGNAL(changed()), this, TQT_SLOT(slotChanged()));
+ connect(it.data(), TQ_SIGNAL(changed()), this, TQ_SLOT(slotChanged()));
}
SQ_GLView::~SQ_GLView()
diff --git a/ksquirrel/ksquirrelpart/sq_glwidget.cpp b/ksquirrel/ksquirrelpart/sq_glwidget.cpp
index 33b2647..0380090 100644
--- a/ksquirrel/ksquirrelpart/sq_glwidget.cpp
+++ b/ksquirrel/ksquirrelpart/sq_glwidget.cpp
@@ -113,7 +113,7 @@ SQ_GLWidget::SQ_GLWidget(TQWidget *parent, const char *name) : TQGLWidget(parent
m_instance = this;
#ifdef KSQUIRREL_PART
- connect(&t_glv, TQT_SIGNAL(message(const TQString &)), this, TQT_SIGNAL(message(const TQString &)));
+ connect(&t_glv, TQ_SIGNAL(message(const TQString &)), this, TQ_SIGNAL(message(const TQString &)));
#endif
zoomMenu = 0;
@@ -195,19 +195,19 @@ SQ_GLWidget::SQ_GLWidget(TQWidget *parent, const char *name) : TQGLWidget(parent
TQ_CHECK_PTR(timer_prev);
TQ_CHECK_PTR(timer_next);
- connect(timer_prev, TQT_SIGNAL(timeout()), SQ_WidgetStack::instance(), TQT_SLOT(emitPreviousSelected()));
- connect(timer_next, TQT_SIGNAL(timeout()), SQ_WidgetStack::instance(), TQT_SLOT(emitNextSelected()));
+ connect(timer_prev, TQ_SIGNAL(timeout()), SQ_WidgetStack::instance(), TQ_SLOT(emitPreviousSelected()));
+ connect(timer_next, TQ_SIGNAL(timeout()), SQ_WidgetStack::instance(), TQ_SLOT(emitNextSelected()));
#endif
timer_anim = new TQTimer(this);
TQ_CHECK_PTR(timer_anim);
- connect(timer_anim, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimateNext()));
+ connect(timer_anim, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAnimateNext()));
- connect(images, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetCurrentImage(int)));
- connect(images, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotImagesHidden()));
- connect(images, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotImagesShown()));
+ connect(images, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetCurrentImage(int)));
+ connect(images, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(slotImagesHidden()));
+ connect(images, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotImagesShown()));
gls = new SQ_GLSelectionPainter(this);
}
@@ -1641,7 +1641,7 @@ void SQ_GLWidget::decode()
images->setItemChecked(first_id, true);
if(tab->finfo.animated)
- TQTimer::singleShot(tab->finfo.image[tab->current].delay, this, TQT_SLOT(slotAnimateNext()));
+ TQTimer::singleShot(tab->finfo.image[tab->current].delay, this, TQ_SLOT(slotAnimateNext()));
}
/*
diff --git a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
index 521e4fa..bde87c4 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, 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");
+ pASelectionRect = new TDEToggleAction(i18n("Rectangle"), TQPixmap(locate("data", "images/actions/glselection_rect.png")), 0, this, TQ_SLOT(slotSelectionRect()), ac, "SQ Selection Rect");
+ pASelectionEllipse = new TDEToggleAction(i18n("Ellipse"), TQPixmap(locate("data", "images/actions/glselection_ellipse.png")), 0, this, TQ_SLOT(slotSelectionEllipse()), ac, "SQ Selection Ellipse");
+ pASelectionClear = new TDEAction(i18n("Clear"), 0, 0, this, TQ_SLOT(slotSelectionClear()), ac, "SQ Selection Clear");
+
+ pAZoomW = new TDEToggleAction(i18n("Fit width"), TQPixmap(locate("data", "images/actions/zoomW.png")), 0, this, TQ_SLOT(slotZoomW()), ac, "SQ ZoomW");
+ pAZoomH = new TDEToggleAction(i18n("Fit height"), TQPixmap(locate("data", "images/actions/zoomH.png")), 0, this, TQ_SLOT(slotZoomH()), ac, "SQ ZoomH");
+ pAZoomWH = new TDEToggleAction(i18n("Fit image"), TQPixmap(locate("data", "images/actions/zoomWH.png")), 0, this, TQ_SLOT(slotZoomWH()), ac, "SQ ZoomWH");
+ pAZoom100 = new TDEToggleAction(i18n("Zoom 100%"), TQPixmap(locate("data", "images/actions/zoom100.png")), 0, this, TQ_SLOT(slotZoom100()), ac, "SQ Zoom100");
+ pAZoomLast = new TDEToggleAction(i18n("Leave previous zoom"), TQPixmap(locate("data", "images/actions/zoomlast.png")), 0, this, TQ_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,10 +102,10 @@ void SQ_GLWidget::createActions()
pASelectionEllipse->setExclusiveGroup(squirrel_selection_type);
pASelectionRect->setExclusiveGroup(squirrel_selection_type);
- connect(pAIfLess, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotZoomIfLess()));
+ connect(pAIfLess, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotZoomIfLess()));
#ifndef KSQUIRREL_PART
- connect(pAFull, TQT_SIGNAL(toggled(bool)), KSquirrel::app(), TQT_SLOT(slotFullScreen(bool)));
+ connect(pAFull, TQ_SIGNAL(toggled(bool)), KSquirrel::app(), TQ_SLOT(slotFullScreen(bool)));
#endif
SQ_Config::instance()->setGroup("GL view");
@@ -163,46 +163,46 @@ 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"), 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);
+ new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_first.png")), i18n("Go to first image"), this, TQ_SLOT(slotFirst()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_prev.png")), i18n("Previous image"), this, TQ_SLOT(slotPrev()), toolbar);
pATool->setAutoRepeat(true);
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_next.png")), i18n("Next image"), this, TQT_SLOT(slotNext()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_next.png")), i18n("Next image"), this, TQ_SLOT(slotNext()), toolbar);
pATool->setAutoRepeat(true);
- new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_last.png")), i18n("Go to last image"), this, TQT_SLOT(slotLast()), toolbar);
+ new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_last.png")), i18n("Go to last image"), this, TQ_SLOT(slotLast()), toolbar);
// some toolbuttons need autorepeat...
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/zoom+.png")), i18n("Zoom +"), this, TQT_SLOT(slotZoomPlus()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/zoom+.png")), i18n("Zoom +"), this, TQ_SLOT(slotZoomPlus()), toolbar);
pATool->setAutoRepeat(true);
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/zoom-.png")), i18n("Zoom -"), this, TQT_SLOT(slotZoomMinus()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/zoom-.png")), i18n("Zoom -"), this, TQ_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"), this, TQT_SLOT(slotRotateLeft()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/rotateL.png")), i18n("Rotate left"), this, TQ_SLOT(slotRotateLeft()), toolbar);
pATool->setAutoRepeat(true);
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/rotateR.png")), i18n("Rotate right"), this, TQT_SLOT(slotRotateRight()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/rotateR.png")), i18n("Rotate right"), this, TQ_SLOT(slotRotateRight()), toolbar);
pATool->setAutoRepeat(true);
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/flipV.png")), i18n("Flip vertically"), this, TQT_SLOT(slotFlipV()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/flipV.png")), i18n("Flip vertically"), this, TQ_SLOT(slotFlipV()), toolbar);
pATool->setAutoRepeat(true);
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/flipH.png")), i18n("Flip horizontally"), this, TQT_SLOT(slotFlipH()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/flipH.png")), i18n("Flip horizontally"), this, TQ_SLOT(slotFlipH()), toolbar);
pATool->setAutoRepeat(true);
- new SQ_ToolButton(TQPixmap(locate("data", "images/actions/reload.png")), i18n("Normalize"), this, TQT_SLOT(slotMatrixReset()), toolbar);
+ new SQ_ToolButton(TQPixmap(locate("data", "images/actions/reload.png")), i18n("Normalize"), this, TQ_SLOT(slotMatrixReset()), toolbar);
- pAToolFull = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/fullscreen.png")), i18n("Fullscreen"), pAFull, TQT_SLOT(activate()), toolbar);
+ pAToolFull = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/fullscreen.png")), i18n("Fullscreen"), pAFull, TQ_SLOT(activate()), toolbar);
pAToolFull->setToggleButton(true);
pAToolImages = new SQ_ToolButtonPopup(TQPixmap(locate("data", "images/actions/images.png")), i18n("Select image"), toolbar);
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"), this, TQT_SLOT(slotShowCodecSettings()), toolbar);
+ pAToolQuick = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/configure.png")), i18n("Codec settings"), this, TQ_SLOT(slotShowCodecSettings()), toolbar);
pAToolQuick->setEnabled(false);
- 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);
+ pAToolProp = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/prop.png")), i18n("Image Properties"), this, TQ_SLOT(slotProperties()), toolbar);
+ pAToolPrint = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/print.png")), i18n("Print"), this, TQ_SLOT(slotPrint()), toolbar);
+ new SQ_ToolButton(TQPixmap(locate("data", "images/actions/shownav.png")), i18n("Show navigator"), this, TQ_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)), this, TQT_SLOT(slotSetZoomPercents(int)));
+ connect(slider_zoom, TQ_SIGNAL(valueChanged(int)), this, TQ_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()), this, TQT_SLOT(slotApplyCodecSettings()));
+ connect(&skel, TQ_SIGNAL(apply()), this, TQ_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 *)), this, TQT_SLOT(slotCopyResult(TDEIO::Job *)));
+ connect(j, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_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 *)), this, TQT_SLOT(slotCopyResult(TDEIO::Job *)));
+ connect(j, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotCopyResult(TDEIO::Job *)));
}
}
}
@@ -663,7 +663,7 @@ void SQ_GLWidget::bcg()
_bcg.setPreviewImage(generatePreview());
- connect(&_bcg, TQT_SIGNAL(bcg(SQ_ImageBCGOptions *)), this, TQT_SLOT(slotBCG(SQ_ImageBCGOptions *)));
+ connect(&_bcg, TQ_SIGNAL(bcg(SQ_ImageBCGOptions *)), this, TQ_SLOT(slotBCG(SQ_ImageBCGOptions *)));
_bcg.exec();
@@ -681,7 +681,7 @@ void SQ_GLWidget::filter()
flt.setPreviewImage(generatePreview());
- connect(&flt, TQT_SIGNAL(filter(SQ_ImageFilterOptions *)), this, TQT_SLOT(slotFilter(SQ_ImageFilterOptions *)));
+ connect(&flt, TQ_SIGNAL(filter(SQ_ImageFilterOptions *)), this, TQ_SLOT(slotFilter(SQ_ImageFilterOptions *)));
flt.exec();
@@ -871,96 +871,96 @@ void SQ_GLWidget::initAccelsAndMenu()
menu->insertItem(i18n("Image"), menuImage);
#define SQ_ADD_KACTION(b) \
- (new TDEAction(TQString(), b, this, TQT_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").arg(b)))
+ (new TDEAction(TQString(), b, this, TQ_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()));
+ 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), TQ_SLOT(activate()));
#ifndef KSQUIRREL_PART
menuFile->insertSeparator();
- menuFile->insertItem(TQPixmap(locate("data", "images/menu/next16.png")), i18n("Next") + "\tPageDown", SQ_ADD_KACTION(TQt::Key_PageDown), TQT_SLOT(activate()));
- menuFile->insertItem(TQPixmap(locate("data", "images/menu/prev16.png")), i18n("Previous") + "\tPageUp", SQ_ADD_KACTION(TQt::Key_PageUp), TQT_SLOT(activate()));
- menuFile->insertItem(TQPixmap(locate("data", "images/menu/first16.png")), i18n("First") + "\tHome", SQ_ADD_KACTION(TQt::Key_Home), TQT_SLOT(activate()));
- menuFile->insertItem(TQPixmap(locate("data", "images/menu/last16.png")), i18n("Last") + "\tEnd", SQ_ADD_KACTION(TQt::Key_End), TQT_SLOT(activate()));
+ menuFile->insertItem(TQPixmap(locate("data", "images/menu/next16.png")), i18n("Next") + "\tPageDown", SQ_ADD_KACTION(TQt::Key_PageDown), TQ_SLOT(activate()));
+ menuFile->insertItem(TQPixmap(locate("data", "images/menu/prev16.png")), i18n("Previous") + "\tPageUp", SQ_ADD_KACTION(TQt::Key_PageUp), TQ_SLOT(activate()));
+ menuFile->insertItem(TQPixmap(locate("data", "images/menu/first16.png")), i18n("First") + "\tHome", SQ_ADD_KACTION(TQt::Key_Home), TQ_SLOT(activate()));
+ menuFile->insertItem(TQPixmap(locate("data", "images/menu/last16.png")), i18n("Last") + "\tEnd", SQ_ADD_KACTION(TQt::Key_End), TQ_SLOT(activate()));
#endif
menuFile->insertSeparator();
- id_f5 = menuFile->insertItem(i18n("Copy to...") + "\tF5", SQ_ADD_KACTION(TQt::Key_F5), TQT_SLOT(activate()));
- id_f6 = menuFile->insertItem(i18n("Move to...") + "\tF6", SQ_ADD_KACTION(TQt::Key_F7), TQT_SLOT(activate()));
- id_f7 = menuFile->insertItem(i18n("Copy to last folder") + "\tF7", SQ_ADD_KACTION(TQt::Key_F6), TQT_SLOT(activate()));
- id_f8 = menuFile->insertItem(i18n("Move to last folder") + "\tF8", SQ_ADD_KACTION(TQt::Key_F8), TQT_SLOT(activate()));
+ id_f5 = menuFile->insertItem(i18n("Copy to...") + "\tF5", SQ_ADD_KACTION(TQt::Key_F5), TQ_SLOT(activate()));
+ id_f6 = menuFile->insertItem(i18n("Move to...") + "\tF6", SQ_ADD_KACTION(TQt::Key_F7), TQ_SLOT(activate()));
+ id_f7 = menuFile->insertItem(i18n("Copy to last folder") + "\tF7", SQ_ADD_KACTION(TQt::Key_F6), TQ_SLOT(activate()));
+ id_f8 = menuFile->insertItem(i18n("Move to last folder") + "\tF8", SQ_ADD_KACTION(TQt::Key_F8), TQ_SLOT(activate()));
menuFile->insertSeparator();
- id_del = menuFile->insertItem(i18n("Delete") + "\tDelete", SQ_ADD_KACTION(TQt::Key_Delete), TQT_SLOT(activate()));
+ id_del = menuFile->insertItem(i18n("Delete") + "\tDelete", SQ_ADD_KACTION(TQt::Key_Delete), TQ_SLOT(activate()));
- menuRotate->insertItem(TQPixmap(locate("data", "images/menu/rotateLeft16.png")), i18n("Rotate left") + "\tCtrl+Left", SQ_ADD_KACTION(TQt::Key_Left+CTRL), TQT_SLOT(activate()));
- menuRotate->insertItem(TQPixmap(locate("data", "images/menu/rotateRight16.png")), i18n("Rotate right") + "\tCtrl+Right", SQ_ADD_KACTION(TQt::Key_Right+CTRL), TQT_SLOT(activate()));
+ menuRotate->insertItem(TQPixmap(locate("data", "images/menu/rotateLeft16.png")), i18n("Rotate left") + "\tCtrl+Left", SQ_ADD_KACTION(TQt::Key_Left+CTRL), TQ_SLOT(activate()));
+ menuRotate->insertItem(TQPixmap(locate("data", "images/menu/rotateRight16.png")), i18n("Rotate right") + "\tCtrl+Right", SQ_ADD_KACTION(TQt::Key_Right+CTRL), TQ_SLOT(activate()));
menuRotate->insertSeparator();
- menuRotate->insertItem(TQPixmap(locate("data", "images/menu/18016.png")), i18n("Rotate 180'") + "\tCtrl+Up", SQ_ADD_KACTION(TQt::Key_Up+CTRL), TQT_SLOT(activate()));
+ menuRotate->insertItem(TQPixmap(locate("data", "images/menu/18016.png")), i18n("Rotate 180'") + "\tCtrl+Up", SQ_ADD_KACTION(TQt::Key_Up+CTRL), TQ_SLOT(activate()));
menuRotate->insertSeparator();
- menuRotate->insertItem(i18n("Rotate 1' left") + "\tAlt+Left", SQ_ADD_KACTION(TQt::Key_Left+ALT), TQT_SLOT(activate()));
- menuRotate->insertItem(i18n("Rotate 1' right") + "\tAlt+Right", SQ_ADD_KACTION(TQt::Key_Right+ALT), TQT_SLOT(activate()));
+ menuRotate->insertItem(i18n("Rotate 1' left") + "\tAlt+Left", SQ_ADD_KACTION(TQt::Key_Left+ALT), TQ_SLOT(activate()));
+ menuRotate->insertItem(i18n("Rotate 1' right") + "\tAlt+Right", SQ_ADD_KACTION(TQt::Key_Right+ALT), TQ_SLOT(activate()));
- menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom+16.png")), i18n("Zoom +") + "\t+", SQ_ADD_KACTION(TQt::Key_Plus), TQT_SLOT(activate()));
- menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom-16.png")), i18n("Zoom -") + "\t-", SQ_ADD_KACTION(TQt::Key_Minus), TQT_SLOT(activate()));
- menuZoom->insertItem(i18n("Zoom 2x") + "\tCtrl++", SQ_ADD_KACTION(TQt::Key_Plus+CTRL), TQT_SLOT(activate()));
- menuZoom->insertItem(i18n("Zoom 1/2x") + "\tCtrl+-", SQ_ADD_KACTION(TQt::Key_Minus+CTRL), TQT_SLOT(activate()));
+ menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom+16.png")), i18n("Zoom +") + "\t+", SQ_ADD_KACTION(TQt::Key_Plus), TQ_SLOT(activate()));
+ menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom-16.png")), i18n("Zoom -") + "\t-", SQ_ADD_KACTION(TQt::Key_Minus), TQ_SLOT(activate()));
+ menuZoom->insertItem(i18n("Zoom 2x") + "\tCtrl++", SQ_ADD_KACTION(TQt::Key_Plus+CTRL), TQ_SLOT(activate()));
+ menuZoom->insertItem(i18n("Zoom 1/2x") + "\tCtrl+-", SQ_ADD_KACTION(TQt::Key_Minus+CTRL), TQ_SLOT(activate()));
menuZoom->insertSeparator();
- menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom10016.png")), TQString::fromLatin1("100%") + "\t1", SQ_ADD_KACTION(TQt::Key_1), TQT_SLOT(activate()));
- menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom20016.png")), TQString::fromLatin1("200%") + "\t2", SQ_ADD_KACTION(TQt::Key_2), TQT_SLOT(activate()));
- menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom30016.png")), TQString::fromLatin1("300%") + "\t3", SQ_ADD_KACTION(TQt::Key_3), TQT_SLOT(activate()));
- menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom50016.png")), TQString::fromLatin1("500%") + "\t5", SQ_ADD_KACTION(TQt::Key_5), TQT_SLOT(activate()));
- menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom70016.png")), TQString::fromLatin1("700%") + "\t7", SQ_ADD_KACTION(TQt::Key_7), TQT_SLOT(activate()));
- menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom90016.png")), TQString::fromLatin1("900%") + "\t9", SQ_ADD_KACTION(TQt::Key_9), TQT_SLOT(activate()));
- menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom100016.png")), TQString::fromLatin1("1000%") + "\t0", SQ_ADD_KACTION(TQt::Key_0), TQT_SLOT(activate()));
-
- menuMove->insertItem(TQPixmap(locate("data", "images/menu/moveLeft16.png")), i18n("Move left") + "\tRight", SQ_ADD_KACTION(TQt::Key_Right), TQT_SLOT(activate()));
- menuMove->insertItem(TQPixmap(locate("data", "images/menu/moveRight16.png")), i18n("Move right") + "\tLeft", SQ_ADD_KACTION(TQt::Key_Left), TQT_SLOT(activate()));
- menuMove->insertItem(TQPixmap(locate("data", "images/menu/moveUp16.png")), i18n("Move up") + "\tDown", SQ_ADD_KACTION(TQt::Key_Down), TQT_SLOT(activate()));
- menuMove->insertItem(TQPixmap(locate("data", "images/menu/moveDown16.png")), i18n("Move down") + "\tUp", SQ_ADD_KACTION(TQt::Key_Up), TQT_SLOT(activate()));
-
- menuImage->insertItem(TQPixmap(locate("data", "images/menu/animate16.png")), i18n("Start/stop animation") + "\tA", SQ_ADD_KACTION(TQt::Key_A), TQT_SLOT(activate()));
- menuImage->insertItem(TQPixmap(locate("data", "images/menu/background16.png")), i18n("Hide/show background") + "\tB", SQ_ADD_KACTION(TQt::Key_B), TQT_SLOT(activate()));
- menuImage->insertItem(TQPixmap(locate("data", "images/menu/tickmarks16.png")), i18n("Hide/show tickmarks") + "\tK", SQ_ADD_KACTION(TQt::Key_K), TQT_SLOT(activate()));
+ menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom10016.png")), TQString::fromLatin1("100%") + "\t1", SQ_ADD_KACTION(TQt::Key_1), TQ_SLOT(activate()));
+ menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom20016.png")), TQString::fromLatin1("200%") + "\t2", SQ_ADD_KACTION(TQt::Key_2), TQ_SLOT(activate()));
+ menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom30016.png")), TQString::fromLatin1("300%") + "\t3", SQ_ADD_KACTION(TQt::Key_3), TQ_SLOT(activate()));
+ menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom50016.png")), TQString::fromLatin1("500%") + "\t5", SQ_ADD_KACTION(TQt::Key_5), TQ_SLOT(activate()));
+ menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom70016.png")), TQString::fromLatin1("700%") + "\t7", SQ_ADD_KACTION(TQt::Key_7), TQ_SLOT(activate()));
+ menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom90016.png")), TQString::fromLatin1("900%") + "\t9", SQ_ADD_KACTION(TQt::Key_9), TQ_SLOT(activate()));
+ menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom100016.png")), TQString::fromLatin1("1000%") + "\t0", SQ_ADD_KACTION(TQt::Key_0), TQ_SLOT(activate()));
+
+ menuMove->insertItem(TQPixmap(locate("data", "images/menu/moveLeft16.png")), i18n("Move left") + "\tRight", SQ_ADD_KACTION(TQt::Key_Right), TQ_SLOT(activate()));
+ menuMove->insertItem(TQPixmap(locate("data", "images/menu/moveRight16.png")), i18n("Move right") + "\tLeft", SQ_ADD_KACTION(TQt::Key_Left), TQ_SLOT(activate()));
+ menuMove->insertItem(TQPixmap(locate("data", "images/menu/moveUp16.png")), i18n("Move up") + "\tDown", SQ_ADD_KACTION(TQt::Key_Down), TQ_SLOT(activate()));
+ menuMove->insertItem(TQPixmap(locate("data", "images/menu/moveDown16.png")), i18n("Move down") + "\tUp", SQ_ADD_KACTION(TQt::Key_Up), TQ_SLOT(activate()));
+
+ menuImage->insertItem(TQPixmap(locate("data", "images/menu/animate16.png")), i18n("Start/stop animation") + "\tA", SQ_ADD_KACTION(TQt::Key_A), TQ_SLOT(activate()));
+ menuImage->insertItem(TQPixmap(locate("data", "images/menu/background16.png")), i18n("Hide/show background") + "\tB", SQ_ADD_KACTION(TQt::Key_B), TQ_SLOT(activate()));
+ menuImage->insertItem(TQPixmap(locate("data", "images/menu/tickmarks16.png")), i18n("Hide/show tickmarks") + "\tK", SQ_ADD_KACTION(TQt::Key_K), TQ_SLOT(activate()));
menuImage->insertSeparator();
- menuImage->insertItem(TQPixmap(locate("data", "images/menu/flipV16.png")), i18n("Flip vertically") + "\tV", SQ_ADD_KACTION(TQt::Key_V), TQT_SLOT(activate()));
- menuImage->insertItem(TQPixmap(locate("data", "images/menu/flipH16.png")), i18n("Flip horizontally") + "\tH", SQ_ADD_KACTION(TQt::Key_H), TQT_SLOT(activate()));
+ menuImage->insertItem(TQPixmap(locate("data", "images/menu/flipV16.png")), i18n("Flip vertically") + "\tV", SQ_ADD_KACTION(TQt::Key_V), TQ_SLOT(activate()));
+ menuImage->insertItem(TQPixmap(locate("data", "images/menu/flipH16.png")), i18n("Flip horizontally") + "\tH", SQ_ADD_KACTION(TQt::Key_H), TQ_SLOT(activate()));
menuImage->insertSeparator();
- menuImage->insertItem(TQPixmap(locate("data", "images/menu/page116.png")), i18n("First page") + "\tF1", SQ_ADD_KACTION(TQt::Key_F1), TQT_SLOT(activate()));
- menuImage->insertItem(TQPixmap(locate("data", "images/menu/page216.png")), i18n("Previous page") + "\tF2", SQ_ADD_KACTION(TQt::Key_F2), TQT_SLOT(activate()));
- menuImage->insertItem(TQPixmap(locate("data", "images/menu/page316.png")), i18n("Next page") + "\tF3", SQ_ADD_KACTION(TQt::Key_F3), TQT_SLOT(activate()));
- menuImage->insertItem(TQPixmap(locate("data", "images/menu/page416.png")), i18n("Last page") + "\tF4", SQ_ADD_KACTION(TQt::Key_F4), TQT_SLOT(activate()));
+ menuImage->insertItem(TQPixmap(locate("data", "images/menu/page116.png")), i18n("First page") + "\tF1", SQ_ADD_KACTION(TQt::Key_F1), TQ_SLOT(activate()));
+ menuImage->insertItem(TQPixmap(locate("data", "images/menu/page216.png")), i18n("Previous page") + "\tF2", SQ_ADD_KACTION(TQt::Key_F2), TQ_SLOT(activate()));
+ menuImage->insertItem(TQPixmap(locate("data", "images/menu/page316.png")), i18n("Next page") + "\tF3", SQ_ADD_KACTION(TQt::Key_F3), TQ_SLOT(activate()));
+ menuImage->insertItem(TQPixmap(locate("data", "images/menu/page416.png")), i18n("Last page") + "\tF4", SQ_ADD_KACTION(TQt::Key_F4), TQ_SLOT(activate()));
menuImage->insertSeparator();
- menuImage->insertItem(i18n("Copy file url") + "\tF9", SQ_ADD_KACTION(TQt::Key_F9), TQT_SLOT(activate()));
- menuImage->insertItem(i18n("To clipboard") + "\tQ", SQ_ADD_KACTION(TQt::Key_Q), TQT_SLOT(activate()));
- menuImage->insertItem(i18n("Print") + "\tCtrl+P", SQ_ADD_KACTION(TQt::Key_P+CTRL), TQT_SLOT(activate()));
+ menuImage->insertItem(i18n("Copy file url") + "\tF9", SQ_ADD_KACTION(TQt::Key_F9), TQ_SLOT(activate()));
+ menuImage->insertItem(i18n("To clipboard") + "\tQ", SQ_ADD_KACTION(TQt::Key_Q), TQ_SLOT(activate()));
+ menuImage->insertItem(i18n("Print") + "\tCtrl+P", SQ_ADD_KACTION(TQt::Key_P+CTRL), TQ_SLOT(activate()));
menuImage->insertSeparator();
- id_settings = menuImage->insertItem(SQ_IconLoader::instance()->loadIcon("configure", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Codec settings") + "\tC", SQ_ADD_KACTION(TQt::Key_C), TQT_SLOT(activate()));
+ id_settings = menuImage->insertItem(SQ_IconLoader::instance()->loadIcon("configure", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Codec settings") + "\tC", SQ_ADD_KACTION(TQt::Key_C), TQ_SLOT(activate()));
menuImage->setItemEnabled(id_settings, false);
menuImage->insertSeparator();
- menuImage->insertItem(i18n("Color balance...") + "\tD", SQ_ADD_KACTION(TQt::Key_D), TQT_SLOT(activate()));
- menuImage->insertItem(i18n("Apply filter...") + "\tU", SQ_ADD_KACTION(TQt::Key_U), TQT_SLOT(activate()));
+ menuImage->insertItem(i18n("Color balance...") + "\tD", SQ_ADD_KACTION(TQt::Key_D), TQ_SLOT(activate()));
+ menuImage->insertItem(i18n("Apply filter...") + "\tU", SQ_ADD_KACTION(TQt::Key_U), TQ_SLOT(activate()));
- menuImage->insertItem(i18n("Crop") + "\tY", SQ_ADD_KACTION(TQt::Key_Y), TQT_SLOT(activate()));
+ menuImage->insertItem(i18n("Crop") + "\tY", SQ_ADD_KACTION(TQt::Key_Y), TQ_SLOT(activate()));
#ifndef KSQUIRREL_PART
- menuWindow->insertItem(TQPixmap(locate("data", "images/menu/fullscreen16.png")), i18n("Fullscreen") + "\tF", SQ_ADD_KACTION(TQt::Key_F), TQT_SLOT(activate()));
+ menuWindow->insertItem(TQPixmap(locate("data", "images/menu/fullscreen16.png")), i18n("Fullscreen") + "\tF", SQ_ADD_KACTION(TQt::Key_F), TQ_SLOT(activate()));
menuWindow->insertSeparator();
- menuWindow->insertItem(i18n("Previous tab") + "\tShift+Left", SQ_ADD_KACTION(TQt::Key_Left+SHIFT), TQT_SLOT(activate()));
- menuWindow->insertItem(i18n("Next tab") + "\tShift+Right", SQ_ADD_KACTION(TQt::Key_Right+SHIFT), TQT_SLOT(activate()));
+ menuWindow->insertItem(i18n("Previous tab") + "\tShift+Left", SQ_ADD_KACTION(TQt::Key_Left+SHIFT), TQ_SLOT(activate()));
+ menuWindow->insertItem(i18n("Next tab") + "\tShift+Right", SQ_ADD_KACTION(TQt::Key_Right+SHIFT), TQ_SLOT(activate()));
menuWindow->insertSeparator();
- menuWindow->insertItem(i18n("Close tab") + "\tW", SQ_ADD_KACTION(TQt::Key_W), TQT_SLOT(activate()));
+ menuWindow->insertItem(i18n("Close tab") + "\tW", SQ_ADD_KACTION(TQt::Key_W), TQ_SLOT(activate()));
- menuWindow->insertItem(i18n("Close all tabs") + "\tCtrl+W", SQ_ADD_KACTION(TQt::Key_W+CTRL), TQT_SLOT(activate()));
+ menuWindow->insertItem(i18n("Close all tabs") + "\tCtrl+W", SQ_ADD_KACTION(TQt::Key_W+CTRL), TQ_SLOT(activate()));
#endif
menu->insertSeparator();
- menu->insertItem(TQPixmap(locate("data", "images/menu/reset16.png")), i18n("Reset") + "\tR", SQ_ADD_KACTION(TQt::Key_R), TQT_SLOT(activate()));
- id_prop = menu->insertItem(TQPixmap(locate("data", "images/menu/prop16.png")), i18n("Properties") + "\tP", SQ_ADD_KACTION(TQt::Key_P), TQT_SLOT(activate()));
+ menu->insertItem(TQPixmap(locate("data", "images/menu/reset16.png")), i18n("Reset") + "\tR", SQ_ADD_KACTION(TQt::Key_R), TQ_SLOT(activate()));
+ id_prop = menu->insertItem(TQPixmap(locate("data", "images/menu/prop16.png")), i18n("Properties") + "\tP", SQ_ADD_KACTION(TQt::Key_P), TQ_SLOT(activate()));
menu->insertSeparator();
- menu->insertItem(i18n("Hotkeys") + "\t/", SQ_ADD_KACTION(TQt::Key_Slash), TQT_SLOT(activate()));
+ menu->insertItem(i18n("Hotkeys") + "\t/", SQ_ADD_KACTION(TQt::Key_Slash), TQ_SLOT(activate()));
#ifndef KSQUIRREL_PART
menu->insertSeparator();
- menu->insertItem(TQPixmap(locate("data", "images/menu/close16.png")), i18n("Close") + "\tX", SQ_ADD_KACTION(TQt::Key_X), TQT_SLOT(activate()));
+ menu->insertItem(TQPixmap(locate("data", "images/menu/close16.png")), i18n("Close") + "\tX", SQ_ADD_KACTION(TQt::Key_X), TQ_SLOT(activate()));
#endif
SQ_ADD_KACTION(TQt::Key_Down+CTRL);
@@ -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 *)), this, TQT_SLOT(slotCopyJobResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_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 *)), this, TQT_SLOT(slotCopyJobResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_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_imagebcg.ui.h b/ksquirrel/ksquirrelpart/sq_imagebcg.ui.h
index 3d0913d..31c3516 100644
--- a/ksquirrel/ksquirrelpart/sq_imagebcg.ui.h
+++ b/ksquirrel/ksquirrelpart/sq_imagebcg.ui.h
@@ -46,7 +46,7 @@ void SQ_ImageBCG::init()
spinG->setRange(0, 6.0, 0.01, 2);
spinG->setValue(1.0);
- connect(spinG, TQT_SIGNAL(valueChanged(int)), spinG, TQT_SLOT(slotValueChanged(int)));
+ connect(spinG, TQ_SIGNAL(valueChanged(int)), spinG, TQ_SLOT(slotValueChanged(int)));
}
void SQ_ImageBCG::slotResetG()
diff --git a/ksquirrel/ksquirrelpart/sq_imagefilter.ui.h b/ksquirrel/ksquirrelpart/sq_imagefilter.ui.h
index 643b0a5..18eb263 100644
--- a/ksquirrel/ksquirrelpart/sq_imagefilter.ui.h
+++ b/ksquirrel/ksquirrelpart/sq_imagefilter.ui.h
@@ -576,32 +576,32 @@ void SQ_ImageFilter::oil()
void SQ_ImageFilter::hackConnect()
{
- connect( blendOpacity, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( blend() ) );
- connect( pushBlendColor, TQT_SIGNAL( changed(const TQColor&) ), this, TQT_SLOT( blend() ) );
- connect( blurRadius, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( blur() ) );
- connect( blurSigma, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( blur() ) );
- connect( desaturateValue, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( desaturate() ) );
- connect( edgeRadius, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( edge() ) );
- connect( embossRadius, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( emboss() ) );
- connect( embossSigma, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( emboss() ) );
- connect( fadeColor, TQT_SIGNAL( changed(const TQColor&) ), this, TQT_SLOT( fade() ) );
- connect( fadeValue, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( fade() ) );
- connect( flattenColor1, TQT_SIGNAL( changed(const TQColor&) ), this, TQT_SLOT( flatten() ) );
- connect( flattenColor2, TQT_SIGNAL( changed(const TQColor&) ), this, TQT_SLOT( flatten() ) );
- connect( implodeFactor, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( implode() ) );
- connect( buttonGroupNoise, TQT_SIGNAL( clicked(int) ), this, TQT_SLOT( noise() ) );
- connect( oilRadius, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( oil() ) );
- connect( shadeAzim, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( shade() ) );
- connect( shadeColor, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( shade() ) );
- connect( shadeElev, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( shade() ) );
- connect( sharpenRadius, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( sharpen() ) );
- connect( sharpenSigma, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( sharpen() ) );
- connect( solarizeValue, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( solarize() ) );
- connect( spreadValue, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( spread() ) );
- connect( buttonGroupSwapRGB, TQT_SIGNAL( clicked(int) ), this, TQT_SLOT( swapRGB() ) );
- connect( swirlAngle, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( swirl() ) );
- connect( thresholdValue, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( threshold() ) );
- connect( thresholdRE, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( redeye() ) );
+ connect( blendOpacity, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( blend() ) );
+ connect( pushBlendColor, TQ_SIGNAL( changed(const TQColor&) ), this, TQ_SLOT( blend() ) );
+ connect( blurRadius, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( blur() ) );
+ connect( blurSigma, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( blur() ) );
+ connect( desaturateValue, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( desaturate() ) );
+ connect( edgeRadius, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( edge() ) );
+ connect( embossRadius, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( emboss() ) );
+ connect( embossSigma, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( emboss() ) );
+ connect( fadeColor, TQ_SIGNAL( changed(const TQColor&) ), this, TQ_SLOT( fade() ) );
+ connect( fadeValue, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( fade() ) );
+ connect( flattenColor1, TQ_SIGNAL( changed(const TQColor&) ), this, TQ_SLOT( flatten() ) );
+ connect( flattenColor2, TQ_SIGNAL( changed(const TQColor&) ), this, TQ_SLOT( flatten() ) );
+ connect( implodeFactor, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( implode() ) );
+ connect( buttonGroupNoise, TQ_SIGNAL( clicked(int) ), this, TQ_SLOT( noise() ) );
+ connect( oilRadius, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( oil() ) );
+ connect( shadeAzim, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( shade() ) );
+ connect( shadeColor, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( shade() ) );
+ connect( shadeElev, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( shade() ) );
+ connect( sharpenRadius, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( sharpen() ) );
+ connect( sharpenSigma, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( sharpen() ) );
+ connect( solarizeValue, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( solarize() ) );
+ connect( spreadValue, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( spread() ) );
+ connect( buttonGroupSwapRGB, TQ_SIGNAL( clicked(int) ), this, TQ_SLOT( swapRGB() ) );
+ connect( swirlAngle, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( swirl() ) );
+ connect( thresholdValue, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( threshold() ) );
+ connect( thresholdRE, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( redeye() ) );
}
SQ_ImageFilter* SQ_ImageFilter::instance()
diff --git a/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h b/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h
index 41926a2..5265d46 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(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);
+ copy = KStdAction::copy(this, TQ_SLOT(slotCopyString()), 0);
+ copyentry = new TDEAction(i18n("Copy entry"), 0, this, TQ_SLOT(slotCopyEntry()), 0);
+ copyall = new TDEAction(i18n("Copy all entries"), 0, this, TQ_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 *)), this, TQT_SLOT(slotStatResult(TDEIO::Job *)));
+ connect(stjob, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_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)), this, TQT_SLOT(slotModeClicked(int)));
+ connect(gr, TQ_SIGNAL(clicked(int)), this, TQ_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 3111c78..0508e8d 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(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, TQ_SIGNAL(spacePressed(TQListViewItem*)), this, TQ_SIGNAL(executed(TQListViewItem*)));
+ connect(this, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, TQ_SIGNAL(executed(TQListViewItem*)));
+ connect(this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotItemExecuted(TQListViewItem*)));
+ connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, TQ_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*)), this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)));
+ connect(view, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQ_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()), 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"));
+ toolbar->insertButton("folder-new", 0, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewCategory()), true, i18n("New category"));
+ toolbar->insertButton("edittrash", 0, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteItem()), true, i18n("Delete"));
+ toolbar->insertButton("application-vnd.tde.info", 0, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotItemProperties()), true, i18n("Properties"));
+ toolbar->insertButton("bookmark_add", 0, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDefaultCategories()), true, i18n("Create default categories"));
- 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()));
+ view->popupMenu()->reconnect(SQ_TreeViewMenu::New, this, TQ_SLOT(slotNewCategory()));
+ view->popupMenu()->reconnect(SQ_TreeViewMenu::Delete, this, TQ_SLOT(slotDeleteItem()));
+ view->popupMenu()->reconnect(SQ_TreeViewMenu::Properties, this, TQ_SLOT(slotItemProperties()));
}
SQ_CategoriesBox::~SQ_CategoriesBox()
diff --git a/ksquirrel/sidebar/sq_categorybrowsermenu.cpp b/ksquirrel/sidebar/sq_categorybrowsermenu.cpp
index 5585ed5..d071eb3 100644
--- a/ksquirrel/sidebar/sq_categorybrowsermenu.cpp
+++ b/ksquirrel/sidebar/sq_categorybrowsermenu.cpp
@@ -73,12 +73,12 @@ SQ_CategoryBrowserMenu::SQ_CategoryBrowserMenu(TQString path, TQWidget *parent,
// we are not interested for dirty events on files inside the
// directory (see slotClearIfNeeded)
- connect( &_dirWatch, TQT_SIGNAL(dirty(const TQString&)),
- this, TQT_SLOT(slotClearIfNeeded(const TQString&)) );
- connect( &_dirWatch, TQT_SIGNAL(created(const TQString&)),
- this, TQT_SLOT(slotClear()) );
- connect( &_dirWatch, TQT_SIGNAL(deleted(const TQString&)),
- this, TQT_SLOT(slotClear()) );
+ connect( &_dirWatch, TQ_SIGNAL(dirty(const TQString&)),
+ this, TQ_SLOT(slotClearIfNeeded(const TQString&)) );
+ connect( &_dirWatch, TQ_SIGNAL(created(const TQString&)),
+ this, TQ_SLOT(slotClear()) );
+ connect( &_dirWatch, TQ_SIGNAL(deleted(const TQString&)),
+ this, TQ_SLOT(slotClear()) );
}
SQ_CategoryBrowserMenu::~SQ_CategoryBrowserMenu()
@@ -164,7 +164,7 @@ void SQ_CategoryBrowserMenu::initialize()
if(dir.root() != path())
{
insertTitle(path().right(path().length() - dir.root().length()));
- insertItem(CICON("bookmark_add"), i18n("Add here"), this, TQT_SLOT(slotAddToCategory()));
+ insertItem(CICON("bookmark_add"), i18n("Add here"), this, TQ_SLOT(slotAddToCategory()));
}
}
@@ -342,7 +342,7 @@ void SQ_CategoryBrowserMenu::initialize()
if(!_mimecheckTimer)
_mimecheckTimer = new TQTimer(this);
- connect(_mimecheckTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotMimeCheck()));
+ connect(_mimecheckTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotMimeCheck()));
_mimecheckTimer->start(0);
}
}
diff --git a/ksquirrel/sidebar/sq_directorybasket.cpp b/ksquirrel/sidebar/sq_directorybasket.cpp
index 57d5730..74ba7e2 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"), this, TQT_SLOT(slotChangeIcon()));
+ id_icon = insertItem(i18n("Change icon"), this, TQ_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*)), this, TQT_SLOT(slotDirectoryResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_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()), this, TQT_SLOT(slotSortReal()));
+ connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSortReal()));
timerAdd = new TQTimer(this);
- connect(timerAdd, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDelayedShowAdd()));
+ connect(timerAdd, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDelayedShowAdd()));
setSorting(-1);
setAcceptDrops(true);
@@ -237,7 +237,7 @@ SQ_DirectoryBasket::SQ_DirectoryBasket(TQWidget *parent, const char *name) : KFi
addBranch(root);
- disconnect(root, TQT_SIGNAL(refreshItems(const KFileItemList &)), 0, 0);
+ disconnect(root, TQ_SIGNAL(refreshItems(const KFileItemList &)), 0, 0);
header()->hide();
addColumn(i18n("File"));
@@ -246,16 +246,16 @@ SQ_DirectoryBasket::SQ_DirectoryBasket(TQWidget *parent, const char *name) : KFi
root->setOpen(true);
setRootIsDecorated(false);
- menu->reconnect(SQ_TreeViewMenu::New, this, TQT_SLOT(slotNewDirectory()));
+ menu->reconnect(SQ_TreeViewMenu::New, this, TQ_SLOT(slotNewDirectory()));
- 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()));
+ connect(this, TQ_SIGNAL(spacePressed(TQListViewItem*)), this, TQ_SIGNAL(executed(TQListViewItem*)));
+ connect(this, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, TQ_SIGNAL(executed(TQListViewItem*)));
+ connect(this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotItemExecuted(TQListViewItem*)));
+ connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
+ connect(this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)));
+ connect(this, TQ_SIGNAL(itemRenamed(TQListViewItem *, int, const TQString &)), this, TQ_SLOT(slotItemRenamedMy(TQListViewItem *, int, const TQString &)));
+ connect(this, TQ_SIGNAL(itemAdded(TQListViewItem *)), this, TQ_SLOT(slotSort()));
+ connect(this, TQ_SIGNAL(moved()), this, TQ_SLOT(slotReindex()));
}
SQ_DirectoryBasket::~SQ_DirectoryBasket()
diff --git a/ksquirrel/sidebar/sq_imagebasket.cpp b/ksquirrel/sidebar/sq_imagebasket.cpp
index bc2c3b2..eeba95c 100644
--- a/ksquirrel/sidebar/sq_imagebasket.cpp
+++ b/ksquirrel/sidebar/sq_imagebasket.cpp
@@ -42,20 +42,20 @@ SQ_ImageBasket::SQ_ImageBasket(TQWidget *parent, const char *name) : KDirOperato
{
m_inst = this;
- connect(this, TQT_SIGNAL(dropped(const KFileItem *, TQDropEvent*, const KURL::List&)),
- this, TQT_SLOT(slotDropped(const KFileItem *, TQDropEvent*, const KURL::List&)));
+ connect(this, TQ_SIGNAL(dropped(const KFileItem *, TQDropEvent*, const KURL::List&)),
+ this, TQ_SLOT(slotDropped(const KFileItem *, TQDropEvent*, const KURL::List&)));
- disconnect(dirLister(), TQT_SIGNAL(refreshItems(const KFileItemList &)), 0, 0);
+ disconnect(dirLister(), TQ_SIGNAL(refreshItems(const KFileItemList &)), 0, 0);
// redirect "Properties" dialog
disconnect(actionCollection()->action("properties"), 0, 0, 0);
- connect(actionCollection()->action("properties"), TQT_SIGNAL(activated()), this, TQT_SLOT(slotBasketProperties()));
+ connect(actionCollection()->action("properties"), TQ_SIGNAL(activated()), this, TQ_SLOT(slotBasketProperties()));
- disconnect(dirLister(), TQT_SIGNAL(newItems(const KFileItemList &)), 0, 0);
- connect(dirLister(), TQT_SIGNAL(newItems(const KFileItemList &)), this, TQT_SLOT(insertNewFiles(const KFileItemList &)));
+ disconnect(dirLister(), TQ_SIGNAL(newItems(const KFileItemList &)), 0, 0);
+ connect(dirLister(), TQ_SIGNAL(newItems(const KFileItemList &)), this, TQ_SLOT(insertNewFiles(const KFileItemList &)));
- connect(this, TQT_SIGNAL(viewChanged(KFileView *)), this, TQT_SLOT(slotViewChanged(KFileView *)));
- connect(this, TQT_SIGNAL(fileSelected(const KFileItem *)), this, TQT_SLOT(slotExecuted(const KFileItem *)));
+ connect(this, TQ_SIGNAL(viewChanged(KFileView *)), this, TQ_SLOT(slotViewChanged(KFileView *)));
+ connect(this, TQ_SIGNAL(fileSelected(const KFileItem *)), this, TQ_SLOT(slotExecuted(const KFileItem *)));
setView(KFile::Simple);
setMode(KFile::Files);
@@ -268,7 +268,7 @@ void SQ_ImageBasket::activatedMenu(const KFileItem *, const TQPoint &pos)
updateSelectionDependentActions();
TDEActionMenu *pADirOperatorMenu = dynamic_cast<TDEActionMenu *>(actionCollection()->action("popupMenu"));
- pADirOperatorMenu->popupMenu()->insertItem(i18n("Synchronize"), this, TQT_SLOT(slotSync()), 0, -1, 0);
+ pADirOperatorMenu->popupMenu()->insertItem(i18n("Synchronize"), this, TQ_SLOT(slotSync()), 0, -1, 0);
pADirOperatorMenu->popupMenu()->insertSeparator(1);
pADirOperatorMenu->popup(pos);
diff --git a/ksquirrel/sidebar/sq_mountview.cpp b/ksquirrel/sidebar/sq_mountview.cpp
index 7b985a6..c52b199 100644
--- a/ksquirrel/sidebar/sq_mountview.cpp
+++ b/ksquirrel/sidebar/sq_mountview.cpp
@@ -40,20 +40,20 @@ SQ_MountView::SQ_MountView(TQWidget *parent, const char *name) : TDEListView(par
popup = new TDEPopupMenu;
id_mount = popup->insertItem(SQ_IconLoader::instance()->loadIcon("drive-harddisk-mounted", TDEIcon::Desktop, TDEIcon::SizeSmall),
- i18n("Mount"), this, TQT_SLOT(slotMount()));
+ i18n("Mount"), this, TQ_SLOT(slotMount()));
id_unmount = popup->insertItem(SQ_IconLoader::instance()->loadIcon("drive-harddisk-unmounted", TDEIcon::Desktop, TDEIcon::SizeSmall),
- i18n("Unmount"), this, TQT_SLOT(slotUnmount()));
+ i18n("Unmount"), this, TQ_SLOT(slotUnmount()));
popup->insertItem(SQ_IconLoader::instance()->loadIcon("reload", TDEIcon::Desktop, TDEIcon::SizeSmall),
- i18n("Refresh"), this, TQT_SLOT(slotRefresh()));
+ i18n("Refresh"), this, TQ_SLOT(slotRefresh()));
popup->insertSeparator();
popup->insertItem(i18n("Cancel"));
- connect(this, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)),
- this, TQT_SLOT(slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &)));
+ connect(this, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)),
+ this, TQ_SLOT(slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &)));
setAcceptDrops(false);
- connect(this, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(slotExecuted(TQListViewItem *)));
- connect(this, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(slotExecuted(TQListViewItem *)));
+ connect(this, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, TQ_SLOT(slotExecuted(TQListViewItem *)));
+ connect(this, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotExecuted(TQListViewItem *)));
setShowSortIndicator(true);
setAllColumnsShowFocus(true);
@@ -82,7 +82,7 @@ void SQ_MountView::slotExecuted(TQListViewItem *i)
{
mountItem = mvi;
KAutoMount *mounter = new KAutoMount(false, TQString(), mvi->device(), TQString(), TQString(), false);
- connect(mounter, TQT_SIGNAL(finished()), this, TQT_SLOT(slotMountFinished()));
+ connect(mounter, TQ_SIGNAL(finished()), this, TQ_SLOT(slotMountFinished()));
}
}
@@ -212,7 +212,7 @@ void SQ_MountView::slotUnmount()
if(citem)
{
KAutoUnmount *mounter = new KAutoUnmount(citem->text(0), TQString());
- connect(mounter, TQT_SIGNAL(finished()), this, TQT_SLOT(slotUnmountFinished()));
+ connect(mounter, TQ_SIGNAL(finished()), this, TQ_SLOT(slotUnmountFinished()));
}
}
@@ -221,8 +221,8 @@ void SQ_MountView::slotMount()
if(citem)
{
KAutoMount *mounter = new KAutoMount(false, TQString(), citem->device(), TQString(), TQString(), false);
- connect(mounter, TQT_SIGNAL(finished()), this, TQT_SLOT(slotMountFinished2()));
-// connect(mounter, TQT_SIGNAL(error()), this, TQT_SLOT(slotMountError()));
+ connect(mounter, TQ_SIGNAL(finished()), this, TQ_SLOT(slotMountFinished2()));
+// connect(mounter, TQ_SIGNAL(error()), this, TQ_SLOT(slotMountError()));
}
}
diff --git a/ksquirrel/sidebar/sq_multibar.cpp b/ksquirrel/sidebar/sq_multibar.cpp
index 2be7d16..399929d 100644
--- a/ksquirrel/sidebar/sq_multibar.cpp
+++ b/ksquirrel/sidebar/sq_multibar.cpp
@@ -45,7 +45,7 @@ SQ_MultiBar::SQ_MultiBar(TQWidget *parent, const char *name) : TQHBox(parent, na
mapper = new TQSignalMapper(this);
- connect(mapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(raiseWidget(int)));
+ connect(mapper, TQ_SIGNAL(mapped(int)), this, TQ_SLOT(raiseWidget(int)));
mt = new KMultiTabBar(KMultiTabBar::Vertical, this);
@@ -85,7 +85,7 @@ void SQ_MultiBar::addWidget(TQWidget *new_w, const TQString &text, const TQStrin
// we should use TQSignalMapper to determine it.
mapper->setMapping(mt->tab(m_id), m_id);
- connect(mt->tab(m_id), TQT_SIGNAL(clicked()), mapper, TQT_SLOT(map()));
+ connect(mt->tab(m_id), TQ_SIGNAL(clicked()), mapper, TQ_SLOT(map()));
m_id++;
}
diff --git a/ksquirrel/sidebar/sq_previewwidget.cpp b/ksquirrel/sidebar/sq_previewwidget.cpp
index db039a7..ca9f668 100644
--- a/ksquirrel/sidebar/sq_previewwidget.cpp
+++ b/ksquirrel/sidebar/sq_previewwidget.cpp
@@ -56,19 +56,19 @@ SQ_PreviewWidget::SQ_PreviewWidget(TQWidget *parent, const char *name)
rereadColor();
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)));
+ connect(down, TQ_SIGNAL(result(const KURL &)), this, TQ_SLOT(slotDownloadResult(const KURL &)));
+ connect(down, TQ_SIGNAL(percents(int)), this, TQ_SLOT(slotDownloadPercents(int)));
popup = new TDEPopupMenu;
- popup->insertItem(i18n("Background color..."), this, TQT_SLOT(slotBackground()));
- popup->insertItem(i18n("Text color..."), this, TQT_SLOT(slotText()));
+ popup->insertItem(i18n("Background color..."), this, TQ_SLOT(slotBackground()));
+ popup->insertItem(i18n("Text color..."), this, TQ_SLOT(slotText()));
popup->insertSeparator();
- 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->insertItem(i18n("Go to first image")+"\tHome", this, TQ_SIGNAL(first()));
+ popup->insertItem(i18n("Next image")+"\tSpace", this, TQ_SIGNAL(next()));
+ popup->insertItem(i18n("Previous image")+"\tBackSpace", this, TQ_SIGNAL(previous()));
+ popup->insertItem(i18n("Go to last image")+"\tEnd", this, TQ_SIGNAL(last()));
popup->insertSeparator();
- popup->insertItem(i18n("Execute")+"\tEnter", this, TQT_SIGNAL(execute()));
+ popup->insertItem(i18n("Execute")+"\tEnter", this, TQ_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 38c7280..22207a9 100644
--- a/ksquirrel/sidebar/sq_treeview.cpp
+++ b/ksquirrel/sidebar/sq_treeview.cpp
@@ -73,8 +73,8 @@ SQ_TreeView::SQ_TreeView(TQWidget *parent, const char *name) : KFileTreeView(par
scanTimer = new TQTimer(this);
m_ignoreClick = false;
- connect(m_animTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimation()));
- connect(scanTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDelayedScan()));
+ connect(m_animTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAnimation()));
+ connect(scanTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDelayedScan()));
dw = 0;
m_recurs = No;
@@ -119,14 +119,14 @@ SQ_TreeView::SQ_TreeView(TQWidget *parent, const char *name) : KFileTreeView(par
// connect signals
// Space and Return will open item
- 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(currentChanged(TQListViewItem *)), this, TQT_SLOT(slotCurrentChanged(TQListViewItem*)));
+ connect(this, TQ_SIGNAL(spacePressed(TQListViewItem*)), this, TQ_SIGNAL(executed(TQListViewItem*)));
+ connect(this, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, TQ_SIGNAL(executed(TQListViewItem*)));
+ connect(this, TQ_SIGNAL(currentChanged(TQListViewItem *)), this, TQ_SLOT(slotCurrentChanged(TQListViewItem*)));
- connect(this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotItemExecuted(TQListViewItem*)));
- connect(this, TQT_SIGNAL(newURL(const KURL&)), this, TQT_SLOT(slotNewURL(const KURL&)));
- connect(root, TQT_SIGNAL(populateFinished(KFileTreeViewItem *)), this, TQT_SLOT(slotOpened(KFileTreeViewItem *)));
- connect(root, TQT_SIGNAL(deleteItem(KFileItem *)), this, TQT_SLOT(slotDeleteItemMy(KFileItem *)));
+ connect(this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotItemExecuted(TQListViewItem*)));
+ connect(this, TQ_SIGNAL(newURL(const KURL&)), this, TQ_SLOT(slotNewURL(const KURL&)));
+ connect(root, TQ_SIGNAL(populateFinished(KFileTreeViewItem *)), this, TQ_SLOT(slotOpened(KFileTreeViewItem *)));
+ connect(root, TQ_SIGNAL(deleteItem(KFileItem *)), this, TQ_SLOT(slotDeleteItemMy(KFileItem *)));
setCurrentItem(root->root());
root->setChildRecurse(false);
@@ -140,18 +140,18 @@ SQ_TreeView::SQ_TreeView(TQWidget *parent, const char *name) : KFileTreeView(par
setAcceptDrops(true);
- connect(this, TQT_SIGNAL(dropped(TQDropEvent *, TQListViewItem *, TQListViewItem *)),
- this, TQT_SLOT(slotDropped(TQDropEvent *, TQListViewItem *, TQListViewItem *)));
+ connect(this, TQ_SIGNAL(dropped(TQDropEvent *, TQListViewItem *, TQListViewItem *)),
+ this, TQ_SLOT(slotDropped(TQDropEvent *, TQListViewItem *, TQListViewItem *)));
- connect(this, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)),
- this, TQT_SLOT(slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &)));
+ connect(this, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)),
+ this, TQ_SLOT(slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &)));
menu = new SQ_TreeViewMenu(this);
if(SQ_HLOptions::instance()->have_directorybasket)
{
menu->insertSeparator();
- menu->insertItem(i18n("Add to Folder Basket"), this, TQT_SLOT(slotAddToFolderBasket()));
+ menu->insertItem(i18n("Add to Folder Basket"), this, TQ_SLOT(slotAddToFolderBasket()));
}
}
@@ -186,7 +186,7 @@ void SQ_TreeView::setRecursion(int b)
if(m_recurs == No && b)
{
dw = new KDirWatch(this);
- connect(dw, TQT_SIGNAL(dirty(const TQString &)), this, TQT_SLOT(slotDirty(const TQString &)));
+ connect(dw, TQ_SIGNAL(dirty(const TQString &)), this, TQ_SLOT(slotDirty(const TQString &)));
dw->blockSignals(true);
lister->lock();
diff --git a/ksquirrel/sidebar/sq_treeviewmenu.cpp b/ksquirrel/sidebar/sq_treeviewmenu.cpp
index 0fa1329..624c753 100644
--- a/ksquirrel/sidebar/sq_treeviewmenu.cpp
+++ b/ksquirrel/sidebar/sq_treeviewmenu.cpp
@@ -15,13 +15,13 @@
SQ_TreeViewMenu::SQ_TreeViewMenu(TQWidget *parent, const char *name) : TDEPopupMenu(parent, name)
{
- id_new = insertItem(SQ_IconLoader::instance()->loadIcon("folder-new", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("New folder..."), this, TQT_SLOT(slotDirectoryNew()));
+ id_new = insertItem(SQ_IconLoader::instance()->loadIcon("folder-new", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("New folder..."), this, TQ_SLOT(slotDirectoryNew()));
insertSeparator();
- id_rename = insertItem(i18n("Rename"), this, TQT_SLOT(slotDirectoryRename()));
- id_clear = insertItem(i18n("Clear contents"), this, TQT_SLOT(slotDirectoryClear()));
- id_delete = insertItem(SQ_IconLoader::instance()->loadIcon("edit-delete", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Delete"), this, TQT_SLOT(slotDirectoryDelete()));
+ id_rename = insertItem(i18n("Rename"), this, TQ_SLOT(slotDirectoryRename()));
+ id_clear = insertItem(i18n("Clear contents"), this, TQ_SLOT(slotDirectoryClear()));
+ id_delete = insertItem(SQ_IconLoader::instance()->loadIcon("edit-delete", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Delete"), this, TQ_SLOT(slotDirectoryDelete()));
insertSeparator();
- id_prop = insertItem(i18n("Properties"), this, TQT_SLOT(slotDirectoryProperties()));
+ id_prop = insertItem(i18n("Properties"), this, TQ_SLOT(slotDirectoryProperties()));
}
SQ_TreeViewMenu::~SQ_TreeViewMenu()
@@ -71,7 +71,7 @@ void SQ_TreeViewMenu::slotDirectoryNew()
dstURL.addPath(mNewFilename);
TDEIO::Job *job = TDEIO::mkdir(dstURL);
- connect(job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotDirectoryResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotDirectoryResult(TDEIO::Job *)));
}
}
}
@@ -96,7 +96,7 @@ void SQ_TreeViewMenu::slotDirectoryRename()
TDEIO::Job *job = TDEIO::rename(renameSrcURL, renameDstURL, true);
- connect(job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotDirectoryResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotDirectoryResult(TDEIO::Job *)));
}
}
}
@@ -113,7 +113,7 @@ void SQ_TreeViewMenu::slotDirectoryDelete()
TDEIO::Job *job = TDEIO::del(m_url);
- connect(job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotDirectoryResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotDirectoryResult(TDEIO::Job *)));
}
}
@@ -129,8 +129,8 @@ void SQ_TreeViewMenu::slotDirectoryClear()
TDEIO::Job *job = TDEIO::listDir(m_url, false, true);
- connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), this, TQT_SLOT(slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)));
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotListResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), this, TQ_SLOT(slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotListResult(TDEIO::Job *)));
}
}
@@ -177,7 +177,7 @@ void SQ_TreeViewMenu::slotListResult(TDEIO::Job *job)
else if(!urlstodel.isEmpty())
{
TDEIO::Job *job = TDEIO::del(urlstodel);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotDirectoryResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotDirectoryResult(TDEIO::Job *)));
}
}
diff --git a/ksquirrel/sq_diroperator.cpp b/ksquirrel/sq_diroperator.cpp
index a7f1bbe..3434fc9 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(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(this, TQ_SIGNAL(finishedLoading()), this, TQ_SLOT(slotFinishedLoading()));
+ connect(this, TQ_SIGNAL(updateInformation(int,int)), this, TQ_SLOT(slotUpdateInformation(int,int)));
+ connect(this, TQ_SIGNAL(urlEntered(const KURL&)), this, TQ_SLOT(slotUrlEntered(const KURL&)));
+ connect(this, TQ_SIGNAL(dropped(const KFileItem *, TQDropEvent*, const KURL::List&)),
+ this, TQ_SLOT(slotDropped(const KFileItem *, TQDropEvent*, const KURL::List&)));
+ connect(this, TQ_SIGNAL(fileSelected(const KFileItem *)), this, TQ_SLOT(slotExecutedConst(const KFileItem *)));
- 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 &)));
+ connect(dirLister(), TQ_SIGNAL(deleteItem(KFileItem *)), this, TQ_SLOT(slotItemDeleted(KFileItem *)));
+ connect(dirLister(), TQ_SIGNAL(newItems(const KFileItemList &)), this, TQ_SLOT(slotNewItems(const KFileItemList &)));
+ connect(dirLister(), TQ_SIGNAL(refreshItems(const KFileItemList &)), this, TQ_SLOT(slotRefreshItems(const KFileItemList &)));
timer_preview = new TQTimer(this);
- connect(timer_preview, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotPreview()));
+ connect(timer_preview, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotPreview()));
setAcceptDrops(true);
@@ -99,10 +99,10 @@ SQ_DirOperator::SQ_DirOperator(const KURL &url, ViewT type_, TQWidget *parent, c
fireDiskSize(url);
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(down, TQ_SIGNAL(result(const KURL &)), this, TQ_SLOT(slotDownloaderResult(const KURL &)));
+ connect(down, TQ_SIGNAL(percents(int)), this, TQ_SLOT(slotDownloadPercents(int)));
- connect(SQ_ArchiveHandler::instance(), TQT_SIGNAL(unpack(const KURL &)), this, TQT_SLOT(slotSetURL(const KURL &)));
+ connect(SQ_ArchiveHandler::instance(), TQ_SIGNAL(unpack(const KURL &)), this, TQ_SLOT(slotSetURL(const KURL &)));
// read sorting settings
SQ_Config::instance()->setGroup("Fileview");
@@ -149,11 +149,11 @@ void SQ_DirOperator::fireDiskSize(const KURL &url)
{
KDiskFreeSp *sp = KDiskFreeSp::findUsageInfo(url.path());
- connect(sp, TQT_SIGNAL(foundMountPoint(const unsigned long&,
+ connect(sp, TQ_SIGNAL(foundMountPoint(const unsigned long&,
const unsigned long&,
const unsigned long&,
const TQString&)),
- this, TQT_SLOT(slotFoundMountPoint(const unsigned long&,
+ this, TQ_SLOT(slotFoundMountPoint(const unsigned long&,
const unsigned long&,
const unsigned long&,
const TQString&)));
@@ -238,10 +238,10 @@ void SQ_DirOperator::prepareView(ViewT t)
SQ_FileDetailView *dv;
fileview = dv = new SQ_FileDetailView(this, "detail view");
- 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()));
+ connect(dv, TQ_SIGNAL(currentChanged(TQListViewItem *)), this, TQ_SLOT(slotCurrentChanged(TQListViewItem *)));
+ connect(dv, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()));
+ connect(dv, TQ_SIGNAL(invokeBrowser()), this, TQ_SLOT(slotInvokeBrowser()));
+ connect(KSquirrel::app(), TQ_SIGNAL(resetToolTip()), dv, TQ_SLOT(slotResetToolTip()));
}
break;
@@ -251,10 +251,10 @@ 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 *)), 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()));
+ connect(iv, TQ_SIGNAL(currentChanged(TQIconViewItem *)), this, TQ_SLOT(slotCurrentChanged(TQIconViewItem *)));
+ connect(iv, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()));
+ connect(iv, TQ_SIGNAL(invokeBrowser()), this, TQ_SLOT(slotInvokeBrowser()));
+ connect(KSquirrel::app(), TQ_SIGNAL(resetToolTip()), iv, TQ_SLOT(slotResetToolTip()));
disableSpecificActions(iv);
}
@@ -265,11 +265,11 @@ void SQ_DirOperator::prepareView(ViewT t)
SQ_FileThumbView *tv;
fileview = tv = new SQ_FileThumbView(this, "thumb view");
- 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()));
+ connect(tv, TQ_SIGNAL(currentChanged(TQIconViewItem *)), this, TQ_SLOT(slotCurrentChanged(TQIconViewItem *)));
+ connect(tv, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()));
+ connect(tv, TQ_SIGNAL(invokeBrowser()), this, TQ_SLOT(slotInvokeBrowser()));
+ connect(dirLister(), TQ_SIGNAL(canceled()), tv, TQ_SLOT(stopThumbnailUpdate()));
+ connect(KSquirrel::app(), TQ_SIGNAL(resetToolTip()), tv, TQ_SLOT(slotResetToolTip()));
disableSpecificActions(tv);
}
@@ -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, this, TQT_SLOT(slotEditMime()), actionCollection(), "dirop_edit_mime");
+ new TDEAction(i18n("Edit file type"), 0, 0, this, TQ_SLOT(slotEditMime()), actionCollection(), "dirop_edit_mime");
if(SQ_HLOptions::instance()->have_imagebasket)
- new TDEAction(i18n("Add to Basket"), "folder_image", CTRL+TQt::Key_B, this, TQT_SLOT(slotAddToBasket()), actionCollection(), "dirop_tobasket");
+ new TDEAction(i18n("Add to Basket"), "folder_image", CTRL+TQt::Key_B, this, TQ_SLOT(slotAddToBasket()), actionCollection(), "dirop_tobasket");
if(SQ_HLOptions::instance()->have_directorybasket)
- new TDEAction(i18n("Add to Folder Basket"), "folder_image", CTRL+TQt::Key_D, this, TQT_SLOT(slotAddToDirectoryBasket()), actionCollection(), "dirop_todirbasket");
+ new TDEAction(i18n("Add to Folder Basket"), "folder_image", CTRL+TQt::Key_D, this, TQ_SLOT(slotAddToDirectoryBasket()), actionCollection(), "dirop_todirbasket");
TDEActionMenu *file = new TDEActionMenu(i18n("File actions"), actionCollection(), "dirop_file_menu");
TDEAction *prop = actionCollection()->action("properties");
@@ -364,28 +364,28 @@ 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)), this, TQT_SLOT(slotEnableFileActions(bool)));
+ connect(prop, TQ_SIGNAL(enabled(bool)), this, TQ_SLOT(slotEnableFileActions(bool)));
TDEAction *sep = actionCollection()->action("separator");
- file->insert(new TDEAction(i18n("Copy"), "edit-copy", TDEStdAccel::copy(), SQ_WidgetStack::instance(), TQT_SLOT(slotFileCopy()), actionCollection(), "dirop_copy"));
- file->insert(new TDEAction(i18n("Cut"), "edit-cut", TDEStdAccel::cut(), SQ_WidgetStack::instance(), TQT_SLOT(slotFileCut()), actionCollection(), "dirop_cut"));
- file->insert(new TDEAction(i18n("Paste"), "edit-paste", TDEStdAccel::paste(), SQ_WidgetStack::instance(), TQT_SLOT(slotFilePaste()), actionCollection(), "dirop_paste"));
+ file->insert(new TDEAction(i18n("Copy"), "edit-copy", TDEStdAccel::copy(), SQ_WidgetStack::instance(), TQ_SLOT(slotFileCopy()), actionCollection(), "dirop_copy"));
+ file->insert(new TDEAction(i18n("Cut"), "edit-cut", TDEStdAccel::cut(), SQ_WidgetStack::instance(), TQ_SLOT(slotFileCut()), actionCollection(), "dirop_cut"));
+ file->insert(new TDEAction(i18n("Paste"), "edit-paste", TDEStdAccel::paste(), SQ_WidgetStack::instance(), TQ_SLOT(slotFilePaste()), actionCollection(), "dirop_paste"));
file->insert(sep);
- file->insert(new TDEAction(i18n("Copy to..."), 0, TQt::Key_F5, SQ_WidgetStack::instance(), TQT_SLOT(slotFileCopyTo()), actionCollection(), "dirop_copyto"));
- file->insert(new TDEAction(i18n("Move to..."), 0, TQt::Key_F6, SQ_WidgetStack::instance(), TQT_SLOT(slotFileMoveTo()),actionCollection(), "dirop_cutto"));
- file->insert(new TDEAction(i18n("Link to..."), 0, TQt::Key_F7, SQ_WidgetStack::instance(), TQT_SLOT(slotFileLinkTo()), actionCollection(), "dirop_linkto"));
+ file->insert(new TDEAction(i18n("Copy to..."), 0, TQt::Key_F5, SQ_WidgetStack::instance(), TQ_SLOT(slotFileCopyTo()), actionCollection(), "dirop_copyto"));
+ file->insert(new TDEAction(i18n("Move to..."), 0, TQt::Key_F6, SQ_WidgetStack::instance(), TQ_SLOT(slotFileMoveTo()),actionCollection(), "dirop_cutto"));
+ file->insert(new TDEAction(i18n("Link to..."), 0, TQt::Key_F7, SQ_WidgetStack::instance(), TQ_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, 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(new TDEAction(i18n("Run"), "launch", CTRL+Key_J, SQ_WidgetStack::instance(), TQ_SLOT(slotRunSeparately()), actionCollection(), "dirop_runsepar"));
+ file->insert(new TDEAction(i18n("Repeat (nothing to repeat)"), "go-down", TQt::Key_F10, KSquirrel::app(), TQ_SLOT(slotRepeat()), actionCollection(), "dirop_repeat"));
+ file->insert(new TDEAction(i18n("Convert..."), 0, CTRL+TQt::Key_K, SQ_Converter::instance(), TQ_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"));
+ TQ_SLOT(slotRecreateThumbnail()), actionCollection(), "dirop_recreate_thumbnails"));
file->insert(sep);
- 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"));
+ file->insert(new TDEAction(i18n("Copy file path"), 0, TQt::Key_F8, this, TQ_SLOT(slotCopyPath()), actionCollection(), "dirop_copypath"));
+ file->insert(new TDEAction(i18n("Copy file url"), 0, TQt::Key_F9, this, TQ_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, this, TQT_SLOT(slotDelayedFinishedLoading()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedFinishedLoading()));
}
void SQ_DirOperator::slotDelayedFinishedLoading()
@@ -734,13 +734,13 @@ void SQ_DirOperator::urlAdded(const KURL &_url)
lister->setMainWindow(dirLister()->mainWindow());
// redirect all signals to dirLister() - nice hack
- connect(lister, TQT_SIGNAL(refreshItems(const KFileItemList &)), dirLister(), TQT_SIGNAL(refreshItems(const KFileItemList &)));
- connect(lister, TQT_SIGNAL(deleteItem(KFileItem *)), dirLister(), TQT_SIGNAL(deleteItem(KFileItem *)));
- connect(lister, TQT_SIGNAL(newItems(const KFileItemList &)), dirLister(), TQT_SIGNAL(newItems(const KFileItemList &)));
+ connect(lister, TQ_SIGNAL(refreshItems(const KFileItemList &)), dirLister(), TQ_SIGNAL(refreshItems(const KFileItemList &)));
+ connect(lister, TQ_SIGNAL(deleteItem(KFileItem *)), dirLister(), TQ_SIGNAL(deleteItem(KFileItem *)));
+ connect(lister, TQ_SIGNAL(newItems(const KFileItemList &)), dirLister(), TQ_SIGNAL(newItems(const KFileItemList &)));
- connect(lister, TQT_SIGNAL(started(const KURL &)), dirLister(), TQT_SIGNAL(started(const KURL &)));
- connect(lister, TQT_SIGNAL(completed()), dirLister(), TQT_SIGNAL(completed()));
- connect(lister, TQT_SIGNAL(canceled()), dirLister(), TQT_SIGNAL(canceled()));
+ connect(lister, TQ_SIGNAL(started(const KURL &)), dirLister(), TQ_SIGNAL(started(const KURL &)));
+ connect(lister, TQ_SIGNAL(completed()), dirLister(), TQ_SIGNAL(completed()));
+ connect(lister, TQ_SIGNAL(canceled()), dirLister(), TQ_SIGNAL(canceled()));
// save this lister for us
listers[_url] = lister;
diff --git a/ksquirrel/sq_downloader.cpp b/ksquirrel/sq_downloader.cpp
index 772fce0..e877850 100644
--- a/ksquirrel/sq_downloader.cpp
+++ b/ksquirrel/sq_downloader.cpp
@@ -66,8 +66,8 @@ void SQ_Downloader::start(KFileItem *fi)
continueDownload = false;
- connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotDataResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotDataResult(TDEIO::Job *)));
}
void SQ_Downloader::slotData(TDEIO::Job *job, const TQByteArray &ba)
diff --git a/ksquirrel/sq_externaltool.cpp b/ksquirrel/sq_externaltool.cpp
index c62e09e..adca2bf 100644
--- a/ksquirrel/sq_externaltool.cpp
+++ b/ksquirrel/sq_externaltool.cpp
@@ -50,8 +50,8 @@ SQ_ExternalTool::SQ_ExternalTool(TQObject *parent) : TQObject(parent), TQValueVe
m_instance = this;
menu = new SQ_PopupMenu(0, "External tools");
- connect(menu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotAboutToShowMenu()));
- connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivateTool(int)));
+ connect(menu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotAboutToShowMenu()));
+ connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivateTool(int)));
TQString str, tmp;
diff --git a/ksquirrel/sq_filedetailview.cpp b/ksquirrel/sq_filedetailview.cpp
index 617cb8f..932715d 100644
--- a/ksquirrel/sq_filedetailview.cpp
+++ b/ksquirrel/sq_filedetailview.cpp
@@ -54,10 +54,10 @@ SQ_FileDetailView::SQ_FileDetailView(TQWidget* parent, const char* name)
toolTip = new KonqFileTip(this);
slotResetToolTip();
- disconnect(this, TQT_SIGNAL(onViewport()), this, 0);
- disconnect(this, TQT_SIGNAL(onItem(TQListViewItem *)), this, 0);
- connect(this, TQT_SIGNAL(onViewport()), this, TQT_SLOT(slotRemoveToolTip()));
- connect(this, TQT_SIGNAL(onItem(TQListViewItem *)), this, TQT_SLOT(slotShowToolTip(TQListViewItem *)));
+ disconnect(this, TQ_SIGNAL(onViewport()), this, 0);
+ disconnect(this, TQ_SIGNAL(onItem(TQListViewItem *)), this, 0);
+ connect(this, TQ_SIGNAL(onViewport()), this, TQ_SLOT(slotRemoveToolTip()));
+ connect(this, TQ_SIGNAL(onItem(TQListViewItem *)), this, TQ_SLOT(slotShowToolTip(TQListViewItem *)));
}
SQ_FileDetailView::~SQ_FileDetailView()
diff --git a/ksquirrel/sq_fileiconviewbase.cpp b/ksquirrel/sq_fileiconviewbase.cpp
index 01433b8..f0e2a78 100644
--- a/ksquirrel/sq_fileiconviewbase.cpp
+++ b/ksquirrel/sq_fileiconviewbase.cpp
@@ -38,10 +38,10 @@ SQ_FileIconViewBase::SQ_FileIconViewBase(TQWidget *parent, const char *name)
toolTip = new KonqFileTip(this);
slotResetToolTip();
- disconnect(this, TQT_SIGNAL(onViewport()), this, 0);
- disconnect(this, TQT_SIGNAL(onItem(TQIconViewItem *)), this, 0);
- connect(this, TQT_SIGNAL(onViewport()), this, TQT_SLOT(slotRemoveToolTip()));
- connect(this, TQT_SIGNAL(onItem(TQIconViewItem *)), this, TQT_SLOT(slotShowToolTip(TQIconViewItem *)));
+ disconnect(this, TQ_SIGNAL(onViewport()), this, 0);
+ disconnect(this, TQ_SIGNAL(onItem(TQIconViewItem *)), this, 0);
+ connect(this, TQ_SIGNAL(onViewport()), this, TQ_SLOT(slotRemoveToolTip()));
+ connect(this, TQ_SIGNAL(onItem(TQIconViewItem *)), this, TQ_SLOT(slotShowToolTip(TQIconViewItem *)));
}
SQ_FileIconViewBase::~SQ_FileIconViewBase()
diff --git a/ksquirrel/sq_filethumbview.cpp b/ksquirrel/sq_filethumbview.cpp
index 389cc73..80b693c 100644
--- a/ksquirrel/sq_filethumbview.cpp
+++ b/ksquirrel/sq_filethumbview.cpp
@@ -55,10 +55,10 @@ SQ_FileThumbView::SQ_FileThumbView(TQWidget *parent, const char *name) : SQ_File
m_progressBox = new SQ_ProgressBox(this);
timerScroll = new TQTimer(this);
- connect(timerScroll, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDelayedContentsMoving()));
+ connect(timerScroll, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDelayedContentsMoving()));
timerAdd = new TQTimer(this);
- connect(timerAdd, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDelayedAddItems()));
+ connect(timerAdd, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDelayedAddItems()));
// setup cache limit
SQ_Config::instance()->setGroup("Thumbnails");
@@ -73,7 +73,7 @@ SQ_FileThumbView::SQ_FileThumbView(TQWidget *parent, const char *name) : SQ_File
// load "pending" pixmaps
pending = SQ_IconLoader::instance()->loadIcon("clock", TDEIcon::Desktop, 32);
- 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)));
rebuildCachedPixmaps();
}
@@ -313,10 +313,10 @@ void SQ_FileThumbView::doStartThumbnailUpdate(const KFileItemList &list)
// create new job
thumbJob = new SQ_ThumbnailLoadJob(list, this);
- connect(thumbJob, TQT_SIGNAL(thumbnailLoaded(const KFileItem*, const SQ_Thumbnail &)),
- this, TQT_SLOT(setThumbnailPixmap(const KFileItem*, const SQ_Thumbnail&)));
+ connect(thumbJob, TQ_SIGNAL(thumbnailLoaded(const KFileItem*, const SQ_Thumbnail &)),
+ this, TQ_SLOT(setThumbnailPixmap(const KFileItem*, const SQ_Thumbnail&)));
- connect(thumbJob, TQT_SIGNAL(done()), SQ_WidgetStack::instance(), TQT_SLOT(thumbnailsUpdateEnded()));
+ connect(thumbJob, TQ_SIGNAL(done()), SQ_WidgetStack::instance(), TQ_SLOT(thumbnailsUpdateEnded()));
// start!
thumbJob->start();
diff --git a/ksquirrel/sq_glview.cpp b/ksquirrel/sq_glview.cpp
index 7fd2ab5..59498ca 100644
--- a/ksquirrel/sq_glview.cpp
+++ b/ksquirrel/sq_glview.cpp
@@ -85,10 +85,10 @@ void SQ_GLView::createContent()
gl->glInitA();
gl->setFocus();
- connect(m_tabbar, TQT_SIGNAL(selected(int)), gl, TQT_SLOT(slotChangeTab(int)));
- connect(m_tabbar, TQT_SIGNAL(closeRequest(int)), gl, TQT_SLOT(slotCloseRequest(int)));
- connect(m_tabbar, TQT_SIGNAL(mouseMiddleClick(int)), gl, TQT_SLOT(slotCloseRequest(int)));
- connect(gl, TQT_SIGNAL(tabCountChanged()), this, TQT_SLOT(slotTabCountChanged()));
+ connect(m_tabbar, TQ_SIGNAL(selected(int)), gl, TQ_SLOT(slotChangeTab(int)));
+ connect(m_tabbar, TQ_SIGNAL(closeRequest(int)), gl, TQ_SLOT(slotCloseRequest(int)));
+ connect(m_tabbar, TQ_SIGNAL(mouseMiddleClick(int)), gl, TQ_SLOT(slotCloseRequest(int)));
+ connect(gl, TQ_SIGNAL(tabCountChanged()), this, TQ_SLOT(slotTabCountChanged()));
setStretchFactor(gl, 1);
diff --git a/ksquirrel/sq_glwidget.cpp b/ksquirrel/sq_glwidget.cpp
index 33b2647..0380090 100644
--- a/ksquirrel/sq_glwidget.cpp
+++ b/ksquirrel/sq_glwidget.cpp
@@ -113,7 +113,7 @@ SQ_GLWidget::SQ_GLWidget(TQWidget *parent, const char *name) : TQGLWidget(parent
m_instance = this;
#ifdef KSQUIRREL_PART
- connect(&t_glv, TQT_SIGNAL(message(const TQString &)), this, TQT_SIGNAL(message(const TQString &)));
+ connect(&t_glv, TQ_SIGNAL(message(const TQString &)), this, TQ_SIGNAL(message(const TQString &)));
#endif
zoomMenu = 0;
@@ -195,19 +195,19 @@ SQ_GLWidget::SQ_GLWidget(TQWidget *parent, const char *name) : TQGLWidget(parent
TQ_CHECK_PTR(timer_prev);
TQ_CHECK_PTR(timer_next);
- connect(timer_prev, TQT_SIGNAL(timeout()), SQ_WidgetStack::instance(), TQT_SLOT(emitPreviousSelected()));
- connect(timer_next, TQT_SIGNAL(timeout()), SQ_WidgetStack::instance(), TQT_SLOT(emitNextSelected()));
+ connect(timer_prev, TQ_SIGNAL(timeout()), SQ_WidgetStack::instance(), TQ_SLOT(emitPreviousSelected()));
+ connect(timer_next, TQ_SIGNAL(timeout()), SQ_WidgetStack::instance(), TQ_SLOT(emitNextSelected()));
#endif
timer_anim = new TQTimer(this);
TQ_CHECK_PTR(timer_anim);
- connect(timer_anim, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimateNext()));
+ connect(timer_anim, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAnimateNext()));
- connect(images, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetCurrentImage(int)));
- connect(images, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotImagesHidden()));
- connect(images, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotImagesShown()));
+ connect(images, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetCurrentImage(int)));
+ connect(images, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(slotImagesHidden()));
+ connect(images, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotImagesShown()));
gls = new SQ_GLSelectionPainter(this);
}
@@ -1641,7 +1641,7 @@ void SQ_GLWidget::decode()
images->setItemChecked(first_id, true);
if(tab->finfo.animated)
- TQTimer::singleShot(tab->finfo.image[tab->current].delay, this, TQT_SLOT(slotAnimateNext()));
+ TQTimer::singleShot(tab->finfo.image[tab->current].delay, this, TQ_SLOT(slotAnimateNext()));
}
/*
diff --git a/ksquirrel/sq_glwidget_stuff.cpp b/ksquirrel/sq_glwidget_stuff.cpp
index 521e4fa..bde87c4 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, 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");
+ pASelectionRect = new TDEToggleAction(i18n("Rectangle"), TQPixmap(locate("data", "images/actions/glselection_rect.png")), 0, this, TQ_SLOT(slotSelectionRect()), ac, "SQ Selection Rect");
+ pASelectionEllipse = new TDEToggleAction(i18n("Ellipse"), TQPixmap(locate("data", "images/actions/glselection_ellipse.png")), 0, this, TQ_SLOT(slotSelectionEllipse()), ac, "SQ Selection Ellipse");
+ pASelectionClear = new TDEAction(i18n("Clear"), 0, 0, this, TQ_SLOT(slotSelectionClear()), ac, "SQ Selection Clear");
+
+ pAZoomW = new TDEToggleAction(i18n("Fit width"), TQPixmap(locate("data", "images/actions/zoomW.png")), 0, this, TQ_SLOT(slotZoomW()), ac, "SQ ZoomW");
+ pAZoomH = new TDEToggleAction(i18n("Fit height"), TQPixmap(locate("data", "images/actions/zoomH.png")), 0, this, TQ_SLOT(slotZoomH()), ac, "SQ ZoomH");
+ pAZoomWH = new TDEToggleAction(i18n("Fit image"), TQPixmap(locate("data", "images/actions/zoomWH.png")), 0, this, TQ_SLOT(slotZoomWH()), ac, "SQ ZoomWH");
+ pAZoom100 = new TDEToggleAction(i18n("Zoom 100%"), TQPixmap(locate("data", "images/actions/zoom100.png")), 0, this, TQ_SLOT(slotZoom100()), ac, "SQ Zoom100");
+ pAZoomLast = new TDEToggleAction(i18n("Leave previous zoom"), TQPixmap(locate("data", "images/actions/zoomlast.png")), 0, this, TQ_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,10 +102,10 @@ void SQ_GLWidget::createActions()
pASelectionEllipse->setExclusiveGroup(squirrel_selection_type);
pASelectionRect->setExclusiveGroup(squirrel_selection_type);
- connect(pAIfLess, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotZoomIfLess()));
+ connect(pAIfLess, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotZoomIfLess()));
#ifndef KSQUIRREL_PART
- connect(pAFull, TQT_SIGNAL(toggled(bool)), KSquirrel::app(), TQT_SLOT(slotFullScreen(bool)));
+ connect(pAFull, TQ_SIGNAL(toggled(bool)), KSquirrel::app(), TQ_SLOT(slotFullScreen(bool)));
#endif
SQ_Config::instance()->setGroup("GL view");
@@ -163,46 +163,46 @@ 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"), 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);
+ new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_first.png")), i18n("Go to first image"), this, TQ_SLOT(slotFirst()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_prev.png")), i18n("Previous image"), this, TQ_SLOT(slotPrev()), toolbar);
pATool->setAutoRepeat(true);
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_next.png")), i18n("Next image"), this, TQT_SLOT(slotNext()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_next.png")), i18n("Next image"), this, TQ_SLOT(slotNext()), toolbar);
pATool->setAutoRepeat(true);
- new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_last.png")), i18n("Go to last image"), this, TQT_SLOT(slotLast()), toolbar);
+ new SQ_ToolButton(TQPixmap(locate("data", "images/actions/file_last.png")), i18n("Go to last image"), this, TQ_SLOT(slotLast()), toolbar);
// some toolbuttons need autorepeat...
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/zoom+.png")), i18n("Zoom +"), this, TQT_SLOT(slotZoomPlus()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/zoom+.png")), i18n("Zoom +"), this, TQ_SLOT(slotZoomPlus()), toolbar);
pATool->setAutoRepeat(true);
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/zoom-.png")), i18n("Zoom -"), this, TQT_SLOT(slotZoomMinus()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/zoom-.png")), i18n("Zoom -"), this, TQ_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"), this, TQT_SLOT(slotRotateLeft()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/rotateL.png")), i18n("Rotate left"), this, TQ_SLOT(slotRotateLeft()), toolbar);
pATool->setAutoRepeat(true);
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/rotateR.png")), i18n("Rotate right"), this, TQT_SLOT(slotRotateRight()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/rotateR.png")), i18n("Rotate right"), this, TQ_SLOT(slotRotateRight()), toolbar);
pATool->setAutoRepeat(true);
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/flipV.png")), i18n("Flip vertically"), this, TQT_SLOT(slotFlipV()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/flipV.png")), i18n("Flip vertically"), this, TQ_SLOT(slotFlipV()), toolbar);
pATool->setAutoRepeat(true);
- pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/flipH.png")), i18n("Flip horizontally"), this, TQT_SLOT(slotFlipH()), toolbar);
+ pATool = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/flipH.png")), i18n("Flip horizontally"), this, TQ_SLOT(slotFlipH()), toolbar);
pATool->setAutoRepeat(true);
- new SQ_ToolButton(TQPixmap(locate("data", "images/actions/reload.png")), i18n("Normalize"), this, TQT_SLOT(slotMatrixReset()), toolbar);
+ new SQ_ToolButton(TQPixmap(locate("data", "images/actions/reload.png")), i18n("Normalize"), this, TQ_SLOT(slotMatrixReset()), toolbar);
- pAToolFull = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/fullscreen.png")), i18n("Fullscreen"), pAFull, TQT_SLOT(activate()), toolbar);
+ pAToolFull = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/fullscreen.png")), i18n("Fullscreen"), pAFull, TQ_SLOT(activate()), toolbar);
pAToolFull->setToggleButton(true);
pAToolImages = new SQ_ToolButtonPopup(TQPixmap(locate("data", "images/actions/images.png")), i18n("Select image"), toolbar);
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"), this, TQT_SLOT(slotShowCodecSettings()), toolbar);
+ pAToolQuick = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/configure.png")), i18n("Codec settings"), this, TQ_SLOT(slotShowCodecSettings()), toolbar);
pAToolQuick->setEnabled(false);
- 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);
+ pAToolProp = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/prop.png")), i18n("Image Properties"), this, TQ_SLOT(slotProperties()), toolbar);
+ pAToolPrint = new SQ_ToolButton(TQPixmap(locate("data", "images/actions/print.png")), i18n("Print"), this, TQ_SLOT(slotPrint()), toolbar);
+ new SQ_ToolButton(TQPixmap(locate("data", "images/actions/shownav.png")), i18n("Show navigator"), this, TQ_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)), this, TQT_SLOT(slotSetZoomPercents(int)));
+ connect(slider_zoom, TQ_SIGNAL(valueChanged(int)), this, TQ_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()), this, TQT_SLOT(slotApplyCodecSettings()));
+ connect(&skel, TQ_SIGNAL(apply()), this, TQ_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 *)), this, TQT_SLOT(slotCopyResult(TDEIO::Job *)));
+ connect(j, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_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 *)), this, TQT_SLOT(slotCopyResult(TDEIO::Job *)));
+ connect(j, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotCopyResult(TDEIO::Job *)));
}
}
}
@@ -663,7 +663,7 @@ void SQ_GLWidget::bcg()
_bcg.setPreviewImage(generatePreview());
- connect(&_bcg, TQT_SIGNAL(bcg(SQ_ImageBCGOptions *)), this, TQT_SLOT(slotBCG(SQ_ImageBCGOptions *)));
+ connect(&_bcg, TQ_SIGNAL(bcg(SQ_ImageBCGOptions *)), this, TQ_SLOT(slotBCG(SQ_ImageBCGOptions *)));
_bcg.exec();
@@ -681,7 +681,7 @@ void SQ_GLWidget::filter()
flt.setPreviewImage(generatePreview());
- connect(&flt, TQT_SIGNAL(filter(SQ_ImageFilterOptions *)), this, TQT_SLOT(slotFilter(SQ_ImageFilterOptions *)));
+ connect(&flt, TQ_SIGNAL(filter(SQ_ImageFilterOptions *)), this, TQ_SLOT(slotFilter(SQ_ImageFilterOptions *)));
flt.exec();
@@ -871,96 +871,96 @@ void SQ_GLWidget::initAccelsAndMenu()
menu->insertItem(i18n("Image"), menuImage);
#define SQ_ADD_KACTION(b) \
- (new TDEAction(TQString(), b, this, TQT_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").arg(b)))
+ (new TDEAction(TQString(), b, this, TQ_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()));
+ 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), TQ_SLOT(activate()));
#ifndef KSQUIRREL_PART
menuFile->insertSeparator();
- menuFile->insertItem(TQPixmap(locate("data", "images/menu/next16.png")), i18n("Next") + "\tPageDown", SQ_ADD_KACTION(TQt::Key_PageDown), TQT_SLOT(activate()));
- menuFile->insertItem(TQPixmap(locate("data", "images/menu/prev16.png")), i18n("Previous") + "\tPageUp", SQ_ADD_KACTION(TQt::Key_PageUp), TQT_SLOT(activate()));
- menuFile->insertItem(TQPixmap(locate("data", "images/menu/first16.png")), i18n("First") + "\tHome", SQ_ADD_KACTION(TQt::Key_Home), TQT_SLOT(activate()));
- menuFile->insertItem(TQPixmap(locate("data", "images/menu/last16.png")), i18n("Last") + "\tEnd", SQ_ADD_KACTION(TQt::Key_End), TQT_SLOT(activate()));
+ menuFile->insertItem(TQPixmap(locate("data", "images/menu/next16.png")), i18n("Next") + "\tPageDown", SQ_ADD_KACTION(TQt::Key_PageDown), TQ_SLOT(activate()));
+ menuFile->insertItem(TQPixmap(locate("data", "images/menu/prev16.png")), i18n("Previous") + "\tPageUp", SQ_ADD_KACTION(TQt::Key_PageUp), TQ_SLOT(activate()));
+ menuFile->insertItem(TQPixmap(locate("data", "images/menu/first16.png")), i18n("First") + "\tHome", SQ_ADD_KACTION(TQt::Key_Home), TQ_SLOT(activate()));
+ menuFile->insertItem(TQPixmap(locate("data", "images/menu/last16.png")), i18n("Last") + "\tEnd", SQ_ADD_KACTION(TQt::Key_End), TQ_SLOT(activate()));
#endif
menuFile->insertSeparator();
- id_f5 = menuFile->insertItem(i18n("Copy to...") + "\tF5", SQ_ADD_KACTION(TQt::Key_F5), TQT_SLOT(activate()));
- id_f6 = menuFile->insertItem(i18n("Move to...") + "\tF6", SQ_ADD_KACTION(TQt::Key_F7), TQT_SLOT(activate()));
- id_f7 = menuFile->insertItem(i18n("Copy to last folder") + "\tF7", SQ_ADD_KACTION(TQt::Key_F6), TQT_SLOT(activate()));
- id_f8 = menuFile->insertItem(i18n("Move to last folder") + "\tF8", SQ_ADD_KACTION(TQt::Key_F8), TQT_SLOT(activate()));
+ id_f5 = menuFile->insertItem(i18n("Copy to...") + "\tF5", SQ_ADD_KACTION(TQt::Key_F5), TQ_SLOT(activate()));
+ id_f6 = menuFile->insertItem(i18n("Move to...") + "\tF6", SQ_ADD_KACTION(TQt::Key_F7), TQ_SLOT(activate()));
+ id_f7 = menuFile->insertItem(i18n("Copy to last folder") + "\tF7", SQ_ADD_KACTION(TQt::Key_F6), TQ_SLOT(activate()));
+ id_f8 = menuFile->insertItem(i18n("Move to last folder") + "\tF8", SQ_ADD_KACTION(TQt::Key_F8), TQ_SLOT(activate()));
menuFile->insertSeparator();
- id_del = menuFile->insertItem(i18n("Delete") + "\tDelete", SQ_ADD_KACTION(TQt::Key_Delete), TQT_SLOT(activate()));
+ id_del = menuFile->insertItem(i18n("Delete") + "\tDelete", SQ_ADD_KACTION(TQt::Key_Delete), TQ_SLOT(activate()));
- menuRotate->insertItem(TQPixmap(locate("data", "images/menu/rotateLeft16.png")), i18n("Rotate left") + "\tCtrl+Left", SQ_ADD_KACTION(TQt::Key_Left+CTRL), TQT_SLOT(activate()));
- menuRotate->insertItem(TQPixmap(locate("data", "images/menu/rotateRight16.png")), i18n("Rotate right") + "\tCtrl+Right", SQ_ADD_KACTION(TQt::Key_Right+CTRL), TQT_SLOT(activate()));
+ menuRotate->insertItem(TQPixmap(locate("data", "images/menu/rotateLeft16.png")), i18n("Rotate left") + "\tCtrl+Left", SQ_ADD_KACTION(TQt::Key_Left+CTRL), TQ_SLOT(activate()));
+ menuRotate->insertItem(TQPixmap(locate("data", "images/menu/rotateRight16.png")), i18n("Rotate right") + "\tCtrl+Right", SQ_ADD_KACTION(TQt::Key_Right+CTRL), TQ_SLOT(activate()));
menuRotate->insertSeparator();
- menuRotate->insertItem(TQPixmap(locate("data", "images/menu/18016.png")), i18n("Rotate 180'") + "\tCtrl+Up", SQ_ADD_KACTION(TQt::Key_Up+CTRL), TQT_SLOT(activate()));
+ menuRotate->insertItem(TQPixmap(locate("data", "images/menu/18016.png")), i18n("Rotate 180'") + "\tCtrl+Up", SQ_ADD_KACTION(TQt::Key_Up+CTRL), TQ_SLOT(activate()));
menuRotate->insertSeparator();
- menuRotate->insertItem(i18n("Rotate 1' left") + "\tAlt+Left", SQ_ADD_KACTION(TQt::Key_Left+ALT), TQT_SLOT(activate()));
- menuRotate->insertItem(i18n("Rotate 1' right") + "\tAlt+Right", SQ_ADD_KACTION(TQt::Key_Right+ALT), TQT_SLOT(activate()));
+ menuRotate->insertItem(i18n("Rotate 1' left") + "\tAlt+Left", SQ_ADD_KACTION(TQt::Key_Left+ALT), TQ_SLOT(activate()));
+ menuRotate->insertItem(i18n("Rotate 1' right") + "\tAlt+Right", SQ_ADD_KACTION(TQt::Key_Right+ALT), TQ_SLOT(activate()));
- menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom+16.png")), i18n("Zoom +") + "\t+", SQ_ADD_KACTION(TQt::Key_Plus), TQT_SLOT(activate()));
- menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom-16.png")), i18n("Zoom -") + "\t-", SQ_ADD_KACTION(TQt::Key_Minus), TQT_SLOT(activate()));
- menuZoom->insertItem(i18n("Zoom 2x") + "\tCtrl++", SQ_ADD_KACTION(TQt::Key_Plus+CTRL), TQT_SLOT(activate()));
- menuZoom->insertItem(i18n("Zoom 1/2x") + "\tCtrl+-", SQ_ADD_KACTION(TQt::Key_Minus+CTRL), TQT_SLOT(activate()));
+ menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom+16.png")), i18n("Zoom +") + "\t+", SQ_ADD_KACTION(TQt::Key_Plus), TQ_SLOT(activate()));
+ menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom-16.png")), i18n("Zoom -") + "\t-", SQ_ADD_KACTION(TQt::Key_Minus), TQ_SLOT(activate()));
+ menuZoom->insertItem(i18n("Zoom 2x") + "\tCtrl++", SQ_ADD_KACTION(TQt::Key_Plus+CTRL), TQ_SLOT(activate()));
+ menuZoom->insertItem(i18n("Zoom 1/2x") + "\tCtrl+-", SQ_ADD_KACTION(TQt::Key_Minus+CTRL), TQ_SLOT(activate()));
menuZoom->insertSeparator();
- menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom10016.png")), TQString::fromLatin1("100%") + "\t1", SQ_ADD_KACTION(TQt::Key_1), TQT_SLOT(activate()));
- menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom20016.png")), TQString::fromLatin1("200%") + "\t2", SQ_ADD_KACTION(TQt::Key_2), TQT_SLOT(activate()));
- menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom30016.png")), TQString::fromLatin1("300%") + "\t3", SQ_ADD_KACTION(TQt::Key_3), TQT_SLOT(activate()));
- menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom50016.png")), TQString::fromLatin1("500%") + "\t5", SQ_ADD_KACTION(TQt::Key_5), TQT_SLOT(activate()));
- menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom70016.png")), TQString::fromLatin1("700%") + "\t7", SQ_ADD_KACTION(TQt::Key_7), TQT_SLOT(activate()));
- menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom90016.png")), TQString::fromLatin1("900%") + "\t9", SQ_ADD_KACTION(TQt::Key_9), TQT_SLOT(activate()));
- menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom100016.png")), TQString::fromLatin1("1000%") + "\t0", SQ_ADD_KACTION(TQt::Key_0), TQT_SLOT(activate()));
-
- menuMove->insertItem(TQPixmap(locate("data", "images/menu/moveLeft16.png")), i18n("Move left") + "\tRight", SQ_ADD_KACTION(TQt::Key_Right), TQT_SLOT(activate()));
- menuMove->insertItem(TQPixmap(locate("data", "images/menu/moveRight16.png")), i18n("Move right") + "\tLeft", SQ_ADD_KACTION(TQt::Key_Left), TQT_SLOT(activate()));
- menuMove->insertItem(TQPixmap(locate("data", "images/menu/moveUp16.png")), i18n("Move up") + "\tDown", SQ_ADD_KACTION(TQt::Key_Down), TQT_SLOT(activate()));
- menuMove->insertItem(TQPixmap(locate("data", "images/menu/moveDown16.png")), i18n("Move down") + "\tUp", SQ_ADD_KACTION(TQt::Key_Up), TQT_SLOT(activate()));
-
- menuImage->insertItem(TQPixmap(locate("data", "images/menu/animate16.png")), i18n("Start/stop animation") + "\tA", SQ_ADD_KACTION(TQt::Key_A), TQT_SLOT(activate()));
- menuImage->insertItem(TQPixmap(locate("data", "images/menu/background16.png")), i18n("Hide/show background") + "\tB", SQ_ADD_KACTION(TQt::Key_B), TQT_SLOT(activate()));
- menuImage->insertItem(TQPixmap(locate("data", "images/menu/tickmarks16.png")), i18n("Hide/show tickmarks") + "\tK", SQ_ADD_KACTION(TQt::Key_K), TQT_SLOT(activate()));
+ menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom10016.png")), TQString::fromLatin1("100%") + "\t1", SQ_ADD_KACTION(TQt::Key_1), TQ_SLOT(activate()));
+ menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom20016.png")), TQString::fromLatin1("200%") + "\t2", SQ_ADD_KACTION(TQt::Key_2), TQ_SLOT(activate()));
+ menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom30016.png")), TQString::fromLatin1("300%") + "\t3", SQ_ADD_KACTION(TQt::Key_3), TQ_SLOT(activate()));
+ menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom50016.png")), TQString::fromLatin1("500%") + "\t5", SQ_ADD_KACTION(TQt::Key_5), TQ_SLOT(activate()));
+ menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom70016.png")), TQString::fromLatin1("700%") + "\t7", SQ_ADD_KACTION(TQt::Key_7), TQ_SLOT(activate()));
+ menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom90016.png")), TQString::fromLatin1("900%") + "\t9", SQ_ADD_KACTION(TQt::Key_9), TQ_SLOT(activate()));
+ menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom100016.png")), TQString::fromLatin1("1000%") + "\t0", SQ_ADD_KACTION(TQt::Key_0), TQ_SLOT(activate()));
+
+ menuMove->insertItem(TQPixmap(locate("data", "images/menu/moveLeft16.png")), i18n("Move left") + "\tRight", SQ_ADD_KACTION(TQt::Key_Right), TQ_SLOT(activate()));
+ menuMove->insertItem(TQPixmap(locate("data", "images/menu/moveRight16.png")), i18n("Move right") + "\tLeft", SQ_ADD_KACTION(TQt::Key_Left), TQ_SLOT(activate()));
+ menuMove->insertItem(TQPixmap(locate("data", "images/menu/moveUp16.png")), i18n("Move up") + "\tDown", SQ_ADD_KACTION(TQt::Key_Down), TQ_SLOT(activate()));
+ menuMove->insertItem(TQPixmap(locate("data", "images/menu/moveDown16.png")), i18n("Move down") + "\tUp", SQ_ADD_KACTION(TQt::Key_Up), TQ_SLOT(activate()));
+
+ menuImage->insertItem(TQPixmap(locate("data", "images/menu/animate16.png")), i18n("Start/stop animation") + "\tA", SQ_ADD_KACTION(TQt::Key_A), TQ_SLOT(activate()));
+ menuImage->insertItem(TQPixmap(locate("data", "images/menu/background16.png")), i18n("Hide/show background") + "\tB", SQ_ADD_KACTION(TQt::Key_B), TQ_SLOT(activate()));
+ menuImage->insertItem(TQPixmap(locate("data", "images/menu/tickmarks16.png")), i18n("Hide/show tickmarks") + "\tK", SQ_ADD_KACTION(TQt::Key_K), TQ_SLOT(activate()));
menuImage->insertSeparator();
- menuImage->insertItem(TQPixmap(locate("data", "images/menu/flipV16.png")), i18n("Flip vertically") + "\tV", SQ_ADD_KACTION(TQt::Key_V), TQT_SLOT(activate()));
- menuImage->insertItem(TQPixmap(locate("data", "images/menu/flipH16.png")), i18n("Flip horizontally") + "\tH", SQ_ADD_KACTION(TQt::Key_H), TQT_SLOT(activate()));
+ menuImage->insertItem(TQPixmap(locate("data", "images/menu/flipV16.png")), i18n("Flip vertically") + "\tV", SQ_ADD_KACTION(TQt::Key_V), TQ_SLOT(activate()));
+ menuImage->insertItem(TQPixmap(locate("data", "images/menu/flipH16.png")), i18n("Flip horizontally") + "\tH", SQ_ADD_KACTION(TQt::Key_H), TQ_SLOT(activate()));
menuImage->insertSeparator();
- menuImage->insertItem(TQPixmap(locate("data", "images/menu/page116.png")), i18n("First page") + "\tF1", SQ_ADD_KACTION(TQt::Key_F1), TQT_SLOT(activate()));
- menuImage->insertItem(TQPixmap(locate("data", "images/menu/page216.png")), i18n("Previous page") + "\tF2", SQ_ADD_KACTION(TQt::Key_F2), TQT_SLOT(activate()));
- menuImage->insertItem(TQPixmap(locate("data", "images/menu/page316.png")), i18n("Next page") + "\tF3", SQ_ADD_KACTION(TQt::Key_F3), TQT_SLOT(activate()));
- menuImage->insertItem(TQPixmap(locate("data", "images/menu/page416.png")), i18n("Last page") + "\tF4", SQ_ADD_KACTION(TQt::Key_F4), TQT_SLOT(activate()));
+ menuImage->insertItem(TQPixmap(locate("data", "images/menu/page116.png")), i18n("First page") + "\tF1", SQ_ADD_KACTION(TQt::Key_F1), TQ_SLOT(activate()));
+ menuImage->insertItem(TQPixmap(locate("data", "images/menu/page216.png")), i18n("Previous page") + "\tF2", SQ_ADD_KACTION(TQt::Key_F2), TQ_SLOT(activate()));
+ menuImage->insertItem(TQPixmap(locate("data", "images/menu/page316.png")), i18n("Next page") + "\tF3", SQ_ADD_KACTION(TQt::Key_F3), TQ_SLOT(activate()));
+ menuImage->insertItem(TQPixmap(locate("data", "images/menu/page416.png")), i18n("Last page") + "\tF4", SQ_ADD_KACTION(TQt::Key_F4), TQ_SLOT(activate()));
menuImage->insertSeparator();
- menuImage->insertItem(i18n("Copy file url") + "\tF9", SQ_ADD_KACTION(TQt::Key_F9), TQT_SLOT(activate()));
- menuImage->insertItem(i18n("To clipboard") + "\tQ", SQ_ADD_KACTION(TQt::Key_Q), TQT_SLOT(activate()));
- menuImage->insertItem(i18n("Print") + "\tCtrl+P", SQ_ADD_KACTION(TQt::Key_P+CTRL), TQT_SLOT(activate()));
+ menuImage->insertItem(i18n("Copy file url") + "\tF9", SQ_ADD_KACTION(TQt::Key_F9), TQ_SLOT(activate()));
+ menuImage->insertItem(i18n("To clipboard") + "\tQ", SQ_ADD_KACTION(TQt::Key_Q), TQ_SLOT(activate()));
+ menuImage->insertItem(i18n("Print") + "\tCtrl+P", SQ_ADD_KACTION(TQt::Key_P+CTRL), TQ_SLOT(activate()));
menuImage->insertSeparator();
- id_settings = menuImage->insertItem(SQ_IconLoader::instance()->loadIcon("configure", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Codec settings") + "\tC", SQ_ADD_KACTION(TQt::Key_C), TQT_SLOT(activate()));
+ id_settings = menuImage->insertItem(SQ_IconLoader::instance()->loadIcon("configure", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Codec settings") + "\tC", SQ_ADD_KACTION(TQt::Key_C), TQ_SLOT(activate()));
menuImage->setItemEnabled(id_settings, false);
menuImage->insertSeparator();
- menuImage->insertItem(i18n("Color balance...") + "\tD", SQ_ADD_KACTION(TQt::Key_D), TQT_SLOT(activate()));
- menuImage->insertItem(i18n("Apply filter...") + "\tU", SQ_ADD_KACTION(TQt::Key_U), TQT_SLOT(activate()));
+ menuImage->insertItem(i18n("Color balance...") + "\tD", SQ_ADD_KACTION(TQt::Key_D), TQ_SLOT(activate()));
+ menuImage->insertItem(i18n("Apply filter...") + "\tU", SQ_ADD_KACTION(TQt::Key_U), TQ_SLOT(activate()));
- menuImage->insertItem(i18n("Crop") + "\tY", SQ_ADD_KACTION(TQt::Key_Y), TQT_SLOT(activate()));
+ menuImage->insertItem(i18n("Crop") + "\tY", SQ_ADD_KACTION(TQt::Key_Y), TQ_SLOT(activate()));
#ifndef KSQUIRREL_PART
- menuWindow->insertItem(TQPixmap(locate("data", "images/menu/fullscreen16.png")), i18n("Fullscreen") + "\tF", SQ_ADD_KACTION(TQt::Key_F), TQT_SLOT(activate()));
+ menuWindow->insertItem(TQPixmap(locate("data", "images/menu/fullscreen16.png")), i18n("Fullscreen") + "\tF", SQ_ADD_KACTION(TQt::Key_F), TQ_SLOT(activate()));
menuWindow->insertSeparator();
- menuWindow->insertItem(i18n("Previous tab") + "\tShift+Left", SQ_ADD_KACTION(TQt::Key_Left+SHIFT), TQT_SLOT(activate()));
- menuWindow->insertItem(i18n("Next tab") + "\tShift+Right", SQ_ADD_KACTION(TQt::Key_Right+SHIFT), TQT_SLOT(activate()));
+ menuWindow->insertItem(i18n("Previous tab") + "\tShift+Left", SQ_ADD_KACTION(TQt::Key_Left+SHIFT), TQ_SLOT(activate()));
+ menuWindow->insertItem(i18n("Next tab") + "\tShift+Right", SQ_ADD_KACTION(TQt::Key_Right+SHIFT), TQ_SLOT(activate()));
menuWindow->insertSeparator();
- menuWindow->insertItem(i18n("Close tab") + "\tW", SQ_ADD_KACTION(TQt::Key_W), TQT_SLOT(activate()));
+ menuWindow->insertItem(i18n("Close tab") + "\tW", SQ_ADD_KACTION(TQt::Key_W), TQ_SLOT(activate()));
- menuWindow->insertItem(i18n("Close all tabs") + "\tCtrl+W", SQ_ADD_KACTION(TQt::Key_W+CTRL), TQT_SLOT(activate()));
+ menuWindow->insertItem(i18n("Close all tabs") + "\tCtrl+W", SQ_ADD_KACTION(TQt::Key_W+CTRL), TQ_SLOT(activate()));
#endif
menu->insertSeparator();
- menu->insertItem(TQPixmap(locate("data", "images/menu/reset16.png")), i18n("Reset") + "\tR", SQ_ADD_KACTION(TQt::Key_R), TQT_SLOT(activate()));
- id_prop = menu->insertItem(TQPixmap(locate("data", "images/menu/prop16.png")), i18n("Properties") + "\tP", SQ_ADD_KACTION(TQt::Key_P), TQT_SLOT(activate()));
+ menu->insertItem(TQPixmap(locate("data", "images/menu/reset16.png")), i18n("Reset") + "\tR", SQ_ADD_KACTION(TQt::Key_R), TQ_SLOT(activate()));
+ id_prop = menu->insertItem(TQPixmap(locate("data", "images/menu/prop16.png")), i18n("Properties") + "\tP", SQ_ADD_KACTION(TQt::Key_P), TQ_SLOT(activate()));
menu->insertSeparator();
- menu->insertItem(i18n("Hotkeys") + "\t/", SQ_ADD_KACTION(TQt::Key_Slash), TQT_SLOT(activate()));
+ menu->insertItem(i18n("Hotkeys") + "\t/", SQ_ADD_KACTION(TQt::Key_Slash), TQ_SLOT(activate()));
#ifndef KSQUIRREL_PART
menu->insertSeparator();
- menu->insertItem(TQPixmap(locate("data", "images/menu/close16.png")), i18n("Close") + "\tX", SQ_ADD_KACTION(TQt::Key_X), TQT_SLOT(activate()));
+ menu->insertItem(TQPixmap(locate("data", "images/menu/close16.png")), i18n("Close") + "\tX", SQ_ADD_KACTION(TQt::Key_X), TQ_SLOT(activate()));
#endif
SQ_ADD_KACTION(TQt::Key_Down+CTRL);
@@ -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 *)), this, TQT_SLOT(slotCopyJobResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_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 *)), this, TQT_SLOT(slotCopyJobResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_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 41926a2..5265d46 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(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);
+ copy = KStdAction::copy(this, TQ_SLOT(slotCopyString()), 0);
+ copyentry = new TDEAction(i18n("Copy entry"), 0, this, TQ_SLOT(slotCopyEntry()), 0);
+ copyall = new TDEAction(i18n("Copy all entries"), 0, this, TQ_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 *)), this, TQT_SLOT(slotStatResult(TDEIO::Job *)));
+ connect(stjob, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_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)), this, TQT_SLOT(slotModeClicked(int)));
+ connect(gr, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotModeClicked(int)));
TQGridLayout *pageLayoutGR = new TQGridLayout(gr, 1, 3, 0, -1, "tabWidgetEXIFGRLayout");
diff --git a/ksquirrel/sq_kipiinterface.cpp b/ksquirrel/sq_kipiinterface.cpp
index 4d7eb60..474ab46 100644
--- a/ksquirrel/sq_kipiinterface.cpp
+++ b/ksquirrel/sq_kipiinterface.cpp
@@ -114,11 +114,11 @@ class SQ_KIPIImageInfo : public KIPI::ImageInfoShared
SQ_KIPIInterface::SQ_KIPIInterface(TQWidget *parent)
: KIPI::Interface(parent, "KSquirrel KIPI Interface")
{
- connect(SQ_WidgetStack::instance()->diroperator(), TQT_SIGNAL(fileHighlighted(const KFileItem *)),
- this, TQT_SLOT(slotSelectionChanged()));
+ connect(SQ_WidgetStack::instance()->diroperator(), TQ_SIGNAL(fileHighlighted(const KFileItem *)),
+ this, TQ_SLOT(slotSelectionChanged()));
- connect(SQ_WidgetStack::instance()->diroperator()->dirLister(), TQT_SIGNAL(completed(const KURL&)),
- this, TQT_SLOT(slotDirectoryChanged()));
+ connect(SQ_WidgetStack::instance()->diroperator()->dirLister(), TQ_SIGNAL(completed(const KURL&)),
+ this, TQ_SLOT(slotDirectoryChanged()));
}
SQ_KIPIInterface::~SQ_KIPIInterface()
diff --git a/ksquirrel/sq_kipimanager.cpp b/ksquirrel/sq_kipimanager.cpp
index f9db8e4..23c7bb0 100644
--- a/ksquirrel/sq_kipimanager.cpp
+++ b/ksquirrel/sq_kipimanager.cpp
@@ -72,11 +72,11 @@ SQ_KIPIManager::SQ_KIPIManager(TQWidget *_parent, const char *name) : TQObject(_
loaded = false;
p = new TDEPopupMenu;
- connect(p, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotAboutToShow()));
+ connect(p, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotAboutToShow()));
SQ_KIPIInterface *interface = new SQ_KIPIInterface(_parent);
mPluginLoader = new KIPI::PluginLoader(TQStringList(), interface);
- connect(mPluginLoader, TQT_SIGNAL(replug()), this, TQT_SLOT(slotReplug()));
+ connect(mPluginLoader, TQ_SIGNAL(replug()), this, TQ_SLOT(slotReplug()));
}
SQ_KIPIManager::~SQ_KIPIManager()
diff --git a/ksquirrel/sq_navigatordropmenu.cpp b/ksquirrel/sq_navigatordropmenu.cpp
index bfcb30f..efd629b 100644
--- a/ksquirrel/sq_navigatordropmenu.cpp
+++ b/ksquirrel/sq_navigatordropmenu.cpp
@@ -39,13 +39,13 @@ SQ_NavigatorDropMenu::SQ_NavigatorDropMenu(TQObject *parent) : TQObject(parent)
dropmenu = new SQ_PopupMenu(0);
// "copy" action
- TDEAction *pACopy = new TDEAction(i18n("Copy here"), "edit-paste", 0, this, TQT_SLOT(slotCopy()), ac, "sq_copy");
+ TDEAction *pACopy = new TDEAction(i18n("Copy here"), "edit-paste", 0, this, TQ_SLOT(slotCopy()), ac, "sq_copy");
// "move" action
- TDEAction *pAMove = new TDEAction(i18n("Move here"), 0, 0, this, TQT_SLOT(slotMove()), ac, "sq_move");
+ TDEAction *pAMove = new TDEAction(i18n("Move here"), 0, 0, this, TQ_SLOT(slotMove()), ac, "sq_move");
// "link" action
- TDEAction *pALink = new TDEAction(i18n("Link here"), "www", 0, this, TQT_SLOT(slotLink()), ac, "sq_link");
+ TDEAction *pALink = new TDEAction(i18n("Link here"), "www", 0, this, TQ_SLOT(slotLink()), ac, "sq_link");
// "cancel" action, this action will do nothing - just close popup menu
TDEAction *pACancel = new TDEAction(i18n("Cancel"), 0, 0, 0, 0, ac, "sq_cancel");
@@ -69,7 +69,7 @@ void SQ_NavigatorDropMenu::slotCopy()
if(also) emit done(url, SQ_NavigatorDropMenu::Copy);
TDEIO::Job *job = TDEIO::copy(list, url);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotJobResult(TDEIO::Job *)));
}
void SQ_NavigatorDropMenu::slotMove()
@@ -77,7 +77,7 @@ void SQ_NavigatorDropMenu::slotMove()
if(also) emit done(url, SQ_NavigatorDropMenu::Move);
TDEIO::Job *job = TDEIO::move(list, url);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotJobResult(TDEIO::Job *)));
}
void SQ_NavigatorDropMenu::slotLink()
@@ -85,7 +85,7 @@ void SQ_NavigatorDropMenu::slotLink()
if(also) emit done(url, SQ_NavigatorDropMenu::Link);
TDEIO::Job *job = TDEIO::link(list, url);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotJobResult(TDEIO::Job *)));
}
void SQ_NavigatorDropMenu::slotJobResult(TDEIO::Job *job)
diff --git a/ksquirrel/sq_options.ui.h b/ksquirrel/sq_options.ui.h
index a2154f1..df07794 100644
--- a/ksquirrel/sq_options.ui.h
+++ b/ksquirrel/sq_options.ui.h
@@ -164,7 +164,7 @@ void SQ_Options::init()
listMain->updateAndInstall(this);
- connect(listMain, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotShowPage()));
+ connect(listMain, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotShowPage()));
kURLReqOpenCustom->setMode(mode);
diff --git a/ksquirrel/sq_progressbox.cpp b/ksquirrel/sq_progressbox.cpp
index 8997589..34516a3 100644
--- a/ksquirrel/sq_progressbox.cpp
+++ b/ksquirrel/sq_progressbox.cpp
@@ -30,7 +30,7 @@ SQ_ProgressBox::SQ_ProgressBox(TQWidget *parent, const char *name) : TQHBox(pare
buttonStop = new TQPushButton(this);
buttonStop->setFlat(true);
buttonStop->setPixmap(SQ_IconLoader::instance()->loadIcon("media-playback-stop", TDEIcon::Desktop, TDEIcon::SizeSmall));
- connect(buttonStop, TQT_SIGNAL(clicked()), parent, TQT_SLOT(slotThumbnailUpdateToggle()));
+ connect(buttonStop, TQ_SIGNAL(clicked()), parent, TQ_SLOT(slotThumbnailUpdateToggle()));
// create progress bar
p = new SQ_Progress(this);
diff --git a/ksquirrel/sq_slideshow.ui.h b/ksquirrel/sq_slideshow.ui.h
index ffdfd42..72e8ee3 100644
--- a/ksquirrel/sq_slideshow.ui.h
+++ b/ksquirrel/sq_slideshow.ui.h
@@ -46,7 +46,7 @@ void SQ_SlideShow::init()
break;
}
- connect(hist, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)));
+ connect(hist, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)));
pushHistory->setPopup(hist);
}
diff --git a/ksquirrel/sq_slideshowlisting.ui.h b/ksquirrel/sq_slideshowlisting.ui.h
index 17eea16..f0dd0e5 100644
--- a/ksquirrel/sq_slideshowlisting.ui.h
+++ b/ksquirrel/sq_slideshowlisting.ui.h
@@ -12,7 +12,7 @@
void SQ_SlideShowListing::init()
{
- connect(pushCancel, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(kill()));
+ connect(pushCancel, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(kill()));
}
void SQ_SlideShowListing::setFile(int count, const TQString &f)
diff --git a/ksquirrel/sq_slideshowwidget.cpp b/ksquirrel/sq_slideshowwidget.cpp
index 2e4ba6a..167fb44 100644
--- a/ksquirrel/sq_slideshowwidget.cpp
+++ b/ksquirrel/sq_slideshowwidget.cpp
@@ -66,7 +66,7 @@ SQ_SlideShowWidget::SQ_SlideShowWidget(TQWidget *parent, const char *name)
message->setMargin(4);
message->setFrameShape(TQFrame::NoFrame);
- connect(timerHide, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotHide()));
+ connect(timerHide, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotHide()));
options = new TQHBox(this, "tde toolbar widget");
options->setSpacing(0);
@@ -79,26 +79,26 @@ SQ_SlideShowWidget::SQ_SlideShowWidget(TQWidget *parent, const char *name)
TQToolButton *b = new TQToolButton(options);
b->setIconSet(SQ_IconLoader::instance()->loadIcon("go-previous", TDEIcon::Desktop, is));
- connect(b, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(previous()));
- connect(b, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotResetPause()));
+ connect(b, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(previous()));
+ connect(b, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotResetPause()));
b = new TQToolButton(options);
b->setIconSet(SQ_IconLoader::instance()->loadIcon("go-next", TDEIcon::Desktop, is));
- connect(b, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(next()));
- connect(b, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotResetPause()));
+ connect(b, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(next()));
+ connect(b, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotResetPause()));
buttonPause = new TQToolButton(options);
buttonPause->setToggleButton(true);
buttonPause->setIconSet(SQ_IconLoader::instance()->loadIcon("media-playback-pause", TDEIcon::Desktop, is));
- connect(buttonPause, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(pause()));
+ connect(buttonPause, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(pause()));
b = new TQToolButton(options);
b->setIconSet(SQ_IconLoader::instance()->loadIcon("help", TDEIcon::Desktop, is));
- connect(b, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotShowHelp()));
+ connect(b, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotShowHelp()));
b = new TQToolButton(options);
b->setIconSet(SQ_IconLoader::instance()->loadIcon("cancel", TDEIcon::Desktop, is));
- connect(b, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(stopSlideShow()));
+ connect(b, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(stopSlideShow()));
options->adjustSize();
message->setFixedHeight(options->height());
diff --git a/ksquirrel/sq_thumbnailcachemaster.ui.h b/ksquirrel/sq_thumbnailcachemaster.ui.h
index e22176d..2659ae8 100644
--- a/ksquirrel/sq_thumbnailcachemaster.ui.h
+++ b/ksquirrel/sq_thumbnailcachemaster.ui.h
@@ -44,7 +44,7 @@ void SQ_ThumbnailCacheMaster::slotClearCache()
KURL url = tmp.root();
TDEIO::DeleteJob *job = TDEIO::del(url);
- connect(job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotClearFinished(TDEIO::Job*)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotClearFinished(TDEIO::Job*)));
}
void SQ_ThumbnailCacheMaster::slotClearFinished( TDEIO::Job * )
diff --git a/ksquirrel/sq_thumbnailloadjob.cpp b/ksquirrel/sq_thumbnailloadjob.cpp
index 7681f8f..e75dcf4 100644
--- a/ksquirrel/sq_thumbnailloadjob.cpp
+++ b/ksquirrel/sq_thumbnailloadjob.cpp
@@ -265,8 +265,8 @@ void SQ_ThumbnailLoadJob::slotResult(TDEIO::Job *job)
TDEIO::Job *cpjob = TDEIO::get(mCurrentURL, false, false);
- connect(cpjob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
- this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+ connect(cpjob, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+ this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
addSubjob(cpjob);
}
diff --git a/ksquirrel/sq_widgetstack.cpp b/ksquirrel/sq_widgetstack.cpp
index 4e79aac..aec29e1 100644
--- a/ksquirrel/sq_widgetstack.cpp
+++ b/ksquirrel/sq_widgetstack.cpp
@@ -89,13 +89,13 @@ SQ_WidgetStack::SQ_WidgetStack(TQWidget *parent, const int id) : TQObject(parent
raiseWidget(m_type, false);
- connect(KSquirrel::app(), TQT_SIGNAL(thumbSizeChanged(const TQString&)), dirop, TQT_SLOT(slotSetThumbSize(const TQString&)));
- connect(dirop, TQT_SIGNAL(runSeparately(KFileItem *)), this, TQT_SLOT(slotRunSeparately()));
+ connect(KSquirrel::app(), TQ_SIGNAL(thumbSizeChanged(const TQString&)), dirop, TQ_SLOT(slotSetThumbSize(const TQString&)));
+ connect(dirop, TQ_SIGNAL(runSeparately(KFileItem *)), this, TQ_SLOT(slotRunSeparately()));
KSquirrel::app()->historyCombo()->setEditText(url.isLocalFile() ? url.path() : url.prettyURL());
timerShowProgress = new TQTimer(this);
- connect(timerShowProgress, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDelayedShowProgress()));
+ connect(timerShowProgress, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDelayedShowProgress()));
}
SQ_WidgetStack::~SQ_WidgetStack()
@@ -116,8 +116,8 @@ void SQ_WidgetStack::init()
fileaction = static_cast<SQ_WidgetStack::FileAction>(SQ_Config::instance()->readNumEntry("last_action", SQ_WidgetStack::Unknown));
KURL uu = KURL::fromPathOrURL(SQ_Config::instance()->readEntry("last_url"));
- connect(SQ_NavigatorDropMenu::instance(), TQT_SIGNAL(done(const KURL &, int)),
- this, TQT_SLOT(slotTreeMenuDone(const KURL &, int)));
+ connect(SQ_NavigatorDropMenu::instance(), TQ_SIGNAL(done(const KURL &, int)),
+ this, TQ_SLOT(slotTreeMenuDone(const KURL &, int)));
emitNewLastURL(uu);
}
@@ -481,7 +481,7 @@ void SQ_WidgetStack::slotRecreateThumbnail()
tv->progressBox()->show();
- TQTimer::singleShot(1, this, TQT_SLOT(slotDelayedRecreateThumbnail()));
+ TQTimer::singleShot(1, this, TQ_SLOT(slotDelayedRecreateThumbnail()));
}
void SQ_WidgetStack::slotDelayedRecreateThumbnail()
@@ -566,7 +566,7 @@ void SQ_WidgetStack::slotFilePaste()
// now copy or move files to current url
job = (fileaction == SQ_WidgetStack::Copy) ? TDEIO::copy(files, _url) : TDEIO::move(files, _url);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotJobResult(TDEIO::Job *)));
}
void SQ_WidgetStack::slotJobResult(TDEIO::Job *job)
@@ -605,7 +605,7 @@ void SQ_WidgetStack::repeat()
return;
TDEIO::Job *job = (fileaction == SQ_WidgetStack::Copy) ? TDEIO::copy(files, lastURL) : TDEIO::move(files, lastURL);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotJobResult(TDEIO::Job *)));
}
// Create links