summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/directorymergewindow.cpp4
-rw-r--r--src/directorymergewindow.h6
-rw-r--r--src/kreplacements/kreplacements.cpp4
-rw-r--r--src/kreplacements/kreplacements.h8
-rw-r--r--src/optiondialog.cpp18
5 files changed, 20 insertions, 20 deletions
diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp
index c020d0e..f3f9500 100644
--- a/src/directorymergewindow.cpp
+++ b/src/directorymergewindow.cpp
@@ -268,7 +268,7 @@ static int s_UnsolvedCol = 6; // Nr of unsolved conflicts (for 3 input files)
static int s_SolvedCol = 7; // Nr of auto-solvable conflicts (for 3 input files)
static int s_NonWhiteCol = 8; // Nr of nonwhite deltas (for 2 input files)
static int s_WhiteCol = 9; // Nr of white deltas (for 2 input files)
-DirectoryMergeWindow::DirectoryMergeWindow( TQWidget* pParent, OptionDialog* pOptions, KIconLoader* pIconLoader )
+DirectoryMergeWindow::DirectoryMergeWindow( TQWidget* pParent, OptionDialog* pOptions, TDEIconLoader* pIconLoader )
: TQListView( pParent )
{
connect( TQT_TQOBJECT(this), TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(onDoubleClick(TQListViewItem*)));
@@ -1197,7 +1197,7 @@ void DirectoryMergeWindow::prepareListView( ProgressProxy& pp )
{
#include "xpm/file.xpm"
#include "xpm/folder.xpm"
- s_pm_dir = new TQPixmap( m_pIconLoader->loadIcon("folder", KIcon::Small ) );
+ s_pm_dir = new TQPixmap( m_pIconLoader->loadIcon("folder", TDEIcon::Small ) );
if (s_pm_dir->size()!=TQSize(16,16))
{
delete s_pm_dir;
diff --git a/src/directorymergewindow.h b/src/directorymergewindow.h
index 88ee923..05d1217 100644
--- a/src/directorymergewindow.h
+++ b/src/directorymergewindow.h
@@ -29,7 +29,7 @@
#include "diff.h" //TotalDiffStatus
class OptionDialog;
-class KIconLoader;
+class TDEIconLoader;
class StatusInfo;
class DirectoryMergeInfo;
class OneDirectoryInfo;
@@ -119,7 +119,7 @@ class DirectoryMergeWindow : public TQListView
Q_OBJECT
public:
- DirectoryMergeWindow( TQWidget* pParent, OptionDialog* pOptions, KIconLoader* pIconLoader );
+ DirectoryMergeWindow( TQWidget* pParent, OptionDialog* pOptions, TDEIconLoader* pIconLoader );
~DirectoryMergeWindow();
void setDirectoryMergeInfo(DirectoryMergeInfo* p){ m_pDirectoryMergeInfo=p; }
bool init(
@@ -257,7 +257,7 @@ protected:
bool m_bScanning; // true while in init()
OptionDialog* m_pOptions;
- KIconLoader* m_pIconLoader;
+ TDEIconLoader* m_pIconLoader;
DirectoryMergeInfo* m_pDirectoryMergeInfo;
StatusInfo* m_pStatusInfo;
diff --git a/src/kreplacements/kreplacements.cpp b/src/kreplacements/kreplacements.cpp
index bceee94..499ceac 100644
--- a/src/kreplacements/kreplacements.cpp
+++ b/src/kreplacements/kreplacements.cpp
@@ -842,7 +842,7 @@ void KPrinter::setPageSelection(e_PageSelection)
}
-TQPixmap KIconLoader::loadIcon( const TQString&, int )
+TQPixmap TDEIconLoader::loadIcon( const TQString&, int )
{
return TQPixmap();
}
@@ -1124,7 +1124,7 @@ TDEApplication* TDEApplication::kApplication()
return kapp;
}
-KIconLoader* TDEApplication::iconLoader()
+TDEIconLoader* TDEApplication::iconLoader()
{
return &m_iconLoader;
}
diff --git a/src/kreplacements/kreplacements.h b/src/kreplacements/kreplacements.h
index 0275a1b..5f4e811 100644
--- a/src/kreplacements/kreplacements.h
+++ b/src/kreplacements/kreplacements.h
@@ -264,7 +264,7 @@ public:
static TDEAction* keyBindings( TQWidget* parent, const char* slot, TDEActionCollection* );
};
-class KIcon
+class TDEIcon
{
public:
enum {SizeMedium,Small};
@@ -369,7 +369,7 @@ public:
bool isSet(const TQString&);
};
-class KIconLoader
+class TDEIconLoader
{
public:
TQPixmap loadIcon(const TQString& name, int);
@@ -378,11 +378,11 @@ public:
class TDEApplication : public TQApplication
{
TDEConfig m_config;
- KIconLoader m_iconLoader;
+ TDEIconLoader m_iconLoader;
public:
TDEApplication();
static TDEApplication* kApplication();
- KIconLoader* iconLoader();
+ TDEIconLoader* iconLoader();
TDEConfig* config();
bool isRestored();
};
diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp
index e463b38..512357b 100644
--- a/src/optiondialog.cpp
+++ b/src/optiondialog.cpp
@@ -508,7 +508,7 @@ void OptionDialog::setupOtherOptions()
void OptionDialog::setupFontPage( void )
{
TQFrame *page = addPage( i18n("Font"), i18n("Editor & Diff Output Font" ),
- BarIcon("fonts", KIcon::SizeMedium ) );
+ BarIcon("fonts", TDEIcon::SizeMedium ) );
TQVBoxLayout *topLayout = new TQVBoxLayout( page, 5, spacingHint() );
@@ -540,7 +540,7 @@ void OptionDialog::setupFontPage( void )
void OptionDialog::setupColorPage( void )
{
TQFrame *page = addPage( i18n("Color"), i18n("Colors Settings"),
- BarIcon("colorize", KIcon::SizeMedium ) );
+ BarIcon("colorize", TDEIcon::SizeMedium ) );
TQVBoxLayout *topLayout = new TQVBoxLayout( page, 5, spacingHint() );
TQGridLayout *gbox = new TQGridLayout( 7, 2 );
@@ -668,7 +668,7 @@ void OptionDialog::setupColorPage( void )
void OptionDialog::setupEditPage( void )
{
TQFrame *page = addPage( i18n("Editor"), i18n("Editor Behavior"),
- BarIcon("edit", KIcon::SizeMedium ) );
+ BarIcon("edit", TDEIcon::SizeMedium ) );
TQVBoxLayout *topLayout = new TQVBoxLayout( page, 5, spacingHint() );
TQGridLayout *gbox = new TQGridLayout( 4, 2 );
@@ -730,7 +730,7 @@ void OptionDialog::setupEditPage( void )
void OptionDialog::setupDiffPage( void )
{
TQFrame *page = addPage( i18n("Diff"), i18n("Diff Settings"),
- BarIcon("misc", KIcon::SizeMedium ) );
+ BarIcon("misc", TDEIcon::SizeMedium ) );
TQVBoxLayout *topLayout = new TQVBoxLayout( page, 5, spacingHint() );
TQGridLayout *gbox = new TQGridLayout( 3, 2 );
@@ -798,7 +798,7 @@ void OptionDialog::setupDiffPage( void )
void OptionDialog::setupMergePage( void )
{
TQFrame *page = addPage( i18n("Merge"), i18n("Merge Settings"),
- BarIcon("misc", KIcon::SizeMedium ) );
+ BarIcon("misc", TDEIcon::SizeMedium ) );
TQVBoxLayout *topLayout = new TQVBoxLayout( page );
topLayout->setMargin( 5 );
topLayout->setSpacing( spacingHint() );
@@ -981,7 +981,7 @@ void OptionDialog::setupMergePage( void )
void OptionDialog::setupDirectoryMergePage( void )
{
TQFrame *page = addPage( i18n("Directory Merge"), i18n("Directory Merge"),
- BarIcon("folder", KIcon::SizeMedium ) );
+ BarIcon("folder", TDEIcon::SizeMedium ) );
TQVBoxLayout *topLayout = new TQVBoxLayout( page, 5, spacingHint() );
TQGridLayout *gbox = new TQGridLayout( 11, 2 );
@@ -1211,7 +1211,7 @@ void OptionDialog::setupRegionalPage( void )
new Utf8BOMCodec();
TQFrame *page = addPage( i18n("Regional Settings"), i18n("Regional Settings"),
- BarIcon("locale"/*"charset"*/, KIcon::SizeMedium ) );
+ BarIcon("locale"/*"charset"*/, TDEIcon::SizeMedium ) );
TQVBoxLayout *topLayout = new TQVBoxLayout( page, 5, spacingHint() );
TQGridLayout *gbox = new TQGridLayout( 3, 2 );
@@ -1441,7 +1441,7 @@ static char* countryMap[]={
void OptionDialog::setupIntegrationPage( void )
{
TQFrame *page = addPage( i18n("Integration"), i18n("Integration Settings"),
- BarIcon("launch"/*"charset"*/, KIcon::SizeMedium ) );
+ BarIcon("launch"/*"charset"*/, TDEIcon::SizeMedium ) );
TQVBoxLayout *topLayout = new TQVBoxLayout( page, 5, spacingHint() );
TQGridLayout *gbox = new TQGridLayout( 3, 3 );
@@ -1537,7 +1537,7 @@ void OptionDialog::slotEncodingChanged()
void OptionDialog::setupKeysPage( void )
{
//TQVBox *page = addVBoxPage( i18n("Keys"), i18n("KeyDialog" ),
- // BarIcon("fonts", KIcon::SizeMedium ) );
+ // BarIcon("fonts", TDEIcon::SizeMedium ) );
//TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
// new TDEFontChooser( page,"font",false/*onlyFixed*/,TQStringList(),false,6 );
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-18 11:27:14 +0000