diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:25:10 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:25:10 -0600 |
| commit | af42c31c98d07cff797a6a8ba19022b3cb522f55 (patch) | |
| tree | c3a0d4d463f86f2fe2d738caf3eabd3f20e3a861 /ksquirrel/ksquirrelpart/sq_iconloader.cpp | |
| parent | 5f9e8eb2cb86f04c9aa8cb03dad9ade7c3452006 (diff) | |
| download | ksquirrel-af42c31c98d07cff797a6a8ba19022b3cb522f55.tar.gz ksquirrel-af42c31c98d07cff797a6a8ba19022b3cb522f55.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'ksquirrel/ksquirrelpart/sq_iconloader.cpp')
| -rw-r--r-- | ksquirrel/ksquirrelpart/sq_iconloader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ksquirrel/ksquirrelpart/sq_iconloader.cpp b/ksquirrel/ksquirrelpart/sq_iconloader.cpp index 05fbd12..aa55a43 100644 --- a/ksquirrel/ksquirrelpart/sq_iconloader.cpp +++ b/ksquirrel/ksquirrelpart/sq_iconloader.cpp @@ -40,7 +40,7 @@ SQ_IconLoader::~SQ_IconLoader() TQPixmap SQ_IconLoader::loadIcon(const TQString& name, KIcon::Group group, int size) const { // try to load from installed icon theme - TQPixmap p = KGlobal::iconLoader()->loadIcon(name, group, size, KIcon::DefaultState, 0, true); + TQPixmap p = TDEGlobal::iconLoader()->loadIcon(name, group, size, KIcon::DefaultState, 0, true); // requested pixmap not found, let's // try to find it in our pixmaps @@ -61,7 +61,7 @@ TQPixmap SQ_IconLoader::loadIcon(const TQString& name, KIcon::Group group, int s else if(name == "edit" && size == 32) p = pixmap_edit; else - p = KGlobal::iconLoader()->loadIcon("unknown", group, size); + p = TDEGlobal::iconLoader()->loadIcon("unknown", group, size); } return p; |